FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

ICU-20575 fix broken default locale mapping for C.UTF-8 by srl295 · Pull Request #634 · unicode-org/icu · GitHub

/ icu Public

ICU-20575 fix broken default locale mapping for C.UTF-8 - #634

Merged
srl295 merged 1 commit into
unicode-org:masterfrom
srl295:fix-ICU-20575
Apr 25, 2019
ConversationCommits (1)ChecksFiles changed
Merged

ICU-20575 fix broken default locale mapping for C.UTF-8#634
srl295 merged 1 commit into
unicode-org:masterfrom
srl295:fix-ICU-20575

Conversation

srl295 commented Apr 25, 2019 •
edited
Loading

Copy link
Copy Markdown
Member
  1. LANG=C.UTF-8 would not map to en_US_POSIX but to invalid language c
  2. LANG=aa@BB (and similar) would map to aa__BB__BB
Checklist

srl295 requested review from jefgen and markusicu April 25, 2019 17:47
srl295 self-assigned this Apr 25, 2019

srl295 commented Apr 25, 2019

Copy link
Copy Markdown
Member Author

Test case: env LANG=C.UTF-8 icuinfo should return:

    <param name="locale.default">en_US_POSIX</param>
    <param name="locale.default.bcp47">en-US-u-va-posix</param>

Before this bug, they return c and und respectively.

markusicu commented Apr 25, 2019

Copy link
Copy Markdown
Member

I really don't like these mappings at this level. There has to be a way to handle "C.UTF-8" in the getDefaultLocale() code.

jefgen commented Apr 25, 2019

Copy link
Copy Markdown
Member

FWIW, I believe this exacerbated the issue with the DateTimePatternGenerator (ICU-20558), as "C.UTF-8" would be treated as a default locale of root, rather than "en_US_POSIX".

srl295 commented Apr 25, 2019

Copy link
Copy Markdown
Member Author

I really don't like these mappings at this level. There has to be a way to handle "C.UTF-8" in the getDefaultLocale() code.

Markus, makes sense. I'll see what i can do.

jira-pull-request-webhook Bot commented Apr 25, 2019

Copy link
Copy Markdown

Notice: the branch changed across the force-push!

  • icu4c/source/common/putil.cpp is now changed in the branch
  • icu4c/source/common/uloc.cpp is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook Bot commented Apr 25, 2019

Copy link
Copy Markdown

Notice: the branch changed across the force-push!

  • icu4c/source/common/putil.cpp is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

srl295 commented Apr 25, 2019 •
edited
Loading

Copy link
Copy Markdown
Member Author

@markusicu PTAL at the updated approach. There was another bug, where aa@bb turned into aa_BB_BB (doubled…). I think C@PREEURO never worked (even back to 4.8). Not that important, but at least we should not overwrite the variant twice and be consistent. (I've updated the bug to mention this)

markusicu commented Apr 25, 2019

Copy link
Copy Markdown
Member

Thanks for fixing it all via putil.cpp!

Is the PR description still accurate?

srl295 commented Apr 25, 2019

Copy link
Copy Markdown
Member Author

@markusicu welcome. the PR is accurate now (and the commit message already was)

markusicu reviewed Apr 25, 2019
View reviewed changes
Comment thread icu4c/source/common/putil.cpp
Comment thread icu4c/source/common/putil.cpp Outdated
// Over-allocate in case we replace "@" with "__".
char *correctedPOSIXLocale = static_cast<char *>(uprv_malloc(uprv_strlen(posixID) + 1 + 1));
// Over-allocate in case we replace "@" with "__" or "C" with "en_US_POSIX"
char *correctedPOSIXLocale = static_cast<char *>(uprv_malloc(uprv_strlen(posixID) + 11 + 1));

markusicu Apr 25, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

FYI +10 would suffice because en_US_POSIX has length 11 which is 10 longer than C.
Unless I am mis-counting.

srl295 Apr 25, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I think you are right.

ICU-20575 fix broken default locale mapping for C.UTF-8
974193d 
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)

jira-pull-request-webhook Bot commented Apr 25, 2019

Copy link
Copy Markdown

Notice: the branch changed across the force-push!

  • icu4c/source/common/putil.cpp is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

markusicu approved these changes Apr 25, 2019
View reviewed changes

markusicu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

lgtm

srl295 mentioned this pull request Apr 25, 2019
Closed
srl295 merged commit 075cefb into unicode-org:master Apr 25, 2019
srl295 deleted the fix-ICU-20575 branch April 25, 2019 21:59
srl295 mentioned this pull request Apr 25, 2019
Merged
3 tasks
srl295 mentioned this pull request Apr 26, 2019
Closed
3 tasks
srl295 added a commit to srl295/node that referenced this pull request Apr 26, 2019
deps: backport ICU-20575 to fix err/crasher
2566e66 
- Floating patch for ICU 64.x
- includes test case

ICU Bug: https://unicode-org.atlassian.net/browse/ICU-20575
Backport of: unicode-org/icu#634
Fixes: nodejs#27418
targos pushed a commit to nodejs/node that referenced this pull request Apr 27, 2019
deps: backport ICU-20575 to fix err/crasher
31ac8b9 
- Floating patch for ICU 64.x
- includes test case

ICU Bug: https://unicode-org.atlassian.net/browse/ICU-20575
Backport of: unicode-org/icu#634
Fixes: #27418

PR-URL: #27435
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
targos pushed a commit to nodejs/node that referenced this pull request Apr 27, 2019
deps: backport ICU-20575 to fix err/crasher
3282ccb 
- Floating patch for ICU 64.x
- includes test case

ICU Bug: https://unicode-org.atlassian.net/browse/ICU-20575
Backport of: unicode-org/icu#634
Fixes: #27418

PR-URL: #27435
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
BethGriggs pushed a commit to nodejs/node that referenced this pull request May 10, 2019
deps: backport ICU-20575 to fix err/crasher
cdde908 
- Floating patch for ICU 64.x
- includes test case

ICU Bug: https://unicode-org.atlassian.net/browse/ICU-20575
Backport of: unicode-org/icu#634
Fixes: #27418

PR-URL: #27435
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
MylesBorins pushed a commit to nodejs/node that referenced this pull request May 16, 2019
deps: backport ICU-20575 to fix err/crasher
f91a818 
- Floating patch for ICU 64.x
- includes test case

ICU Bug: https://unicode-org.atlassian.net/browse/ICU-20575
Backport of: unicode-org/icu#634
Fixes: #27418

PR-URL: #27435
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

markusicu markusicu approved these changes
jefgen jefgen approved these changes

Assignees

srl295

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL