Skip to content

Conversation

@srl295
Copy link
Member

@srl295 srl295 commented Apr 25, 2019

Regression was in 1afef30
PR #418 ICU-20187

  • We dropped the mapping from "C" in uloc_canonicalize,
    but then putil.cpp did not handle cases where a codepage was
    set (such as "C.UTF-8").

  • Add an additional check in uprv_getDefaultLocaleID() for
    locales that end up as "C" or "POSIX" after removing codepage
    suffix.

  • Also fix regression where aa@bb would become aa__BB__BB
    (incorrectly doubled __BB)

(cherry picked from commit 075cefb and #634 )

Checklist

Regression was in 1afef30
PR unicode-org#418 [ICU-20187]

- We dropped the mapping from "C" in uloc_canonicalize,
  but then putil did not handle cases where a codepage was
  set (such as C.UTF-8).

- Add an additional check in uprv_getDefaultLocaleID() for
  locales that end up as "C" or "POSIX" after removing codepage
  suffix.

- Also fix regression where aa@bb would become aa__BB__BB
  (incorrectly doubled __BB)

(cherry picked from commit 075cefb)
@srl295 srl295 added the cherry-pick This PR is a cherry-pick of an already-approved-and-merged PR to another branch. label Apr 25, 2019
@srl295 srl295 self-assigned this Apr 25, 2019
jefgen
jefgen previously approved these changes Apr 25, 2019
Copy link
Member

@jefgen jefgen 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 Steven!

@markusicu
Copy link
Member

this PR says it goes into master -- should it not go into maint/maint-64 ?

@jefgen jefgen dismissed their stale review April 26, 2019 00:17

Good catch Markus.

@jefgen jefgen changed the base branch from master to maint/maint-64 April 26, 2019 00:18
@jefgen
Copy link
Member

jefgen commented Apr 26, 2019

@srl295 I changed the branch on this PR to go into maint/maint-64.

Copy link
Member

@markusicu markusicu left a comment

Choose a reason for hiding this comment

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

lgtm

@srl295 srl295 merged commit cfb2086 into unicode-org:maint/maint-64 Apr 26, 2019
@srl295 srl295 deleted the backport-ICU-20575-64m branch April 26, 2019 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick This PR is a cherry-pick of an already-approved-and-merged PR to another branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants