Changeset 3957 in josm for trunk

Timestamp:

2011-03-05T23:05:25+01:00 (14 years ago)

Author:

stoecker

Message:

i18n update, remove unsupported languages ro and sl

Location:

trunk

Files:

• data/ar.lang (modified) ( previous)
• data/bg.lang (modified) ( previous)
• data/cs.lang (modified) ( previous)
• data/da.lang (modified) ( previous)
• data/de.lang (modified) ( previous)
• data/el.lang (modified) ( previous)
• data/en.lang (modified) ( previous)
• data/en_AU.lang (modified) ( previous)
• data/en_GB.lang (modified) ( previous)
• data/es.lang (modified) ( previous)
• data/et.lang (modified) ( previous)
• data/eu.lang (modified) ( previous)
• data/fi.lang (modified) ( previous)
• data/fr.lang (modified) ( previous)
• data/gl.lang (modified) ( previous)
• data/he.lang (modified) ( previous)
• data/is.lang (modified) ( previous)
• data/it.lang (modified) ( previous)
• data/ja.lang (modified) ( previous)
• data/nb.lang (modified) ( previous)
• data/nl.lang (modified) ( previous)
• data/pl.lang (modified) ( previous)
• data/pt_BR.lang (modified) ( previous)
• data/ro.lang (deleted)
• data/ru.lang (modified) ( previous)
• data/sk.lang (modified) ( previous)
• data/sl.lang (deleted)
• data/sv.lang (modified) ( previous)
• data/tr.lang (modified) ( previous)
• data/uk.lang (modified) ( previous)
• data/zh_TW.lang (modified) ( previous)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (4 diffs)

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

@@ -25 +25 @@
 public class I18n {
     private enum PluralMode { MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
-        MODE_CS, MODE_AR, MODE_PL, MODE_RO, MODE_RU, MODE_SK, MODE_SL}
+        MODE_CS, MODE_AR, MODE_PL/*, MODE_RO*/, MODE_RU, MODE_SK/*, MODE_SL*/}
     private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
 
@@ -293 +293 @@
         languages.put("pl", PluralMode.MODE_PL);
         languages.put("pt_BR", PluralMode.MODE_GREATERONE);
-        languages.put("ro", PluralMode.MODE_RO);
+        //languages.put("ro", PluralMode.MODE_RO);
         languages.put("ru", PluralMode.MODE_RU);
         languages.put("sk", PluralMode.MODE_SK);
-        languages.put("sl", PluralMode.MODE_SL);
+        //languages.put("sl", PluralMode.MODE_SL);
         languages.put("sv", PluralMode.MODE_NOTONE);
         languages.put("tr", PluralMode.MODE_NONE);
@@ -533 +533 @@
             return ((n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
                     && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
-        case MODE_RO:
-            return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
+        //case MODE_RO:
+        //    return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
         case MODE_RU:
             return ((((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
@@ -540 +540 @@
         case MODE_SK:
             return ((n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0));
-        case MODE_SL:
-            return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)
-                    || ((n % 100) == 4)) ? 3 : 0)));
+        //case MODE_SL:
+        //    return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)
+        //            || ((n % 100) == 4)) ? 3 : 0)));
         }
         return 0;