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-17220 SBRS v45 merge selected maint/maint-44 fixes back to main #3373

Conversation

pedberg-icu
Copy link
Contributor

@pedberg-icu pedberg-icu commented Oct 31, 2023

CLDR-17220

  • This PR completes the ticket.

This merges relevant fixes on the maint/maint-44 branch back to main. Notes:

  • The maint/maint-44 branch was created on Oct 11 after commit e58b346 of Oct 10
  • This merge includes everything on the maint/maint-44 branch after the above commit, up through commit fa9259f of Oct 30, except for the specific items listed in the next sections.
  • The following commits on maint/maint-44 were not included because they were cherry-picks to maint/maint-44 of fixes that had already been made on main:
    • Commit 32a1842 Oct 11, 2 keyboard spec fixes
    • Commit fc7cf41 Oct 11, 1 keyboard spec fix
  • The following commits on maint/maint-44 were not included because they were specifically about updating various items to final status. On the main branch, we want to keep non-final status, but will update the version numbers for 45 under a separate PR.
    • Commit c291c05 Oct 25, remove -SNAPSHOT in poms, updated README to final
    • Commit 6e3f841 Oct 26, update spec status to final (but there are a few other specific fixes here that will be rolled in when I do the version number update)
    • Commit 19406a1 Oct 27, use final ICU4J libs

We probably want to merge this with a Rebase and merge (temporarily enable in Settings) instead of the usual Squash and merge.

ALLOW_MANY_COMMITS=true
DISABLE_JIRA_ISSUE_MATCH=true

stenshamn and others added 16 commits October 31, 2023 16:15
…icode-org#3338)

Adding missing variable in translation

(cherry picked from commit bd50a7f)
Updates to modification section reflecting:
- CLDR-16937
- CLDR-16038
- CLDR-16249
- CLDR-16251

(cherry picked from commit 06f64fc)
…unicode-org#3324)

* CLDR-17153 Investigate discrepancy between growth and coverage charts

* CLDR-17153 Cleanup

(cherry picked from commit 3bea383)
…#3358)

Punt a better fix to CLDR-17186

(cherry picked from commit 9df3a18)
…nicode-org#3359)

- clarify that keyboard is a technical preview
- fix typo in modification section

(cherry picked from commit 0020703)
- charts broke with recent renames (such as to= to output=)

(cherry picked from commit fa9259f)
@pedberg-icu pedberg-icu self-assigned this Oct 31, 2023
Copy link
Member

@btangmu btangmu left a comment

Choose a reason for hiding this comment

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

LGTM though I'm unfamiliar with most of this code

@@ -355,7 +456,7 @@ private static Map<String, FoundAndTotal> addGrowth(
}
// END HACK

if (showMissing) {
if (false && showMissing) {
Copy link
Member

Choose a reason for hiding this comment

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

dead code like this generally shouldn't be kept unless accompanied by an explanatory comment, preferably a TODO comment with an open ticket number, otherwise it leads to unmaintainable code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, but fixing those kinds of things probably does not belong in this kind of PR which is just merging maint branch changes back to main as is.

@pedberg-icu pedberg-icu merged commit 0b9e199 into unicode-org:main Nov 1, 2023
8 checks passed
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.

6 participants