GeezerVison is showing github.com — deps: V8: cherry-pick d2db7fa7f786 · nodejs/node@4b422d3
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: common.gypi +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
36 | 36 |
|
37 | 37 | # Reset this number to 0 on major V8 upgrades. |
38 | 38 | # Increment by one for each non-official patch applied to deps/v8. |
39 | | - 'v8_embedder_string': '-node.87', |
| 39 | + 'v8_embedder_string': '-node.88', |
40 | 40 |
|
41 | 41 | ##### V8 defaults for Node.js ##### |
42 | 42 |
|
|
Collapse file
Copy file name to clipboardExpand all lines: deps/v8/src/objects/intl-objects.cc +8-1Lines changed: 8 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -569,7 +569,14 @@ std::set<std::string> Intl::BuildLocaleSet( |
569 | 569 | for (const std::string& locale : icu_available_locales) { |
570 | 570 | if (path != nullptr || validate_key != nullptr) { |
571 | 571 | 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 | + } |
573 | 580 | } |
574 | 581 | } |
575 | 582 | locales.insert(locale); |
|