Changeset 1058 in josm

Timestamp:

2008-10-28T22:13:12+01:00 (16 years ago)

Author:

mfloryan

Message:

Changed infrastructure of JOSM translations. lang-* plugins are now
obsolete. Translations are integrated into core via lang-translation.jar
in /lib directory. Ant scripts are updated automated build may require
an update. Source translation files are still kept in JOSM SVN repo.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• lib/josm-translation.jar (added)
• src/org/openstreetmap/josm/Main.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (6 diffs)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (2 diffs)

trunk/build.xml

@@ -19 +19 @@
                         <fileset refid="josm_required_libs" />
                 </unjar>
+    
+    <!-- translation -->
+    <unjar dest="build">
+      <fileset dir="lib">
+        <include name="josm-translation.jar" />
+      </fileset>
+    </unjar>
 
                 <!-- images -->

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

@@ -219 +219 @@
          * early plugins are loaded (before constructor).
          */
-        public static void loadPlugins(boolean early, String lang) {
+        public static void loadPlugins(boolean early) {
                 List<String> plugins = new LinkedList<String>();
                 if (Main.pref.hasKey("plugins"))
@@ -226 +226 @@
                         plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
 
-                String [] oldplugins = new String[]{"mappaint", "unglueplugin"};
+                String [] oldplugins = new String[] {"mappaint", "unglueplugin", "lang-de","lang-en_GB","lang-fr","lang-it","lang-pl","lang-ro","lang-ru"};
                 for(String p : oldplugins)
                 {
@@ -235 +235 @@
                         }
                 }
-                if(lang != null)
-                {
-                        for(String p : plugins)
-                        {
-                                if(p.startsWith("lang-"))
-                                {
-                                        plugins.remove(p);
-                                        break;
-                                }
-                        }
-                        if(!lang.equals("en"))
-                                plugins.add("lang-"+lang);
-                }
 
                 if (plugins.isEmpty())
                         return;
+                
                 SortedMap<Integer, Collection<PluginInformation>> p = new TreeMap<Integer, Collection<PluginInformation>>();
                 for (String pluginName : plugins) {

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -3 +3 @@
 package org.openstreetmap.josm.gui;
 
+import org.xnap.commons.i18n.I18nFactory;
+import static org.openstreetmap.josm.tools.I18n.i18n;
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 
 import java.awt.EventQueue;
@@ -16 +19 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
@@ -25 +29 @@
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 /**
  * Main window class application.
@@ -159 +164 @@
                         Main.pref.save();
                 }
+                
+
+                String localeName = null; //The locale to use
+        
+                //Check if passed as parameter
+                if(args.containsKey("language")) 
+                    localeName = (String)(args.get("language").toArray()[0]);
+                
+                //TODO: Check preferences for language
+        
+                //If override then set new default locale - otherwise, override
+        if (localeName != null) {
+            Locale.setDefault(new Locale(localeName));
+        }
+        
+        i18n = I18nFactory.getI18n(MainApplication.class);
+                
                 SplashScreen splash = new SplashScreen(Main.pref.getBoolean("draw.splashscreen", true));
-
-                String language = null;
-                if(args.containsKey("language"))
-                        language = (String)(args.get("language").toArray()[0]);
 
                 splash.setStatus(tr("Activating updated plugins"));
@@ -174 +192 @@
                 // load the early plugins
                 splash.setStatus(tr("Loading early plugins"));
-                Main.loadPlugins(true, language);
+                Main.loadPlugins(true);
 
                 splash.setStatus(tr("Setting defaults"));
@@ -183 +201 @@
                 final Main main = new MainApplication(mainFrame);
                 splash.setStatus(tr("Loading plugins"));
-                Main.loadPlugins(false, null);
+                Main.loadPlugins(false);
                 toolbar.refreshToolbarControl();
 

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

@@ -35 +35 @@
                 if (i18n == null)
                         return n == 1 ? tr(text, objects) : tr(pluralText, objects);
-                        return i18n.trn(text, pluralText, n, objects);
+                return i18n.trn(text, pluralText, n, objects);
         }
 
@@ -41 +41 @@
                 if (i18n == null)
                         return n == 1 ? tr(text) : tr(pluralText);
-                        return i18n.trn(text, pluralText, n);
+                return i18n.trn(text, pluralText, n);
         }
 }