richard pushed to branch base-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits: d363fccf by Pier Angelo Vendrame at 2024-02-07T12:23:06+00:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 066750e9 by Pier Angelo Vendrame at 2024-02-07T12:23:06+00:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr

Differential Revision: https://phabricator.services.mozilla.com/D198967

- - - - -

2 changed files:

- dom/html/input/NumericInputTypes.cpp - intl/unicharutil/util/ICUUtils.cpp

Changes:

===================================== dom/html/input/NumericInputTypes.cpp ===================================== @@ -52,11 +52,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { MOZ_ASSERT(!maximum.isNaN());

nsAutoString maxStr; - char buf[32]; - DebugOnly<bool> ok = maximum.toString(buf, ArrayLength(buf)); - maxStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(maximum, maxStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", mInputElement->OwnerDoc(), maxStr); @@ -67,11 +63,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { MOZ_ASSERT(!minimum.isNaN());

nsAutoString minStr; - char buf[32]; - DebugOnly<bool> ok = minimum.toString(buf, ArrayLength(buf)); - minStr.AssignASCII(buf); - MOZ_ASSERT(ok, "buf not big enough"); - + ConvertNumberToString(minimum, minStr); return nsContentUtils::FormatMaybeLocalizedString( aMessage, nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", mInputElement->OwnerDoc(), minStr);

===================================== intl/unicharutil/util/ICUUtils.cpp ===================================== @@ -47,8 +47,13 @@ void ICUUtils::LanguageTagIterForContent::GetNext(nsACString& aBCP47LangTag) {

if (mCurrentFallbackIndex < 2) { mCurrentFallbackIndex = 2; - // Else take the app's locale: - + // Else take the app's locale (or en-US, if spoof English applies): + const bool spoofLocale = nsContentUtils::SpoofLocaleEnglish() && + !mContent->OwnerDoc()->AllowsL10n(); + if (spoofLocale) { + aBCP47LangTag.AssignLiteral("en-US"); + return; + } nsAutoCString appLocale; LocaleService::GetInstance()->GetAppLocaleAsBCP47(aBCP47LangTag); return;

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6c906db...