Changeset 8227 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-04-18T23:35:57+02:00 (10 years ago)

Author:

stoecker

Message:

fix #11148 - add Valencian language

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• I18n.java (modified) (2 diffs)
• LanguageInfo.java (modified) (4 diffs)

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

@@ -1 @@
-// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
 
@@ -349 +348 @@
 
     private static URL getTranslationFile(String lang) {
-        return Main.class.getResource("/data/"+lang+".lang");
+        return Main.class.getResource("/data/"+lang.replace("@","-")+".lang");
     }
 

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

@@ -48 +48 @@
                 return null;
             }
-        } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code))
+        } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code)) {
             return null;
+        } else if(code.matches(".+@.+")) {
+          return code.substring(0,1).toUpperCase() + code.substring(1,2)
+          + "-" + code.substring(3,4).toUpperCase() + code.substring(4) + ":";
+        }
         return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
     }
@@ -109 +113 @@
      */
     public static Locale getLocale(String localeName) {
-        if ("ca@valencia".equals(localeName) || "ca__valencia".equals(localeName)) {
+        if ("ca@valencia".equals(localeName)) {
             return new Locale("ca", "", "valencia");
         }
@@ -152 +156 @@
      */
     public static String getLanguageCodeXML() {
-        return getJOSMLocaleCode()+".";
+        String code = getJOSMLocaleCode();
+        code = code.replace("@", "-");
+        return code+".";
     }
 
@@ -162 +168 @@
      */
     public static String getLanguageCodeManifest() {
-        return getJOSMLocaleCode()+"_";
+        String code = getJOSMLocaleCode();
+        code = code.replace("@", "-");
+        return code+"_";
     }
 }