Skip to content

Commit dc8062a

Browse files
macchiatimacchiati
authored
CLDR-18901 Fix escapes (#4977)
1 parent 649eb5d commit dc8062a

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

‎common/main/as.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -925,13 +925,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
925925
<type key="em" type="emoji" scope="core">ইম’জী</type>
926926
<type key="em" type="text" scope="core">পাঠ্য</type>
927927
<type key="hc" type="h11">১২ ঘণ্টীয়া প্ৰণালী (০–১১)</type>
928-
<type key="hc" type="h11" scope="core">১২ (০–১১) ১২ (০❰NDASH❱১১)</type>
928+
<type key="hc" type="h11" scope="core">১২ (০–১১) ১২ (০–১১)</type>
929929
<type key="hc" type="h12">১২ ঘণ্টীয়া প্ৰণালী (১–১২)</type>
930-
<type key="hc" type="h12" scope="core">১২ (১–১২) ১২ (১❰NDASH❱১২)</type>
930+
<type key="hc" type="h12" scope="core">১২ (১–১২) ১২ (১–১২)</type>
931931
<type key="hc" type="h23">২৪ ঘণ্টীয়া প্ৰণালী (০–২৩)</type>
932-
<type key="hc" type="h23" scope="core">24 (0–23) Hour Cycle (12 vs 24) others… ২৪ (০–২৩) …অন্য ঘণ্টীয়া প্ৰণালী(১২ বনাম ২৪): ২৪ (০–২৩) ৩ (০❰NDASH❱২৩)</type>
932+
<type key="hc" type="h23" scope="core">24 (0–23) Hour Cycle (12 vs 24) others… ২৪ (০–২৩) …অন্য ঘণ্টীয়া প্ৰণালী(১২ বনাম ২৪): ২৪ (০–২৩) ৩ (০–২৩)</type>
933933
<type key="hc" type="h24">২৪ ঘণ্টীয়া প্ৰণালী (১–২৪)</type>
934-
<type key="hc" type="h24" scope="core">২৪ (১–২৪) ২৪ (১❰NDASH❱২৪)</type>
934+
<type key="hc" type="h24" scope="core">২৪ (১–২৪) ২৪ (১–২৪)</type>
935935
<type key="lb" type="loose">ঢিলা পংক্তি বিচ্ছেদ শৈলী</type>
936936
<type key="lb" type="loose" scope="core">ঢিলা</type>
937937
<type key="lb" type="normal">সাধাৰণ পংক্তি বিচ্ছেদ শৈলী</type>

‎common/main/co.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
293293
<ellipsis type="word-final" draft="unconfirmed">↑↑↑</ellipsis>
294294
<ellipsis type="word-initial" draft="unconfirmed">↑↑↑</ellipsis>
295295
<ellipsis type="word-medial" draft="unconfirmed">↑↑↑</ellipsis>
296-
<moreInformation draft="unconfirmed">❰NB❱?</moreInformation>
296+
<moreInformation draft="unconfirmed">?</moreInformation>
297297
<parseLenients scope="date" level="lenient">
298298
<parseLenient sample="-" draft="unconfirmed">↑↑↑</parseLenient>
299299
<parseLenient sample=":" draft="unconfirmed">↑↑↑</parseLenient>

‎common/main/ky.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -932,13 +932,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
932932
<type key="em" type="emoji" scope="core">Быйтыкча</type>
933933
<type key="em" type="text" scope="core">Текст</type>
934934
<type key="hc" type="h11">12 сааттык тутум (0–11)</type>
935-
<type key="hc" type="h11" scope="core">12 (0❰NDASH❱11)</type>
935+
<type key="hc" type="h11" scope="core">12 (0–11)</type>
936936
<type key="hc" type="h12">12 сааттык тутум (1–12)</type>
937-
<type key="hc" type="h12" scope="core">12 (1❰NDASH❱12)</type>
937+
<type key="hc" type="h12" scope="core">12 (1–12)</type>
938938
<type key="hc" type="h23">24 сааттык тутум (0–23)</type>
939-
<type key="hc" type="h23" scope="core">24 (0❰NDASH❱23)</type>
939+
<type key="hc" type="h23" scope="core">24 (0–23)</type>
940940
<type key="hc" type="h24">24 сааттык тутум (1–24)</type>
941-
<type key="hc" type="h24" scope="core">24 (1❰NDASH❱24</type>
941+
<type key="hc" type="h24" scope="core">24 (1–24</type>
942942
<type key="lb" type="loose">Саптардын арасы кенен</type>
943943
<type key="lb" type="loose" scope="core">Кенен</type>
944944
<type key="lb" type="normal">Саптардын арасы орточо</type>

‎common/main/ne.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,13 +1157,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
11571157
<type key="em" type="emoji" scope="core">इमोजी</type>
11581158
<type key="em" type="text" scope="core">टेक्स्ट</type>
11591159
<type key="hc" type="h11">१२ घण्टे प्रणाली (०–११)</type>
1160-
<type key="hc" type="h11" scope="core">१२ (0–11) १२ (0❰NDASH❱११)</type>
1160+
<type key="hc" type="h11" scope="core">१२ (0–11) १२ (0–११)</type>
11611161
<type key="hc" type="h12">१२ घन्टाको प्रणाली (१–१२)</type>
1162-
<type key="hc" type="h12" scope="core">१२(१–१२) १२ (1❰NDASH❱१२)</type>
1162+
<type key="hc" type="h12" scope="core">१२(१–१२) १२ (1–१२)</type>
11631163
<type key="hc" type="h23">२४ घन्टाको प्रणाली (०–२३)</type>
1164-
<type key="hc" type="h23" scope="core">२४ (०–२३) २४ (०❰NDASH❱२३)</type>
1164+
<type key="hc" type="h23" scope="core">२४ (०–२३) २४ (०–२३)</type>
11651165
<type key="hc" type="h24">२४ घन्टाको प्रणाली (१–२४)</type>
1166-
<type key="hc" type="h24" scope="core">२४ (१–२४) २४ (१❰NDASH❱२४)</type>
1166+
<type key="hc" type="h24" scope="core">२४ (१–२४) २४ (१–२४)</type>
11671167
<type key="lb" type="loose">पङ्क्ति विच्छेदको खुला शैली</type>
11681168
<type key="lb" type="loose" scope="core">खुला</type>
11691169
<type key="lb" type="normal">पङ्क्ति विच्छेदको सामान्य शैली</type>

‎common/main/ti.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,9 +944,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
944944
<type key="em" type="emoji" scope="core">ኢሞጂ</type>
945945
<type key="em" type="text" scope="core">ጽሑፍ</type>
946946
<type key="hc" type="h11">ስርዓት 12 ሰዓታት (0–11)</type>
947-
<type key="hc" type="h11" scope="core">12 (0–11) 12 (0❰NDASH❱11)</type>
947+
<type key="hc" type="h11" scope="core">12 (0–11) 12 (0–11)</type>
948948
<type key="hc" type="h12">ስርዓት 12 ሰዓታት (1–12)</type>
949-
<type key="hc" type="h12" scope="core">12 (1–12) 12 (1❰NDASH❱12)</type>
949+
<type key="hc" type="h12" scope="core">12 (1–12) 12 (1–12)</type>
950950
<type key="hc" type="h23">ናይ 24 ሰዓታት ስርዓት (0–23)</type>
951951
<type key="hc" type="h23" scope="core">24 (0–23)</type>
952952
<type key="hc" type="h24">ናይ 24 ሰዓታት ስርዓት (1–24)</type>

‎tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckForExemplars.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ private UnicodeSet safeGetExemplars(
311311
return result;
312312
}
313313

314+
static final UnicodeSet ESCAPE = new UnicodeSet("[❰❱]").freeze();
315+
314316
@Override
315317
public CheckCLDR handleCheck(
316318
String path, String fullPath, String value, Options options, List<CheckStatus> result) {
@@ -609,6 +611,13 @@ private void checkIllegalCharacters(String value, List<CheckStatus> result) {
609611
.setSubtype(Subtype.illegalCharacter)
610612
.setMessage(
611613
"Bidi markup can only include LRM RLM ALM, not paired characters such as FSI PDI"));
614+
} else if (ESCAPE.containsSome(value)) {
615+
result.add(
616+
new CheckStatus()
617+
.setCause(this)
618+
.setMainType(CheckStatus.errorType)
619+
.setSubtype(Subtype.illegalCharacter)
620+
.setMessage("The characters {0} are illegal", ESCAPE.toPattern(false)));
612621
}
613622
}
614623

0 commit comments

Comments
 (0)