Skip to content

Intl: apply CLDR alias mappings during locale canonicalization #381

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

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −4
Open

Intl: apply CLDR alias mappings during locale canonicalization #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions Source/JavaScriptCore/runtime/IntlObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,18 @@ bool isWellFormedCurrencyCode(StringView currency)
return currency.length() == 3 && currency.containsOnly<isASCIIAlpha>();
}

#if USE(BUN_JSC_ADDITIONS) && !USE(APPLE_INTERNAL_SDK)
// uloc_canonicalize is documented to not map aliased names (ICU-21506), so
// Intl.Locale / Intl.getCanonicalLocales miss CLDR alias replacements like
// fre -> fr, en-UK -> en-GB, sh -> sr-Latn, SU -> RU/AM on Bun builds. The
// fix lives in icu::Locale::createCanonical (runs the CLDR AliasReplacer
// since ICU 68) / Apple's ualoc_canonicalForm SPI, neither of which is
// reachable here because Platform.h sets U_SHOW_CPLUSPLUS_API=0. Bun provides
// a C wrapper with the uloc_canonicalize signature instead. Weak so the jsc
// shell still links.
extern "C" __attribute__((weak)) int32_t Bun__canonicalizeLocaleID(const char*, char*, int32_t, UErrorCode*);
#endif

std::optional<Vector<char, 32>> canonicalizeLocaleIDWithoutNullTerminator(const char* localeID)
{
ASSERT(localeID);
Expand All @@ -1641,15 +1653,16 @@ std::optional<Vector<char, 32>> canonicalizeLocaleIDWithoutNullTerminator(const
// ICU-21506 is a bug upstreaming this SPI to ICU.
// https://unicode-org.atlassian.net/browse/ICU-21506
auto status = callBufferProducingFunction(ualoc_canonicalForm, localeID, buffer);
if (U_FAILURE(status))
return std::nullopt;
return buffer;
#elif USE(BUN_JSC_ADDITIONS)
auto status = Bun__canonicalizeLocaleID
? callBufferProducingFunction(Bun__canonicalizeLocaleID, localeID, buffer)
: callBufferProducingFunction(uloc_canonicalize, localeID, buffer);
#else
auto status = callBufferProducingFunction(uloc_canonicalize, localeID, buffer);
#endif
if (U_FAILURE(status))
return std::nullopt;
return buffer;
#endif
}

std::optional<String> mapICUCalendarKeywordToBCP47(const String& calendar)
Expand Down
2 changes: 2 additions & 0 deletions Source/cmake/WebKitCompilerFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
-Wl,-U,_WTFTimer__secondsUntilTimer
-Wl,-U,_WTFTimer__cancel
-Wl,-U,_Bun__errorInstance__finalize
-Wl,-U,_Bun__canonicalizeLocaleID
-Wl,-U,_Bun__reportUnhandledError)
else()
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wl,-u,_WTFTimer__create
Expand All @@ -342,6 +343,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
-Wl,-u,_WTFTimer__secondsUntilTimer
-Wl,-u,_WTFTimer__cancel
-Wl,-u,_Bun__errorInstance__finalize
-Wl,-u,_Bun__canonicalizeLocaleID
-Wl,-u,_Bun__reportUnhandledError)
endif()
endif ()
Expand Down
Loading