dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert #11993: new number format system does not and cannot work for CJK languages

Browse Source 
There are too many intricacies that I am unaware of that are popping up after
asking whether things are right or not.
I do not want to keep playing whack-a-mole, so just revert the whole thing.

This reverts:
15be383b93
360fe8b0b6
1aa9a5c0ab
59f56941e5
7e2eefb91f
b741b2ba6f
609d0071d5
9f8fd80112
a253205b93
819c6c756e
This commit is contained in:
Rubidium
2024-02-22 18:08:33 +01:00
committed by rubidium42
parent 8015d96a50
commit 4c117dd2d8
81 changed files with 313 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/language.h
View File

@@ -31,10 +31,10 @@ struct LanguagePackHeader {
char isocode[16]; ///< the ISO code for the language (not country code)
uint16_t offsets[TEXT_TAB_END]; ///< the offsets
/** The raw formatting string for numbers. */
char number_format[64];
/** The raw formatting string for number abbreviations. */
char number_abbreviations[256];
/** Thousand separator used for anything not currencies */
char digit_group_separator[8];
/** Thousand separator used for currencies */
char digit_group_separator_currency[8];
/** Decimal separator */
char digit_decimal_separator[8];
uint16_t missing; ///< number of missing strings.
@@ -107,28 +107,7 @@ extern const LanguageMetadata *_current_language;
extern std::unique_ptr<icu::Collator> _current_collator;
#endif /* WITH_ICU_I18N */
/** The number digits available in a uint64_t. */
constexpr int DIGITS_IN_UINT64_T = 20;
/**
* Table with the text to place after each of the digits of a number. The text at index "20 - i" will be
* inserted after the digit with value "10**i". So, for "normal" thousand separators, the strings at indices
* 3, 6, 9, 12, 15 and 18 will be filled. For CJK the strings at indices 0, 4, 8, 12 and 16 will be filled.
* @see ParseNumberFormatSeparators
*/
using NumberFormatSeparators = std::array<std::string, DIGITS_IN_UINT64_T>;
/** Container for the power to abbreviation mapping for formatting short numbers. */
struct NumberAbbreviation {
NumberAbbreviation(int64_t threshold, NumberFormatSeparators &format) : threshold(threshold), format(format) {}
int64_t threshold; ///< The threshold from which this abbreviation holds.
NumberFormatSeparators format; ///< Format separators to use for this specific power.
};
/** Lookup for abbreviated formats for different powers of ten. */
using NumberAbbreviations = std::vector<NumberAbbreviation>;
bool ReadLanguagePack(const LanguageMetadata *lang);
const LanguageMetadata *GetLanguage(byte newgrflangid);
std::optional<std::string> ParseNumberFormatSeparators(NumberFormatSeparators &separators, std::string_view format, size_t length = DIGITS_IN_UINT64_T);
std::optional<std::string> ParseNumberAbbreviations(NumberAbbreviations &abbreviations, std::string_view input);
#endif /* LANGUAGE_H */