forked from len0rd/rockbox
voice: Have allvoices() sort voices by shortname (eg en_us)
Change-Id: Id4c8b28b09732082cb4b35b3e5f4c05874e6f83c
This commit is contained in:
parent
5d53c94255
commit
130ad0a262
1 changed files with 5 additions and 5 deletions
|
@ -609,7 +609,7 @@ sub simbuilds {
|
||||||
'chinese-simp' => { # Mandarin?
|
'chinese-simp' => { # Mandarin?
|
||||||
'lang' => 'chinese-simp',
|
'lang' => 'chinese-simp',
|
||||||
'name' => '简体中文 (Chinese Simplified)',
|
'name' => '简体中文 (Chinese Simplified)',
|
||||||
'short' => 'zh_CN',
|
'short' => 'zh_cn',
|
||||||
'defengine' => 'piper',
|
'defengine' => 'piper',
|
||||||
'engines' => {
|
'engines' => {
|
||||||
'espeak' => '-vzh',
|
'espeak' => '-vzh',
|
||||||
|
@ -838,14 +838,14 @@ sub simbuilds {
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
sub bylang {
|
sub byshortname {
|
||||||
return uc $voices{$a}{lang} cmp uc $voices{$b}{lang};
|
return uc $voices{$a}{short} cmp uc $voices{$b}{short};
|
||||||
}
|
}
|
||||||
|
|
||||||
sub allvoices {
|
sub allvoices {
|
||||||
my @list;
|
my @list;
|
||||||
|
|
||||||
for my $b (sort bylang keys %voices) {
|
for my $b (sort byshortname keys %voices) {
|
||||||
push @list, $b if (defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
|
push @list, $b if (defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -856,7 +856,7 @@ sub voicesforlang($) {
|
||||||
my $l = shift @_;
|
my $l = shift @_;
|
||||||
my @list;
|
my @list;
|
||||||
|
|
||||||
for my $b (sort bylang keys %voices) {
|
for my $b (sort byshortname keys %voices) {
|
||||||
push @list, $b if ($voices{$b}{lang} eq $b && defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
|
push @list, $b if ($voices{$b}{lang} eq $b && defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue