Changeset 1058 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-10-28T22:13:12+01:00 (17 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.

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (6 diffs)

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();