unicode-org
CLDR-18531 Add long Hawaii time name, remove short names
CLDR-18531
- [x] This PR completes the ticket.
Also removes short "HT" from all locales that somehow translated it, short names should only be in en-US.
ALLOW_MANY_COMMITS=true
I don't think so. it's supposed to be an override of the non-location (metazone) name.
What does this mean:
Error: (TestCLDRFile.java:411) Error: +en, -[ar, fr, ja, root] //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/long/generic
Notice: the branch changed across the force-push!
- tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java is now changed in the branch
~ Your Friendly Jira-GitHub PR Checker Bot
![jira-pull-request-webhook[bot] avatar](https://avatars.githubusercontent.com/u/13873561?v=4 "Published by a pub.dev verified publisher"){kind=small}
Notice: the branch changed across the force-push!
- common/main/en.xml is different
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- common/main/ast.xml is now changed in the branch
- common/main/chr.xml is now changed in the branch
- common/main/cs.xml is now changed in the branch
- common/main/cv.xml is now changed in the branch
- common/main/en_001.xml is now changed in the branch
- common/main/en_AE.xml is now changed in the branch
- common/main/en_JP.xml is now changed in the branch
- common/main/en_MH.xml is now changed in the branch
- common/main/en_MP.xml is now changed in the branch
- common/main/en.xml is different
- common/main/es_MX.xml is now changed in the branch
- common/main/es_US.xml is now changed in the branch
- common/main/et.xml is now changed in the branch
- common/main/eu.xml is now changed in the branch
- common/main/ff_Adlm.xml is now changed in the branch
- common/main/fi.xml is now changed in the branch
- common/main/fil.xml is now changed in the branch
- common/main/fo.xml is now changed in the branch
- common/main/fr.xml is now changed in the branch
- common/main/ga.xml is now changed in the branch
- common/main/gd.xml is now changed in the branch
- common/main/haw.xml is now changed in the branch
- common/main/hi_Latn.xml is now changed in the branch
- common/main/hr.xml is now changed in the branch
- common/main/hu.xml is now changed in the branch
- common/main/id.xml is now changed in the branch
- common/main/is.xml is now changed in the branch
- common/main/it.xml is now changed in the branch
- common/main/kab.xml is now changed in the branch
- common/main/ksh.xml is now changed in the branch
- common/main/lt.xml is now changed in the branch
- common/main/lv.xml is now changed in the branch
- common/main/ms.xml is now changed in the branch
- common/main/mt.xml is now changed in the branch
- common/main/nl.xml is now changed in the branch
- common/main/no.xml is now changed in the branch
- common/main/pl.xml is now changed in the branch
- common/main/pt.xml is now changed in the branch
- common/main/qu.xml is now changed in the branch
- common/main/ro.xml is now changed in the branch
- common/main/sc.xml is now changed in the branch
- common/main/sk.xml is now changed in the branch
- common/main/sl.xml is now changed in the branch
- common/main/sq.xml is now changed in the branch
- common/main/sr_Latn.xml is now changed in the branch
- common/main/sv.xml is now changed in the branch
- common/main/sw.xml is now changed in the branch
- common/main/to.xml is now changed in the branch
- common/main/tr.xml is now changed in the branch
- common/main/vi.xml is now changed in the branch
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- common/main/ast.xml is different
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- common/main/af.xml is now changed in the branch
- common/main/ast.xml is different
- common/main/az.xml is now changed in the branch
- common/main/br.xml is now changed in the branch
- common/main/bs.xml is now changed in the branch
- common/main/ca.xml is now changed in the branch
- common/main/cs.xml is different
- common/main/cy.xml is now changed in the branch
- common/main/da.xml is now changed in the branch
- common/main/de.xml is now changed in the branch
- common/main/ee.xml is now changed in the branch
- common/main/hi_Latn.xml is different
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- common/main/cv.xml is different
- common/main/en_001.xml is different
- common/main/en_AE.xml is different
- common/main/en_JP.xml is different
- common/main/en_MH.xml is different
- common/main/en_MP.xml is different
- common/main/en.xml is different
- common/main/es_US.xml is different
- tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java is now changed in the branch
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- common/main/haw.xml is different
~ Your Friendly Jira-GitHub PR Checker Bot
I think you might be running into a problem (that I filed a ticket on ages ago) than if there is no daylight savings, then the 'standard' version is used, not generic.
I'd have to look to the spec to see what the fallback is. If we fallback to whichever exists, then we should fix the test. But it may cause an ICU migration issue too.
I think you might be running into a problem (that I filed a ticket on ages ago) than if there is no daylight savings, then the 'standard' version is used, not generic.
Etc/UTC also defines a standard name only so that's probably not it.
Notice: the branch changed across the force-push!
- common/main/en.xml is different
- common/main/root.xml is different
- common/main/tr.xml is different
- tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java is different
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java is now changed in the branch
~ Your Friendly Jira-GitHub PR Checker Bot
Notice: the branch changed across the force-push!
- tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java is different
~ Your Friendly Jira-GitHub PR Checker Bot
The only error appears to be the following:
Error: (TestCoverageLevel.java:737) Error: Comprehensive & no exception for path => //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/long/standard
I poked into a bit, but have a doctor's appointment, so have to get back to it later. Here's what I find:
That test is checking the coverage for English, and found that that path is at Comprehensive, instead of modern.
Searching in coverageLevels.xml, for timeZoneNames/zone in HEAD main/en.xml, I find just one applicable line.
451: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='Etc/UTC']/long/standard"/>
452: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='Etc/Unknown']/exemplarCity"/>
453: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='${Target-TimeZones}']/exemplarCity"/>
455: <coverageLevel value="moderate" inTerritory="IE" match="dates/timeZoneNames/zone[@type='Europe/Dublin']/long/daylight"/>
456: <coverageLevel value="moderate" inTerritory="IE" match="dates/timeZoneNames/zone[@type='Europe/Dublin']/short/daylight"/>
457: <coverageLevel value="moderate" inTerritory="GB" match="dates/timeZoneNames/zone[@type='Europe/London']/long/daylight"/>
458: <coverageLevel value="moderate" inTerritory="GB" match="dates/timeZoneNames/zone[@type='Europe/London']/short/daylight"/>
1,047: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='%timeZones']/exemplarCity"/>
1,048: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='Europe/(Dublin|London)']/long/daylight"/>
1,049: <coverageLevel value="moderate" match="dates/timeZoneNames/zone[@type='Europe/(Dublin|London)']/short/daylight"/>
Using SearchXML on en.xml I get:
[-p/timeZoneNames/zone, -f^en$]
#-s source ≝ /Users/markdavis/github/cldr/common/main/
#-f file ≔ ^en$
#-p path ≔ /timeZoneNames/zone
#-R RootUncovered ≝ false
#-P PathStyle ≝ path
Searching...
# en ⟪Value⟫ Path Org-Level
# en ⟪Mexico City⟫ //ldml/dates/timeZoneNames/zone[@type="America/Mexico_City"]/exemplarCity moderate
# en ⟪Easter Island⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Easter"]/exemplarCity moderate
# en ⟪Galápagos Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Galapagos"]/exemplarCity moderate
# en ⟪Chagos Archipelago⟫ //ldml/dates/timeZoneNames/zone[@type="Indian/Chagos"]/exemplarCity moderate
# en ⟪Comoros⟫ //ldml/dates/timeZoneNames/zone[@type="Indian/Comoro"]/exemplarCity moderate
# en ⟪Kerguelen Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Indian/Kerguelen"]/exemplarCity moderate
# en ⟪Canaries⟫ //ldml/dates/timeZoneNames/zone[@type="Atlantic/Canary"]/exemplarCity moderate
# en ⟪Faroes⟫ //ldml/dates/timeZoneNames/zone[@type="Atlantic/Faeroe"]/exemplarCity moderate
# en ⟪Aktau⟫ //ldml/dates/timeZoneNames/zone[@type="Asia/Aqtau"]/exemplarCity moderate
# en ⟪Kostanay⟫ //ldml/dates/timeZoneNames/zone[@type="Asia/Qostanay"]/exemplarCity moderate
# en ⟪Kyzylorda⟫ //ldml/dates/timeZoneNames/zone[@type="Asia/Qyzylorda"]/exemplarCity moderate
# en ⟪Ho Chi Minh City⟫ //ldml/dates/timeZoneNames/zone[@type="Asia/Saigon"]/exemplarCity moderate
# en ⟪Chatham Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Chatham"]/exemplarCity moderate
# en ⟪Christmas Island⟫ //ldml/dates/timeZoneNames/zone[@type="Indian/Christmas"]/exemplarCity moderate
# en ⟪Cocos Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Indian/Cocos"]/exemplarCity moderate
# en ⟪Lord Howe Island⟫ //ldml/dates/timeZoneNames/zone[@type="Australia/Lord_Howe"]/exemplarCity moderate
# en ⟪Macquarie Island⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Macquarie"]/exemplarCity moderate
# en ⟪Norfolk Island⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Norfolk"]/exemplarCity moderate
# en ⟪Casey Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Casey"]/exemplarCity moderate
# en ⟪Dumont d’Urville Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/DumontDUrville"]/exemplarCity moderate
# en ⟪Mawson Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Mawson"]/exemplarCity moderate
# en ⟪McMurdo Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/McMurdo"]/exemplarCity moderate
# en ⟪Palmer Land⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Palmer"]/exemplarCity moderate
# en ⟪Rothera Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Rothera"]/exemplarCity moderate
# en ⟪Showa Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Syowa"]/exemplarCity moderate
# en ⟪Troll Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Troll"]/exemplarCity moderate
# en ⟪Vostok Station⟫ //ldml/dates/timeZoneNames/zone[@type="Antarctica/Vostok"]/exemplarCity moderate
# en ⟪Canton Island⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Enderbury"]/exemplarCity moderate
# en ⟪Kwajalein Atoll⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Kwajalein"]/exemplarCity moderate
# en ⟪Marquesas Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Marquesas"]/exemplarCity moderate
# en ⟪Midway Atoll⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Midway"]/exemplarCity moderate
# en ⟪Pitcairn Islands⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Pitcairn"]/exemplarCity moderate
# en ⟪Wake Island⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Wake"]/exemplarCity moderate
# en ⟪Unknown Location⟫ //ldml/dates/timeZoneNames/zone[@type="Etc/Unknown"]/exemplarCity moderate
# en ⟪Coordinated Universal Time⟫ //ldml/dates/timeZoneNames/zone[@type="Etc/UTC"]/long/standard moderate
# en ⟪Irish Standard Time⟫ //ldml/dates/timeZoneNames/zone[@type="Europe/Dublin"]/long/daylight moderate
# en ⟪British Summer Time⟫ //ldml/dates/timeZoneNames/zone[@type="Europe/London"]/long/daylight moderate
# en ⟪HST⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/generic comprehensive
# en ⟪HST⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/standard comprehensive
# en ⟪HDT⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/daylight comprehensive
I need to look back at the test and find out why the short/standard is not triggering a problem while the long one is.
That test is checking the coverage for English, and found that that path is at Comprehensive
What does that mean? The path is either there or not there in English.
Getting back to this.
This should probably wait until survey tool XML integration. Otherwise importing the data from XML might restore items. Our target for that is July 16. (See https://docs.google.com/spreadsheets/d/1N6inI5R84UoYlRwuCNPBOAP7ri4q2CmJmh8DC5g-S6c/edit?gid=1680747936). So we have a month before then.
However, in answer to your question: A path can either be physically present in a locale, or inherited from a parent (eg for en that's root), or absent.
In any of those cases, the coverage level determines what is actually shown to users. The test in question verifies that for a known locale (English) there are certain paths, and the coverage levels for those paths make sense. In the note I had above, we have the following paths at comprehensive (in main), but I think it might be checking for the long versions and failing.
# en ⟪HST⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/generic comprehensive
# en ⟪HST⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/standard comprehensive
# en ⟪HDT⟫ //ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/short/daylight comprehensive
I have changed this to draft as there is more to discuss on the ticket (https://unicode-org.atlassian.net/browse/CLDR-18531?focusedCommentId=185471).