diff options
author | Timothy Flynn <trflynn89@pm.me> | 2022-01-26 10:02:42 -1000 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-01-27 21:16:44 +0000 |
commit | f8892fdea21208f0c1dfcf96a497d7c13e3bba35 (patch) | |
tree | 344432849e91af4cfe0cdcabe3d2e5898a1d66ab /Userland/Libraries | |
parent | 789f093b2eb5a63a651d7e02bc34b71aad28438d (diff) | |
download | serenity-f8892fdea21208f0c1dfcf96a497d7c13e3bba35.zip |
LibUnicode: Templatize our naive implementation of plurality selection
As we didn't (and still don't) have Intl.PluralRules when we implemented
Intl.NumberFormat, we use a locale-unaware basic implementation to pick
a pattern based on a number's value. Templatize this method for now to
work other other format-like structures (will be used for relative-time
formatting).
Diffstat (limited to 'Userland/Libraries')
-rw-r--r-- | Userland/Libraries/LibUnicode/NumberFormat.cpp | 28 | ||||
-rw-r--r-- | Userland/Libraries/LibUnicode/NumberFormat.h | 30 |
2 files changed, 29 insertions, 29 deletions
diff --git a/Userland/Libraries/LibUnicode/NumberFormat.cpp b/Userland/Libraries/LibUnicode/NumberFormat.cpp index afccb02565..3571e0814d 100644 --- a/Userland/Libraries/LibUnicode/NumberFormat.cpp +++ b/Userland/Libraries/LibUnicode/NumberFormat.cpp @@ -61,34 +61,6 @@ String replace_digits_for_number_system(StringView system, StringView number) return builder.build(); } -Optional<NumberFormat> select_pattern_with_plurality(Vector<NumberFormat> const& formats, double number) -{ - // FIXME: This is a rather naive and locale-unaware implementation Unicode's TR-35 pluralization - // rules: https://www.unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules - // Once those rules are implemented for LibJS, we better use them instead. - auto find_plurality = [&](auto plurality) -> Optional<NumberFormat> { - if (auto it = formats.find_if([&](auto& patterns) { return patterns.plurality == plurality; }); it != formats.end()) - return *it; - return {}; - }; - - if (number == 0) { - if (auto patterns = find_plurality(NumberFormat::Plurality::Zero); patterns.has_value()) - return patterns; - } else if (number == 1) { - if (auto patterns = find_plurality(NumberFormat::Plurality::One); patterns.has_value()) - return patterns; - } else if (number == 2) { - if (auto patterns = find_plurality(NumberFormat::Plurality::Two); patterns.has_value()) - return patterns; - } else if (number > 2) { - if (auto patterns = find_plurality(NumberFormat::Plurality::Many); patterns.has_value()) - return patterns; - } - - return find_plurality(NumberFormat::Plurality::Other); -} - // https://www.unicode.org/reports/tr35/tr35-numbers.html#Currencies Optional<String> augment_currency_format_pattern([[maybe_unused]] StringView currency_display, [[maybe_unused]] StringView base_pattern) { diff --git a/Userland/Libraries/LibUnicode/NumberFormat.h b/Userland/Libraries/LibUnicode/NumberFormat.h index 2f3fcfac13..34b69f523a 100644 --- a/Userland/Libraries/LibUnicode/NumberFormat.h +++ b/Userland/Libraries/LibUnicode/NumberFormat.h @@ -79,7 +79,35 @@ Optional<NumberFormat> get_standard_number_system_format(StringView locale, Stri Vector<NumberFormat> get_compact_number_system_formats(StringView locale, StringView system, CompactNumberFormatType type); Vector<NumberFormat> get_unit_formats(StringView locale, StringView unit, Style style); -Optional<NumberFormat> select_pattern_with_plurality(Vector<NumberFormat> const& formats, double number); Optional<String> augment_currency_format_pattern(StringView currency_display, StringView base_pattern); +template<typename FormatType> +Optional<FormatType> select_pattern_with_plurality(Vector<FormatType> const& formats, double number) +{ + // FIXME: This is a rather naive and locale-unaware implementation Unicode's TR-35 pluralization + // rules: https://www.unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules + // Once those rules are implemented for LibJS, we better use them instead. + auto find_plurality = [&](auto plurality) -> Optional<FormatType> { + if (auto it = formats.find_if([&](auto& patterns) { return patterns.plurality == plurality; }); it != formats.end()) + return *it; + return {}; + }; + + if (number == 0) { + if (auto patterns = find_plurality(FormatType::Plurality::Zero); patterns.has_value()) + return patterns; + } else if (number == 1) { + if (auto patterns = find_plurality(FormatType::Plurality::One); patterns.has_value()) + return patterns; + } else if (number == 2) { + if (auto patterns = find_plurality(FormatType::Plurality::Two); patterns.has_value()) + return patterns; + } else if (number > 2) { + if (auto patterns = find_plurality(FormatType::Plurality::Many); patterns.has_value()) + return patterns; + } + + return find_plurality(FormatType::Plurality::Other); +} + } |