Changeset 8241 in josm for trunk/src/org

Timestamp:

2015-04-20T11:21:00+02:00 (10 years ago)

Author:

stoecker

Message:

see #11148 - removed language display name workaround, but keep the function nevertheless

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• I18n.java (modified) (1 diff)
• LanguageInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -663 +663 @@
                 if (!"en".equals(l.getLanguage())) {
                     Main.info(tr("Unable to find translation for the locale {0}. Reverting to {1}.",
-                            l.getDisplayName(), Locale.getDefault().getDisplayName()));
+                            LanguageInfo.getDisplayName(l), LanguageInfo.getDisplayName(Locale.getDefault())));
                 } else {
                     strings = null;

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -138 +138 @@
      */
     public static String getDisplayName(Locale locale) {
-        String full = locale.toString();
+        /*String full = locale.toString();
         if ("ca__valencia".equals(full))
-            return trc("language", "Valencian");
+            return t_r_c("language", "Valencian");*/
 
         return locale.getDisplayName();