cpp/openttd-patchpack/source Changeset - r28771:91a47b351165

Changeset - r28771:91a47b351165

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Rubidium - 10 months ago 2024-02-08 20:39:16
rubidium@openttd.org

Feature: Fully customisable number abbreviations per translation

1 file changed with 20 insertions and 20 deletions:

src/strings.cpp

0 comments (0 inline, 0 general)

src/strings.cpp

➞

Show inline comments

@@ @@ -53,12 +53,13 @@ std::string _config_language_file; @@
 LanguageList _languages;                          ///< The actual list of language meta data.
 const LanguageMetadata *_current_language = nullptr; ///< The currently loaded language.
 TextDirection _current_text_dir; ///< Text direction of the currently selected language.
 static NumberFormatSeparators _number_format_separators;
 static NumberAbbreviations _number_abbreviations;
 #ifdef WITH_ICU_I18N
 std::unique_ptr<icu::Collator> _current_collator;    ///< Collator for the language currently in use.
 #endif /* WITH_ICU_I18N */
 ArrayStringParameters<20> _global_string_params;
@@ @@ -386,12 +387,14 @@ static const char *GetDecimalSeparator() @@
 	return decimal_separator;
+}
 void InitializeNumberFormats()
+{
 	ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format);
 	ParseNumberAbbreviations(_number_abbreviations, _current_language->number_abbreviations);
 	_number_abbreviations.emplace_back(0, _number_format_separators);
+}
 /**
  * Format a number into a string.
  * @param builder The string builder to write to.
  * @param number The number to write down.
@@ @@ -513,38 +516,35 @@ static void FormatGenericCurrency(String @@
 	/* Add prefix part, following symbol_pos specification.
 	 * Here, it can can be either 0 (prefix) or 2 (both prefix and suffix).
 	 * The only remaining value is 1 (suffix), so everything that is not 1 */
 	if (spec->symbol_pos != 1) builder += spec->prefix;
-	StringID number_str = STR_NULL;
+	NumberFormatSeparators *format = &_number_format_separators;
 	/* For huge numbers, compact the number. */
 	if (compact) {
 		/* Take care of the thousand rounding. Having 1 000 000 k
 		 * and 1 000 M is inconsistent, so always use 1 000 M. */
 		if (number >= Money(1'000'000'000'000'000) - 500'000'000) {
 			number = (number + Money(500'000'000'000)) / Money(1'000'000'000'000);
 			number_str = STR_CURRENCY_SHORT_TERA;
 		} else if (number >= Money(1'000'000'000'000) - 500'000) {
 			number = (number + 500'000'000) / 1'000'000'000;
 			number_str = STR_CURRENCY_SHORT_GIGA;
 		} else if (number >= 1'000'000'000 - 500) {
 			number = (number + 500'000) / 1'000'000;
 			number_str = STR_CURRENCY_SHORT_MEGA;
 		} else if (number >= 1'000'000) {
 			number = (number + 500) / 1'000;
 			number_str = STR_CURRENCY_SHORT_KILO;
 		auto it = _number_abbreviations.begin();
 		for (;;) {
 			int64_t threshold = it->threshold;
 			++it;
 			if (it == _number_abbreviations.end()) break;
 			int64_t divisor = it->threshold;
 			threshold -= divisor / 2;
 			if ((int64_t)number > threshold) {
 				format = &it->format;
 				number += divisor / 2;
 				number /= divisor;
 				break;
+			}
+		}
+	}
 	FormatNumber(builder, number, _number_format_separators);
 	if (number_str != STR_NULL) {
 		auto tmp_params = ArrayStringParameters<0>();
 		FormatString(builder, GetStringPtr(number_str), tmp_params);
+	}
 	FormatNumber(builder, number, *format);
 	/* Add suffix part, following symbol_pos specification.
 	 * Here, it can can be either 1 (suffix) or 2 (both prefix and suffix).
 	 * The only remaining value is 1 (prefix), so everything that is not 0 */
 	if (spec->symbol_pos != 0) builder += spec->suffix;

0 comments (0 inline, 0 general)