devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

updatelang: Alter syntax for 'phrase missing entirely' errors

Browse source 
Instead of 'this phrase missing entirely [...]' followed by the
verbatim phrase copied from English, instead the message now
reads 'the 'PHRASE_ID' is missing entirely [...].  This allows
the warning to be self-contained.

Change-Id: I413c29e0c1f6616e74d875d197b34c4724330d67
This commit is contained in:
Solomon Peachy 2025-04-19 21:59:01 -04:00
parent ceeca12f07
commit f563fe54c2
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/langstatus
View file

@ -28,7 +28,7 @@ ENGLISH="$LANGDIR"/english.lang
while read LINE; do while read LINE; do
case $LINE in case $LINE in
"### This phrase is missing entirely"*) "### The phrase "*)
MISSING=`expr $MISSING + 1` MISSING=`expr $MISSING + 1`
;; ;;
"### The 'desc' field for"*|"### The 'user' field for"*) "### The 'desc' field for"*|"### The 'user' field for"*)

32
tools/updatelang
View file

@ -245,10 +245,10 @@ foreach (@missingorder) {
if ($_ eq 'VOICE_LANG_NAME') { if ($_ eq 'VOICE_LANG_NAME') {
$lang{$_} = $english{$_}; $lang{$_} = $english{$_};
$lang{$_}{'voice'}{'*'} = ""; $lang{$_}{'voice'}{'*'} = "";
$lang{$_}{'notes'} .= "### This phrase is missing entirely, please fill out\n"; $lang{$_}{'notes'} .= "### The phrase '$_' is missing entirely, please fill out\n";
} else { } else {
$lang{$_} = $english{$_}; $lang{$_} = $english{$_};
$lang{$_}{'notes'} .= "### This phrase is missing entirely, copying from english!\n"; $lang{$_}{'notes'} .= "### The phrase '$_' is missing entirely, copying from english!\n";
} }
$lang{$_}{'new'} = 1; $lang{$_}{'new'} = 1;
} }
@ -269,7 +269,9 @@ foreach my $id (@langorder) {
# print "#!! '$id' deprecated, deleting\n"; # print "#!! '$id' deprecated, deleting\n";
$lang{$id} = $english{$id}; $lang{$id} = $english{$id};
} else { } else {
$lang{$id}{'notes'} .= "### The 'desc' field for '$id' differs from the english!\n### the previously used desc is commented below:\n### desc: $lp{desc}\n"; $lang{$id}{'notes'} .= "### The 'desc' field for '$id' differs from the english!\n";
$lang{$id}{'notes'} .= "#### the previously used desc is commented below:\n";
$lang{$id}{'notes'} .= "##### desc: $lp{desc}\n";
$lang{$id}{'phrase'}{'desc'} = $english{$id}{'phrase'}{'desc'}; $lang{$id}{'phrase'}{'desc'} = $english{$id}{'phrase'}{'desc'};
# print "#!! '$id' changed description\n"; # print "#!! '$id' changed description\n";
} }
@ -280,7 +282,9 @@ foreach my $id (@langorder) {
} }
if (!defined($lp{'user'}) || $lp{'user'} ne $ep{'user'}) { if (!defined($lp{'user'}) || $lp{'user'} ne $ep{'user'}) {
$lang{$id}{'notes'} .= "### The 'user' field for '$id' differs from the english!\n### the previously used desc is commented below:\n### desc: $lp{user}\n"; $lang{$id}{'notes'} .= "### The 'user' field for '$id' differs from the english!\n";
$lang{$id}{'notes'} .= "#### the previously used desc is commented below:\n";
$lang{$id}{'notes'} .= "##### desc: $lp{user}\n";
if (!defined($lp{'user'}) || length($lp{'user'}) == 0) { if (!defined($lp{'user'}) || length($lp{'user'}) == 0) {
$lp{'user'} = $ep{'user'}; $lp{'user'} = $ep{'user'};
} }
@ -320,8 +324,8 @@ foreach my $id (@langorder) {
} elsif ($lp{$tgt} ne $ep{$tgt}) { } elsif ($lp{$tgt} ne $ep{$tgt}) {
# If the source string differs, complain, and copy from English # If the source string differs, complain, and copy from English
$lang{$id}{'notes'} .= "### The <source> section for '$id:$tgt' differs from the english!\n"; $lang{$id}{'notes'} .= "### The <source> section for '$id:$tgt' differs from the english!\n";
$lang{$id}{'notes'} .= "### the previously used one is commented below:\n"; $lang{$id}{'notes'} .= "#### the previously used one is commented below:\n";
$lang{$id}{'notes'} .= "### $english{$id}{source}{$tgt}\n"; $lang{$id}{'notes'} .= "##### $english{$id}{source}{$tgt}\n";
# print "#!! '$id:$tgt' source changed ('$lp{$tgt}' vs '$ep{$tgt}')\n"; # print "#!! '$id:$tgt' source changed ('$lp{$tgt}' vs '$ep{$tgt}')\n";
$lang{$id}{'source'}{$tgt} = $english{$id}{'source'}{$tgt}; $lang{$id}{'source'}{$tgt} = $english{$id}{'source'}{$tgt};
} }
@ -365,8 +369,8 @@ foreach my $id (@langorder) {
} elsif ($lp{$tgt} ne '' && $ep{$tgt} eq '') { } elsif ($lp{$tgt} ne '' && $ep{$tgt} eq '') {
# It should be kept blank! # It should be kept blank!
$lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' is not blank!\n"; $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' is not blank!\n";
$lang{$id}{'notes'} .= "### the previously used one is commented below:\n"; $lang{$id}{'notes'} .= "#### the previously used one is commented below:\n";
$lang{$id}{'notes'} .= "### $english{$id}{dest}{$tgt}\n"; $lang{$id}{'notes'} .= "##### $english{$id}{dest}{$tgt}\n";
# print "#!! '$id:$tgt' dest not blank ('$lp{$tgt}' vs '$ep{$tgt}')\n"; # print "#!! '$id:$tgt' dest not blank ('$lp{$tgt}' vs '$ep{$tgt}')\n";
$lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt}; $lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt};
} }
@ -380,8 +384,8 @@ foreach my $id (@langorder) {
$sane =~ tr/YAmd~//d; $sane =~ tr/YAmd~//d;
if (length($sane) != 0) { if (length($sane) != 0) {
$lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has illegal characters! Restoring from English!\n"; $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has illegal characters! Restoring from English!\n";
$lang{$id}{'notes'} .= "### the previously used one is commented below:\n"; $lang{$id}{'notes'} .= "#### the previously used one is commented below:\n";
$lang{$id}{'notes'} .= "### $lang{$id}{dest}{$tgt}\n"; $lang{$id}{'notes'} .= "##### $lang{$id}{dest}{$tgt}\n";
$lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt}; $lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt};
} }
} }
@ -398,8 +402,8 @@ foreach my $id (@langorder) {
} }
if ($fmt1 ne $fmt2) { if ($fmt1 ne $fmt2) {
$lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has incorrect format specifiers! Copying from English!\n"; $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has incorrect format specifiers! Copying from English!\n";
$lang{$id}{'notes'} .= "### the previously used one is commented below:\n"; $lang{$id}{'notes'} .= "#### the previously used one is commented below:\n";
$lang{$id}{'notes'} .= "### $lang{$id}{dest}{$tgt}\n"; $lang{$id}{'notes'} .= "##### $lang{$id}{dest}{$tgt}\n";
$lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt}; $lang{$id}{'dest'}{$tgt} = $english{$id}{'dest'}{$tgt};
# print "#!! '$id:$tgt' dest does not match src format args: '$fmt1' vs '$fmt2'\n"; # print "#!! '$id:$tgt' dest does not match src format args: '$fmt1' vs '$fmt2'\n";
} }
@ -462,8 +466,8 @@ foreach my $id (@langorder) {
if ($id ne 'VOICE_NUMERIC_TENS_SWAP_SEPARATOR') { if ($id ne 'VOICE_NUMERIC_TENS_SWAP_SEPARATOR') {
# If it's not blank, clear it and complain! # If it's not blank, clear it and complain!
$lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' is not blank!\n"; $lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' is not blank!\n";
$lang{$id}{'notes'} .= "### the previously used one is commented below:\n"; $lang{$id}{'notes'} .= "#### the previously used one is commented below:\n";
$lang{$id}{'notes'} .= "### $english{$id}{voice}{$tgt}\n"; $lang{$id}{'notes'} .= "##### $english{$id}{voice}{$tgt}\n";
# print "#!! '$id:$tgt' voice not blank ('$lp{$tgt}' vs '$ep{$tgt}')\n"; # print "#!! '$id:$tgt' voice not blank ('$lp{$tgt}' vs '$ep{$tgt}')\n";
$lang{$id}{'voice'}{$tgt} = $english{$id}{'voice'}{$tgt}; $lang{$id}{'voice'}{$tgt} = $english{$id}{'voice'}{$tgt};
} }