Changeset 4212 in josm

Timestamp:

Jul 8, 2011 9:28:59 PM (23 months ago)

Author:

stoecker

Message:

reduce hardcoded I18n parts

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

@@ -299 +299 @@
         });
         return l;
+    }
+
+    public static boolean hasCode(String code)
+    {
+        return languages.containsKey(code);
     }
 

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

@@ -69 +69 @@
         else if (full.equals("in"))
             return "id";
-        /* list of non-single codes supported by josm */
-        else if (full.equals("en_GB") || full.equals("pt_BR") || full.equals("en_AU") || full.equals("zh_TW") || full.equals("zh_CN"))
+        else if (I18n.hasCode(full)) /* catch all non-single codes */
             return full;
 
+        /* return single code */
         return locale.getLanguage();
     }