-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
[HybridGlobalization] Pass non-breaking space / narrow non-breaking space characters #103226
Conversation
Tagging subscribers to this area: @dotnet/area-system-globalization |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst,runtime-wasm |
Azure Pipelines successfully started running 4 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst,runtime-wasm |
Azure Pipelines successfully started running 4 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst,runtime-wasm |
Azure Pipelines successfully started running 4 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst,runtime-wasm |
Azure Pipelines successfully started running 4 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modulo my comments and question, LGTM.
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Good job with reducing the iOS CultureData code and using the ICU one instead.
/backport to release/8.0-staging |
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9560514583 |
@mkhamoyan backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: convert narrow no-break spaces to spaces too
Using index info to reconstruct a base tree...
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Unix.cs
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.iOS.cs
A src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs
A src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs
A src/mono/browser/runtime/hybrid-globalization/helpers.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/mono/browser/runtime/hybrid-globalization/helpers.ts deleted in HEAD and modified in convert narrow no-break spaces to spaces too. Version convert narrow no-break spaces to spaces too of src/mono/browser/runtime/hybrid-globalization/helpers.ts left in tree.
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.iOS.cs
CONFLICT (content): Merge conflict in src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.iOS.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
CONFLICT (content): Merge conflict in src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Unix.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Auto-merging src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs
Auto-merging src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 convert narrow no-break spaces to spaces too
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@mkhamoyan an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
In recent ICU versions they introduced a change where
regular spaces are replaced with non-breaking spaces (NBSP / \u00A0) or narrow non-breaking spaces (NNBSP / \u202F)
. For more details, see the related ICU change.With this PR, in HybridGlobalization mode for both
Apple platforms
andBrowser
, we will pass'NO-BREAK SPACE' (U+00A0)
and'NARROW NO-BREAK SPACE' (U+202F)
as they are, instead of converting them to regular spaces, to maintain consistency across all platforms (see).For more info check discussion under #83571
Fixes #102250