voice: Have allvoices() sort voices by shortname (eg en_us)

Change-Id: Id4c8b28b09732082cb4b35b3e5f4c05874e6f83c

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/builds.pm b/tools/builds.pm
index e6c6d7509e..3e5db46dd1 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -609,7 +609,7 @@ sub simbuilds {
     'chinese-simp' => {  # Mandarin?
         'lang' => 'chinese-simp',
         'name' => '简体中文 (Chinese Simplified)',
-        'short' => 'zh_CN',
+        'short' => 'zh_cn',
         'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vzh',
@@ -838,14 +838,14 @@ sub simbuilds {
     },
 );
 
-sub bylang {
-    return uc $voices{$a}{lang} cmp uc $voices{$b}{lang};
+sub byshortname {
+    return uc $voices{$a}{short} cmp uc $voices{$b}{short};
 }
 
 sub allvoices {
     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});
     }
 
@@ -856,7 +856,7 @@ sub voicesforlang($) {
     my $l = shift @_;
     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});
     }