From 7e2eefb91ff5999667752eea6e13bd8a0d293f48 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Thu, 8 Feb 2024 21:51:38 +0100 Subject: [PATCH] Cleanup: Remove digit group separators from strgen and languages --- src/lang/afrikaans.txt | 2 -- src/lang/arabic_egypt.txt | 2 -- src/lang/basque.txt | 2 -- src/lang/belarusian.txt | 2 -- src/lang/brazilian_portuguese.txt | 2 -- src/lang/bulgarian.txt | 2 -- src/lang/catalan.txt | 2 -- src/lang/chuvash.txt | 2 -- src/lang/croatian.txt | 2 -- src/lang/czech.txt | 2 -- src/lang/danish.txt | 2 -- src/lang/dutch.txt | 2 -- src/lang/english.txt | 7 ------- src/lang/english_AU.txt | 2 -- src/lang/english_US.txt | 2 -- src/lang/esperanto.txt | 2 -- src/lang/estonian.txt | 2 -- src/lang/faroese.txt | 2 -- src/lang/finnish.txt | 2 -- src/lang/french.txt | 2 -- src/lang/frisian.txt | 2 -- src/lang/gaelic.txt | 2 -- src/lang/galician.txt | 2 -- src/lang/german.txt | 2 -- src/lang/greek.txt | 2 -- src/lang/hebrew.txt | 2 -- src/lang/hindi.txt | 2 -- src/lang/hungarian.txt | 2 -- src/lang/icelandic.txt | 2 -- src/lang/ido.txt | 2 -- src/lang/indonesian.txt | 2 -- src/lang/irish.txt | 2 -- src/lang/italian.txt | 2 -- src/lang/japanese.txt | 2 -- src/lang/korean.txt | 2 -- src/lang/latin.txt | 2 -- src/lang/latvian.txt | 2 -- src/lang/lithuanian.txt | 2 -- src/lang/luxembourgish.txt | 2 -- src/lang/macedonian.txt | 2 -- src/lang/malay.txt | 2 -- src/lang/maltese.txt | 2 -- src/lang/marathi.txt | 2 -- src/lang/norwegian_bokmal.txt | 2 -- src/lang/norwegian_nynorsk.txt | 2 -- src/lang/persian.txt | 2 -- src/lang/polish.txt | 2 -- src/lang/portuguese.txt | 2 -- src/lang/romanian.txt | 2 -- src/lang/russian.txt | 2 -- src/lang/serbian.txt | 2 -- src/lang/simplified_chinese.txt | 2 -- src/lang/slovak.txt | 2 -- src/lang/slovenian.txt | 2 -- src/lang/spanish.txt | 2 -- src/lang/spanish_MX.txt | 2 -- src/lang/swedish.txt | 2 -- src/lang/tamil.txt | 2 -- src/lang/thai.txt | 2 -- src/lang/traditional_chinese.txt | 2 -- src/lang/turkish.txt | 2 -- src/lang/ukrainian.txt | 2 -- src/lang/urdu.txt | 2 -- src/lang/vietnamese.txt | 2 -- src/lang/welsh.txt | 2 -- src/language.h | 4 ---- src/strgen/strgen.cpp | 6 ------ src/strgen/strgen_base.cpp | 2 -- src/strings.cpp | 2 -- 69 files changed, 149 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 5a2f74e1a6..6a7afc41dc 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3,8 +3,6 @@ ##isocode af_ZA ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0436 ##grflangid 0x1b diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 8ec3bfe56f..bb204cbbf7 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3,8 +3,6 @@ ##isocode ar_EG ##plural 1 ##textdir rtl -##digitsep ٬ -##digitsepcur ٬ ##decimalsep ٫ ##winlangid 0x0c01 ##grflangid 0x14 diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 925b19d29f..086638458f 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -3,8 +3,6 @@ ##isocode eu_ES ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x042d ##grflangid 0x21 diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index f5c2d15aae..de00579105 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3,8 +3,6 @@ ##isocode be_BY ##plural 6 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0423 ##grflangid 0x10 diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index a2a6fb9103..aabd8f8e93 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3,8 +3,6 @@ ##isocode pt_BR ##plural 2 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0416 ##grflangid 0x37 diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index e783ddeae0..7e44b6afaa 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3,8 +3,6 @@ ##isocode bg_BG ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0402 ##grflangid 0x18 diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index d198a5ad68..d3d1caba75 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3,8 +3,6 @@ ##isocode ca_ES ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0403 ##grflangid 0x22 diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index 112ae79fb9..3a2787f199 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -3,8 +3,6 @@ ##isocode cv_RU ##plural 0 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0419 ##grflangid 0x0b diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 8597c7c3b8..ebd8fb5d12 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3,8 +3,6 @@ ##isocode hr_HR ##plural 6 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x041a ##grflangid 0x38 diff --git a/src/lang/czech.txt b/src/lang/czech.txt index f0d709351e..515b381994 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3,8 +3,6 @@ ##isocode cs_CZ ##plural 10 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0405 ##grflangid 0x15 diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ae7604ced7..c9fa131876 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3,8 +3,6 @@ ##isocode da_DK ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0406 ##grflangid 0x2d diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 8e18f0314e..2753cca65d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3,8 +3,6 @@ ##isocode nl_NL ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0413 ##grflangid 0x1f diff --git a/src/lang/english.txt b/src/lang/english.txt index 44945bca69..3956b25bc9 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -5,8 +5,6 @@ ##textdir ltr ##numberformat 00,000,000,000,000,000,000 ##numberabbreviations 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 -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0809 ##grflangid 0x01 @@ -5812,11 +5810,6 @@ STR_TOWN_NAME :{TOWN} STR_VEHICLE_NAME :{VEHICLE} STR_WAYPOINT_NAME :{WAYPOINT} -STR_CURRENCY_SHORT_KILO :{NBSP}k -STR_CURRENCY_SHORT_MEGA :{NBSP}m -STR_CURRENCY_SHORT_GIGA :{NBSP}bn -STR_CURRENCY_SHORT_TERA :{NBSP}tn - STR_JUST_CARGO :{CARGO_LONG} STR_JUST_RIGHT_ARROW :{RIGHT_ARROW} STR_JUST_CHECKMARK :{CHECKMARK} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 338bd6ddc3..988377a278 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -3,8 +3,6 @@ ##isocode en_AU ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0c09 ##grflangid 0x3d diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 81e24c9946..e1b8dc945c 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3,8 +3,6 @@ ##isocode en_US ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0409 ##grflangid 0x00 diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index af8b3cf83a..267245c209 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -3,8 +3,6 @@ ##isocode eo_EO ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0000 ##grflangid 0x05 diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 735b66ebd3..bc5577d8f2 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3,8 +3,6 @@ ##isocode et_EE ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0425 ##grflangid 0x34 diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index fa5c7a1a3f..a42ac2f9ad 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -3,8 +3,6 @@ ##isocode fo_FO ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0438 ##grflangid 0x12 diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 458f9cb030..3ca3956711 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3,8 +3,6 @@ ##isocode fi_FI ##plural 0 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x040b ##grflangid 0x35 diff --git a/src/lang/french.txt b/src/lang/french.txt index 57218911bf..edcddd0fd3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3,8 +3,6 @@ ##isocode fr_FR ##plural 2 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x040c ##grflangid 0x03 diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index ce525edc6c..8b48996734 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -3,8 +3,6 @@ ##isocode fy_NL ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0462 ##grflangid 0x32 diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 1c6e26202d..c703113961 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -3,8 +3,6 @@ ##isocode gd_GB ##plural 13 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x083c ##grflangid 0x13 diff --git a/src/lang/galician.txt b/src/lang/galician.txt index ab7968a25e..96a716d23b 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3,8 +3,6 @@ ##isocode gl_ES ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0456 ##grflangid 0x31 diff --git a/src/lang/german.txt b/src/lang/german.txt index 0d108a2d3e..6499270f91 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3,8 +3,6 @@ ##isocode de_DE ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0407 ##grflangid 0x02 diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ef3452828e..400fe0fb9c 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3,8 +3,6 @@ ##isocode el_GR ##plural 2 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0408 ##grflangid 0x1e diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 7a4886ae45..dd3ada10d6 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3,8 +3,6 @@ ##isocode he_IL ##plural 0 ##textdir rtl -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x040d ##grflangid 0x61 diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 938b8f164a..22d28e3362 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -3,8 +3,6 @@ ##isocode hi_IN ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0439 ##grflangid 0x17 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index e30cef191e..e017b00e06 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3,8 +3,6 @@ ##isocode hu_HU ##plural 2 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x040e ##grflangid 0x24 diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index afdea186e0..fb4761dcb1 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3,8 +3,6 @@ ##isocode is_IS ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x040f ##grflangid 0x29 diff --git a/src/lang/ido.txt b/src/lang/ido.txt index b229f9bbd5..065ea41c86 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -3,8 +3,6 @@ ##isocode io_IO ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0000 ##grflangid 0x06 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index b5100dc8bc..fce72c422c 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3,8 +3,6 @@ ##isocode id_ID ##plural 1 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0421 ##grflangid 0x5a diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 8510de3bf8..aaf333df5e 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -3,8 +3,6 @@ ##isocode ga_IE ##plural 4 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x083c ##grflangid 0x08 diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 3ab1028641..2d62810b4b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3,8 +3,6 @@ ##isocode it_IT ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0410 ##grflangid 0x27 diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 93225d923f..94a7a02eac 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3,8 +3,6 @@ ##isocode ja_JP ##plural 1 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0411 ##grflangid 0x39 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 4a52df754c..169b22e07e 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3,8 +3,6 @@ ##isocode ko_KR ##plural 11 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0412 ##grflangid 0x3a diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 301cf4f529..21052fb91e 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -3,8 +3,6 @@ ##isocode la_VA ##plural 0 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep . ##winlangid 0x0476 ##grflangid 0x66 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index e9632e063b..493b9c4174 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3,8 +3,6 @@ ##isocode lv_LV ##plural 3 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0426 ##grflangid 0x2a diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index cb750dbc5a..d8e5989953 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3,8 +3,6 @@ ##isocode lt_LT ##plural 5 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0427 ##grflangid 0x2b diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index f7db2674da..08a829b4ea 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3,8 +3,6 @@ ##isocode lb_LU ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x046e ##grflangid 0x23 diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 34310c245c..824b689de6 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -3,8 +3,6 @@ ##isocode mk_MK ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x042f ##grflangid 0x26 diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 93baaf1d26..29e5bbe6ad 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -3,8 +3,6 @@ ##isocode ms_MY ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x043a ##grflangid 0x3c diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 044b9c049a..fc92a98ad6 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -3,8 +3,6 @@ ##isocode mt_MT ##plural 12 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x043a ##grflangid 0x09 diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 88f4c54703..150a96f0fa 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -3,8 +3,6 @@ ##isocode mr_IN ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x044e ##grflangid 0x11 diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 19d7ae1c83..c798cc78d6 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3,8 +3,6 @@ ##isocode nb_NO ##plural 0 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0414 ##grflangid 0x2f diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index bcd28a98f4..9790bf50c8 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3,8 +3,6 @@ ##isocode nn_NO ##plural 0 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0814 ##grflangid 0x0e diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 70a0594700..e8baf15d11 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -3,8 +3,6 @@ ##isocode fa_IR ##plural 0 ##textdir rtl -##digitsep ٬ -##digitsepcur ٬ ##decimalsep ٫ ##winlangid 0x0429 ##grflangid 0x62 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 8a614e009f..83468f0b19 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3,8 +3,6 @@ ##isocode pl_PL ##plural 7 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0415 ##grflangid 0x30 diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 932ee61d42..63010386ff 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3,8 +3,6 @@ ##isocode pt_PT ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0816 ##grflangid 0x36 diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 0f9a4befa3..a69699ec8f 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3,8 +3,6 @@ ##isocode ro_RO ##plural 14 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0418 ##grflangid 0x28 diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 5b6d0b03c7..4715e43a6a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3,8 +3,6 @@ ##isocode ru_RU ##plural 6 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x0419 ##grflangid 0x07 diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 443f8ecbd9..5fb4ebf256 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3,8 +3,6 @@ ##isocode sr_RS ##plural 6 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x7c1a ##grflangid 0x0d diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index e06de8aeb7..7dda1edfd5 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3,8 +3,6 @@ ##isocode zh_CN ##plural 1 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0804 ##grflangid 0x56 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 75cc314397..811ebe5f9e 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3,8 +3,6 @@ ##isocode sk_SK ##plural 10 ##textdir ltr -##digitsep {NBSP} -##digitsepcur {NBSP} ##decimalsep , ##winlangid 0x041b ##grflangid 0x16 diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index badd88b0a6..da595106e2 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3,8 +3,6 @@ ##isocode sl_SI ##plural 8 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0424 ##grflangid 0x2c diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 3c48fd2f9d..7a86cf5512 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3,8 +3,6 @@ ##isocode es_ES ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0c0a ##grflangid 0x04 diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index ce1ddf52b5..5847868846 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3,8 +3,6 @@ ##isocode es_MX ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x080a ##grflangid 0x55 diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 56073743b9..aa405d211b 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3,8 +3,6 @@ ##isocode sv_SE ##plural 0 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x081d ##grflangid 0x2e diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 0824ac4a72..5577804bbe 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -3,8 +3,6 @@ ##isocode ta_IN ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0449 ##grflangid 0x0a diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 0ef982c3ee..c38fd0c5b3 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -3,8 +3,6 @@ ##isocode th_TH ##plural 1 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x041e ##grflangid 0x42 diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 090d73bc12..187ae40531 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3,8 +3,6 @@ ##isocode zh_TW ##plural 1 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0404 ##grflangid 0x0c diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index c946e6aae9..a1eba1598a 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3,8 +3,6 @@ ##isocode tr_TR ##plural 1 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x041f ##grflangid 0x3e diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 00ac0d9393..b4b2db064b 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3,8 +3,6 @@ ##isocode uk_UA ##plural 6 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x0422 ##grflangid 0x33 diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 552f331362..c673281c40 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -3,8 +3,6 @@ ##isocode ur_PK ##plural 0 ##textdir rtl -##digitsep ٬ -##digitsepcur ٬ ##decimalsep ٫ ##winlangid 0x0420 ##grflangid 0x5c diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 7803761f71..6be02769f6 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3,8 +3,6 @@ ##isocode vi_VN ##plural 1 ##textdir ltr -##digitsep . -##digitsepcur . ##decimalsep , ##winlangid 0x042a ##grflangid 0x54 diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index dec48e8e4f..e4addc8bdf 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3,8 +3,6 @@ ##isocode cy_GB ##plural 0 ##textdir ltr -##digitsep , -##digitsepcur , ##decimalsep . ##winlangid 0x0452 ##grflangid 0x0f diff --git a/src/language.h b/src/language.h index 8fc0619338..3664113194 100644 --- a/src/language.h +++ b/src/language.h @@ -35,10 +35,6 @@ struct LanguagePackHeader { 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. diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 73baed50b8..60d2afa5be 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -137,12 +137,6 @@ void FileStringReader::HandlePragma(char *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)); diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 42e11f1246..4b08d05099 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -758,8 +758,6 @@ void StringReader::ParseFile() MemSetT(&_lang, 0); strecpy(_lang.number_format, "00,000,000,000,000,000,000", lastof(_lang.number_format)); strecpy(_lang.number_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.number_abbreviations)); - strecpy(_lang.digit_group_separator, ",", lastof(_lang.digit_group_separator)); - strecpy(_lang.digit_group_separator_currency, ",", lastof(_lang.digit_group_separator_currency)); strecpy(_lang.digit_decimal_separator, ".", lastof(_lang.digit_decimal_separator)); _cur_line = 1; diff --git a/src/strings.cpp b/src/strings.cpp index 8e884b6363..a4fffe60b2 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1892,8 +1892,6 @@ bool LanguagePackHeader::IsValid() const StrValid(this->isocode, lastof(this->isocode)) && StrValid(this->number_format, lastof(this->number_format)) && StrValid(this->number_abbreviations, lastof(this->number_abbreviations)) && - StrValid(this->digit_group_separator, lastof(this->digit_group_separator)) && - StrValid(this->digit_group_separator_currency, lastof(this->digit_group_separator_currency)) && StrValid(this->digit_decimal_separator, lastof(this->digit_decimal_separator)); }