3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix \0x Refresh and Sheet.. messages being added correctly

Browse Source
This commit is contained in:
3d-gussner 2022-03-11 15:35:30 +01:00
parent d6de893ac5
commit 1f4da80609
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lang/lang-add.sh
View File

@ -21,8 +21,8 @@ if [ -z "$CONFIG_OK" ] | [ $CONFIG_OK -eq 0 ]; then echo 'Config NG!' >&2; exit
if [ ! -z "$COMMUNITY_LANGUAGES" ]; then
LANGUAGES+=" $COMMUNITY_LANGUAGES"
fi
echo "fw-clean languages:$LANGUAGES" >&2
LANGUAGES=$(ls lang_en_*.txt|cut -d '_' -f3|cut -d '.' -f1)
echo "lang-add languages:$LANGUAGES" >&2
# insert single text to english dictionary
# $1 - text to insert
@ -30,7 +30,7 @@ echo "fw-clean languages:$LANGUAGES" >&2
insert_en()
{
#replace '[' and ']' in string with '\[' and '\]'
str=$(echo "$1" | sed "s/\[/\\\[/g;s/\]/\\\]/g")
str=$(echo "$1" | sed 's/\[/\\\[/g;s/\]/\\\]/g')
# extract english texts, merge new text, grep line number
ln=$((cat lang_en.txt; echo "$1") | sed "/^$/d;/^#/d" | sort | grep -n "$str" | sed "s/:.*//;q")
# calculate position for insertion
@ -49,7 +49,7 @@ insert_en()
insert_xx()
{
#replace '[' and ']' in string with '\[' and '\]'
str=$(echo "$1" | sed "s/\[/\\\[/g;s/\]/\\\]/g")
str=$(echo "$1" | sed 's/\[/\\\[/g;s/\]/\\\]/g')
# extract english texts, merge new text, grep line number
ln=$((cat lang_en_$2.txt; echo "$1") | sed "/^$/d;/^#/d" | sed -n 'p;n' | sort | grep -n "$str" | sed "s/:.*//;q")
# calculate position for insertion
@ -67,7 +67,8 @@ insert_xx()
# $1 - text to search for
find_metadata()
{
sed -ne "s^.*\(_[iI]\|ISTR\)($1).*////\(.*\)^\2^p" ../Firmware/*.[ch]* | head -1
FIND_STR=$(echo $1|sed 's/\\/\\\\/g;s/\\\\x0a/\\\\n/g')
sed -ne "s^.*\(_[iI]\|ISTR\)($FIND_STR).*////\(.*\)^\2^p" ../Firmware/*.[ch]* | head -1
}
# check if input file exists
@ -76,7 +77,7 @@ if ! [ -e lang_add.txt ]; then
exit 1
fi
cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do
cat lang_add.txt | sed 's/^/"/;s/$/"/;s/\\/\\\\/g' | while read new_s; do
if grep "$new_s" lang_en.txt >/dev/null; then
echo "text already exist:"
echo "$new_s"

3
lang/progmem.sh
View File

@ -115,6 +115,9 @@ cat $PROGMEM.chr | \
sed 's/\\x01/\\\\\\x01/g;' | \
sed 's/\\xf8/\\\\\\xf8/g;' | \
sed 's/\\x0a/\\\\\\x0a/g;' | \
sed 's/\\x04/\\\\\\x04/g;' | \
sed 's/\\xe4/\\\\\\xe4/g;' | \
sed 's/\\n/\\\\\\0a/g;' | \
sed 's/\\x00$/\n/;s/^/\"/;s/$/\"\\/'; \
) | sh > $PROGMEM.var