Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4b422d3

Browse filesBrowse files
committed
deps: V8: cherry-pick d2db7fa7f786
Original commit message: [Intl] Fix nb / no fallback ICU 69 moved content of nb resources to no and let nb fallback to no. This break our original design of checking locale availability. Hard wire to check on no if nb fail for now until we come out with a better fix. Bug: chromium:1215606 Change-Id: I831529d29590cc643ee0109fb2ce8948dac75613 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3068010 Commit-Queue: Frank Tang <ftang@chromium.org> Reviewed-by: Shu-yu Guo <syg@chromium.org> Cr-Commit-Position: refs/heads/master@{#76044} Refs: v8/v8@d2db7fa PR-URL: #45785 Fixes: #45784 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 5b2ea12 commit 4b422d3
Copy full SHA for 4b422d3

File tree

Expand file treeCollapse file tree

2 files changed

+9
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+9
-2
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.87',
39+
'v8_embedder_string': '-node.88',
4040

4141
##### V8 defaults for Node.js #####
4242

Collapse file

‎deps/v8/src/objects/intl-objects.cc‎

Copy file name to clipboardExpand all lines: deps/v8/src/objects/intl-objects.cc
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,14 @@ std::set<std::string> Intl::BuildLocaleSet(
569569
for (const std::string& locale : icu_available_locales) {
570570
if (path != nullptr || validate_key != nullptr) {
571571
if (!ValidateResource(icu::Locale(locale.c_str()), path, validate_key)) {
572-
continue;
572+
// FIXME(chromium:1215606) Find a beter fix for nb->no fallback
573+
if (locale != "nb") {
574+
continue;
575+
}
576+
// Try no for nb
577+
if (!ValidateResource(icu::Locale("no"), path, validate_key)) {
578+
continue;
579+
}
573580
}
574581
}
575582
locales.insert(locale);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.