Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICU-21581 integrate CLDR release-40-m1 to ICU trunk #1742

Conversation

pedberg-icu
Copy link
Contributor

@pedberg-icu pedberg-icu commented Jun 15, 2021

Checklist
  • Required: Issue filed: https://unicode-org.atlassian.net/browse/ICU-21581
  • Required: The PR title must be prefixed with a JIRA Issue number.
  • Required: The PR description must include the link to the Jira Issue, for example by completing the URL in the first checklist item
  • Required: Each commit message must be prefixed with a JIRA Issue number.
  • Issue accepted (done by Technical Committee after discussion)
  • Tests included, if applicable
  • API docs and/or User Guide docs changed or added, if applicable

This integrates into ICU the CLDR data in xml as of a few days after the start of data submission for CLDR 40; this is tagged CLDR "release-40-m1". This should have most or all of the new structure going into CLDR 40, but does not yet have any results of data submission and vetting via the CLDR Survey Tool.

Some notable items:

  • This includes an ICU version of the new CLDR datetimeSkeletons for standard patterns added per CLDR-13425. In ICU this is currently a new DateTimeSkeletons bundle whose entries parallel the first 8 entries in DateTimePatterns, but this can be changed. This affects most locale files.
  • New measure units "concentr: item" and "force: kilowatt-hour-per-100-kilometer" per CLDR-14504 and side fix under CLDR-14824.
  • Time cycles and time preferences are updated for Chinese regions and locales per CLDR-10560: Time formats for CN (and zh) switch from ah to HH, time formats for TW (and zh_Hant) switch from ah to Bh, and skeleton character C no longer results in Bh for CN, HK, MO.
  • Unicode 14 scripts are added per CLDR-14801
  • New Yukon metazone per CLDR-14709
  • And other changes: Adjustments to grammar data, more availableFormats, remove/add some narrow symbols for BYN/RUR, etc.

Note: in ICU-21569, icu4c/source/data/brkitr/root.txt was manually edited to add lstm entries without adding the corresponding source data in icu4c/source/data/xml/brkitr/root.xml, so the normal CLDR-ICU integration deletes them. In this PR those lstm entries in icu4c/source/data/brkitr/root.txt are manually restored, but for the next CLDR-ICU integration, icu4c/source/data/xml/brkitr/root.xml should be updated to generate them automatically.

@pedberg-icu
Copy link
Contributor Author

/azp run CI-Exhaustive

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@pedberg-icu pedberg-icu force-pushed the ICU-21581-brs70rc-integrate-cldr-40-at-data-submit branch from a003741 to 1949ff5 Compare June 15, 2021 16:28
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

Copy link
Member

@sffc sffc left a comment

Choose a reason for hiding this comment

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

Looks great!

@pedberg-icu pedberg-icu merged commit 4a6ad3d into unicode-org:main Jun 15, 2021
@pedberg-icu pedberg-icu deleted the ICU-21581-brs70rc-integrate-cldr-40-at-data-submit branch June 15, 2021 21:24
@@ -11357,6 +11362,7 @@ supplementalData:table(nofallback){
"energy-british-thermal-unit",
"force-pound-force",
"force-newton",
"force-kilowatt-hour-per-100-kilometer",
Copy link
Member

Choose a reason for hiding this comment

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

Huh? That's a measure of consumption, not of force.

Copy link
Member

Choose a reason for hiding this comment

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

By definition, energy over distance equals force. So the "real" category should be force. But the "fake" category could still be consuption if that makes more sense.

Copy link
Member

Choose a reason for hiding this comment

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

kWh/100km should go together with

                "consumption-liter-per-100-kilometer",
                "consumption-liter-per-kilometer",
                "consumption-mile-per-gallon",
                "consumption-mile-per-gallon-imperial",

Copy link
Member

Choose a reason for hiding this comment

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

@@ -422,6 +427,11 @@ en{
}
}
force{
kilowatt-hour-per-100-kilometer{
Copy link
Member

Choose a reason for hiding this comment

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

again, consumption not force

@macchiati
Copy link
Member

macchiati commented Jun 15, 2021 via email

@macchiati
Copy link
Member

macchiati commented Jun 15, 2021 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants