Changeset 4719 in josm

Timestamp:

Dec 27, 2011 2:28:04 PM (18 months ago)

Author:

stoecker

Message:

make patching locale loader easier, update i18n

Location:

trunk

Files:

• data/cs.lang (modified) (previous)
• data/da.lang (modified) (previous)
• data/el.lang (modified) (previous)
• data/fr.lang (modified) (previous)
• data/it.lang (modified) (previous)
• data/nl.lang (modified) (previous)
• data/pl.lang (modified) (previous)
• data/ru.lang (modified) (previous)
• data/uk.lang (modified) (previous)
• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -42 +42 @@
 import javax.swing.UIManager;
 
-import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
 import org.openstreetmap.josm.actions.JosmAction;

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

@@ -308 +308 @@
     }
 
+    private static URL getTranslationFile(String lang) {
+        return Main.class.getResource("/data/"+lang+".lang");
+    }
+
     /**
      * Get a list of all available JOSM Translations.
@@ -314 +318 @@
     public static final Locale[] getAvailableTranslations() {
         Collection<Locale> v = new ArrayList<Locale>(languages.size());
-        if(Main.class.getResource("/data/en.lang") != null)
+        if(getTranslationFile("en") != null)
         {
             for (String loc : languages.keySet()) {
-                if(Main.class.getResource("/data/"+loc+".lang") != null) {
+                if(getTranslationFile(loc) != null) {
                     v.add(LanguageInfo.getLocale(loc));
                 }
@@ -448 +452 @@
             return true;
         }
-        URL en = Main.class.getResource("/data/en.lang");
+        URL en = getTranslationFile("en");
         if(en == null)
             return false;
-        URL tr = Main.class.getResource("/data/"+l+".lang");
+        URL tr = getTranslationFile(l);
         if(tr == null || !languages.containsKey(l))
         {
@@ -458 +462 @@
                 l = l.substring(0, i);
             }
-            tr = Main.class.getResource("/data/"+l+".lang");
+            tr = getTranslationFile(l);
             if(tr == null || !languages.containsKey(l))
                 return false;