Changeset 966 in josm

Timestamp:

Sep 14, 2008 1:53:07 PM (5 years ago)

Author:

stoecker

Message:

commandline arg --language works as expected

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (4 diffs)

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

@@ -206 +206 @@
          * early plugins are loaded (before constructor).
          */
-        public static void loadPlugins(boolean early) {
+        public static void loadPlugins(boolean early, String lang) {
                 List<String> plugins = new LinkedList<String>();
                 if (Main.pref.hasKey("plugins"))
@@ -212 +212 @@
                 if (System.getProperty("josm.plugins") != null)
                         plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
-                
-                // we remove mappaint from the preferences on startup but this is just
-                // in case it crept in through the properties:
-                if (plugins.contains("mappaint")) {
-                        plugins.remove("mappaint");
-                        System.out.println("Warning - loading of mappaint plugin was requested. This JOSM version has built-in mappaint support. The plugin is not required.");
+
+                String [] oldplugins = new String[]{"mappaint", "unglueplugin"};
+                for(String p : oldplugins)
+                {
+                        if(plugins.contains(p))
+                        {
+                                plugins.remove(p);
+                                System.out.println(tr("Warning - loading of {0} plugin was requested. This plugin is no longer required.", p));
+                        }
+                }
+                if(lang != null)
+                {
+                        for(String p : plugins)
+                        {
+                                if(p.startsWith("lang-"))
+                                {
+                                        plugins.remove(p);
+                                        break;
+                                }
+                        }
+                        if(!lang.equals("en"))
+                                plugins.add("lang-"+lang);
                 }
                 

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

@@ -119 +119 @@
                         Main.pref.save();
                 }
+                String language = null;
+                if(args.containsKey("language"))
+                        language = (String)(args.get("language").toArray()[0]);
 
                 if (!PluginDownloader.moveUpdatedPlugins()) {
@@ -127 +130 @@
                 
                 // load the early plugins
-                Main.loadPlugins(true);
+                Main.loadPlugins(true, language);
 
                 if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
@@ -143 +146 @@
                                         "\t--no-fullscreen                           "+tr("Don't launch in fullscreen mode")+"\n"+
                                         "\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+
-                                        "\t--language=<language>                     "+tr("Set the language. Example: ")+"\n\n"+
+                                        "\t--language=<language>                     "+tr("Set the language.")+"\n\n"+
                                         tr("examples")+":\n"+
                                         "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
@@ -160 +163 @@
                 Main.parent = mainFrame;
                 final Main main = new MainApplication(mainFrame);
-                Main.loadPlugins(false);
+                Main.loadPlugins(false, null);
                 toolbar.refreshToolbarControl();