Changeset 8207 in josm for trunk/src

Timestamp:

2015-04-18T00:27:22+02:00 (10 years ago)

Author:

simon04

Message:

fix #11148 - Add Valencian language to josm (ca@valencia)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/display/LanguagePreference.java (modified) (2 diffs)
• tools/I18n.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Component;
@@ -118 +119 @@
                 int index, boolean isSelected, boolean cellHasFocus) {
             return dispatch.getListCellRendererComponent(list,
-                    l == null ? tr("Default (Auto determined)") : l.getDisplayName(l),
-                            index, isSelected, cellHasFocus);
+                    l == null
+                            ? tr("Default (Auto determined)")
+                            : "ca__valencia".equals(l.toString())
+                            ? trc("language", "Valencian")
+                            : l.getDisplayName(l),
+                    index, isSelected, cellHasFocus);
         }
     }

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

@@ -400 +400 @@
         languages.put("bg", PluralMode.MODE_NOTONE);
         languages.put("ca", PluralMode.MODE_NOTONE);
+        languages.put("ca@valencia", PluralMode.MODE_NOTONE);
         languages.put("cs", PluralMode.MODE_CS);
         languages.put("da", PluralMode.MODE_NOTONE);

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

@@ -91 +91 @@
         else if ("in".equals(full))
             return "id";
+        else if ("ca__valencia".equals(full))
+            return "ca@valencia";
         else if (I18n.hasCode(full)) // catch all non-single codes
             return full;
@@ -107 +109 @@
      */
     public static Locale getLocale(String localeName) {
+        if ("ca@valencia".equals(localeName) || "ca__valencia".equals(localeName)) {
+            return new Locale("ca", "", "valencia");
+        }
         if ("he".equals(localeName)) {
             localeName = "iw_IL";