Skip to content

Commit 23d11bc

Browse files
grhotengrhoten
authored
CLDR-16292 Plural rules in Spanish should return different ordinal types for number 1 and 3 (#5163)
1 parent c8e1983 commit 23d11bc

File tree

5 files changed

+13
-41
lines changed

5 files changed

+13
-41
lines changed

‎common/main/es.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7731,7 +7731,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
77317731
<pluralMinimalPairs count="one">{0} día</pluralMinimalPairs>
77327732
<pluralMinimalPairs count="many">{0} de días</pluralMinimalPairs>
77337733
<pluralMinimalPairs count="other">{0} días</pluralMinimalPairs>
7734-
<ordinalMinimalPairs ordinal="other">Toma la {0}.ª a la derecha.</ordinalMinimalPairs>
7734+
<ordinalMinimalPairs ordinal="one">El {0}.ᵉʳ equipo clasificado ganó.</ordinalMinimalPairs>
7735+
<ordinalMinimalPairs ordinal="other">El equipo {0}.º clasificado ganó.</ordinalMinimalPairs>
77357736
<genderMinimalPairs gender="feminine">La {0} es...</genderMinimalPairs>
77367737
<genderMinimalPairs gender="masculine">El {0} es…</genderMinimalPairs>
77377738
</minimalPairs>

‎common/main/es_419.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6511,7 +6511,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
65116511
<pluralMinimalPairs count="one">↑↑↑</pluralMinimalPairs>
65126512
<pluralMinimalPairs count="many">↑↑↑</pluralMinimalPairs>
65136513
<pluralMinimalPairs count="other">↑↑↑</pluralMinimalPairs>
6514-
<ordinalMinimalPairs ordinal="other">↑↑↑</ordinalMinimalPairs>
6514+
<ordinalMinimalPairs ordinal="one">El {0}ᵉʳ. equipo clasificado ganó.</ordinalMinimalPairs>
6515+
<ordinalMinimalPairs ordinal="other">El equipo {0}º. clasificado ganó.</ordinalMinimalPairs>
65156516
<genderMinimalPairs gender="feminine">↑↑↑</genderMinimalPairs>
65166517
<genderMinimalPairs gender="masculine">↑↑↑</genderMinimalPairs>
65176518
</minimalPairs>

‎common/rbnf/es.xml‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -552,17 +552,9 @@ x.x: =#,##0.#=;
552552
</rulesetGrouping>
553553
<rulesetGrouping type="OrdinalRules">
554554
<rbnfRules><![CDATA[
555-
%%dord-mascabbrev:
556-
0: º;
557-
1: ᵉʳ;
558-
2: º;
559-
3: ᵉʳ;
560-
4: º;
561-
20: >>;
562-
100: >>;
563555
%digits-ordinal-masculine-adjective:
564556
-x: −>>;
565-
0: =#,##0=.=%%dord-mascabbrev=;
557+
0: =#,##0=.$(ordinal,one{ᵉʳ}other{º})$;
566558
%digits-ordinal-masculine:
567559
-x: −>>;
568560
0: =#,##0=.º;
@@ -579,18 +571,9 @@ x.x: =#,##0.#=;
579571
0: =%digits-ordinal-masculine=;
580572
]]></rbnfRules>
581573
<!-- The following redundant ruleset elements have been deprecated and will be removed in the next release. Please use the rbnfRules contents instead. -->
582-
<ruleset type="dord-mascabbrev" access="private">
583-
<rbnfrule value="0">º;</rbnfrule>
584-
<rbnfrule value="1">ᵉʳ;</rbnfrule>
585-
<rbnfrule value="2">º;</rbnfrule>
586-
<rbnfrule value="3">ᵉʳ;</rbnfrule>
587-
<rbnfrule value="4">º;</rbnfrule>
588-
<rbnfrule value="20">→→;</rbnfrule>
589-
<rbnfrule value="100">→→;</rbnfrule>
590-
</ruleset>
591574
<ruleset type="digits-ordinal-masculine-adjective">
592575
<rbnfrule value="-x">−→→;</rbnfrule>
593-
<rbnfrule value="0">=#,##0=.=%%dord-mascabbrev=;</rbnfrule>
576+
<rbnfrule value="0">=#,##0=.$(ordinal,one{ᵉʳ}other{º})$;</rbnfrule>
594577
</ruleset>
595578
<ruleset type="digits-ordinal-masculine">
596579
<rbnfrule value="-x">−→→;</rbnfrule>

‎common/rbnf/es_419.xml‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,9 @@ For terms of use, see http://www.unicode.org/copyright.html
1414
<rbnf>
1515
<rulesetGrouping type="OrdinalRules">
1616
<rbnfRules><![CDATA[
17-
%%dord-mascabbrev:
18-
0: º;
19-
1: ᵉʳ;
20-
2: º;
21-
3: ᵉʳ;
22-
4: º;
23-
20: >>;
24-
100: >>;
2517
%digits-ordinal-masculine-adjective:
2618
-x: −>>;
27-
0: =#,##0==%%dord-mascabbrev=.;
19+
0: =#,##0=$(ordinal,one{ᵉʳ}other{º})$.;
2820
%digits-ordinal-masculine:
2921
-x: −>>;
3022
0: =#,##0=º.;
@@ -41,18 +33,9 @@ For terms of use, see http://www.unicode.org/copyright.html
4133
0: =%digits-ordinal-masculine=;
4234
]]></rbnfRules>
4335
<!-- The following redundant ruleset elements have been deprecated and will be removed in the next release. Please use the rbnfRules contents instead. -->
44-
<ruleset type="dord-mascabbrev" access="private">
45-
<rbnfrule value="0">º;</rbnfrule>
46-
<rbnfrule value="1">ᵉʳ;</rbnfrule>
47-
<rbnfrule value="2">º;</rbnfrule>
48-
<rbnfrule value="3">ᵉʳ;</rbnfrule>
49-
<rbnfrule value="4">º;</rbnfrule>
50-
<rbnfrule value="20">→→;</rbnfrule>
51-
<rbnfrule value="100">→→;</rbnfrule>
52-
</ruleset>
5336
<ruleset type="digits-ordinal-masculine-adjective">
5437
<rbnfrule value="-x">−→→;</rbnfrule>
55-
<rbnfrule value="0">=#,##0==%%dord-mascabbrev=.;</rbnfrule>
38+
<rbnfrule value="0">=#,##0=$(ordinal,one{ᵉʳ}other{º})$.;</rbnfrule>
5639
</ruleset>
5740
<ruleset type="digits-ordinal-masculine">
5841
<rbnfrule value="-x">−→→;</rbnfrule>

‎common/supplemental/ordinals.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
1313

1414
<!-- 1: other -->
1515

16-
<pluralRules locales="am an ar ast bs ce cs cv da de dsb el es et eu fa fi fy gl gsw he hr hsb ia id ie in is iw ja km kn ko ky lt lv ml mn my nb nl no pa pl prg ps pt root ru sd sh si sk sl sr sw ta te th tpi tr ur uz yue zh zu">
16+
<pluralRules locales="am an ar ast bs ce cs cv da de dsb el et eu fa fi fy gl gsw he hr hsb ia id ie in is iw ja km kn ko ky lt lv ml mn my nb nl no pa pl prg ps pt root ru sd sh si sk sl sr sw ta te th tpi tr ur uz yue zh zu">
1717
<pluralRule count="other"> @integer 0~15, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
1818
</pluralRules>
1919

@@ -35,6 +35,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
3535
<pluralRule count="one">n = 1..4 @integer 1~4</pluralRule>
3636
<pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
3737
</pluralRules>
38+
<pluralRules locales="es">
39+
<pluralRule count="one">n % 10 = 1,3 and n % 100 != 11 @integer 1, 3, 13, 21, 23, 31, 33, 41, 43, 51, 53, 101, 103, 1001, 1003, …</pluralRule>
40+
<pluralRule count="other"> @integer 0, 2, 4~12, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
41+
</pluralRules>
3842

3943
<!-- 2: few,other -->
4044

0 commit comments

Comments
 (0)