Skip to content

REGRESSION: Web Extensions do not pick zh locale when zh-Hant is preferred. #39097

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 15, 2025
Merged

REGRESSION: Web Extensions do not pick zh locale when zh-Hant is preferred. #39097

merged 1 commit into from
Jan 15, 2025

Conversation

xeenon
Copy link
Contributor

@xeenon xeenon commented Jan 15, 2025 •
edited by webkit-early-warning-system
Loading

f1892e2

REGRESSION: Web Extensions do not pick zh locale when zh-Hant is preferred.
https://webkit.org/b/286024
rdar://142602243

Reviewed by Brian Weinstein.

On Apple platforms, the best match search uses Foundation, which skips "zh" when the preferred locale is "zh-Hant",
likely assuming "zh" refers to simplified Chinese. However, web extensions expect the base language to be selected
if it is supported, regardless of specific variants.

Fix this by adding a special-case for base language fallback before using the default locale.

* Source/WebKit/UIProcess/Extensions/WebExtension.cpp:
(WebKit::WebExtension::bestMatchLocale): Added base language fallback.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPILocalization.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPILocalization, i18nChineseTraditionalFallback)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPILocalization, i18nChineseSimplifiedFallback)): Added.

Canonical link: https://commits.webkit.org/288974@main

f6c435f

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl   🧪 ios-wk2 ✅ 🧪 api-mac   🧪 api-wpe
  🧪 ios-wk2-wpt ✅ 🧪 mac-wk1   🛠 wpe-cairo
  🧪 api-ios ✅ 🧪 mac-wk2   🛠 gtk
✅ 🛠 vision   🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress   🧪 api-gtk
✅ 🧪 vision-wk2   🧪 mac-intel-wk2   🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv   🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@xeenon xeenon requested a review from b-weinstein as a code owner January 15, 2025 21:59
@xeenon xeenon self-assigned this Jan 15, 2025
@xeenon xeenon added the WebKit Extensions Bugs related to extension support. label Jan 15, 2025
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 15, 2025 •
edited
Loading

EWS run on previous version of this PR (hash bf6e8f4)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2   🧪 api-mac   🧪 api-wpe
⏳ 🧪 ios-wk2-wpt   🧪 mac-wk1   🛠 wpe-cairo
⏳ 🧪 api-ios ✅ 🧪 mac-wk2   🛠 gtk
✅ 🛠 vision ⏳ 🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress   🧪 api-gtk
  🧪 vision-wk2 ⏳ 🧪 mac-intel-wk2   🛠 playstation
✅ 🛠 tv   🛠 mac-safer-cpp
  🛠 tv-sim
✅ 🛠 watch
  🛠 watch-sim

b-weinstein
b-weinstein reviewed Jan 15, 2025
View reviewed changes
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 15, 2025 •
edited
Loading

EWS run on previous version of this PR (hash c4e7d16)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2   🧪 api-mac   🧪 api-wpe
⏳ 🧪 ios-wk2-wpt   🧪 mac-wk1   🛠 wpe-cairo
⏳ 🧪 api-ios   🧪 mac-wk2   🛠 gtk
✅ 🛠 vision ⏳ 🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim   🧪 mac-wk2-stress   🧪 api-gtk
  🧪 vision-wk2 ⏳ 🧪 mac-intel-wk2   🛠 playstation
  🛠 tv   🛠 mac-safer-cpp
  🛠 tv-sim
  🛠 watch
  🛠 watch-sim

@xeenon xeenon added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Jan 15, 2025
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 15, 2025 •
edited
Loading

EWS run on current version of this PR (hash f6c435f)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl   🧪 ios-wk2 ✅ 🧪 api-mac   🧪 api-wpe
  🧪 ios-wk2-wpt ✅ 🧪 mac-wk1   🛠 wpe-cairo
  🧪 api-ios ✅ 🧪 mac-wk2   🛠 gtk
✅ 🛠 vision   🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress   🧪 api-gtk
✅ 🧪 vision-wk2   🧪 mac-intel-wk2   🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv   🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@xeenon xeenon added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Jan 15, 2025
@xeenon
REGRESSION: Web Extensions do not pick zh locale when zh-Hant is pref…
f1892e2 
…erred.

https://webkit.org/b/286024
rdar://142602243

Reviewed by Brian Weinstein.

On Apple platforms, the best match search uses Foundation, which skips "zh" when the preferred locale is "zh-Hant",
likely assuming "zh" refers to simplified Chinese. However, web extensions expect the base language to be selected
if it is supported, regardless of specific variants.

Fix this by adding a special-case for base language fallback before using the default locale.

* Source/WebKit/UIProcess/Extensions/WebExtension.cpp:
(WebKit::WebExtension::bestMatchLocale): Added base language fallback.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPILocalization.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPILocalization, i18nChineseTraditionalFallback)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPILocalization, i18nChineseSimplifiedFallback)): Added.

Canonical link: https://commits.webkit.org/288974@main
@webkit-commit-queue
Copy link
Collaborator

Committed 288974@main (f1892e2): https://commits.webkit.org/288974@main

Reviewed commits have been landed. Closing PR #39097 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit f1892e2 into WebKit:main Jan 15, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 15, 2025
@xeenon xeenon deleted the bug/286024 branch January 16, 2025 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@b-weinstein b-weinstein b-weinstein approved these changes

@davidjohnson91 davidjohnson91 Awaiting requested review from davidjohnson91

@elijahsawyers elijahsawyers Awaiting requested review from elijahsawyers

@kiaraarose kiaraarose Awaiting requested review from kiaraarose

Assignees

@xeenon xeenon

Labels

WebKit Extensions Bugs related to extension support.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@xeenon @webkit-early-warning-system @webkit-commit-queue @b-weinstein