зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1701695 - Rename NumberFormatOptions::CurrencyDisplayStyle; r=gregtatum
This should be CurrencyDisplay to be consistent with ecma-402. Differential Revision: https://phabricator.services.mozilla.com/D113557
This commit is contained in:
Родитель
089ad0d14c
Коммит
72adfe7239
|
@ -96,8 +96,8 @@ TEST(IntlNumberFormat, SignificantDigits)
|
|||
TEST(IntlNumberFormat, Currency)
|
||||
{
|
||||
NumberFormatOptions options;
|
||||
options.mCurrency = Some(
|
||||
std::make_pair("MXN", NumberFormatOptions::CurrencyDisplayStyle::Symbol));
|
||||
options.mCurrency =
|
||||
Some(std::make_pair("MXN", NumberFormatOptions::CurrencyDisplay::Symbol));
|
||||
NumberFormat nf("es-MX", options);
|
||||
Buffer<uint8_t> buf8;
|
||||
ASSERT_TRUE(nf.format(123456.789, buf8).isOk());
|
||||
|
|
|
@ -42,13 +42,13 @@ struct MOZ_STACK_CLASS NumberFormatOptions {
|
|||
* https://github.com/unicode-org/icu/blob/master/docs/userguide/format_parse/numbers/skeletons.md#unit
|
||||
* https://github.com/unicode-org/icu/blob/master/docs/userguide/format_parse/numbers/skeletons.md#unit-width
|
||||
*/
|
||||
enum class CurrencyDisplayStyle {
|
||||
enum class CurrencyDisplay {
|
||||
Symbol,
|
||||
Code,
|
||||
Name,
|
||||
NarrowSymbol,
|
||||
};
|
||||
Maybe<std::pair<std::string_view, CurrencyDisplayStyle>> mCurrency;
|
||||
Maybe<std::pair<std::string_view, CurrencyDisplay>> mCurrency;
|
||||
|
||||
/**
|
||||
* Set the fraction digits settings. |min| can be zero, |max| must be
|
||||
|
|
|
@ -82,19 +82,19 @@ bool NumberFormatterSkeleton::currency(std::string_view currency) {
|
|||
}
|
||||
|
||||
bool NumberFormatterSkeleton::currencyDisplay(
|
||||
NumberFormatOptions::CurrencyDisplayStyle display) {
|
||||
NumberFormatOptions::CurrencyDisplay display) {
|
||||
switch (display) {
|
||||
case NumberFormatOptions::CurrencyDisplayStyle::Code:
|
||||
case NumberFormatOptions::CurrencyDisplay::Code:
|
||||
return appendToken(u"unit-width-iso-code");
|
||||
break;
|
||||
case NumberFormatOptions::CurrencyDisplayStyle::Name:
|
||||
case NumberFormatOptions::CurrencyDisplay::Name:
|
||||
return appendToken(u"unit-width-full-name");
|
||||
break;
|
||||
case NumberFormatOptions::CurrencyDisplayStyle::Symbol:
|
||||
case NumberFormatOptions::CurrencyDisplay::Symbol:
|
||||
// Default, no additional tokens needed.
|
||||
return true;
|
||||
break;
|
||||
case NumberFormatOptions::CurrencyDisplayStyle::NarrowSymbol:
|
||||
case NumberFormatOptions::CurrencyDisplay::NarrowSymbol:
|
||||
return appendToken(u"unit-width-narrow");
|
||||
break;
|
||||
default:
|
||||
|
|
|
@ -59,7 +59,7 @@ class MOZ_STACK_CLASS NumberFormatterSkeleton final {
|
|||
|
||||
bool currency(std::string_view currency);
|
||||
|
||||
bool currencyDisplay(NumberFormatOptions::CurrencyDisplayStyle display);
|
||||
bool currencyDisplay(NumberFormatOptions::CurrencyDisplay display);
|
||||
|
||||
bool unit(std::string_view unit);
|
||||
|
||||
|
|
|
@ -218,15 +218,15 @@ ffi::RawNumberFormatter* FluentBuiltInNumberFormatterCreate(
|
|||
switch (aOptions->currency_display) {
|
||||
case ffi::FluentNumberCurrencyDisplayStyleRaw::Symbol:
|
||||
options.mCurrency = Some(std::make_pair(
|
||||
currency, NumberFormatOptions::CurrencyDisplayStyle::Symbol));
|
||||
currency, NumberFormatOptions::CurrencyDisplay::Symbol));
|
||||
break;
|
||||
case ffi::FluentNumberCurrencyDisplayStyleRaw::Code:
|
||||
options.mCurrency = Some(std::make_pair(
|
||||
currency, NumberFormatOptions::CurrencyDisplayStyle::Code));
|
||||
currency, NumberFormatOptions::CurrencyDisplay::Code));
|
||||
break;
|
||||
case ffi::FluentNumberCurrencyDisplayStyleRaw::Name:
|
||||
options.mCurrency = Some(std::make_pair(
|
||||
currency, NumberFormatOptions::CurrencyDisplayStyle::Name));
|
||||
currency, NumberFormatOptions::CurrencyDisplay::Name));
|
||||
break;
|
||||
default:
|
||||
MOZ_ASSERT_UNREACHABLE();
|
||||
|
|
Загрузка…
Ссылка в новой задаче