Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

8293834: Update CLDR data following tzdata 2022c update #26

Closed
wants to merge 2 commits into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Sep 16, 2022

This adds the alias for Europe/Kyiv to the CLDR translation data, following the tzdata update which introduces this zone.

This is unnecessary for trunk, as it will be added by an update to CLDR v42, but such updates are not backported.

Without patch (from openjdk/jdk#10012 (comment)):

jshell> ZoneId.of("Europe/Kyiv").getDisplayName(TextStyle.FULL, Locale.US)
$178 ==> "Kyiv Time"

jshell> ZoneId.of("Europe/Kiev").getDisplayName(TextStyle.FULL, Locale.US)
$179 ==> "Eastern European Time"

With patch:

jshell> ZoneId.of("Europe/Kyiv").getDisplayName(TextStyle.FULL, Locale.US)
$178 ==> "Eastern European Time"

jshell> ZoneId.of("Europe/Kiev").getDisplayName(TextStyle.FULL, Locale.US)
$179 ==> "Eastern European Time"

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8293834: Update CLDR data following tzdata 2022c update

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk19u pull/26/head:pull/26
$ git checkout pull/26

Update a local copy of the PR:
$ git checkout pull/26
$ git pull https://git.openjdk.org/jdk19u pull/26/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26

View PR using the GUI difftool:
$ git pr show -t 26

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk19u/pull/26.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 16, 2022

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 16, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 16, 2022

Webrevs

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the fix.

@openjdk
Copy link

openjdk bot commented Sep 16, 2022

@gnu-andrew This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8293834: Update CLDR data following tzdata 2022c update

Reviewed-by: naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • 88490ec: 8293348: A false cyclic inheritance error reported
  • b5f7988: 8293578: Duplicate ldc generated by javac
  • 66bc356: 8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 16, 2022
@gnu-andrew
Copy link
Member Author

Thanks. Flagged the bug with jdk19u-fix-request.

@gnu-andrew
Copy link
Member Author

While this is still waiting for approval, I've added an update to the TimeZoneNamesTest to check these values.

This change is also included in the 17u PR: openjdk/jdk17u#355

@gnu-andrew
Copy link
Member Author

This now has jdk19u-fix-yes.

@naotoj are you still ok with this, with the additional test changes?

@naotoj
Copy link
Member

naotoj commented Sep 27, 2022

@gnu-andrew Looks OK to me, assuming those localized texts are retrieved from "Europe_Eastern" metazone texts of CLDR.

@gnu-andrew
Copy link
Member Author

@gnu-andrew Looks OK to me, assuming those localized texts are retrieved from "Europe_Eastern" metazone texts of CLDR.

They are, copied directly and then non-ASCII characters escaped (failed initially when I didn't do that: openjdk/jdk17u@f4d2dfa)

The test passes on a patched build, but fails with an existing release (e.g. 17.0.4) as follows:

$ grep 'AssertionError' test.1663972846/jdk/JTwork/sun/util/resources/cldr/TimeZoneNamesTest.jtr 
java.lang.AssertionError: expected [Eastern European Standard Time] but found [Kyiv Standard Time]
java.lang.AssertionError: expected [heure normale d\u2019Europe de l\u2019Est] but found [Kyiv (heure standard)]
java.lang.AssertionError: expected [Osteurop\u00e4ische Normalzeit] but found [Kyiv Normalzeit]

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 28, 2022

Going to push as commit e102312.
Since your change was applied there have been 16 commits pushed to the master branch:

  • 7f34799: 8291508: Fix some tests with "requires vm.jvmti & vm.continuations"
  • 59a331a: 8290496: riscv: Fix build warnings-as-errors with GCC 11
  • 30294b3: 8286314: Trampoline not created for far runtime targets outside small CodeCache
  • d0b021b: 8288992: AArch64: CMN should be handled the same way as CMP
  • e6bd2c9: 8290246: test fails "assert(init != __null) failed: initialization not found"
  • 27158f2: 8290451: Incorrect result when switching to C2 OSR compilation from C1
  • 83cb884: 8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
  • 63c53da: 8290705: StringConcat::validate_mem_flow asserts with "unexpected user: StoreI"
  • 6b9fe5d: 8293044: C1: Missing access check on non-accessible class
  • e8a134a: 8291775: C2: assert(r != __null && r->is_Region()) failed: this phi must have a region
  • ... and 6 more: https://git.openjdk.org/jdk19u/compare/903c21b0268f7c5e3bfd3ae69328b864fb3cc65c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 28, 2022
@openjdk openjdk bot closed this Sep 28, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 28, 2022
@openjdk
Copy link

openjdk bot commented Sep 28, 2022

@gnu-andrew Pushed as commit e102312.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
integrated Pull request has been integrated
2 participants