Changeset 14647 in josm

Timestamp:

2019-01-05T21:20:11+01:00 (6 years ago)

Author:

simon04

Message:

see #17173 - Use correct language prefixes for OSM wiki

Reference: ​https://wiki.openstreetmap.org/wiki/Template:Languages

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/properties/HelpAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/Link.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/HelpAction.java

@@ -100 +100 @@
      */
     public static void displayTagHelp(String key, String val) {
-        final String lang = LanguageInfo.getWikiLanguagePrefix();
+        final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI);
         final List<String> pages = Arrays.asList(
                 String.format("%sTag:%s=%s", lang, key, val),
@@ -118 +118 @@
      */
     public static void displayRelationHelp(IRelation<?> rel) {
-        final String lang = LanguageInfo.getWikiLanguagePrefix();
+        final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI);
         final List<String> pages = new ArrayList<>();
         String type = rel.get("type");
@@ -140 +140 @@
      */
     public static void displayGenericHelp() {
-        final String lang = LanguageInfo.getWikiLanguagePrefix();
+        final String lang = LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI);
         final List<String> pages = Arrays.asList(
                 String.format("%sMap_Features", lang),

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Link.java

@@ -7 +7 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 
@@ -43 +44 @@
                     if (SwingUtilities.isLeftMouseButton(e)) {
                         // Open localized page if exists
-                        HelpAction.displayHelp(Arrays.asList(LanguageInfo.getWikiLanguagePrefix() + wiki, wiki));
+                        final List<String> pages = Arrays.asList(
+                                LanguageInfo.getWikiLanguagePrefix(LanguageInfo.LocaleType.OSM_WIKI) + wiki,
+                                wiki);
+                        HelpAction.displayHelp(pages);
                     } else {
                         super.mouseClicked(e);

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

@@ -27 +27 @@
         BASELANGUAGE,
         /** The standard english texts */
-        ENGLISH
+        ENGLISH,
+        /** The locale prefix on the OSM wiki */
+        OSM_WIKI,
     }
 
@@ -45 +47 @@
 
     static String getWikiLanguagePrefix(Locale locale, LocaleType type) {
-        if (type == LocaleType.ENGLISH)
-          return "";
+        if (type == LocaleType.ENGLISH) {
+            return "";
+        } else if (type == LocaleType.OSM_WIKI && Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) {
+            return "";
+        } else if (type == LocaleType.OSM_WIKI && Locale.SIMPLIFIED_CHINESE.equals(locale)) {
+            return "Zh-hans:";
+        } else if (type == LocaleType.OSM_WIKI && Locale.TRADITIONAL_CHINESE.equals(locale)) {
+            return "Zh-hant:";
+        } else if (type == LocaleType.OSM_WIKI) {
+            return locale.getLanguage() + ':';
+        }
 
         String code = getJOSMLocaleCode(locale);
@@ -60 +71 @@
             return null;
         } else if (code.matches(".+@.+")) {
-          return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1, 2)
-          + '-' + code.substring(3, 4).toUpperCase(Locale.ENGLISH) + code.substring(4) + ':';
+            return code.substring(0, 1).toUpperCase(Locale.ENGLISH)
+                    + code.substring(1, 2)
+                    + '-'
+                    + code.substring(3, 4).toUpperCase(Locale.ENGLISH)
+                    + code.substring(4)
+                    + ':';
         }
         return code.substring(0, 1).toUpperCase(Locale.ENGLISH) + code.substring(1) + ':';

trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -23 +26 @@
     public JOSMTestRules test = new JOSMTestRules().i18n("ca@valencia");
 
+    private static final Locale EN_CA = Locale.CANADA;
     private static final Locale DE_DE = Locale.GERMANY;
     private static final Locale PT_BR = new Locale("pt", "BR");
     private static final Locale CA_ES_VALENCIA = new Locale("ca", "ES", "valencia");
+    private static final Locale ZN_CN = Locale.SIMPLIFIED_CHINESE;
+    private static final Locale ZN_TW = Locale.TRADITIONAL_CHINESE;
 
     /**
@@ -32 +38 @@
     @Test
     public void getWikiLanguagePrefix() {
-        Assert.assertEquals("De:", LanguageInfo.getWikiLanguagePrefix(DE_DE, LanguageInfo.LocaleType.DEFAULT));
-        Assert.assertEquals("Pt_BR:", LanguageInfo.getWikiLanguagePrefix(PT_BR, LanguageInfo.LocaleType.DEFAULT));
+        testWikiLanguagePrefixes(LanguageInfo.LocaleType.DEFAULT,
+                "En:", "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:");
+        testWikiLanguagePrefixes(LanguageInfo.LocaleType.DEFAULTNOTENGLISH,
+                null, "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:");
+        testWikiLanguagePrefixes(LanguageInfo.LocaleType.BASELANGUAGE,
+                null, null, "Pt:", null, "Zh:", "Zh:");
+        testWikiLanguagePrefixes(LanguageInfo.LocaleType.ENGLISH,
+                "", "", "", "", "", "");
+        testWikiLanguagePrefixes(LanguageInfo.LocaleType.OSM_WIKI,
+                "", "de:", "pt:", "ca:", "Zh-hans:", "Zh-hant:");
+    }
+
+    private static void testWikiLanguagePrefixes(LanguageInfo.LocaleType type, String...expected) {
+        final List<String> actual = Stream.of(EN_CA, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW)
+                .map(locale -> LanguageInfo.getWikiLanguagePrefix(locale, type))
+                .collect(Collectors.toList());
+        Assert.assertEquals(Arrays.asList(expected), actual);
     }