Changeset 14811 in josm

Timestamp:

2019-02-24T23:42:39+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17380 - enable en_CA

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/I18n.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java (modified) (3 diffs)

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

@@ -105 +105 @@
         languages.put("el", PluralMode.MODE_NOTONE);
         languages.put("en_AU", PluralMode.MODE_NOTONE);
+        languages.put("en_CA", PluralMode.MODE_NOTONE);
         languages.put("en_GB", PluralMode.MODE_NOTONE);
         languages.put("es", PluralMode.MODE_NOTONE);
@@ -608 +609 @@
     private static int pluralEval(long n) {
         switch(pluralMode) {
-        case MODE_NOTONE: /* bg, da, de, el, en, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
+        case MODE_NOTONE: /* bg, da, de, el, en, en_AU, en_CA, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
             return (n != 1) ? 1 : 0;
         case MODE_NONE: /* id, vi, ja, km, tr, zh_CN, zh_TW */

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

@@ -27 +27 @@
     public JOSMTestRules test = new JOSMTestRules().i18n("ca@valencia");
 
-    private static final Locale EN_CA = Locale.CANADA;
+    private static final Locale EN_NZ = new Locale("en", "NZ");
     private static final Locale DE_DE = Locale.GERMANY;
     private static final Locale PT_BR = new Locale("pt", "BR");
@@ -33 +33 @@
     private static final Locale ZN_CN = Locale.SIMPLIFIED_CHINESE;
     private static final Locale ZN_TW = Locale.TRADITIONAL_CHINESE;
-    private static final Locale EN_GB = new Locale("en", "GB");
+    private static final Locale EN_GB = Locale.UK;
     private static final Locale RU = new Locale("ru");
     private static final Locale NB = new Locale("nb");
@@ -56 +56 @@
 
     private static void testGetWikiLanguagePrefixes(LanguageInfo.LocaleType type, String...expected) {
-        final List<String> actual = Stream.of(EN_CA, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
+        final List<String> actual = Stream.of(EN_NZ, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
                 .map(locale -> LanguageInfo.getWikiLanguagePrefix(locale, type))
                 .collect(Collectors.toList());