Hardcode language names in their native language for usability

apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java

@@ -24,41 +24,39 @@ public class ConfigUIHelper {
      *  added to the top-level build.xml for the updater.
      *  As of 0.9.12, ISO 639-2 three-letter codes are supported also.
      *
-     *  Note: we don't currently _x the language strings,
-     *  we'll just rely on the JVM's translations for now.
      *  Country flag unused.
      */
     private static final String langs[][] = {
-        { "ar", "lang_ar", "Arabic", null },
+        { "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
-        { "cs", "cz", "Czech", null },
+        { "cs", "cz", "Čeština", null },
-        //{ "da", "dk", "Danish", null },
+        { "zh", "cn", "Chinese 中文", null },
-        { "de", "de", "German", null },
+        //{ "zh_TW", "tw", "Chinese 中文", "Taiwan" },
-        //{ "et", "ee", "Estonian", null },
+        //{ "da", "dk", "Dansk", null },
-        //{ "el", "gr", "Greek", null },
+        { "de", "de", "Deutsch", null },
+        //{ "et", "ee", "Eesti", null },
         { "en", "us", "English", null },
-        { "es", "es", "Spanish", null },
+        { "es", "es", "Español", null },
-        { "fi", "fi", "Finnish", null },
+        { "fr", "fr", "Français", null },
-        { "fr", "fr", "French", null },
+        //{ "gl", "lang_gl", "Galego", null },
-        //{ "gl", "lang_gl", "Galician", null },
+        //{ "el", "gr", "Greek Ελληνικά", null },
-        { "hu", "hu", "Hungarian", null },
+        { "it", "it", "Italiano", null },
-        { "it", "it", "Italian", null },
+        { "ja", "jp", "Japanese 日本語", null },
-        { "ja", "jp", "Japanese", null },
+        { "ko", "kr", "Korean 한국어", null },
-        { "ko", "kr", "Korean", null },
         //{ "mg", "mg", "Malagasy", null },
-        { "nl", "nl", "Dutch", null },
+        { "hu", "hu", "Magyar", null },
-        { "nb", "no", "Norwegian Bokmaal", null },
+        { "nl", "nl", "Nederlands", null },
-        { "pl", "pl", "Polish", null },
+        { "nb", "no", "Norsk (bokmål)", null },
-        { "pt", "pt", "Portuguese", null },
+        { "pl", "pl", "Polski", null },
-        { "pt_BR", "br", "Portuguese", "Brazil" },
+        { "pt", "pt", "Português", null },
-        { "ro", "ro", "Romanian", null },
+        { "pt_BR", "br", "Português", "Brazil" },
-        { "ru", "ru", "Russian", null },
+        { "ro", "ro", "Română", null },
-        { "sk", "sk", "Slovak", null },
+        { "ru", "ru", "Russian Русский", null },
-        { "sv", "se", "Swedish", null },
+        { "sk", "sk", "Slovenčina", null },
-        { "tr", "tr", "Turkish", null },
+        { "fi", "fi", "Suomi", null },
-        { "uk", "ua", "Ukrainian", null },
+        { "sv", "se", "Svenska", null },
-        { "vi", "vn", "Vietnamese", null },
+        { "tr", "tr", "Türkçe", null },
-        { "zh", "cn", "Chinese", null },
+        { "uk", "ua", "Ukrainian Українська", null },
-        //{ "zh_TW", "tw", "Chinese", "Taiwan" },
+        { "vi", "vn", "Vietnamese Tiếng Việt", null },
         { "xx", "a1", "Debug: Find untagged strings", null },
     };
 
@@ -107,16 +105,11 @@ public class ConfigUIHelper {
             buf.append("value=\"").append(lang).append("\">");
             int under = lang.indexOf('_');
             String slang = (under > 0) ? lang.substring(0, under) : lang;
-            // we don't actually have translations for these, see above
+            buf.append(langs[i][2]);
-            buf.append(Translate.getDisplayLanguage(slang, langs[i][2], ctx, BUNDLE_NAME));
             String name = langs[i][3];
             if (name != null) {
-                String cou = (under > 0) ? lang.substring(under + 1) : lang;
-                Locale cur = new Locale(current);
-                Locale loc = new Locale(slang, cou);
                 buf.append(" (")
-                   //.append(Translate.getString(name, ctx, COUNTRY_BUNDLE_NAME))
+                   .append(name)
-                   .append(loc.getDisplayCountry(cur))
                    .append(')');
             }
             buf.append("</option>\n");

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

@@ -89,43 +89,43 @@ public class ConfigUIHelper extends HelperBase {
         // apps/routerconsole/jsp/home.jsp
         // .tx/config
         // New lang_xx flags: Add to top-level build.xml
+        // Names must be 18 chars or less (including country if specified)
         //
-        { "ar", "lang_ar", _x("Arabic"), null },
+        { "en", "us", "English", null },
-        { "cs", "cz", _x("Czech"), null },
+        { "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
-        { "da", "dk", _x("Danish"), null },
+        { "cs", "cz", "Čeština", null },
-        { "de", "de", _x("German"), null },
+        { "zh", "cn", "Chinese 中文", null },
-        { "et", "ee", _x("Estonian"), null },
+        { "zh_TW", "tw", "Chinese 中文", "Taiwan" },
-        { "el", "gr", _x("Greek"), null },
+        { "da", "dk", "Dansk", null },
-        { "en", "us", _x("English"), null },
+        { "de", "de", "Deutsch", null },
-        { "es", "es", _x("Spanish"), null },
+        { "et", "ee", "Eesti", null },
-        { "fi", "fi", _x("Finnish"), null },
+        { "es", "es", "Español", null },
-        { "fr", "fr", _x("French"), null },
+        { "fr", "fr", "Français", null },
-        { "gl", "lang_gl", _x("Galician"), null },
+        { "gl", "lang_gl", "Galego", null },
-        { "hu", "hu", _x("Hungarian"), null },
+        { "el", "gr", "Greek Ελληνικά", null },
-        { "it", "it", _x("Italian"), null },
+        { "it", "it", "Italiano", null },
-        { "ja", "jp", _x("Japanese"), null },
+        { "ja", "jp", "Japanese 日本語", null },
-        { "ko", "kr", _x("Korean"), null },
+        { "ko", "kr", "Korean 한국어", null },
-        { "mg", "mg", _x("Malagasy"), null },
+        { "mg", "mg", "Malagasy", null },
-        { "nl", "nl", _x("Dutch"), null },
+        { "hu", "hu", "Magyar", null },
-        { "nb", "no", _x("Norwegian Bokmaal"), null },
+        { "nl", "nl", "Nederlands", null },
-        { "pl", "pl", _x("Polish"), null },
+        { "nb", "no", "Norsk (bokmål)", null },
-        { "pt", "pt", _x("Portuguese"), null },
+        { "pl", "pl", "Polski", null },
-        { "pt_BR", "br", _x("Portuguese"), "Brazil" },
+        { "pt", "pt", "Português", null },
-        { "ro", "ro", _x("Romanian"), null },
+        { "pt_BR", "br", "Português", "Brazil" },
-        { "ru", "ru", _x("Russian"), null },
+        { "ro", "ro", "Română", null },
-        { "sk", "sk", _x("Slovak"), null },
+        { "ru", "ru", "Russian Русский", null },
-        { "sv", "se", _x("Swedish"), null },
+        { "sk", "sk", "Slovenčina", null },
-        { "tr", "tr", _x("Turkish"), null },
+        { "fi", "fi", "Suomi", null },
-        { "uk", "ua", _x("Ukrainian"), null },
+        { "sv", "se", "Svenska", null },
-        { "vi", "vn", _x("Vietnamese"), null },
+        { "tr", "tr", "Türkçe", null },
-        { "zh", "cn", _x("Chinese"), null },
+        { "uk", "ua", "Ukraine Українська", null },
-        { "zh_TW", "tw", _x("Chinese"), "Taiwan" },
+        { "vi", "vn", "Vietnam Tiếng Việt", null },
         { "xx", "a1", "Untagged strings", null },
     };
 
 
 
-    /** todo sort by translated string */
     public String getLangSettings() {
         String clang = Messages.getLanguage(_context);
         String current = clang;
@@ -167,11 +167,11 @@ public class ConfigUIHelper extends HelperBase {
                .append("<div class=\"ui_lang\">");
             int under = lang.indexOf('_');
             String slang = (under > 0) ? lang.substring(0, under) : lang;
-            buf.append(Messages.getDisplayLanguage(slang, langs[i][2], _context));
+            buf.append(langs[i][2]);
             String name = langs[i][3];
             if (name != null) {
                 buf.append(" (")
-                   .append(Messages.getString(name, _context, Messages.COUNTRY_BUNDLE_NAME))
+                   .append(name)
                    .append(')');
             }
             buf.append("</div></div>\n");

apps/routerconsole/jsp/console.jsp

@@ -33,35 +33,35 @@
  <div class="welcome">
   <div class="langbox"> <% /* English, then alphabetical by English name please */ %>
     <a href="/console?lang=en&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a>
-    <a href="/console?lang=ar&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a>
+    <a href="/console?lang=ar&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="Arabic عربية" alt="Arabic عربية"></a>
-    <a href="/console?lang=zh&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="中文" alt="中文"></a>
+    <a href="/console?lang=cs&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Čeština" alt="Čeština"></a>
-    <a href="/console?lang=cs&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="čeština" alt="čeština"></a>
+    <a href="/console?lang=zh&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="Chinese 中文" alt="Chinese 中文"></a>
+    <a href="/console?lang=zh_TW&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese 中文 (Taiwan)" alt="Chinese 中文 (Taiwan)"></a>
     <a href="/console?lang=da&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=dk" title="Dansk" alt="Dansk"></a>
     <a href="/console?lang=de&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
     <a href="/console?lang=et&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ee" title="Eesti" alt="Eesti"></a>
     <a href="/console?lang=es&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=es" title="Español" alt="Español"></a>
-    <a href="/console?lang=fi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a>
     <a href="/console?lang=fr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
     <a href="/console?lang=gl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_gl" title="Galician" alt="Galician"></a>
-    <a href="/console?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="ελληνικά" alt="ελληνικά"></a>
+    <a href="/console?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="Greek ελληνικά" alt="Greek ελληνικά"></a>
-    <a href="/console?lang=hu&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
     <a href="/console?lang=it&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
-    <a href="/console?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a><br>
+    <a href="/console?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a><br>
-    <a href="/console?lang=ko&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="한국어" alt="한국어"></a>
+    <a href="/console?lang=ko&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean 한국어" alt="Korean 한국어"></a>
     <a href="/console?lang=mg&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=mg" title="Malagasy" alt="Malagasy"></a>
-    <a href="/console?lang=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Bokmål" alt="Norwegian Bokmaal"></a>
+    <a href="/console?lang=hu&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
+    <a href="/console?lang=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Norsk (bokmål)" alt="Norsk (bokmål)"></a>
     <a href="/console?lang=nl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
     <a href="/console?lang=pl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a>
     <a href="/console?lang=pt&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pt" title="Português" alt="Português"></a>
     <a href="/console?lang=pt_BR&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=br" title="Português brasileiro" alt="Português brasileiro"></a>
     <a href="/console?lang=ro&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ro" title="Română" alt="Română"></a>
-    <a href="/console?lang=ru&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a>
+    <a href="/console?lang=ru&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="Russian Русский" alt="Russian Русский"></a>
     <a href="/console?lang=sk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=sk" title="Slovenčina" alt="Slovenčina"></a>
+    <a href="/console?lang=fi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a>
     <a href="/console?lang=sv&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a>
     <a href="/console?lang=tr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tr" title="Türkçe" alt="Türkçe"></a>
-    <a href="/console?lang=zh_TW&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese (Taiwan)" alt="Chinese (Taiwan)"></a>
+    <a href="/console?lang=uk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Ukrainian Українська" alt="Ukrainian Українська"></a>
-    <a href="/console?lang=uk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Українська" alt="Українська"></a>
+    <a href="/console?lang=vi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Vietnamese Tiếng Việt" alt="Vietnamese Tiếng Việt"></a>
-    <a href="/console?lang=vi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Tiếng Việt" alt="Tiếng Việt"></a>
   </div>
   <a name="top"></a>
   <h2><%=intl._t("Welcome to I2P")%></h2>

apps/routerconsole/jsp/home.jsp

@@ -60,35 +60,35 @@
 <div class="welcome" title="<%=intl._t("Click a flag to select a language. Click 'Configure UI' below to change it later.")%>">
   <div class="langbox" id="langbox">
     <a href="/home?lang=en&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a>
-    <a href="/home?lang=ar&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a>
+    <a href="/home?lang=ar&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="Arabic عربية" alt="Arabic عربية"></a>
-    <a href="/home?lang=zh&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="中文" alt="中文"></a>
+    <a href="/home?lang=cs&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Čeština" alt="Čeština"></a>
-    <a href="/home?lang=cs&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Česky" alt="Česky"></a>
+    <a href="/home?lang=zh&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="Chinese 中文" alt="Chinese 中文"></a>
+    <a href="/home?lang=zh_TW&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese 中文 (Taiwan)" alt="Chinese 中文 (Taiwan)"></a>
     <a href="/home?lang=da&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=dk" title="Dansk" alt="Dansk"></a>
     <a href="/home?lang=de&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
     <a href="/home?lang=et&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ee" title="Eesti" alt="Eesti"></a>
     <a href="/home?lang=es&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=es" title="Español" alt="Español"></a>
-    <a href="/home?lang=fi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a>
     <a href="/home?lang=fr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
-    <a href="/home?lang=gl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_gl" title="Galician" alt=Galician"></a>
+    <a href="/home?lang=gl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_gl" title="Galician" alt="Galician"></a>
-    <a href="/home?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="ελληνικά" alt="ελληνικά"></a>
+    <a href="/home?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="Greek ελληνικά" alt="Greek ελληνικά"></a>
-    <a href="/home?lang=hu&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
     <a href="/home?lang=it&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
-    <a href="/home?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="日本語" alt="日本語"></a><br>
+    <a href="/home?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a><br>
-    <a href="/home?lang=ko&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="한국어" alt="한국어"></a>
+    <a href="/home?lang=ko&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean 한국어" alt="Korean 한국어"></a>
     <a href="/home?lang=mg&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=mg" title="Malagasy" alt="Malagasy"></a>
-    <a href="/home?lang=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Bokmål" alt="Norwegian Bokmaal"></a>
+    <a href="/home?lang=hu&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>
+    <a href="/home?lang=nb&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=no" title="Norsk (bokmål)" alt="Norsk (bokmål)"></a>
     <a href="/home?lang=nl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
     <a href="/home?lang=pl&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a>
     <a href="/home?lang=pt&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pt" title="Português" alt="Português"></a>
     <a href="/home?lang=pt_BR&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=br" title="Português brasileiro" alt="Português brasileiro"></a>
     <a href="/home?lang=ro&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ro" title="Română" alt="Română"></a>
-    <a href="/home?lang=ru&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a>
+    <a href="/home?lang=ru&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="Russian Русский" alt="Russian Русский"></a>
     <a href="/home?lang=sk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=sk" title="Slovenčina" alt="Slovenčina"></a>
+    <a href="/home?lang=fi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a>
     <a href="/home?lang=sv&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a>
     <a href="/home?lang=tr&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tr" title="Türkçe" alt="Türkçe"></a>
-    <a href="/home?lang=zh_TW&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=tw" title="Chinese (Taiwan)" alt="Chinese (Taiwan)"></a>
+    <a href="/home?lang=uk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Ukrainian Українська" alt="Ukrainian Українська"></a>
-    <a href="/home?lang=uk&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Українська" alt="Українська"></a>
+    <a href="/home?lang=vi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Vietnamese Tiếng Việt" alt="Vietnamese Tiếng Việt"></a>
-    <a href="/home?lang=vi&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Tiếng Việt" alt="Tiếng Việt"></a>
   </div>
   <h2><%=intl._t("Welcome to I2P")%></h2>
 </div>

history.txt

@@ -2,6 +2,8 @@
  * De-duplicate strings for translation
  * Minor theme tweaks and bugfixes
  * SusiDNS: Update SVG image to use grouped objects for styling and hotlinks
+ * Hardcode language names in their native language (to make them easier for
+   users to identify)
 
 2017-06-03 str4d
  * Console: