len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some fixes for language and voice scripts:

Browse source 
Languages:
  * Get rid of leading space on LANG_ID3_VBR [ " (VBR)" ]
  * Fix up sole user to insert the space programmically
 updatelang:
  * strip leading and trailing spaces on all phrases except VOICE_PAUSE
 voice.pl
  * Debug logging with UTF-8 output
  * Explicitly delete tab character from voiced strings

Change-Id: Ie466793479ce15ce7a9553770583a070530e7afd
This commit is contained in:
Solomon Peachy 2025-04-29 18:49:13 -04:00
parent 0ea02f0268
commit 12b9419006
47 changed files with 110 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/lang/basque.lang
View file

@ -7076,10 +7076,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/bulgarian.lang
View file

@ -6512,10 +6512,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/catala.lang
View file

@ -7071,10 +7071,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

2
apps/lang/chinese-simp.lang
View file

@ -4333,7 +4333,7 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: "(VBR)"

2
apps/lang/chinese-trad.lang
View file

@ -4432,7 +4432,7 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (變動位元率)"

4
apps/lang/czech.lang
View file

@ -7084,10 +7084,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "vé bé er"

4
apps/lang/dansk.lang
View file

@ -4064,10 +4064,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/deutsch.lang
View file

@ -6498,10 +6498,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/eesti.lang
View file

@ -4550,10 +4550,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/english-us.lang
View file

@ -6506,10 +6506,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

39
apps/lang/english.lang
View file

@ -91,6 +91,7 @@
# GoGear SA9200 gogearsa9200
# Samsung
# YH820/YH920/YH925 samsungyh*
# First item will be shown when P2STR is passed a NULL pointer
<phrase>
id: LANG_ROCKBOX_TITLE
desc: main menu title
@ -105,7 +106,6 @@
*: "Rockbox"
</voice>
</phrase>
# First item will be shown when P2STR is passed a NULL pointer
<phrase>
id: LANG_SET_BOOL_YES
desc: bool true representation
@ -3524,18 +3524,15 @@
user: core
<source>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</source>
<dest>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</dest>
<voice>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</voice>
</phrase>
<phrase>
@ -3544,18 +3541,15 @@
user: core
<source>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</source>
<dest>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</dest>
<voice>
*: none
battery_types: ""
xduoox3: ""
battery_types,xduoox3: ""
</voice>
</phrase>
<phrase>
@ -3688,8 +3682,8 @@
user: core
<source>
*: none
gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Set"
gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
iriverh100,iriverh120,iriverh300: "NAVI = Set"
mpiohd300: "ENTER = Set"
mrobe500: "HEART = Set"
@ -3698,8 +3692,8 @@
</source>
<dest>
*: none
gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Set"
gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
iriverh100,iriverh120,iriverh300: "NAVI = Set"
mpiohd300: "ENTER = Set"
mrobe500: "HEART = Set"
@ -3717,8 +3711,8 @@
user: core
<source>
*: none
gigabeatfx,mrobe500: "POWER = Revert"
aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Revert"
gigabeatfx,mrobe500: "POWER = Revert"
gogearsa9200: "LEFT = Revert"
iaudiom5,iaudiox5: "RECORD = Revert"
ipod*,mpiohd300,sansac200*: "MENU = Revert"
@ -3731,8 +3725,8 @@
</source>
<dest>
*: none
gigabeatfx,mrobe500: "POWER = Revert"
aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Revert"
gigabeatfx,mrobe500: "POWER = Revert"
gogearsa9200: "LEFT = Revert"
iaudiom5,iaudiox5: "RECORD = Revert"
ipod*,mpiohd300,sansac200*: "MENU = Revert"
@ -6674,10 +6668,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"
@ -6994,7 +6988,6 @@
*: "Add Current to Shortcuts"
</voice>
</phrase>
<phrase>
id: LANG_PITCH
desc: "pitch" in the pitch screen
@ -16998,15 +16991,15 @@
user: core
<source>
*: none
lineout_poweroff,erosqnative: "Line Out"
erosqnative,lineout_poweroff: "Line Out"
</source>
<dest>
*: none
lineout_poweroff,erosqnative: "Line Out"
erosqnative,lineout_poweroff: "Line Out"
</dest>
<voice>
*: none
lineout_poweroff,erosqnative: "Line Out"
erosqnative,lineout_poweroff: "Line Out"
</voice>
</phrase>
<phrase>

