diff options
| -rw-r--r-- | data/script.js | 11 | ||||
| -rwxr-xr-x | util/jsgen.pl | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/data/script.js b/data/script.js index 27f20f6b..609db8da 100644 --- a/data/script.js +++ b/data/script.js @@ -34,9 +34,6 @@ * In the case of an mt('<key>') without any extra arguments, the entire * function call may be replaced by the TL string. In such a case mt() * behaves similar to a preprocessor macro in C. - * - * The "_lang_*" keys for all languages for which we have a translation are - * already included automatically. */ var expanded_icon = '▾'; var collapsed_icon = '▸'; @@ -2297,10 +2294,10 @@ if(byId('lang_select')) { var lst = tag('ul', null); for(var i=0; i<L10N_LANG.length; i++) { var ln = L10N_LANG[i]; - var icon = tag('acronym', {'class':'icons lang '+ln}, ' '); - lst.appendChild(tag('li', {'class':'lang_selector'}, curlang == ln - ? tag('i', icon, mt('_lang_'+ln)) - : tag('a', {href:'/setlang?lang='+ln}, icon, L10N_STR['_lang_'+ln][ln]||mt('_lang_'+ln)) + var icon = tag('acronym', {'class':'icons lang '+ln[0]}, ' '); + lst.appendChild(tag('li', {'class':'lang_selector'}, curlang == ln[0] + ? tag('i', icon, mt('_lang_'+ln[0])) + : tag('a', {href:'/setlang?lang='+ln[0]}, icon, ln[1]) )); } return lst; diff --git a/util/jsgen.pl b/util/jsgen.pl index 03b79ab5..5bd15c8f 100755 --- a/util/jsgen.pl +++ b/util/jsgen.pl @@ -55,9 +55,6 @@ sub l10n { "mt('$k'$s" } #eg; - # also add the _lang_* for all languages for which we have a translation - my $jskeys_lang = join '|', VNDB::L10N::languages(); - push @keys, qr/_lang_(?:$jskeys_lang)/; # generate header my $r = "L10N_STR = {\n"; @@ -113,7 +110,9 @@ sub jsgen { $common .= sprintf "animated = [ %s ];\n", join ', ', @{$S{animated}}; $common .= sprintf "voiced = [ %s ];\n", join ', ', @{$S{voiced}}; $common .= sprintf "vn_lengths = [ %s ];\n", join ', ', @{$S{vn_lengths}}; - $common .= sprintf "L10N_LANG = [ %s ];\n", join(', ', map qq{"$_"}, VNDB::L10N::languages()); + $common .= sprintf "L10N_LANG = [ %s ];\n", join(', ', map + sprintf('["%s","%s"]', $_, $lang{$_}{"_lang_$_"}||$lang{en}{"_lang_$_"}), + VNDB::L10N::languages()); open my $JS, '<:utf8', "$ROOT/data/script.js" or die $!; my $js .= join '', <$JS>; |