Changeset 1163 in josm

Timestamp:

22.12.2008 23:20:11 (3 years ago)

Author:

stoecker

Message:

cleanup language code handling

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/HelpAction.java (modified) (1 diff)
• gui/GettingStarted.java (modified) (2 diffs)
• tools/XmlObjectParser.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.SortedMap;
@@ -523 +524 @@
     }
 
+    static public String getLanguageCodeU()
+    {
+        String languageCode = Locale.getDefault().getLanguage();
+        return languageCode.substring(0,1).toUpperCase() + languageCode.substring(1) + ":";
+    }
+    static public String getLanguageCode()
+    {
+        return Locale.getDefault().getLanguage() + ":";
+    }
 }

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -46 +46 @@
     }
 
-        private String languageCode = tr("En:");
+        private String languageCode = Main.getLanguageCodeU();
         private JFrame helpBrowser = new JFrame(tr("JOSM Online Help"));
         private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");

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

@@ -68 +68 @@
             Matcher matcher = versionPattern.matcher(motdcontent);
             matcher.reset();
+            String languageCode = Main.getLanguageCodeU();
             while (matcher.find()) {
                 int targetVersion = Integer.parseInt(matcher.group(4));
@@ -94 +95 @@
                 start = matcher.end();
                 if (included) {
-                    // translators: set this to a suitable language code to
-                    // be able to provide translations in the Wiki.
-                    String languageCode = tr("En:");
                     String url = matcher.group(1) + languageCode + matcher.group(2);
                     try {

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.Reader;
@@ -23 +21 @@
 import org.xml.sax.helpers.DefaultHandler;
 
+import org.openstreetmap.josm.Main;
+
 /**
  * An helper class that reads from a XML stream into specific objects.
@@ -30 +30 @@
 public class XmlObjectParser implements Iterable<Object> {
 
-        public static final String lang = tr("En:").toLowerCase();
+        public static final String lang = Main.getLanguageCode();
         public static class Uniform<T> implements Iterable<T>{
                 private Iterator<Object> iterator;