diff options
author | Nick Snyder <nickdsnyder@gmail.com> | 2018-11-18 01:22:47 +0300 |
---|---|---|
committer | Nick Snyder <nickdsnyder@gmail.com> | 2018-11-18 01:22:47 +0300 |
commit | c52be5deb3eb4e21546d4c03323bc3ec0fbaa7a4 (patch) | |
tree | 7c402bcd15564ffd4e75ad0ba92c8bd5100d2dda | |
parent | 8b8bf78aec03f638658a1ea55b240ddb8cc54b14 (diff) |
update to CLDR 34
-rw-r--r-- | v2/internal/plural/codegen/plurals.xml | 4 | ||||
-rw-r--r-- | v2/internal/plural/rule_gen.go | 2 | ||||
-rw-r--r-- | v2/internal/plural/rule_gen_test.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/v2/internal/plural/codegen/plurals.xml b/v2/internal/plural/codegen/plurals.xml index 2704a8e..0c2a748 100644 --- a/v2/internal/plural/codegen/plurals.xml +++ b/v2/internal/plural/codegen/plurals.xml @@ -6,7 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic For terms of use, see http://www.unicode.org/copyright.html --> <supplementalData> - <version number="$Revision: 13898 $"/> + <version number="$Revision: 14397 $"/> <plurals type="cardinal"> <!-- For a canonicalized list, use GeneratedPluralSamples --> @@ -30,7 +30,7 @@ For terms of use, see http://www.unicode.org/copyright.html <pluralRule count="one">i = 0..1 @integer 0, 1 @decimal 0.0~1.5</pluralRule> <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule> </pluralRules> - <pluralRules locales="ast ca de en et fi fy gl io it ji nl pt_PT scn sv sw ur yi"> + <pluralRules locales="ast ca de en et fi fy gl ia io it ji nl pt_PT sc scn sv sw ur yi"> <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule> <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule> </pluralRules> diff --git a/v2/internal/plural/rule_gen.go b/v2/internal/plural/rule_gen.go index 7cc6fc7..b366d0a 100644 --- a/v2/internal/plural/rule_gen.go +++ b/v2/internal/plural/rule_gen.go @@ -43,7 +43,7 @@ func DefaultRules() Rules { return Other }, }) - addPluralRules(rules, []string{"ast", "ca", "de", "en", "et", "fi", "fy", "gl", "io", "it", "ji", "nl", "pt_PT", "scn", "sv", "sw", "ur", "yi"}, &Rule{ + addPluralRules(rules, []string{"ast", "ca", "de", "en", "et", "fi", "fy", "gl", "ia", "io", "it", "ji", "nl", "pt_PT", "sc", "scn", "sv", "sw", "ur", "yi"}, &Rule{ PluralForms: newPluralFormSet(One, Other), PluralFormFunc: func(ops *Operands) Form { // i = 1 and v = 0 diff --git a/v2/internal/plural/rule_gen_test.go b/v2/internal/plural/rule_gen_test.go index ec0a3ce..ca2e047 100644 --- a/v2/internal/plural/rule_gen_test.go +++ b/v2/internal/plural/rule_gen_test.go @@ -61,7 +61,7 @@ func TestPt(t *testing.T) { } } -func TestAstCaDeEnEtFiFyGlIoItJiNlPt_PTScnSvSwUrYi(t *testing.T) { +func TestAstCaDeEnEtFiFyGlIaIoItJiNlPt_PTScScnSvSwUrYi(t *testing.T) { var tests []pluralFormTest tests = appendIntegerTests(tests, One, []string{"1"}) @@ -69,7 +69,7 @@ func TestAstCaDeEnEtFiFyGlIoItJiNlPt_PTScnSvSwUrYi(t *testing.T) { tests = appendIntegerTests(tests, Other, []string{"0", "2~16", "100", "1000", "10000", "100000", "1000000"}) tests = appendDecimalTests(tests, Other, []string{"0.0~1.5", "10.0", "100.0", "1000.0", "10000.0", "100000.0", "1000000.0"}) - locales := []string{"ast", "ca", "de", "en", "et", "fi", "fy", "gl", "io", "it", "ji", "nl", "pt_PT", "scn", "sv", "sw", "ur", "yi"} + locales := []string{"ast", "ca", "de", "en", "et", "fi", "fy", "gl", "ia", "io", "it", "ji", "nl", "pt_PT", "sc", "scn", "sv", "sw", "ur", "yi"} for _, locale := range locales { runTests(t, locale, tests) } |