Changeset 8232 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

Timestamp:

2015-04-19T13:12:20+02:00 (9 years ago)

Author:

stoecker

Message:

see #11148 - move language stuff to the correct place instead of spreading it in the code

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (modified) (5 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;
@@ -28 +27 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -73 +73 @@
         else
             return Main.pref.put("language",
-                    ((Locale)langCombo.getSelectedItem()).toString());
+                    LanguageInfo.getJOSMLocaleCode((Locale)langCombo.getSelectedItem()));
     }
 
@@ -87 +87 @@
             setSelectedItem(null);
             if (language != null) {
+                language = LanguageInfo.getJavaLocaleCode(language);
                 for (Locale locale: data) {
                     if (locale == null) {
@@ -121 +122 @@
                     l == null
                             ? tr("Default (Auto determined)")
-                            : "ca__valencia".equals(l.toString())
-                            ? trc("language", "Valencian")
-                            : l.getDisplayName(l),
+                            : LanguageInfo.getDisplayName(l),
                     index, isSelected, cellHasFocus);
         }