gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature: Fully customisable number format per translation

Browse Source
This commit is contained in:
Rubidium 2024-02-08 21:35:33 +01:00 committed by rubidium42
parent 819c6c756e
commit a253205b93
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/strings.cpp
View File

@ -55,6 +55,8 @@ const LanguageMetadata *_current_language = nullptr; ///< The currently loaded l
TextDirection _current_text_dir; ///< Text direction of the currently selected language. TextDirection _current_text_dir; ///< Text direction of the currently selected language.
static NumberFormatSeparators _number_format_separators;
#ifdef WITH_ICU_I18N #ifdef WITH_ICU_I18N
std::unique_ptr<icu::Collator> _current_collator; ///< Collator for the language currently in use. std::unique_ptr<icu::Collator> _current_collator; ///< Collator for the language currently in use.
#endif /* WITH_ICU_I18N */ #endif /* WITH_ICU_I18N */
@ -384,48 +386,42 @@ static const char *GetDecimalSeparator()
return decimal_separator; return decimal_separator;
} }
void InitializeNumberFormats()
{
ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format);
}
/** /**
* Format a number into a string. * Format a number into a string.
* @param builder the string builder to write to * @param builder The string builder to write to.
* @param number the number to write down * @param number The number to write down.
* @param last the last element in the buffer * @param separators The separator to use between each of the digits.
* @param separator the thousands-separator to use
*/ */
static void FormatNumber(StringBuilder &builder, int64_t number, const char *separator) static void FormatNumber(StringBuilder &builder, int64_t number, const NumberFormatSeparators &separators)
{ {
static const int max_digits = 20;
uint64_t divisor = 10000000000000000000ULL;
int thousands_offset = (max_digits - 1) % 3;
if (number < 0) { if (number < 0) {
builder += '-'; builder += '-';
number = -number; number = -number;
} }
uint64_t divisor = 10000000000000000000ULL;
uint64_t num = number; uint64_t num = number;
uint64_t tot = 0; uint64_t tot = 0;
for (int i = 0; i < max_digits; i++) { for (size_t i = 0; i < separators.size(); i++) {
uint64_t quot = 0; uint64_t quot = 0;
if (num >= divisor) { if (num >= divisor) {
quot = num / divisor; quot = num / divisor;
num = num % divisor; num = num % divisor;
} }
if ((tot |= quot) || i == max_digits - 1) { if ((tot |= quot) != 0 || i == separators.size() - 1) {
builder += '0' + quot; // quot is a single digit builder += '0' + quot; // quot is a single digit
if ((i % 3) == thousands_offset && i < max_digits - 1) builder += separator; builder += separators[i].data();
} }
divisor /= 10; divisor /= 10;
} }
} }
static void FormatCommaNumber(StringBuilder &builder, int64_t number)
{
const char *separator = _settings_game.locale.digit_group_separator.c_str();
if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator;
FormatNumber(builder, number, separator);
}
static void FormatNoCommaNumber(StringBuilder &builder, int64_t number) static void FormatNoCommaNumber(StringBuilder &builder, int64_t number)
{ {
fmt::format_to(builder, "{}", number); fmt::format_to(builder, "{}", number);
@ -541,10 +537,7 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp
} }
} }
const char *separator = _settings_game.locale.digit_group_separator_currency.c_str(); FormatNumber(builder, number, _number_format_separators);
if (StrEmpty(separator)) separator = _currency->separator.c_str();
if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator_currency;
FormatNumber(builder, number, separator);
if (number_str != STR_NULL) { if (number_str != STR_NULL) {
auto tmp_params = ArrayStringParameters<0>(); auto tmp_params = ArrayStringParameters<0>();
FormatString(builder, GetStringPtr(number_str), tmp_params); FormatString(builder, GetStringPtr(number_str), tmp_params);
@ -1189,7 +1182,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
} }
case SCC_COMMA: // {COMMA} case SCC_COMMA: // {COMMA}
FormatCommaNumber(builder, args.GetNextParameter<int64_t>()); FormatNumber(builder, args.GetNextParameter<int64_t>(), _number_format_separators);
break; break;
case SCC_DECIMAL: { // {DECIMAL} case SCC_DECIMAL: { // {DECIMAL}
@ -1199,7 +1192,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
int64_t divisor = PowerOfTen(digits); int64_t divisor = PowerOfTen(digits);
int64_t fractional = number % divisor; int64_t fractional = number % divisor;
number /= divisor; number /= divisor;
FormatCommaNumber(builder, number); FormatNumber(builder, number, _number_format_separators);
fmt::format_to(builder, "{}{:0{}d}", GetDecimalSeparator(), fractional, digits); fmt::format_to(builder, "{}{:0{}d}", GetDecimalSeparator(), fractional, digits);
break; break;
} }
@ -1246,7 +1239,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
} }
} }
FormatCommaNumber(builder, amount); FormatNumber(builder, amount, _number_format_separators);
break; break;
} }
@ -1983,6 +1976,8 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
} }
#endif /* WITH_ICU_I18N */ #endif /* WITH_ICU_I18N */
InitializeNumberFormats();
Layouter::Initialize(); Layouter::Initialize();
/* Some lists need to be sorted again after a language change. */ /* Some lists need to be sorted again after a language change. */