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

CLDR-16058 MERGE COMMIT of maint/maint-42 changes so far back to main #2420

Merged
merged 38 commits into from
Oct 3, 2022

Conversation

pedberg-icu
Copy link
Contributor

@pedberg-icu pedberg-icu commented Oct 3, 2022

CLDR-16058

  • This PR completes the ticket.

DISABLE_JIRA_ISSUE_MATCH=true
ALLOW_MANY_COMMITS=true

This PR is to merge from the maint/maint-42 branch back to main, following the procedure in Merging from Maint to Main (BRS Task) in the git for ICU developers instructions. This uses the "Easy Way" documented there: Just open a PR from maint/maint42 to main, which is OK since there are no merge conflicts doing this.

Note: This requires a MERGE COMMIT to merge; this is normally not enabled, so will require temporarily enabling it by going to the github admin panel, enabling it, using that option for the merge, then disabling the option again.

srl295 and others added 30 commits September 9, 2022 16:47
- update logic for 'modern' vs 'full'
- new StandardCodes.getHighestLocaleCoverageLevel() which checks parent locales (but not root)
- due to CLDR-14336
- also, update the converter to drop draft status in later stages of process
- expose a pattern in CLDRFile with draft status
- updated structure for personnames

also:
- drop xml:space from json, everywhere
- reorg how the copyright date is done in json (to avoid a yearly bump)
- improve how packageDesc is handled, so more packages have descriptions
- add comments in JSON_config.txt
…e locale identifier (#2373)

* CLDR-15956 Specify relations between the unit preferences data and the locale identifier

* CLDR-15956 fix typo

* CLDR-15956 Fixes for Shane's comments
* CLDR-15559 The dateFormatItem count is not documented

* CLDR-15559 Needs backslash escapes.
* CLDR-15956 Incorporate text from #2365, fixing the spelling, and adding pointer to Unit Conversion and Unit Preferences.

* CLDR-15956 Fix typos

* CLDR-15956 change markdown to html
- kept .html when referring to network URLs
- also update my email in a couple of places
PACKAGES.md's readme section was inadvertently written to cldr-packages.json,
after that file was closed.
* CLDR-15608 Specify ranges of numbers with qualifiers

* CLDR-15608 Typos

* CLDR-15608 typos

* CLDR-15608 Revise bidi language, clean up structure

* CLDR-15608 Touchups
- also fix one bad link broken in CLDR-15655
- also unicode.org -> www.unicode.org
pedberg-icu and others added 8 commits September 27, 2022 18:31
CLDR-13370

Fix hybrid locales tags and add more explanation for what script is used for hybrid locales

See #2390
- document the invariant against nondistinguishing elements and children
- update the test to link to the docs
- test: add an unreached enum value to the switch statement
- Also update comment about orderedItems
- Also update comment about NFC
- Also add note about the TECHPREVIEW annotation
- Also regenerated ToC for tr35-info.md
* CLDR-13722 refine person names spec algorithms

These came up in review, but we weren't able to make the changes before beta.

* CLDR-13722 fix GFM lists

* CLDR-13722 misc fixes
@pedberg-icu pedberg-icu changed the title Maint/maint 42 CLDR-16058 Merge maint/maint-42 changes to date back to main branch Oct 3, 2022
@pedberg-icu pedberg-icu changed the title CLDR-16058 Merge maint/maint-42 changes to date back to main branch CLDR-16058 MERGE COMMIT of maint/maint-42 changes to date back to main branch Oct 3, 2022
@pedberg-icu pedberg-icu changed the title CLDR-16058 MERGE COMMIT of maint/maint-42 changes to date back to main branch CLDR-16058 MERGE COMMIT of maint/maint-42 changes so far back to main Oct 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants