Update plural rules for Gaelic and Welsh.
Patch by: jat
Review by: pdr
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9662 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_cy.java b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_cy.java
index 9ac5062..9a75780 100644
--- a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_cy.java
+++ b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_cy.java
@@ -13,11 +13,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-
package com.google.gwt.i18n.client.impl.plurals;
/**
- * Plural forms for Welsh are 1, 2, 8/11, and n.
+ * Plural forms for Welsh.
+ *
+ * See http://www.saltcymru.org/wordpress/?p=99&lang=en
*/
public class DefaultRule_cy extends DefaultRule {
@@ -25,14 +26,17 @@
public PluralForm[] pluralForms() {
return new PluralForm[] {
new PluralForm("other", "Default plural form"),
+ new PluralForm("none", "Count is 0"),
new PluralForm("one", "Count is 1"),
new PluralForm("two", "Count is 2"),
- new PluralForm("eighteleven", "Count is either 8 or 11"),
+ new PluralForm("three", "Count is 3"),
+ new PluralForm("six", "Count is 6"),
};
}
@Override
public int select(int n) {
- return n == 1 ? 1 : n == 2 ? 2 : n == 8 || n == 11 ? 3 : 0;
+ return n == 0 ? 1 : n == 1 ? 2 : n == 2 ? 3 : n == 3 ? 4
+ : n == 6 ? 5 : 0;
}
}
diff --git a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_ga.java b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_ga.java
index 5b666ec..ecb2c43 100644
--- a/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_ga.java
+++ b/user/src/com/google/gwt/i18n/client/impl/plurals/DefaultRule_ga.java
@@ -13,21 +13,28 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-
package com.google.gwt.i18n.client.impl.plurals;
/**
- * Plural forms for Irish are 1, 2, and n.
+ * Plural forms for Celtic (Scottish Gaelic).
+ *
+ * See https://developer.mozilla.org/en/Localization_and_Plurals#Plural_rule_.234_%284_forms%29
*/
public class DefaultRule_ga extends DefaultRule {
@Override
public PluralForm[] pluralForms() {
- return DefaultRule_1_2_n.pluralForms();
+ return new PluralForm[] {
+ new PluralForm("other", "Default plural form"),
+ new PluralForm("one", "Count is 1 or 11"),
+ new PluralForm("two", "Count is 2 or 12"),
+ new PluralForm("few", "Count is 3-10 or 13-19"),
+ };
}
@Override
public int select(int n) {
- return DefaultRule_1_2_n.select(n);
+ return (n == 1 || n == 11) ? 1 : (n == 2 || n == 12) ? 2
+ : (n >= 3 && n <= 19) ? 3 : 0;
}
}
