RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00
Code Issues Activity Actions

LibUnicode: Fallback to per-locale default numbering systems

Browse source 
When patterns, grouping digits, symbols, etc. for a requested numbering
system are not found, use the locale's default numbering system. This
will allow using the correct digits e.g. for the locale "en-u-nu-arab"
even though the "en" locale only contains patterns for the "latn"
numbering system.
This commit is contained in:
Timothy Flynn 2022-07-13 14:03:03 -04:00 • committed by Andreas Kling
parent 998f62936b
commit c849cb9d76
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeNumberFormat.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org> * Copyright (c) 2021-2022, Tim Flynn <trflynn89@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -937,24 +937,35 @@ static NumberSystemData const* find_number_system(StringView locale, StringView
if (!locale_value.has_value()) if (!locale_value.has_value())
return nullptr; return nullptr;
auto number_system_keyword = keyword_nu_from_string(system); auto locale_index = to_underlying(*locale_value) - 1; // Subtract 1 because 0 == Locale::None.
auto const& number_systems = s_locale_number_systems.at(locale_index);
auto lookup_number_system = [&](auto number_system) -> NumberSystemData const* {
auto number_system_keyword = keyword_nu_from_string(number_system);
if (!number_system_keyword.has_value()) if (!number_system_keyword.has_value())
return {}; return nullptr;
auto number_system_value = keyword_to_number_system(*number_system_keyword); auto number_system_value = keyword_to_number_system(*number_system_keyword);
if (!number_system_value.has_value()) if (!number_system_value.has_value())
return {}; return nullptr;
auto locale_index = to_underlying(*locale_value) - 1; // Subtract 1 because 0 == Locale::None.
auto number_system_index = to_underlying(*number_system_value); auto number_system_index = to_underlying(*number_system_value);
auto const& number_systems = s_locale_number_systems.at(locale_index);
number_system_index = number_systems.at(number_system_index); number_system_index = number_systems.at(number_system_index);
if (number_system_index == 0) if (number_system_index == 0)
return nullptr; return nullptr;
return &s_number_systems.at(number_system_index); return &s_number_systems.at(number_system_index);
};
if (auto const* number_system = lookup_number_system(system))
return number_system;
auto default_number_system = get_preferred_keyword_value_for_locale(locale, "nu"sv);
if (!default_number_system.has_value())
return nullptr;
return lookup_number_system(*default_number_system);
} }
Optional<StringView> get_number_system_symbol(StringView locale, StringView system, NumericSymbol symbol) Optional<StringView> get_number_system_symbol(StringView locale, StringView system, NumericSymbol symbol)