CLDR-18531 Add long Hawaii time name, remove short names #4717

robertbastian · 2025-05-20T16:12:48Z

CLDR-18531

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

AEApple · 2025-05-20T16:59:43Z

Isn't this supposed to be an alt?

robertbastian · 2025-05-20T17:14:46Z

I don't think so. it's supposed to be an override of the non-location (metazone) name.

robertbastian · 2025-05-26T10:19:28Z

What does this mean:

Error:  (TestCLDRFile.java:411)  Error: +en, -[ar, fr, ja, root]	//ldml/dates/timeZoneNames/zone[@type="Pacific/Honolulu"]/long/generic

jira-pull-request-webhook · 2025-05-26T11:00:46Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-05-26T12:24:48Z

Notice: the branch changed across the force-push!

common/main/en.xml is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-05-27T09:22:47Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-05-27T09:23:54Z

Notice: the branch changed across the force-push!

common/main/ast.xml is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-05-27T09:29:56Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

robertbastian · 2025-05-29T06:52:31Z

do you know why CI fails?

jira-pull-request-webhook · 2025-06-03T12:56:32Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-06-03T12:58:55Z

Notice: the branch changed across the force-push!

common/main/haw.xml is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

macchiati · 2025-06-03T16:27:22Z

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.

robertbastian · 2025-06-03T16:38:53Z

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.

jira-pull-request-webhook · 2025-06-03T16:46:19Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-06-03T16:50:04Z

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

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2025-06-03T16:50:31Z

Notice: the branch changed across the force-push!

tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

macchiati · 2025-06-04T22:19:48Z

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.

robertbastian · 2025-06-05T06:54:10Z

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.

macchiati · 2025-06-16T22:44:52Z

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

robertbastian · 2025-06-26T14:01:22Z

So what do I have to change?

macchiati

Looks good, just not approving until we are in XML

github-actions bot assigned robertbastian May 20, 2025

robertbastian requested a review from macchiati May 26, 2025 10:19

robertbastian removed their assignment May 26, 2025

robertbastian force-pushed the hawai'i branch from 0788db6 to bdebff2 Compare May 26, 2025 11:00

robertbastian force-pushed the hawai'i branch from bdebff2 to a5a7c62 Compare May 26, 2025 12:24

robertbastian force-pushed the hawai'i branch from a5a7c62 to 7af0a36 Compare May 27, 2025 09:22

robertbastian force-pushed the hawai'i branch from 7af0a36 to ef62d49 Compare May 27, 2025 09:23

robertbastian changed the title ~~CLDR-18531 Add Pacific/Honolulu name~~ CLDR-18531 Add long Hawaii time name May 27, 2025

robertbastian force-pushed the hawai'i branch from ef62d49 to 3c2c1d4 Compare May 27, 2025 09:29

macchiati previously approved these changes May 29, 2025

View reviewed changes

robertbastian dismissed macchiati’s stale review via 4282a4d June 3, 2025 11:50

robertbastian changed the title ~~CLDR-18531 Add long Hawaii time name~~ CLDR-18531 Add long Hawaii time name, remove short names Jun 3, 2025

robertbastian force-pushed the hawai'i branch from 219327b to ae67c7d Compare June 3, 2025 12:56

robertbastian force-pushed the hawai'i branch from ae67c7d to 1500d9a Compare June 3, 2025 12:58

CLDR-18531 Add long Hawaii name

90ee26f

robertbastian force-pushed the hawai'i branch from 1500d9a to 9f2358e Compare June 3, 2025 16:46

robertbastian requested a review from macchiati June 3, 2025 16:48

robertbastian force-pushed the hawai'i branch from 9f2358e to 5e9ced2 Compare June 3, 2025 16:50

CLDR-18531 Fix

461771e

robertbastian force-pushed the hawai'i branch from 5e9ced2 to 461771e Compare June 3, 2025 16:50

macchiati reviewed Jul 15, 2025

View reviewed changes

CLDR-18531 Add long Hawaii time name, remove short names #4717

Are you sure you want to change the base?

CLDR-18531 Add long Hawaii time name, remove short names #4717

Uh oh!

Conversation

robertbastian commented May 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AEApple commented May 20, 2025

Uh oh!

robertbastian commented May 20, 2025

Uh oh!

robertbastian commented May 26, 2025

Uh oh!

jira-pull-request-webhook bot commented May 26, 2025

Uh oh!

jira-pull-request-webhook bot commented May 26, 2025

Uh oh!

jira-pull-request-webhook bot commented May 27, 2025

Uh oh!

jira-pull-request-webhook bot commented May 27, 2025

Uh oh!

jira-pull-request-webhook bot commented May 27, 2025

Uh oh!

robertbastian commented May 29, 2025

Uh oh!

jira-pull-request-webhook bot commented Jun 3, 2025

Uh oh!

jira-pull-request-webhook bot commented Jun 3, 2025

Uh oh!

macchiati commented Jun 3, 2025

Uh oh!

robertbastian commented Jun 3, 2025

Uh oh!

jira-pull-request-webhook bot commented Jun 3, 2025

Uh oh!

jira-pull-request-webhook bot commented Jun 3, 2025

Uh oh!

jira-pull-request-webhook bot commented Jun 3, 2025

Uh oh!

macchiati commented Jun 4, 2025

Uh oh!

robertbastian commented Jun 5, 2025

Uh oh!

macchiati commented Jun 16, 2025

Uh oh!

robertbastian commented Jun 26, 2025

Uh oh!

macchiati left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

robertbastian commented May 20, 2025 •

edited

Loading