4
apps/lang/espanol.lang
View file

@ -4932,10 +4932,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/esperanto.lang
View file

@ -4659,10 +4659,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/finnish.lang
View file

@ -4781,10 +4781,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/francais.lang
View file

@ -6593,10 +6593,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/galego.lang
View file

@ -6155,10 +6155,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/greek.lang
View file

@ -7030,10 +7030,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/hebrew.lang
View file

@ -7109,10 +7109,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/hrvatski.lang
View file

@ -7073,10 +7073,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/islenska.lang
View file

@ -3643,10 +3643,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/italiano.lang
View file

@ -6496,10 +6496,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/japanese.lang
View file

@ -6516,10 +6516,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/korean.lang
View file

@ -6523,10 +6523,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

2
apps/lang/latviesu.lang
View file

@ -6509,7 +6509,7 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: "(MBR)"

4
apps/lang/lietuviu.lang
View file

@ -7151,10 +7151,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/magyar.lang
View file

@ -6681,10 +6681,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/nederlands.lang
View file

@ -4464,10 +4464,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "Variabele bitrate"

4
apps/lang/norsk-nynorsk.lang
View file

@ -4731,10 +4731,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/norsk.lang
View file

@ -4052,10 +4052,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/polski.lang
View file

@ -6502,10 +6502,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/portugues-brasileiro.lang
View file

@ -6511,10 +6511,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/portugues.lang
View file

@ -4431,10 +4431,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

2
apps/lang/romaneste.lang
View file

@ -2414,7 +2414,7 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: "(VBR)"

2
apps/lang/russian.lang
View file

@ -3960,7 +3960,7 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (Переменный)"

4
apps/lang/slovak.lang
View file

@ -6494,10 +6494,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/slovenscina.lang
View file

@ -3200,10 +3200,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/srpski.lang
View file

@ -6592,10 +6592,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/svenska.lang
View file

@ -6516,10 +6516,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/tagalog.lang
View file

@ -6142,10 +6142,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/thai.lang
View file

@ -7054,10 +7054,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/turkce.lang
View file

@ -6550,10 +6550,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/ukrainian.lang
View file

@ -6509,10 +6509,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

4
apps/lang/vlaams.lang
View file

@ -4796,10 +4796,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "Variabele bitrate"

4
apps/lang/walon.lang
View file

@ -7092,10 +7092,10 @@
desc: in browse_id3
user: core
<source>
*: " (VBR)"
*: "(VBR)"
</source>
<dest>
*: " (VBR)"
*: "(VBR)"
</dest>
<voice>
*: "VBR"

3
apps/screens.c
View file

@ -666,7 +666,8 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
case LANG_ID3_BITRATE:
if (!id3->bitrate)
return NULL;
snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate,
snprintf(buffer, buffer_len, "%d kbps%s%s", id3->bitrate,
id3->vbr ? " " : "",
id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) "");
val=buffer;
if(say_it)

9
tools/updatelang
View file

@ -20,6 +20,7 @@ sub trim {
my ($string) = @_;
$string =~ s/^\s+//;
$string =~ s/\s+$//;
$string =~ tr/\t//d;
return $string;
}
@ -61,7 +62,13 @@ sub parselangfile {
}
} elsif ($pos ne 'phrase' && $line =~ /^([^:]+): ?\"?([^\"]*)\"?$/) {
my @targets = split(',', $1);
my $w = $2;
my $w;
if ($id ne 'VOICE_PAUSE') {
$w = trim($2);
} else {
$w = $2;
}
foreach (@targets) {
my $l = trim($_);

3
tools/voice.pl
View file

@ -698,6 +698,9 @@ if (defined($v) or defined($ENV{'V'})) {
# add the tools dir to the path temporarily, for calling various tools
$ENV{'PATH'} = dirname($0) . ':' . $ENV{'PATH'};
# logging needs to be UTF8
binmode(*STDOUT, ':encoding(utf8)');
my $tts_object = init_tts($s, $S, $l);
# Do what we're told