diff --git a/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java b/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java
index efb302010a..90cab8d509 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java
+++ b/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 },
- { "cs", "cz", "Czech", null },
- //{ "da", "dk", "Danish", null },
- { "de", "de", "German", null },
- //{ "et", "ee", "Estonian", null },
- //{ "el", "gr", "Greek", null },
+ { "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
+ { "cs", "cz", "Čeština", null },
+ { "zh", "cn", "Chinese 中文", null },
+ //{ "zh_TW", "tw", "Chinese 中文", "Taiwan" },
+ //{ "da", "dk", "Dansk", null },
+ { "de", "de", "Deutsch", null },
+ //{ "et", "ee", "Eesti", null },
{ "en", "us", "English", null },
- { "es", "es", "Spanish", null },
- { "fi", "fi", "Finnish", null },
- { "fr", "fr", "French", null },
- //{ "gl", "lang_gl", "Galician", null },
- { "hu", "hu", "Hungarian", null },
- { "it", "it", "Italian", null },
- { "ja", "jp", "Japanese", null },
- { "ko", "kr", "Korean", null },
+ { "es", "es", "Español", null },
+ { "fr", "fr", "Français", null },
+ //{ "gl", "lang_gl", "Galego", null },
+ //{ "el", "gr", "Greek Ελληνικά", null },
+ { "it", "it", "Italiano", null },
+ { "ja", "jp", "Japanese 日本語", null },
+ { "ko", "kr", "Korean 한국어", null },
//{ "mg", "mg", "Malagasy", null },
- { "nl", "nl", "Dutch", null },
- { "nb", "no", "Norwegian Bokmaal", null },
- { "pl", "pl", "Polish", null },
- { "pt", "pt", "Portuguese", null },
- { "pt_BR", "br", "Portuguese", "Brazil" },
- { "ro", "ro", "Romanian", null },
- { "ru", "ru", "Russian", null },
- { "sk", "sk", "Slovak", null },
- { "sv", "se", "Swedish", null },
- { "tr", "tr", "Turkish", null },
- { "uk", "ua", "Ukrainian", null },
- { "vi", "vn", "Vietnamese", null },
- { "zh", "cn", "Chinese", null },
- //{ "zh_TW", "tw", "Chinese", "Taiwan" },
+ { "hu", "hu", "Magyar", null },
+ { "nl", "nl", "Nederlands", null },
+ { "nb", "no", "Norsk (bokmål)", null },
+ { "pl", "pl", "Polski", null },
+ { "pt", "pt", "Português", null },
+ { "pt_BR", "br", "Português", "Brazil" },
+ { "ro", "ro", "Română", null },
+ { "ru", "ru", "Russian Русский", null },
+ { "sk", "sk", "Slovenčina", null },
+ { "fi", "fi", "Suomi", null },
+ { "sv", "se", "Svenska", null },
+ { "tr", "tr", "Türkçe", null },
+ { "uk", "ua", "Ukrainian Українська", null },
+ { "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(Translate.getDisplayLanguage(slang, langs[i][2], ctx, BUNDLE_NAME));
+ buf.append(langs[i][2]);
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(loc.getDisplayCountry(cur))
+ .append(name)
.append(')');
}
buf.append("\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 23bc8c26da..d117dc438f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/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 },
- { "cs", "cz", _x("Czech"), null },
- { "da", "dk", _x("Danish"), null },
- { "de", "de", _x("German"), null },
- { "et", "ee", _x("Estonian"), null },
- { "el", "gr", _x("Greek"), null },
- { "en", "us", _x("English"), null },
- { "es", "es", _x("Spanish"), null },
- { "fi", "fi", _x("Finnish"), null },
- { "fr", "fr", _x("French"), null },
- { "gl", "lang_gl", _x("Galician"), null },
- { "hu", "hu", _x("Hungarian"), null },
- { "it", "it", _x("Italian"), null },
- { "ja", "jp", _x("Japanese"), null },
- { "ko", "kr", _x("Korean"), null },
- { "mg", "mg", _x("Malagasy"), null },
- { "nl", "nl", _x("Dutch"), null },
- { "nb", "no", _x("Norwegian Bokmaal"), null },
- { "pl", "pl", _x("Polish"), null },
- { "pt", "pt", _x("Portuguese"), null },
- { "pt_BR", "br", _x("Portuguese"), "Brazil" },
- { "ro", "ro", _x("Romanian"), null },
- { "ru", "ru", _x("Russian"), null },
- { "sk", "sk", _x("Slovak"), null },
- { "sv", "se", _x("Swedish"), null },
- { "tr", "tr", _x("Turkish"), null },
- { "uk", "ua", _x("Ukrainian"), null },
- { "vi", "vn", _x("Vietnamese"), null },
- { "zh", "cn", _x("Chinese"), null },
- { "zh_TW", "tw", _x("Chinese"), "Taiwan" },
+ { "en", "us", "English", null },
+ { "ar", "lang_ar", "Arabic ﻉﺮﺒﻳﺓ", null },
+ { "cs", "cz", "Čeština", null },
+ { "zh", "cn", "Chinese 中文", null },
+ { "zh_TW", "tw", "Chinese 中文", "Taiwan" },
+ { "da", "dk", "Dansk", null },
+ { "de", "de", "Deutsch", null },
+ { "et", "ee", "Eesti", null },
+ { "es", "es", "Español", null },
+ { "fr", "fr", "Français", null },
+ { "gl", "lang_gl", "Galego", null },
+ { "el", "gr", "Greek Ελληνικά", null },
+ { "it", "it", "Italiano", null },
+ { "ja", "jp", "Japanese 日本語", null },
+ { "ko", "kr", "Korean 한국어", null },
+ { "mg", "mg", "Malagasy", null },
+ { "hu", "hu", "Magyar", null },
+ { "nl", "nl", "Nederlands", null },
+ { "nb", "no", "Norsk (bokmål)", null },
+ { "pl", "pl", "Polski", null },
+ { "pt", "pt", "Português", null },
+ { "pt_BR", "br", "Português", "Brazil" },
+ { "ro", "ro", "Română", null },
+ { "ru", "ru", "Russian Русский", null },
+ { "sk", "sk", "Slovenčina", null },
+ { "fi", "fi", "Suomi", null },
+ { "sv", "se", "Svenska", null },
+ { "tr", "tr", "Türkçe", null },
+ { "uk", "ua", "Ukraine Українська", null },
+ { "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("");
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("
\n");
diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp
index 88c307a742..8c5eaf95c7 100644
--- a/apps/routerconsole/jsp/console.jsp
+++ b/apps/routerconsole/jsp/console.jsp
@@ -33,35 +33,35 @@
<%=intl._t("Welcome to I2P")%>
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 0e5c915672..8bc3a6186c 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -60,35 +60,35 @@
">
<%=intl._t("Welcome to I2P")%>
diff --git a/history.txt b/history.txt
index e8d9acd596..550acf0da5 100644
--- a/history.txt
+++ b/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:
- 
- 
- 
+ 
- 
- 
- 
+ 
- 
+ 
- 
+ 
- 
+ 
+ 
- 
- 
+