Skip to content

Commit e1ac2ae

Browse files
grhotengrhoten
authored
CLDR-19090 Ordinal plural rules are missing for af and bg (#5167)
1 parent df9ed54 commit e1ac2ae

File tree

3 files changed

+21
-106
lines changed

3 files changed

+21
-106
lines changed

‎common/rbnf/af.xml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -170,27 +170,14 @@ x.x: =#,##0.#=;
170170
</rulesetGrouping>
171171
<rulesetGrouping type="OrdinalRules">
172172
<rbnfRules><![CDATA[
173-
%%digits-ordinal-indicator:
174-
0: ste;
175-
1: ste;
176-
2: de;
177-
20: ste;
178-
100: >>;
179173
%digits-ordinal:
180174
-x: −>>;
181-
0: =#,##0==%%digits-ordinal-indicator=;
175+
0: =#,##0=$(ordinal,few{de}other{ste})$;
182176
]]></rbnfRules>
183177
<!-- The following redundant ruleset elements have been deprecated and will be removed in the next release. Please use the rbnfRules contents instead. -->
184-
<ruleset type="digits-ordinal-indicator" access="private">
185-
<rbnfrule value="0">ste;</rbnfrule>
186-
<rbnfrule value="1">ste;</rbnfrule>
187-
<rbnfrule value="2">de;</rbnfrule>
188-
<rbnfrule value="20">ste;</rbnfrule>
189-
<rbnfrule value="100">→→;</rbnfrule>
190-
</ruleset>
191178
<ruleset type="digits-ordinal">
192179
<rbnfrule value="-x">−→→;</rbnfrule>
193-
<rbnfrule value="0">=#,##0==%%digits-ordinal-indicator=;</rbnfrule>
180+
<rbnfrule value="0">=#,##0=$(ordinal,few{de}other{ste})$;</rbnfrule>
194181
</ruleset>
195182
</rulesetGrouping>
196183
</rbnf>

‎common/rbnf/bg.xml‎

Lines changed: 6 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,114 +1027,30 @@ x.x: =#,##0.#=;
10271027
</rulesetGrouping>
10281028
<rulesetGrouping type="OrdinalRules">
10291029
<rbnfRules><![CDATA[
1030-
%%digits-ordinal-masculine-larger-suffix:
1031-
0: тен;
1032-
1: >%%digits-ordinal-masculine-suffix>;
1033-
100: >>;
1034-
%%digits-ordinal-masculine-suffix:
1035-
0: и;
1036-
1: ви;
1037-
2: ри;
1038-
3: ти;
1039-
5: и;
1040-
20: >>;
1041-
100: >%%digits-ordinal-masculine-larger-suffix>;
1042-
1000: >>;
10431030
%digits-ordinal-masculine:
10441031
-x: −>>;
1045-
0: =#,##0=-=%%digits-ordinal-masculine-suffix=;
1046-
%%digits-ordinal-feminine-larger-suffix:
1047-
0: тна;
1048-
1: >%%digits-ordinal-feminine-suffix>;
1049-
100: >>;
1050-
%%digits-ordinal-feminine-suffix:
1051-
0: а;
1052-
1: ва;
1053-
2: ра;
1054-
3: та;
1055-
5: а;
1056-
20: >>;
1057-
100: >%%digits-ordinal-feminine-larger-suffix>;
1058-
1000: >>;
1032+
0: =#,##0=-$(ordinal,zero{тен}one{ви}two{ри}few{ти}many{ми}other{и})$;
10591033
%digits-ordinal-feminine:
10601034
-x: −>>;
1061-
0: =#,##0=-=%%digits-ordinal-feminine-suffix=;
1062-
%%digits-ordinal-neuter-larger-suffix:
1063-
0: тно;
1064-
1: >%%digits-ordinal-neuter-suffix>;
1065-
100: >>;
1066-
%%digits-ordinal-neuter-suffix:
1067-
0: o;
1068-
1: вo;
1069-
2: рo;
1070-
3: тo;
1071-
5: o;
1072-
20: >>;
1073-
100: >%%digits-ordinal-neuter-larger-suffix>;
1074-
1000: >>;
1035+
0: =#,##0=-$(ordinal,zero{тна}one{ва}two{ра}few{та}many{ма}other{а})$;
10751036
%digits-ordinal-neuter:
10761037
-x: −>>;
1077-
0: =#,##0=-=%%digits-ordinal-neuter-suffix=;
1038+
0: =#,##0=-$(ordinal,zero{тно}one{вo}two{рo}few{тo}many{мо}other{o})$;
10781039
%digits-ordinal:
10791040
0: =%digits-ordinal-masculine=;
10801041
]]></rbnfRules>
10811042
<!-- The following redundant ruleset elements have been deprecated and will be removed in the next release. Please use the rbnfRules contents instead. -->
1082-
<ruleset type="digits-ordinal-masculine-larger-suffix" access="private">
1083-
<rbnfrule value="0">тен;</rbnfrule>
1084-
<rbnfrule value="1">→%%digits-ordinal-masculine-suffix→;</rbnfrule>
1085-
<rbnfrule value="100">→→;</rbnfrule>
1086-
</ruleset>
1087-
<ruleset type="digits-ordinal-masculine-suffix" access="private">
1088-
<rbnfrule value="0">и;</rbnfrule>
1089-
<rbnfrule value="1">ви;</rbnfrule>
1090-
<rbnfrule value="2">ри;</rbnfrule>
1091-
<rbnfrule value="3">ти;</rbnfrule>
1092-
<rbnfrule value="5">и;</rbnfrule>
1093-
<rbnfrule value="20">→→;</rbnfrule>
1094-
<rbnfrule value="100">→%%digits-ordinal-masculine-larger-suffix→;</rbnfrule>
1095-
<rbnfrule value="1000">→→;</rbnfrule>
1096-
</ruleset>
10971043
<ruleset type="digits-ordinal-masculine">
10981044
<rbnfrule value="-x">−→→;</rbnfrule>
1099-
<rbnfrule value="0">=#,##0=-=%%digits-ordinal-masculine-suffix=;</rbnfrule>
1100-
</ruleset>
1101-
<ruleset type="digits-ordinal-feminine-larger-suffix" access="private">
1102-
<rbnfrule value="0">тна;</rbnfrule>
1103-
<rbnfrule value="1">→%%digits-ordinal-feminine-suffix→;</rbnfrule>
1104-
<rbnfrule value="100">→→;</rbnfrule>
1105-
</ruleset>
1106-
<ruleset type="digits-ordinal-feminine-suffix" access="private">
1107-
<rbnfrule value="0">а;</rbnfrule>
1108-
<rbnfrule value="1">ва;</rbnfrule>
1109-
<rbnfrule value="2">ра;</rbnfrule>
1110-
<rbnfrule value="3">та;</rbnfrule>
1111-
<rbnfrule value="5">а;</rbnfrule>
1112-
<rbnfrule value="20">→→;</rbnfrule>
1113-
<rbnfrule value="100">→%%digits-ordinal-feminine-larger-suffix→;</rbnfrule>
1114-
<rbnfrule value="1000">→→;</rbnfrule>
1045+
<rbnfrule value="0">=#,##0=-$(ordinal,zero{тен}one{ви}two{ри}few{ти}many{ми}other{и})$;</rbnfrule>
11151046
</ruleset>
11161047
<ruleset type="digits-ordinal-feminine">
11171048
<rbnfrule value="-x">−→→;</rbnfrule>
1118-
<rbnfrule value="0">=#,##0=-=%%digits-ordinal-feminine-suffix=;</rbnfrule>
1119-
</ruleset>
1120-
<ruleset type="digits-ordinal-neuter-larger-suffix" access="private">
1121-
<rbnfrule value="0">тно;</rbnfrule>
1122-
<rbnfrule value="1">→%%digits-ordinal-neuter-suffix→;</rbnfrule>
1123-
<rbnfrule value="100">→→;</rbnfrule>
1124-
</ruleset>
1125-
<ruleset type="digits-ordinal-neuter-suffix" access="private">
1126-
<rbnfrule value="0">o;</rbnfrule>
1127-
<rbnfrule value="1">вo;</rbnfrule>
1128-
<rbnfrule value="2">рo;</rbnfrule>
1129-
<rbnfrule value="3">тo;</rbnfrule>
1130-
<rbnfrule value="5">o;</rbnfrule>
1131-
<rbnfrule value="20">→→;</rbnfrule>
1132-
<rbnfrule value="100">→%%digits-ordinal-neuter-larger-suffix→;</rbnfrule>
1133-
<rbnfrule value="1000">→→;</rbnfrule>
1049+
<rbnfrule value="0">=#,##0=-$(ordinal,zero{тна}one{ва}two{ра}few{та}many{ма}other{а})$;</rbnfrule>
11341050
</ruleset>
11351051
<ruleset type="digits-ordinal-neuter">
11361052
<rbnfrule value="-x">−→→;</rbnfrule>
1137-
<rbnfrule value="0">=#,##0=-=%%digits-ordinal-neuter-suffix=;</rbnfrule>
1053+
<rbnfrule value="0">=#,##0=-$(ordinal,zero{тно}one{вo}two{рo}few{тo}many{мо}other{o})$;</rbnfrule>
11381054
</ruleset>
11391055
<ruleset type="digits-ordinal">
11401056
<rbnfrule value="0">=%digits-ordinal-masculine=;</rbnfrule>

‎common/supplemental/ordinals.xml‎

Lines changed: 13 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="af am an ar ast bg 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 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">
1717
<pluralRule count="other"> @integer 0~15, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
1818
</pluralRules>
1919

@@ -38,6 +38,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
3838

3939
<!-- 2: few,other -->
4040

41+
<pluralRules locales="af">
42+
<pluralRule count="few">i % 100 = 2..19 @integer 2~19, 102~119, 202~219, 1002, 10002, 100002, 1000002, …</pluralRule>
43+
<pluralRule count="other"> @integer 0~1, 20~30, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
44+
</pluralRules>
4145
<pluralRules locales="be">
4246
<pluralRule count="few">n % 10 = 2,3 and n % 100 != 12,13 @integer 2, 3, 22, 23, 32, 33, 42, 43, 52, 53, 62, 63, 72, 73, 82, 83, 102, 1002, …</pluralRule>
4347
<pluralRule count="other"> @integer 0, 1, 4~17, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
@@ -164,6 +168,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
164168

165169
<!-- 6: zero,one,two,few,many,other -->
166170

171+
<pluralRules locales="bg">
172+
<pluralRule count="zero">i % 100 = 0 and i != 0 @integer 100, 200, 300, 1000, 10000, 100000, 1000000, …</pluralRule>
173+
<pluralRule count="one">i % 10 = 1 and i % 100 != 11 @integer 1, 21, 31, 101, 201, 1001, …</pluralRule>
174+
<pluralRule count="two">i % 10 = 2 and i % 100 != 12 @integer 2, 22, 32, 102, 202, 1002, …</pluralRule>
175+
<pluralRule count="few">i % 10 = 3,4 and i % 100 != 13,14 @integer 3, 4, 23, 24, 33, 34, 103, 104, 123, 124, 203, 204, 1003, 1004, …</pluralRule>
176+
<pluralRule count="many">i % 10 = 7,8 and i % 100 != 17,18 @integer 7, 8, 27, 28, 107, 108, 207, 208, …</pluralRule>
177+
<pluralRule count="other"> @integer 5~6, 9~20, 1005, 10005, 100005, 1000005, …</pluralRule>
178+
</pluralRules>
167179
<pluralRules locales="cy">
168180
<pluralRule count="zero">n = 0,7,8,9 @integer 0, 7~9</pluralRule>
169181
<pluralRule count="one">n = 1 @integer 1</pluralRule>

0 commit comments

Comments
 (0)