Skip to content

Commit

Permalink
8332424: Update IANA Language Subtag Registry to Version 2024-05-16
Browse files Browse the repository at this point in the history 
Reviewed-by: naoto, iris
  • Loading branch information
Justin Lu committed Jun 3, 2024
1 parent 9686e80 commit 6dac8d6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion src/java.base/share/data/lsrdata/language-subtag-registry.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
File-Date: 2024-03-07
File-Date: 2024-05-16
%%
Type: language
Subtag: aa
Expand Down Expand Up @@ -9402,6 +9402,7 @@ Macrolanguage: doi
%%
Type: language
Subtag: dgr
Description: Tlicho
Description: Dogrib
Description: Tłı̨chǫ
Added: 2005-10-16
Expand Down Expand Up @@ -15255,6 +15256,11 @@ Description: Isu (Menchum Division)
Added: 2009-07-29
%%
Type: language
Subtag: isv
Description: Interslavic
Added: 2024-05-15
%%
Type: language
Subtag: itb
Description: Binongan Itneg
Added: 2009-07-29
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
* @test
* @bug 8025703 8040211 8191404 8203872 8222980 8225435 8241082 8242010 8247432
* 8258795 8267038 8287180 8302512 8304761 8306031 8308021 8313702 8318322
* 8327631
* 8327631 8332424
* @summary Checks the IANA language subtag registry data update
* (LSR Revision: 2024-03-07) with Locale and Locale.LanguageRange
* (LSR Revision: 2024-05-16) with Locale and Locale.LanguageRange
* class methods.
* @run main LanguageSubtagRegistryTest
*/
Expand Down

9 comments on commit 6dac8d6

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6dac8d6 Jul 12, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-6dac8d64-master in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 6dac8d64 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 3 Jun 2024 and was reviewed by Naoto Sato and Iris Clark.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-MBaesken-6dac8d64-master:backport-MBaesken-6dac8d64-master
$ git checkout backport-MBaesken-6dac8d64-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-MBaesken-6dac8d64-master

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6dac8d6 Jul 12, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-6dac8d64-master in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 6dac8d64 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 3 Jun 2024 and was reviewed by Naoto Sato and Iris Clark.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-MBaesken-6dac8d64-master:backport-MBaesken-6dac8d64-master
$ git checkout backport-MBaesken-6dac8d64-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-MBaesken-6dac8d64-master

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6dac8d6 Jul 16, 2024

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 6dac8d64 to openjdk/jdk11u-dev due to conflicts in the following files:

  • make/data/lsrdata/language-subtag-registry.txt
  • test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-MBaesken-6dac8d64-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 6dac8d64527b4e9ade783b99f82fbecd81c426a6

# Backport the commit
$ git cherry-pick --no-commit 6dac8d64527b4e9ade783b99f82fbecd81c426a6
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 6dac8d64527b4e9ade783b99f82fbecd81c426a6'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 6dac8d64527b4e9ade783b99f82fbecd81c426a6.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 6dac8d64 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 3 Jun 2024 and was reviewed by Naoto Sato and Iris Clark.

Thanks!

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6dac8d6 Jul 23, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-6dac8d64-master in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 6dac8d64 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 3 Jun 2024 and was reviewed by Naoto Sato and Iris Clark.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git backport-MBaesken-6dac8d64-master:backport-MBaesken-6dac8d64-master
$ git checkout backport-MBaesken-6dac8d64-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git backport-MBaesken-6dac8d64-master

⚠️ @MBaesken You are not yet a collaborator in my fork openjdk-bots/jdk11u-dev. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.