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

22
src/strgen/strgen.cpp
View File

@@ -121,22 +121,12 @@ void FileStringReader::HandlePragma(char *str)
} else {
FatalError("Invalid textdir {}", str + 8);
}
} else if (!memcmp(str, "numberformat ", 13)) {
str += 13;
NumberFormatSeparators separators;
auto result = ParseNumberFormatSeparators(separators, str);
if (result.has_value()) FatalError("Invalid number format: {}", *result);
strecpy(_lang.number_format, str, lastof(_lang.number_format));
} else if (!memcmp(str, "numberabbreviations ", 20)) {
str += 20;
NumberAbbreviations abbreviations;
auto result = ParseNumberAbbreviations(abbreviations, str);
if (result.has_value()) FatalError("Invalid number abbreviations: {}", *result);
strecpy(_lang.number_abbreviations, str, lastof(_lang.number_abbreviations));
} else if (!memcmp(str, "digitsep ", 9)) {
str += 9;
strecpy(_lang.digit_group_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str, lastof(_lang.digit_group_separator));
} else if (!memcmp(str, "digitsepcur ", 12)) {
str += 12;
strecpy(_lang.digit_group_separator_currency, strcmp(str, "{NBSP}") == 0 ? NBSP : str, lastof(_lang.digit_group_separator_currency));
} else if (!memcmp(str, "decimalsep ", 11)) {
str += 11;
strecpy(_lang.digit_decimal_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str, lastof(_lang.digit_decimal_separator));