Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17544 Fix just the modern paths for gregorian calendar #3916

Merged
merged 3 commits into from
Jul 30, 2024
Merged

CLDR-17544 Fix just the modern paths for gregorian calendar #3916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4b6354
CLDR-17544 Fix just the modern paths for gregorian calendar, drawing …
macchiati Jul 30, 2024
4f68e86
CLDR-17544 Small fix for extra E
macchiati Jul 30, 2024
ceb8ac5
CLDR-17544 Spotless
macchiati Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/main/brx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
<dateFormatItem id="MMMMW" count="one">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">↑↑↑</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/cy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
<dateFormatItem id="y">y G</dateFormatItem>
<dateFormatItem id="yyyy">y G</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/hi_Latn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2143,7 +2143,7 @@ annotations.
<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
<dateFormatItem id="GyMMMd">G y, d MMM</dateFormatItem>
<dateFormatItem id="GyMMMEd">G y, dd MMM, E</dateFormatItem>
<dateFormatItem id="GyMMMEEEEd">↑↑↑</dateFormatItem>
<dateFormatItem id="GyMMMEEEEd">G y, dd MMMM, E</dateFormatItem>
<dateFormatItem id="h">↑↑↑</dateFormatItem>
<dateFormatItem id="H">↑↑↑</dateFormatItem>
<dateFormatItem id="hm">↑↑↑</dateFormatItem>
Expand Down
4 changes: 2 additions & 2 deletions common/main/hy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
<dateFormatItem id="y">y, G</dateFormatItem>
<dateFormatItem id="yyyy">y, G</dateFormatItem>
Expand Down Expand Up @@ -1735,7 +1735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="one">MMMM W-ին շաբաթ</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">MMMM W-րդ շաբաթ</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/km.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">សប្តាហ៍ទី W នៃខែ MMMM</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
<dateFormatItem id="y">↑↑↑</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/kn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2139,7 +2139,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MEd">d/M, E</dateFormatItem>
<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="one">↑↑↑</dateFormatItem>
Expand Down
4 changes: 2 additions & 2 deletions common/main/kok.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="Md">d-M</dateFormatItem>
<dateFormatItem id="MEd">d-M, E</dateFormatItem>
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">↑↑↑</dateFormatItem>
Expand All @@ -1629,7 +1629,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="yM">M-y</dateFormatItem>
<dateFormatItem id="yMd">d-M-y</dateFormatItem>
<dateFormatItem id="yMEd">d-M-y, E</dateFormatItem>
<dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
<dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/om.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
<dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
<dateFormatItem id="yw" count="one">'torbee' w 'kan' Y</dateFormatItem>
<dateFormatItem id="yw" count="other">'torbee' w 'kan' Y</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/pa.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
<dateFormatItem id="y">y G</dateFormatItem>
<dateFormatItem id="yMMM">MMM y G</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/sw.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
<dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
<dateFormatItem id="yw" count="one">↑↑↑</dateFormatItem>
<dateFormatItem id="yw" count="other">'wiki' w 'ya' Y</dateFormatItem>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormatItem id="MEd">dd-MM, E</dateFormatItem>
<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="one">↑↑↑</dateFormatItem>
Expand Down
6 changes: 3 additions & 3 deletions common/main/ti.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,9 +1278,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="MEd">E፣ d/M</dateFormatItem>
<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
<dateFormatItem id="ms">↑↑↑</dateFormatItem>
<dateFormatItem id="y">y G</dateFormatItem>
Expand Down Expand Up @@ -1803,7 +1803,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd">E፣ d MMM</dateFormatItem>
<dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMdd">d MMMM</dateFormatItem>
<dateFormatItem id="MMMMW" count="one">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">ሰሙን W ናይ MMMM</dateFormatItem>
Expand Down
10 changes: 5 additions & 5 deletions tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ enum PathStyle {
.add("organization", ".*", null, "show level for organization")
.add("z-showPath", null, null, "show paths")
.add("resolved", null, null, "use resolved locales")
.add("q-showParent", null, null, "show parent value")
.add("bailey", null, null, "show bailey value")
.add("english", null, null, "show english value")
.add(
"RootUncovered" + "",
Expand Down Expand Up @@ -174,7 +174,7 @@ public static void main(String[] args) {
Boolean valueExclude = exclude.value;

countOnly = myOptions.get("count").doesOccur();
final boolean resolved = myOptions.get("resolved").doesOccur();
boolean resolved = myOptions.get("resolved").doesOccur();

showPath = myOptions.get("z-showPath").doesOccur();
String orgString = myOptions.get("organization").getValue();
Expand All @@ -192,7 +192,7 @@ public static void main(String[] args) {

showSurveyToolUrl = myOptions.get("SurveyTool").doesOccur();

boolean showParent = myOptions.get("q-showParent").doesOccur();
boolean showParent = myOptions.get("bailey").doesOccur();

boolean showEnglish = myOptions.get("english").doesOccur();

Expand Down Expand Up @@ -430,7 +430,7 @@ public static void main(String[] args) {
"Path",
"Full-Path",
"Value",
"Parent-Value",
"Bailey-Value",
"English-Value",
"Source-Locale\tSource-Path",
"Org-Level");
Expand Down Expand Up @@ -484,7 +484,7 @@ public static void main(String[] args) {
path,
fullPath,
value,
!showParent ? null : english.getBaileyValue(path, null, null),
!showParent ? null : resolvedFile.getBaileyValue(path, null, null),
english == null ? null : english.getStringValue(path),
resolvedSource,
Objects.toString(pathLevel) + extra);
Expand Down
Loading