mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-22 04:25:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibJS+LibUnicode: Rename method to select a NumberFormat plurality

Browse source 
Instead of currency pattern lookups within select_currency_unit_pattern,
rename the method to select_pattern_with_plurality and accept any list
of patterns. This method will be needed for units.
This commit is contained in:
Timothy Flynn 2021-11-16 09:45:27 -05:00 • committed by Linus Groh
parent fa13ab61e4
commit 6d34a0b4e8
Notes: sideshowbarker 2024-07-18 01:04:21 +09:00
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp
View file

@ -1370,7 +1370,9 @@ Optional<Variant<StringView, String>> get_number_format_pattern(NumberFormat& nu
// Handling of other [[CurrencyDisplay]] options will occur after [[SignDisplay]].
if (number_format.currency_display() == NumberFormat::CurrencyDisplay::Name) {
auto maybe_patterns = Unicode::select_currency_unit_pattern(number_format.data_locale(), number_format.numbering_system(), number);
auto formats = Unicode::get_compact_number_system_formats(number_format.data_locale(), number_format.numbering_system(), Unicode::CompactNumberFormatType::CurrencyUnit);
auto maybe_patterns = Unicode::select_pattern_with_plurality(formats, number);
if (maybe_patterns.has_value()) {
patterns = maybe_patterns.release_value();
break;

4
Userland/Libraries/LibUnicode/Locale.cpp
View file

@ -975,13 +975,11 @@ String resolve_most_likely_territory([[maybe_unused]] LanguageID const& language
return aliases[0].to_string();
}
Optional<NumberFormat> select_currency_unit_pattern(StringView locale, StringView system, double number)
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 formats = get_compact_number_system_formats(locale, system, CompactNumberFormatType::CurrencyUnit);
auto find_plurality = [&](auto plurality) -> Optional<NumberFormat> {
if (auto it = formats.find_if([&](auto& patterns) { return patterns.plurality == plurality; }); it != formats.end())
return *it;

2
Userland/Libraries/LibUnicode/Locale.h
View file

@ -203,7 +203,7 @@ Optional<LanguageID> add_likely_subtags(LanguageID const& language_id);
Optional<LanguageID> remove_likely_subtags(LanguageID const& language_id);
String resolve_most_likely_territory(LanguageID const& language_id, StringView territory_alias);
Optional<NumberFormat> select_currency_unit_pattern(StringView locale, StringView system, double number);
Optional<NumberFormat> select_pattern_with_plurality(Vector<NumberFormat> const& formats, double number);
Optional<String> augment_currency_format_pattern(StringView currency_display, StringView base_pattern);
}