From 1e0e5f2d68f58843d900467eea6981b5a28244f5 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 14 Nov 2012 18:02:16 +0200 Subject: [PATCH] Add a bunch of missed scripts Change-Id: I078bf95cb50c7ef634f9f3133ab9f9d25439e4ef Reviewed-by: Lars Knoll --- src/corelib/tools/qlocale.h | 27 ++++++++++- src/corelib/tools/qlocale_data_p.h | 75 ++++++++++++++++++++++++++++++ util/local_database/enumdata.py | 27 ++++++++++- 3 files changed, 127 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 9513b11d63..9cfa8553ec 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -310,9 +310,34 @@ public: LatinScript = 7, MongolianScript = 8, TifinaghScript = 9, + ArmenianScript = 10, + BengaliScript = 11, + CherokeeScript = 12, + DevanagariScript = 13, + EthiopicScript = 14, + GeorgianScript = 15, + GreekScript = 16, + GujaratiScript = 17, + HebrewScript = 18, + JapaneseScript = 19, + KhmerScript = 20, + KannadaScript = 21, + KoreanScript = 22, + LaoScript = 23, + MalayalamScript = 24, + MyanmarScript = 25, + OriyaScript = 26, + TamilScript = 27, + TeluguScript = 28, + ThaanaScript = 29, + ThaiScript = 30, + TibetanScript = 31, + SinhalaScript = 32, + SyriacScript = 33, + YiScript = 34, SimplifiedChineseScript = SimplifiedHanScript, TraditionalChineseScript = TraditionalHanScript, - LastScript = TifinaghScript + LastScript = YiScript }; enum Country { AnyCountry = 0, diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 1d22fb8d7a..f0d92b7801 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -4306,6 +4306,31 @@ static const char script_name_list[] = "Latin\0" "Mongolian\0" "Tifinagh\0" +"Armenian\0" +"Bengali\0" +"Cherokee\0" +"Devanagari\0" +"Ethiopic\0" +"Georgian\0" +"Greek\0" +"Gujarati\0" +"Hebrew\0" +"Japanese\0" +"Khmer\0" +"Kannada\0" +"Korean\0" +"Lao\0" +"Malayalam\0" +"Myanmar\0" +"Oriya\0" +"Tamil\0" +"Telugu\0" +"Thaana\0" +"Thai\0" +"Tibetan\0" +"Sinhala\0" +"Syriac\0" +"Yi\0" ; static const quint16 script_name_index[] = { @@ -4319,6 +4344,31 @@ static const quint16 script_name_index[] = { 72, // Latin 78, // Mongolian 88, // Tifinagh + 97, // Armenian + 106, // Bengali + 114, // Cherokee + 123, // Devanagari + 134, // Ethiopic + 143, // Georgian + 152, // Greek + 158, // Gujarati + 167, // Hebrew + 174, // Japanese + 183, // Khmer + 189, // Kannada + 197, // Korean + 204, // Lao + 208, // Malayalam + 218, // Myanmar + 226, // Oriya + 232, // Tamil + 238, // Telugu + 245, // Thaana + 252, // Thai + 257, // Tibetan + 265, // Sinhala + 273, // Syriac + 280, // Yi }; static const char country_name_list[] = @@ -5051,6 +5101,31 @@ static const unsigned char script_code_list[] = "Latn" // Latin "Mong" // Mongolian "Tfng" // Tifinagh +"Armn" // Armenian +"Beng" // Bengali +"Cher" // Cherokee +"Deva" // Devanagari +"Ethi" // Ethiopic +"Geor" // Georgian +"Grek" // Greek +"Gujr" // Gujarati +"Hebr" // Hebrew +"Jpan" // Japanese +"Khmr" // Khmer +"Knda" // Kannada +"Kore" // Korean +"Laoo" // Lao +"Mlym" // Malayalam +"Mymr" // Myanmar +"Orya" // Oriya +"Taml" // Tamil +"Telu" // Telugu +"Thaa" // Thaana +"Thai" // Thai +"Tibt" // Tibetan +"Sinh" // Sinhala +"Syri" // Syriac +"Yiii" // Yi ; static const unsigned char country_code_list[] = " \0" // AnyCountry diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py index 5f51acb4d0..326eaab287 100644 --- a/util/local_database/enumdata.py +++ b/util/local_database/enumdata.py @@ -523,7 +523,32 @@ script_list = { 6 : [ "Traditional Han", "Hant" ], 7 : [ "Latin", "Latn" ], 8 : [ "Mongolian", "Mong" ], - 9 : [ "Tifinagh", "Tfng" ] + 9 : [ "Tifinagh", "Tfng" ], + 10 : [ "Armenian", "Armn" ], + 11 : [ "Bengali", "Beng" ], + 12 : [ "Cherokee", "Cher" ], + 13 : [ "Devanagari", "Deva" ], + 14 : [ "Ethiopic", "Ethi" ], + 15 : [ "Georgian", "Geor" ], + 16 : [ "Greek", "Grek" ], + 17 : [ "Gujarati", "Gujr" ], + 18 : [ "Hebrew", "Hebr" ], + 19 : [ "Japanese", "Jpan" ], + 20 : [ "Khmer", "Khmr" ], + 21 : [ "Kannada", "Knda" ], + 22 : [ "Korean", "Kore" ], + 23 : [ "Lao", "Laoo" ], + 24 : [ "Malayalam", "Mlym" ], + 25 : [ "Myanmar", "Mymr" ], + 26 : [ "Oriya", "Orya" ], + 27 : [ "Tamil", "Taml" ], + 28 : [ "Telugu", "Telu" ], + 29 : [ "Thaana", "Thaa" ], + 30 : [ "Thai", "Thai" ], + 31 : [ "Tibetan", "Tibt" ], + 32 : [ "Sinhala", "Sinh" ], + 33 : [ "Syriac", "Syri" ], + 34 : [ "Yi", "Yiii" ] } def countryCodeToId(code):