-
Notifications
You must be signed in to change notification settings - Fork 22
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
Fix norwegian aliases #296
Fix norwegian aliases #296
Conversation
/backport to dotnet/release/7.0 |
You'll need to comment again, the bot doesn't look for comment edits :) |
/backport to dotnet/release/7.0 |
Started backporting to dotnet/release/7.0: https://github.com/dotnet/icu/actions/runs/3739622431 |
@ilonatommy backporting to dotnet/release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Adding very small alias files.
Using index info to reconstruct a base tree...
M icu-filters/icudt_no_CJK.json
Falling back to patching base and 3-way merge...
Auto-merging icu-filters/icudt_no_CJK.json
CONFLICT (content): Merge conflict in icu-filters/icudt_no_CJK.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Adding very small alias files.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@ilonatommy an error occurred while backporting to dotnet/release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Fixes dotnet/runtime#79815.
Norwegian has an alias for "nb" locale: "no".
Without loading this information in filters we are failing to resolve the culture for both, specific "no-NO" locale and general "no" locale. Adding these two locales to filters do not change the size much, as we are not loading additional data for it.
The only newly-added data is information that "no" is now alias of "nb" and "no-NO" of "nb-NO". See e.g.:
https://github.com/dotnet/icu/blob/dotnet/main/icu/icu4c/source/data/locales/no.txt
https://github.com/dotnet/icu/blob/dotnet/main/icu/icu4c/source/data/locales/no_NO.txt