diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 35e5308fbd..8b93a424a5 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0436 diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 50270388f3..ce4a4b4c80 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 +##currencyformat 00٬000٬000٬000٬000٬000٬000 ##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0c01 diff --git a/src/lang/basque.txt b/src/lang/basque.txt index b7b719e3c4..bed048c94e 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042d diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 2c0383632a..3b448638a2 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -4,6 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0423 diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 2da5af432f..3ddc07b0a8 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -4,6 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0416 diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 392f0a5d8f..a16dc50cc0 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0402 diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 9488297a48..1eb80d7adb 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0403 diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index e23cb6ddaa..a003c3ab20 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0419 diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index d172d2f790..e90833fe56 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -4,6 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041a diff --git a/src/lang/czech.txt b/src/lang/czech.txt index d8ccc20fa3..9dd65c36fa 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -4,6 +4,7 @@ ##plural 10 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}tis.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}mil.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mld.|12=00{NBSP}000{NBSP}000{NBSP}bil.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0405 diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 86fe5fd359..d5d478c8c2 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0406 diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index afc8d67df1..073c74908d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}mj|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0413 diff --git a/src/lang/english.txt b/src/lang/english.txt index 5ae18ae16e..a792f1164a 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0809 diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 259806a7c7..c7e426ec91 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0c09 diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 16e627a3a4..622cbb5bb7 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}K|6=00,000,000,000,000{NBSP}M|9=00,000,000,000{NBSP}B|12=00,000,000{NBSP}T|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0409 diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 74438ccede..c1d4adab90 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0000 diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index fa6c31b9c6..2f485419a2 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0425 diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index dd9a553a99..b63eb2e6c8 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0438 diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index b240737253..a46ce52172 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}milj.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mrd.|12=00{NBSP}000{NBSP}000{NBSP} t|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040b diff --git a/src/lang/french.txt b/src/lang/french.txt index d025c74dca..dbc9b4e700 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -4,6 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}Mio|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}Mrd|12=00{NBSP}000{NBSP}000{NBSP}kMrd|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040c diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 7444b42def..c5cd5bc36b 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0462 diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index b2095630c2..878e8fc974 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -4,6 +4,7 @@ ##plural 13 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x083c diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 44ba985127..c669f85973 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}MM|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0456 diff --git a/src/lang/german.txt b/src/lang/german.txt index 9c1e8e0b54..2395063248 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}Tsd.|6=00.000.000.000.000{NBSP}Mio.|9=00.000.000.000{NBSP}Mrd.|12=00.000.000{NBSP}Bio.|15=00.000{NBSP}Brd.|18=00{NBSP}Trill. ##decimalsep , ##winlangid 0x0407 diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 70ed399fd2..bfa30643de 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -4,6 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0408 diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index c4fc7761a6..d16a724e18 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x040d diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 675ec3384a..67fd43fc7f 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0439 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index dede29c91f..21f7b467c2 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -4,6 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}e|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mrd|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040e diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 230ce74c9c..c9b034c37d 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040f diff --git a/src/lang/ido.txt b/src/lang/ido.txt index f457d6a8df..7e9ecef15c 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0000 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 3b6ed06c61..fcf644340c 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0421 diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 25cc97c094..0d91f7d987 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -4,6 +4,7 @@ ##plural 4 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x083c diff --git a/src/lang/italian.txt b/src/lang/italian.txt index ca99fe02e9..e6836c9c9d 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0410 diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 6f361a5f84..a37d28957a 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 0000京0000兆0000億0000万0000 +##currencyformat 0000京0000兆0000億0000万0000 ##currencyabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0411 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 4f718ad8a7..aa8c9aaffe 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -4,6 +4,7 @@ ##plural 11 ##textdir ltr ##numberformat 0000경0000조0000억0000만0000 +##currencyformat 0000경0000조0000억0000만0000 ##currencyabbreviations 4=0000경0000조0000억0000만|8=0000경0000조0000억|12=0000경0000조|16=0000경 ##decimalsep . ##winlangid 0x0412 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 58f9b5ec3e..63309cbc9e 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0476 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index fe2d763e9f..bb591d15ac 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -4,6 +4,7 @@ ##plural 3 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}tk.|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mljrd.|12=00.000.000{NBSP}tonna|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0426 diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index e16ba2cd04..5ecfb9963f 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -4,6 +4,7 @@ ##plural 5 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0427 diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 79481197b1..965763cc30 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}d|6=00.000.000.000.000{NBSP}Mio|9=00.000.000.000{NBSP}Mrd|12=00.000.000{NBSP}Bio|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x046e diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 896ca341aa..a20c7e686d 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042f diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 9eb443aa04..0e7bcb4942 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x043a diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 9cb470cf52..e0621d92f2 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -4,6 +4,7 @@ ##plural 12 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x043a diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 6cb5e4bafe..1b6217745d 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x044e diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 4442b329e9..c23fda46a2 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0414 diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 4230a44cd0..0f3a883af5 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0814 diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 18329a6bd8..77102a611a 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 +##currencyformat 00٬000٬000٬000٬000٬000٬000 ##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0429 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index fc432bb516..020431ff05 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -4,6 +4,7 @@ ##plural 7 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0415 diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index a764564299..81f477256d 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0816 diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 08382077c2..cea8b4bc16 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -4,6 +4,7 @@ ##plural 14 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}mii|6=00.000.000.000.000{NBSP}mil.|9=00.000.000.000{NBSP}mld.|12=00.000.000{NBSP}bil.|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0418 diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 618756677e..4d74accfb4 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -4,6 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}тыс.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}млн|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}млрд.|12=00{NBSP}000{NBSP}000{NBSP}трлн.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0419 diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index ebd33e2148..ad2856ca13 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -4,6 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x7c1a diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index cf4e697fd6..2ece4824f1 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3,7 +3,8 @@ ##isocode zh_CN ##plural 1 ##textdir ltr -##numberformat 0000京0000兆0000亿0000万0000 +##numberformat 00,000,000,000,000,000,000 +##currencyformat 0000京0000兆0000亿0000万0000 ##currencyabbreviations 4=0000京0000兆0000亿0000万|8=0000京0000兆0000亿|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0804 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 10f54ae60d..07733099da 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -4,6 +4,7 @@ ##plural 10 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 +##currencyformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 ##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041b diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index ece63c778c..58fbfb9c70 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -4,6 +4,7 @@ ##plural 8 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0424 diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 510a7e09a1..fb88fef64f 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}kM|12=00.000.000{NBSP}MM|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0c0a diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 23a3d52629..5eb33ffa4d 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x080a diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 53ad0815c1..6edad35a72 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}t|6=00.000.000.000.000{NBSP}mn|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x081d diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 5417ae62ea..3a217d8d37 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0449 diff --git a/src/lang/thai.txt b/src/lang/thai.txt index b1628c19eb..76daf0b084 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x041e diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index b9d60f8e6d..f3ecdf9014 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3,7 +3,8 @@ ##isocode zh_TW ##plural 1 ##textdir ltr -##numberformat 0000京0000兆0000億0000万0000 +##numberformat 00,000,000,000,000,000,000 +##currencyformat 0000京0000兆0000億0000万0000 ##currencyabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0404 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index f24f705558..2c5ae85ffa 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mlyn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041f diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 109b4cc087..95dc8531c6 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -4,6 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}тис.|6=00.000.000.000.000{NBSP}млн|9=00.000.000.000{NBSP}млрд|12=00.000.000{NBSP}трлн|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0422 diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 4e059599cf..48d37f0d48 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 +##currencyformat 00٬000٬000٬000٬000٬000٬000 ##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0420 diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index ca0cde47e3..20e0e7a43e 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -4,6 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 +##currencyformat 00.000.000.000.000.000.000 ##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042a diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 177bf412f0..6722b3ff33 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -4,6 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 +##currencyformat 00,000,000,000,000,000,000 ##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0452 diff --git a/src/language.h b/src/language.h index d9dabffdce..1ea15b8bc5 100644 --- a/src/language.h +++ b/src/language.h @@ -33,6 +33,8 @@ struct LanguagePackHeader { /** The raw formatting string for numbers. */ char number_format[64]; + /** The raw formatting string for currency numbers. */ + char currency_format[64]; /** The raw formatting string for currency abbreviations. */ char currency_abbreviations[256]; /** Decimal separator */ diff --git a/src/settings_type.h b/src/settings_type.h index c1318556ec..ea083b9585 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -223,6 +223,7 @@ struct GUISettings { bool scale_bevels; ///< bevels are scaled with GUI scale. std::string number_format; ///< formatting string for numbers (like "thousands" grouping) + std::string currency_format; ///< formatting string for currency numbers (like "thousands" grouping) std::string currency_abbreviations; ///< mapping to currency number formats for different powers of ten/thresholds std::string digit_decimal_separator; ///< decimal separator diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index e018cc2d1f..d75df3f033 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -129,6 +129,14 @@ void FileStringReader::HandlePragma(char *str) if (result.has_value()) FatalError("Invalid number format: {}", *result); strecpy(_lang.number_format, str, lastof(_lang.number_format)); + } else if (!memcmp(str, "currencyformat ", 15)) { + str += 15; + + NumberFormatSeparators separators; + auto result = ParseNumberFormatSeparators(separators, str); + if (result.has_value()) FatalError("Invalid currency format: {}", *result); + + strecpy(_lang.currency_format, str, lastof(_lang.currency_format)); } else if (!memcmp(str, "currencyabbreviations ", 22)) { str += 22; diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index a01590e23f..27b2a70745 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -757,6 +757,7 @@ void StringReader::ParseFile() /* For each new file we parse, reset the genders, and language codes. */ MemSetT(&_lang, 0); strecpy(_lang.number_format, "00,000,000,000,000,000,000", lastof(_lang.number_format)); + strecpy(_lang.currency_format, "00,000,000,000,000,000,000", lastof(_lang.currency_format)); strecpy(_lang.currency_abbreviations, "3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi", lastof(_lang.currency_abbreviations)); strecpy(_lang.digit_decimal_separator, ".", lastof(_lang.digit_decimal_separator)); diff --git a/src/strings.cpp b/src/strings.cpp index f178e58088..86ac948508 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -56,6 +56,7 @@ const LanguageMetadata *_current_language = nullptr; ///< The currently loaded l TextDirection _current_text_dir; ///< Text direction of the currently selected language. static NumberFormatSeparators _number_format_separators; +static NumberFormatSeparators _currency_format_separators; static NumberAbbreviations _currency_abbreviations; #ifdef WITH_ICU_I18N @@ -397,6 +398,14 @@ void InitializeNumberFormats() } if (!loaded_number_format) ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format); + bool loaded_currency_format = false; + if (!_settings_client.gui.currency_format.empty()) { + auto res = ParseNumberFormatSeparators(_currency_format_separators, _settings_client.gui.currency_format); + if (res.has_value()) UserError("The setting 'currency_format' under 'gui' is invalid: {}", *res); + loaded_currency_format = !res.has_value(); + } + if (!loaded_currency_format) ParseNumberFormatSeparators(_currency_format_separators, _current_language->currency_format); + bool loaded_currency_abbreviations = false; if (!_settings_client.gui.currency_abbreviations.empty()) { auto res = ParseNumberAbbreviations(_currency_abbreviations, _settings_client.gui.currency_abbreviations); @@ -404,7 +413,7 @@ void InitializeNumberFormats() loaded_currency_abbreviations = !res.has_value(); } if (!loaded_currency_abbreviations) ParseNumberAbbreviations(_currency_abbreviations, _current_language->currency_abbreviations); - _currency_abbreviations.emplace_back(1, _number_format_separators); + _currency_abbreviations.emplace_back(1, _currency_format_separators); } /** @@ -532,7 +541,7 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp * The only remaining value is 1 (suffix), so everything that is not 1 */ if (spec->symbol_pos != 1) builder += spec->prefix; - NumberFormatSeparators *format = &_number_format_separators; + NumberFormatSeparators *format = &_currency_format_separators; /* For huge numbers, compact the number. */ if (compact) { @@ -1895,6 +1904,7 @@ bool LanguagePackHeader::IsValid() const StrValid(this->own_name, lastof(this->own_name)) && StrValid(this->isocode, lastof(this->isocode)) && StrValid(this->number_format, lastof(this->number_format)) && + StrValid(this->currency_format, lastof(this->currency_format)) && StrValid(this->currency_abbreviations, lastof(this->currency_abbreviations)) && StrValid(this->digit_decimal_separator, lastof(this->digit_decimal_separator)); } diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini index bd2adc2033..805d3d2e36 100644 --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -914,6 +914,15 @@ pre_cb = [](auto format) { NumberFormatSeparators separators; return !ParseNum post_cb = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); } startup = true +[SDTC_SSTR] +var = gui.currency_format +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +type = SLE_STRQ +def = nullptr +pre_cb = [](auto format) { NumberFormatSeparators separators; return !ParseNumberFormatSeparators(separators, format).has_value(); } +post_cb = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); } +startup = true + [SDTC_SSTR] var = gui.currency_abbreviations flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC