From c4b63540b711fd061680ed8c207af4968f250fa0 Mon Sep 17 00:00:00 2001 From: macchiati Date: Mon, 29 Jul 2024 18:14:23 -0700 Subject: [PATCH 1/3] =?UTF-8?q?CLDR-17544=20Fix=20just=20the=20modern=20pa?= =?UTF-8?q?ths=20for=20gregorian=20calendar,=20drawing=20on=20similarity?= =?UTF-8?q?=20with=20closely=20related=20patterns.=20Only=20modifying=20?= =?UTF-8?q?=E2=86=91=E2=86=91=E2=86=91=20values.=20Small=20changes=20in=20?= =?UTF-8?q?search=20tooling.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/main/brx.xml | 2 +- common/main/cy.xml | 2 +- common/main/hi_Latn.xml | 2 +- common/main/hy.xml | 4 +-- common/main/km.xml | 2 +- common/main/kn.xml | 2 +- common/main/kok.xml | 4 +-- common/main/om.xml | 2 +- common/main/pa.xml | 2 +- common/main/sw.xml | 2 +- common/main/ta.xml | 2 +- common/main/ti.xml | 6 ++-- .../org/unicode/cldr/tool/SearchCLDR.java | 32 ++++++++++--------- 13 files changed, 33 insertions(+), 31 deletions(-) diff --git a/common/main/brx.xml b/common/main/brx.xml index df6f95d34c1..4a757592291 100644 --- a/common/main/brx.xml +++ b/common/main/brx.xml @@ -1747,7 +1747,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ d-MMM E, MMM d - ↑↑↑ + E, MMMM d E, MMMM d ↑↑↑ ↑↑↑ diff --git a/common/main/cy.xml b/common/main/cy.xml index f30246772c0..02ae568d272 100644 --- a/common/main/cy.xml +++ b/common/main/cy.xml @@ -1255,7 +1255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ d MMM E, d MMM - ↑↑↑ + d MMMM ↑↑↑ y G y G diff --git a/common/main/hi_Latn.xml b/common/main/hi_Latn.xml index 19c0a6cf945..d7c782bb284 100644 --- a/common/main/hi_Latn.xml +++ b/common/main/hi_Latn.xml @@ -2143,7 +2143,7 @@ annotations. G y MMM G y, d MMM G y, dd MMM, E - ↑↑↑ + G y, dd MMMM, E ↑↑↑ ↑↑↑ ↑↑↑ diff --git a/common/main/hy.xml b/common/main/hy.xml index 31cee9e020c..2cf7d86cadb 100644 --- a/common/main/hy.xml +++ b/common/main/hy.xml @@ -1167,7 +1167,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ d MMM d MMM, E - ↑↑↑ + d MMMM ↑↑↑ y, G y, G @@ -1735,7 +1735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ d MMM d MMM, E - ↑↑↑ + d MMMM MMMM W-ին շաբաթ MMMM W-րդ շաբաթ ↑↑↑ diff --git a/common/main/km.xml b/common/main/km.xml index 4ce00c21a76..2cfc109f7b1 100644 --- a/common/main/km.xml +++ b/common/main/km.xml @@ -1709,7 +1709,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ d MMM E d MMM - ↑↑↑ + d MMMM សប្តាហ៍ទី W នៃខែ MMMM ↑↑↑ ↑↑↑ diff --git a/common/main/kn.xml b/common/main/kn.xml index 526aae637f8..911e373f7fc 100644 --- a/common/main/kn.xml +++ b/common/main/kn.xml @@ -2139,7 +2139,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d/M, E dd-MM ↑↑↑ - ↑↑↑ + d MMM E, d MMM d MMMM ↑↑↑ diff --git a/common/main/kok.xml b/common/main/kok.xml index 648445fa799..ad7a01213c2 100644 --- a/common/main/kok.xml +++ b/common/main/kok.xml @@ -1620,7 +1620,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic d-M d-M, E ↑↑↑ - ↑↑↑ + d MMM E, d MMM d MMMM ↑↑↑ @@ -1629,7 +1629,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic M-y d-M-y d-M-y, E - ↑↑↑ + MMM, y d MMM, y ↑↑↑ MMMM, y diff --git a/common/main/om.xml b/common/main/om.xml index 462da8a5fa0..284b80ea2a8 100644 --- a/common/main/om.xml +++ b/common/main/om.xml @@ -1219,7 +1219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y E, MMM d, y MMMM y - ↑↑↑ + QQQ y QQQQ y 'torbee' w 'kan' Y 'torbee' w 'kan' Y diff --git a/common/main/pa.xml b/common/main/pa.xml index 0ac1c445872..e79a6005320 100644 --- a/common/main/pa.xml +++ b/common/main/pa.xml @@ -1399,7 +1399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ d MMM E, d MMM - ↑↑↑ + d MMMM ↑↑↑ y G MMM y G diff --git a/common/main/sw.xml b/common/main/sw.xml index d7a4cbad5f0..54d9f470d59 100644 --- a/common/main/sw.xml +++ b/common/main/sw.xml @@ -1770,7 +1770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y - ↑↑↑ + QQQ y QQQQ y ↑↑↑ 'wiki' w 'ya' Y diff --git a/common/main/ta.xml b/common/main/ta.xml index 6ae45cf2b10..59cba88ad4d 100644 --- a/common/main/ta.xml +++ b/common/main/ta.xml @@ -2226,7 +2226,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd-MM, E dd-MM ↑↑↑ - ↑↑↑ + d MMM ↑↑↑ d MMMM ↑↑↑ diff --git a/common/main/ti.xml b/common/main/ti.xml index ba4ffdbb96b..e4e719f332a 100644 --- a/common/main/ti.xml +++ b/common/main/ti.xml @@ -1278,9 +1278,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E፣ d/M dd/MM ↑↑↑ - ↑↑↑ + d MMM E, MMM d - ↑↑↑ + d MMMM dd MMMM ↑↑↑ y G @@ -1803,7 +1803,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ d MMM E፣ d MMM - ↑↑↑ + d MMMM d MMMM ↑↑↑ ሰሙን W ናይ MMMM diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java index 8ac90482a14..d667a54fabc 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java @@ -1,15 +1,5 @@ package org.unicode.cldr.tool; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import com.google.common.collect.TreeMultimap; -import com.ibm.icu.text.DateTimePatternGenerator; -import com.ibm.icu.text.DateTimePatternGenerator.FormatParser; -import com.ibm.icu.text.DateTimePatternGenerator.VariableField; -import com.ibm.icu.util.ICUUncheckedIOException; -import com.ibm.icu.util.Output; -import com.ibm.icu.util.VersionInfo; import java.io.File; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -22,6 +12,7 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.unicode.cldr.test.CheckCLDR; import org.unicode.cldr.test.CheckCLDR.CheckStatus; import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype; @@ -45,6 +36,17 @@ import org.unicode.cldr.util.StandardCodes; import org.unicode.cldr.util.XPathParts; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import com.google.common.collect.TreeMultimap; +import com.ibm.icu.text.DateTimePatternGenerator; +import com.ibm.icu.text.DateTimePatternGenerator.FormatParser; +import com.ibm.icu.text.DateTimePatternGenerator.VariableField; +import com.ibm.icu.util.ICUUncheckedIOException; +import com.ibm.icu.util.Output; +import com.ibm.icu.util.VersionInfo; + public class SearchCLDR { // private static final int // HELP1 = 0, @@ -116,7 +118,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" + "", @@ -174,7 +176,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(); @@ -192,7 +194,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(); @@ -430,7 +432,7 @@ public static void main(String[] args) { "Path", "Full-Path", "Value", - "Parent-Value", + "Bailey-Value", "English-Value", "Source-Locale\tSource-Path", "Org-Level"); @@ -484,7 +486,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); From 4f68e864e77a18dfda1cd255ccac4ef5c94214fa Mon Sep 17 00:00:00 2001 From: macchiati Date: Mon, 29 Jul 2024 18:21:11 -0700 Subject: [PATCH 2/3] CLDR-17544 Small fix for extra E --- common/main/brx.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/main/brx.xml b/common/main/brx.xml index 4a757592291..9f8b609c90b 100644 --- a/common/main/brx.xml +++ b/common/main/brx.xml @@ -1747,7 +1747,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ d-MMM E, MMM d - E, MMMM d + MMMM d E, MMMM d ↑↑↑ ↑↑↑ From ceb8ac51c9d3ac936302827a1d17d8cad246f0f5 Mon Sep 17 00:00:00 2001 From: macchiati Date: Mon, 29 Jul 2024 18:24:39 -0700 Subject: [PATCH 3/3] CLDR-17544 Spotless --- .../org/unicode/cldr/tool/SearchCLDR.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java index d667a54fabc..50fa9e4b9f7 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/SearchCLDR.java @@ -1,5 +1,15 @@ package org.unicode.cldr.tool; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import com.google.common.collect.TreeMultimap; +import com.ibm.icu.text.DateTimePatternGenerator; +import com.ibm.icu.text.DateTimePatternGenerator.FormatParser; +import com.ibm.icu.text.DateTimePatternGenerator.VariableField; +import com.ibm.icu.util.ICUUncheckedIOException; +import com.ibm.icu.util.Output; +import com.ibm.icu.util.VersionInfo; import java.io.File; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -12,7 +22,6 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.unicode.cldr.test.CheckCLDR; import org.unicode.cldr.test.CheckCLDR.CheckStatus; import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype; @@ -36,17 +45,6 @@ import org.unicode.cldr.util.StandardCodes; import org.unicode.cldr.util.XPathParts; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import com.google.common.collect.TreeMultimap; -import com.ibm.icu.text.DateTimePatternGenerator; -import com.ibm.icu.text.DateTimePatternGenerator.FormatParser; -import com.ibm.icu.text.DateTimePatternGenerator.VariableField; -import com.ibm.icu.util.ICUUncheckedIOException; -import com.ibm.icu.util.Output; -import com.ibm.icu.util.VersionInfo; - public class SearchCLDR { // private static final int // HELP1 = 0,