add Welsh and readd Turkish languages

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19276 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Jan 1, 2025 · 95285a4 · 95285a4
1 parent 9a3f040
commit 95285a4
Show file tree

Hide file tree

Showing 86 changed files with 16 additions and 10 deletions.
diff --git a/nodist/trans/ar.lang b/nodist/trans/ar.lang
diff --git a/nodist/trans/ast.lang b/nodist/trans/ast.lang
diff --git a/nodist/trans/be.lang b/nodist/trans/be.lang
diff --git a/nodist/trans/bg.lang b/nodist/trans/bg.lang
diff --git a/nodist/trans/ca-valencia.lang b/nodist/trans/ca-valencia.lang
diff --git a/nodist/trans/ca.lang b/nodist/trans/ca.lang
diff --git a/nodist/trans/cs.lang b/nodist/trans/cs.lang
diff --git a/nodist/trans/cy.lang b/nodist/trans/cy.lang
diff --git a/nodist/trans/da.lang b/nodist/trans/da.lang
diff --git a/nodist/trans/de.lang b/nodist/trans/de.lang
diff --git a/nodist/trans/el.lang b/nodist/trans/el.lang
diff --git a/nodist/trans/en.lang b/nodist/trans/en.lang
diff --git a/nodist/trans/en_AU.lang b/nodist/trans/en_AU.lang
diff --git a/nodist/trans/en_GB.lang b/nodist/trans/en_GB.lang
diff --git a/nodist/trans/es.lang b/nodist/trans/es.lang
diff --git a/nodist/trans/et.lang b/nodist/trans/et.lang
diff --git a/nodist/trans/fa.lang b/nodist/trans/fa.lang
diff --git a/nodist/trans/fi.lang b/nodist/trans/fi.lang
diff --git a/nodist/trans/fr.lang b/nodist/trans/fr.lang
diff --git a/nodist/trans/gl.lang b/nodist/trans/gl.lang
diff --git a/nodist/trans/hu.lang b/nodist/trans/hu.lang
diff --git a/nodist/trans/id.lang b/nodist/trans/id.lang
diff --git a/nodist/trans/is.lang b/nodist/trans/is.lang
diff --git a/nodist/trans/it.lang b/nodist/trans/it.lang
diff --git a/nodist/trans/ja.lang b/nodist/trans/ja.lang
diff --git a/nodist/trans/km.lang b/nodist/trans/km.lang
diff --git a/nodist/trans/ko.lang b/nodist/trans/ko.lang
diff --git a/nodist/trans/lt.lang b/nodist/trans/lt.lang
diff --git a/nodist/trans/mr.lang b/nodist/trans/mr.lang
diff --git a/nodist/trans/nb.lang b/nodist/trans/nb.lang
diff --git a/nodist/trans/nl.lang b/nodist/trans/nl.lang
diff --git a/nodist/trans/pl.lang b/nodist/trans/pl.lang
diff --git a/nodist/trans/pt.lang b/nodist/trans/pt.lang
diff --git a/nodist/trans/pt_BR.lang b/nodist/trans/pt_BR.lang
diff --git a/nodist/trans/ru.lang b/nodist/trans/ru.lang
diff --git a/nodist/trans/sk.lang b/nodist/trans/sk.lang
diff --git a/nodist/trans/sr-latin.lang b/nodist/trans/sr-latin.lang
diff --git a/nodist/trans/sv.lang b/nodist/trans/sv.lang
diff --git a/nodist/trans/uk.lang b/nodist/trans/uk.lang
diff --git a/nodist/trans/vi.lang b/nodist/trans/vi.lang
diff --git a/nodist/trans/zh_CN.lang b/nodist/trans/zh_CN.lang
diff --git a/nodist/trans/zh_TW.lang b/nodist/trans/zh_TW.lang
diff --git a/resources/data/ar.lang b/resources/data/ar.lang
diff --git a/resources/data/ast.lang b/resources/data/ast.lang
diff --git a/resources/data/be.lang b/resources/data/be.lang
diff --git a/resources/data/bg.lang b/resources/data/bg.lang
diff --git a/resources/data/ca-valencia.lang b/resources/data/ca-valencia.lang
diff --git a/resources/data/ca.lang b/resources/data/ca.lang
diff --git a/resources/data/cs.lang b/resources/data/cs.lang
diff --git a/resources/data/cy.lang b/resources/data/cy.lang
diff --git a/resources/data/da.lang b/resources/data/da.lang
diff --git a/resources/data/de.lang b/resources/data/de.lang
diff --git a/resources/data/el.lang b/resources/data/el.lang
diff --git a/resources/data/en.lang b/resources/data/en.lang
diff --git a/resources/data/en_AU.lang b/resources/data/en_AU.lang
diff --git a/resources/data/en_GB.lang b/resources/data/en_GB.lang
diff --git a/resources/data/es.lang b/resources/data/es.lang
diff --git a/resources/data/et.lang b/resources/data/et.lang
diff --git a/resources/data/fa.lang b/resources/data/fa.lang
diff --git a/resources/data/fi.lang b/resources/data/fi.lang
diff --git a/resources/data/fr.lang b/resources/data/fr.lang
diff --git a/resources/data/gl.lang b/resources/data/gl.lang
diff --git a/resources/data/hu.lang b/resources/data/hu.lang
diff --git a/resources/data/id.lang b/resources/data/id.lang
diff --git a/resources/data/is.lang b/resources/data/is.lang
diff --git a/resources/data/it.lang b/resources/data/it.lang
diff --git a/resources/data/ja.lang b/resources/data/ja.lang
diff --git a/resources/data/km.lang b/resources/data/km.lang
diff --git a/resources/data/ko.lang b/resources/data/ko.lang
diff --git a/resources/data/lt.lang b/resources/data/lt.lang
diff --git a/resources/data/mr.lang b/resources/data/mr.lang
diff --git a/resources/data/nb.lang b/resources/data/nb.lang
diff --git a/resources/data/nl.lang b/resources/data/nl.lang
diff --git a/resources/data/pl.lang b/resources/data/pl.lang
diff --git a/resources/data/pt.lang b/resources/data/pt.lang
diff --git a/resources/data/pt_BR.lang b/resources/data/pt_BR.lang
diff --git a/resources/data/ru.lang b/resources/data/ru.lang
diff --git a/resources/data/sk.lang b/resources/data/sk.lang
diff --git a/resources/data/sr-latin.lang b/resources/data/sr-latin.lang
diff --git a/resources/data/sv.lang b/resources/data/sv.lang
diff --git a/resources/data/tr.lang b/resources/data/tr.lang
diff --git a/resources/data/uk.lang b/resources/data/uk.lang
diff --git a/resources/data/vi.lang b/resources/data/vi.lang
diff --git a/resources/data/zh_CN.lang b/resources/data/zh_CN.lang
diff --git a/resources/data/zh_TW.lang b/resources/data/zh_TW.lang
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
@@ -49,7 +49,7 @@ private I18n() {
     /**
      * Enumeration of possible plural modes. It allows us to identify and implement logical conditions of
      * plural forms defined on <a href="https://help.launchpad.net/Translations/PluralForms">Launchpad</a>.
-     * See <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html">CLDR</a>
+     * See <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html">CLDR</a>
      * for another complete list.
      * @see #pluralEval
      */
@@ -61,28 +61,31 @@ private enum PluralMode {
         /** Plural = Greater than 1. For some latin languages (French, Brazilian Portuguese) */
         MODE_GREATERONE,
         /* Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ar">Arabic</a>.*/
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ar">Arabic</a>.*/
         MODE_AR,
         /** Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#cs">Czech</a>. */
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#cs">Czech</a>. */
         MODE_CS,
         /** Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#pl">Polish</a>. */
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#pl">Polish</a>. */
         MODE_PL,
         /* Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ro">Romanian</a>.*
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ro">Romanian</a>.*
         MODE_RO,*/
         /** Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lt">Lithuanian</a>. */
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lt">Lithuanian</a>. */
         MODE_LT,
         /** Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ru">Russian</a>. */
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ru">Russian</a>. */
         MODE_RU,
         /** Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#sk">Slovak</a>. */
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#sk">Slovak</a>. */
+        MODE_CY,
+        /** Special mode for
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#cy">Welsh</a>. */
         MODE_SK,
         /* Special mode for
-         * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#sl">Slovenian</a>.*
+         * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#sl">Slovenian</a>.*
         MODE_SL,*/
     }
 
@@ -104,6 +107,7 @@ private enum PluralMode {
         languages.put("ca", PluralMode.MODE_NOTONE);
         languages.put("ca@valencia", PluralMode.MODE_NOTONE);
         languages.put("cs", PluralMode.MODE_CS);
+        languages.put("cy", PluralMode.MODE_CY);
         languages.put("da", PluralMode.MODE_NOTONE);
         languages.put("de", PluralMode.MODE_NOTONE);
         languages.put("el", PluralMode.MODE_NOTONE);
@@ -138,7 +142,7 @@ private enum PluralMode {
         //languages.put("sl", PluralMode.MODE_SL);
         languages.put("sr@latin", PluralMode.MODE_RU);
         languages.put("sv", PluralMode.MODE_NOTONE);
-        //languages.put("tr", PluralMode.MODE_NONE);
+        languages.put("tr", PluralMode.MODE_NONE);
         languages.put("uk", PluralMode.MODE_RU);
         //languages.put("vi", PluralMode.MODE_NONE);
         languages.put("zh_CN", PluralMode.MODE_NONE);
@@ -676,6 +680,8 @@ private static int pluralEval(long n) {
                     && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2);
         case MODE_SK:
             return (n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0);
+        case MODE_CY:
+            return (n == 1) ? 0 : ((n == 2) ? 1 : (n != 8 && n != 11) ? 2 : 3);
         //case MODE_SL:
         //    return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)
         //            || ((n % 100) == 4)) ? 3 : 0)));