Skip to content

Commit 740ffca

Browse files
committed
CLDR-19110 Fixes for tests
1 parent 3a26d44 commit 740ffca

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

common/dtd/ldmlSupplemental.dtd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
88
<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, scriptData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitPrefixes?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
99

1010
<!ATTLIST supplementalData version CDATA #IMPLIED >
11-
<!--@MATCH:any-->
11+
<!--@MATCH:version-->
1212
<!--@METADATA-->
1313
<!--@DEPRECATED-->
1414

tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathHeader.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,9 @@
542542
//supplementalData/measurementData/paperSize[@type="%A"]/_territories ; Supplemental ; Measurement ; Paper ; $1 ; HIDE
543543

544544
//supplementalData/dayPeriodRuleSet[@type="%A"]/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"]/_%E ; Supplemental ; DayPeriod ; $1-$2 ; $3-$4 ; HIDE
545+
//supplementalData/dayPeriodRuleSet[@type="%A"]/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"][@from="%A"]/_%E ; Supplemental ; DayPeriod ; $1-$2 ; $3-$4-$5 ; HIDE
545546
//supplementalData/dayPeriodRuleSet/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"]/_%E ; Supplemental ; DayPeriod ; $1 ; $2-$3 ; HIDE
547+
//supplementalData/dayPeriodRuleSet/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"][@from="%A"]/_%E ; Supplemental ; DayPeriod ; $1 ; $2-$3-$4 ; HIDE
546548

547549
//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalCase[@scope="%A"]/_values ; Supplemental ; Grammar ; Case ; $1-$2-$3 ; HIDE
548550
//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalDefiniteness[@scope="%A"]/_values ; Supplemental ; Grammar ; Definiteness ; $1-$2-$3 ; HIDE

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,14 @@ public void testEmptyPcdata() {
991991
// REQUIRED
992992
"//keyboardTest3…/repertoire[@ type < name", // Status: value ≠ distinguished
993993
// Mode: OPTIONAL ≠ REQUIRED
994-
"//keyboardTest3…/info[@ author < name" // Status: metadata ≠ distinguished
994+
"//keyboardTest3…/info[@ author < name", // Status: metadata ≠ distinguished
995995
// Mode: OPTIONAL ≠ REQUIRED
996+
"//supplementalData…/dayPeriodRule[@ before < from",
997+
// Status: value ≠ distinguished Mode: OPTIONAL
998+
"//supplementalData…/minDays[@ territories < draft",
999+
// Status: value ≠ distinguished Mode: REQUIRED ≠ OPTIONAL
1000+
"//supplementalData…/firstDay[@ territories < draft"
1001+
// Status: value ≠ distinguished Mode: REQUIRED ≠ OPTIONAL
9961002
);
9971003

9981004
public void testAttributeOrder() {

0 commit comments

Comments
 (0)