all else is equal, so we may as well use lowercase; that's what locale
identifiers do (eg. "en_US"), anyway.
This commit is contained in:
Glenn Maynard
+139
-139
@@ -306,145 +306,145 @@ RString ConvertUTF8ToACP( const RString &s )
|
|||||||
* We don't use 3-letter codes, so we don't bother supporting them. */
|
* We don't use 3-letter codes, so we don't bother supporting them. */
|
||||||
static const LanguageInfo g_langs[] =
|
static const LanguageInfo g_langs[] =
|
||||||
{
|
{
|
||||||
{"AA", "Afar", ""},
|
{"aa", "Afar", ""},
|
||||||
{"AB", "Abkhazian", "аҧсуа бызшәа"},
|
{"ab", "Abkhazian", "аҧсуа бызшәа"},
|
||||||
{"AF", "Afrikaans", "Afrikaans"},
|
{"af", "Afrikaans", "Afrikaans"},
|
||||||
{"AM", "Amharic", ""},
|
{"am", "Amharic", ""},
|
||||||
{"AR", "Arabic", "العربية"},
|
{"ar", "Arabic", "العربية"},
|
||||||
{"AS", "Assamese", ""},
|
{"as", "Assamese", ""},
|
||||||
{"AY", "Aymara", ""},
|
{"ay", "Aymara", ""},
|
||||||
{"AZ", "Azerbaijani", "azərbaycan"},
|
{"az", "Azerbaijani", "azərbaycan"},
|
||||||
{"BA", "Bashkir", ""},
|
{"ba", "Bashkir", ""},
|
||||||
{"BE", "Byelorussian", "Беларуская"},
|
{"be", "Byelorussian", "Беларуская"},
|
||||||
{"BG", "Bulgarian", "Български"},
|
{"bg", "Bulgarian", "Български"},
|
||||||
{"BH", "Bihari", ""},
|
{"bh", "Bihari", ""},
|
||||||
{"BI", "Bislama", ""},
|
{"bi", "Bislama", ""},
|
||||||
{"BN", "Bengali", ""},
|
{"bn", "Bengali", ""},
|
||||||
{"BO", "Tibetan", ""},
|
{"bo", "Tibetan", ""},
|
||||||
{"BR", "Breton", ""},
|
{"br", "Breton", ""},
|
||||||
{"CA", "Catalan", "Català"},
|
{"ca", "Catalan", "Català"},
|
||||||
{"CO", "Corsican", ""},
|
{"co", "Corsican", ""},
|
||||||
{"CS", "Czech", "čeština"},
|
{"cs", "Czech", "čeština"},
|
||||||
{"CY", "Welsh", "Cymraeg"},
|
{"cy", "Welsh", "Cymraeg"},
|
||||||
{"DA", "Danish", "Dansk"},
|
{"da", "Danish", "Dansk"},
|
||||||
{"DE", "German", "Deutsch"},
|
{"de", "German", "Deutsch"},
|
||||||
{"DZ", "Bhutani", ""},
|
{"dz", "Bhutani", ""},
|
||||||
{"EL", "Greek", "Ελληνικά"},
|
{"el", "Greek", "Ελληνικά"},
|
||||||
{"EN", "English", "English"},
|
{"en", "English", "English"},
|
||||||
{"EO", "Esperanto", ""},
|
{"eo", "Esperanto", ""},
|
||||||
{"ES", "Spanish", "Español"},
|
{"es", "Spanish", "Español"},
|
||||||
{"ET", "Estonian", "Eesti"},
|
{"et", "Estonian", "Eesti"},
|
||||||
{"EU", "Basque", "euskera"},
|
{"eu", "Basque", "euskera"},
|
||||||
{"FA", "Persian", "فارسی"},
|
{"fa", "Persian", "فارسی"},
|
||||||
{"FI", "Finnish", "Suomi"},
|
{"fi", "Finnish", "Suomi"},
|
||||||
{"FJ", "Fiji", ""},
|
{"fj", "Fiji", ""},
|
||||||
{"FO", "Faeroese", ""},
|
{"fo", "Faeroese", ""},
|
||||||
{"FR", "French", "Français"},
|
{"fr", "French", "Français"},
|
||||||
{"FY", "Frisian", ""},
|
{"fy", "Frisian", ""},
|
||||||
{"GA", "Irish", "Gaeilge"},
|
{"ga", "Irish", "Gaeilge"},
|
||||||
{"GD", "Gaelic", ""},
|
{"gd", "Gaelic", ""},
|
||||||
{"GL", "Galician", "Galego"},
|
{"gl", "Galician", "Galego"},
|
||||||
{"GN", "Guarani", ""},
|
{"gn", "Guarani", ""},
|
||||||
{"GU", "Gujarati", ""},
|
{"gu", "Gujarati", ""},
|
||||||
{"HA", "Hausa", "Hausa"},
|
{"ha", "Hausa", "Hausa"},
|
||||||
{"HE", "Hebrew", "עברית"},
|
{"he", "Hebrew", "עברית"},
|
||||||
{"HI", "Hindi", "हिंदी"},
|
{"hi", "Hindi", "हिंदी"},
|
||||||
{"HR", "Croatian", "Hrvatski"},
|
{"hr", "Croatian", "Hrvatski"},
|
||||||
{"HU", "Hungarian", "Magyar"},
|
{"hu", "Hungarian", "Magyar"},
|
||||||
{"HY", "Armenian", "Հայերեն"},
|
{"hy", "Armenian", "Հայերեն"},
|
||||||
{"IA", "Interlingua", ""},
|
{"ia", "Interlingua", ""},
|
||||||
{"ID", "Indonesian", "Bahasa indonesia"},
|
{"id", "Indonesian", "Bahasa indonesia"},
|
||||||
{"IE", "Interlingue", ""},
|
{"ie", "Interlingue", ""},
|
||||||
{"IK", "Inupiak", ""},
|
{"ik", "Inupiak", ""},
|
||||||
{"IN", "Indonesian", "Bahasa indonesia"}, // compatibility
|
{"in", "Indonesian", "Bahasa indonesia"}, // compatibility
|
||||||
{"IS", "Icelandic", "Íslenska"},
|
{"is", "Icelandic", "Íslenska"},
|
||||||
{"IT", "Italian", "Italiano"},
|
{"it", "Italian", "Italiano"},
|
||||||
{"IW", "Hebrew", "עברית"}, // compatibility
|
{"iw", "Hebrew", "עברית"}, // compatibility
|
||||||
{"JA", "Japanese", "日本語"},
|
{"ja", "Japanese", "日本語"},
|
||||||
{"JI", "Yiddish", ""}, // compatibility
|
{"ji", "Yiddish", ""}, // compatibility
|
||||||
{"JW", "Javanese", ""},
|
{"jw", "Javanese", ""},
|
||||||
{"KA", "Georgian", ""},
|
{"ka", "Georgian", ""},
|
||||||
{"KK", "Kazakh", "Қазақ"},
|
{"kk", "Kazakh", "Қазақ"},
|
||||||
{"KL", "Greenlandic", ""},
|
{"kl", "Greenlandic", ""},
|
||||||
{"KM", "Cambodian", ""},
|
{"km", "Cambodian", ""},
|
||||||
{"KN", "Kannada", "ಕನ್ನಡ"},
|
{"kn", "Kannada", "ಕನ್ನಡ"},
|
||||||
{"KO", "Korean", "한국어"},
|
{"ko", "Korean", "한국어"},
|
||||||
{"KS", "Kashmiri", ""},
|
{"ks", "Kashmiri", ""},
|
||||||
{"KU", "Kurdish", ""},
|
{"ku", "Kurdish", ""},
|
||||||
{"KY", "Kirghiz", "Кыргыз"},
|
{"ky", "Kirghiz", "Кыргыз"},
|
||||||
{"LA", "Latin", ""},
|
{"la", "Latin", ""},
|
||||||
{"LN", "Lingala", ""},
|
{"ln", "Lingala", ""},
|
||||||
{"LO", "Laothian", ""},
|
{"lo", "Laothian", ""},
|
||||||
{"LT", "Lithuanian", "Lietuviškai"},
|
{"lt", "Lithuanian", "Lietuviškai"},
|
||||||
{"LV", "Latvian", "Latviešu"},
|
{"lv", "Latvian", "Latviešu"},
|
||||||
{"MG", "Malagasy", ""},
|
{"mg", "Malagasy", ""},
|
||||||
{"MI", "Maori", ""},
|
{"mi", "Maori", ""},
|
||||||
{"MK", "Macedonian", "Македонски"},
|
{"mk", "Macedonian", "Македонски"},
|
||||||
{"ML", "Malayalam", ""},
|
{"ml", "Malayalam", ""},
|
||||||
{"MN", "Mongolian", ""},
|
{"mn", "Mongolian", ""},
|
||||||
{"MO", "Moldavian", ""},
|
{"mo", "Moldavian", ""},
|
||||||
{"MR", "Marathi", ""},
|
{"mr", "Marathi", ""},
|
||||||
{"MS", "Malay", "Bahasa melayu"},
|
{"ms", "Malay", "Bahasa melayu"},
|
||||||
{"MT", "Maltese", "Malti"},
|
{"mt", "Maltese", "Malti"},
|
||||||
{"MY", "Burmese", ""},
|
{"my", "Burmese", ""},
|
||||||
{"NA", "Nauru", ""},
|
{"na", "Nauru", ""},
|
||||||
{"NE", "Nepali", ""},
|
{"ne", "Nepali", ""},
|
||||||
{"NL", "Dutch", "Nederlands"},
|
{"nl", "Dutch", "Nederlands"},
|
||||||
{"NO", "Norwegian", "Norsk"},
|
{"no", "Norwegian", "Norsk"},
|
||||||
{"OC", "Occitan", ""},
|
{"oc", "Occitan", ""},
|
||||||
{"OM", "Oromo", ""},
|
{"om", "Oromo", ""},
|
||||||
{"OR", "Oriya", ""},
|
{"or", "Oriya", ""},
|
||||||
{"PA", "Punjabi", ""},
|
{"pa", "Punjabi", ""},
|
||||||
{"PL", "Polish", "Polski"},
|
{"pl", "Polish", "Polski"},
|
||||||
{"PS", "Pashto", "پښتو"},
|
{"ps", "Pashto", "پښتو"},
|
||||||
{"PT", "Portuguese", "português"},
|
{"pt", "Portuguese", "português"},
|
||||||
{"QU", "Quechua", ""},
|
{"qu", "Quechua", ""},
|
||||||
{"RM", "Rhaeto-Romance", ""},
|
{"rm", "Rhaeto-Romance", ""},
|
||||||
{"RN", "Kirundi", "Kirundi"},
|
{"rn", "Kirundi", "Kirundi"},
|
||||||
{"RO", "Romanian", "Română"},
|
{"ro", "Romanian", "Română"},
|
||||||
{"RU", "Russian", "Pyccĸий"},
|
{"ru", "Russian", "Pyccĸий"},
|
||||||
{"RW", "Kinyarwanda", "Kinyarwanda"},
|
{"rw", "Kinyarwanda", "Kinyarwanda"},
|
||||||
{"SA", "Sanskrit", ""},
|
{"sa", "Sanskrit", ""},
|
||||||
{"SD", "Sindhi", ""},
|
{"sd", "Sindhi", ""},
|
||||||
{"SG", "Sangro", ""},
|
{"sg", "Sangro", ""},
|
||||||
{"SH", "Serbo-Croatian", ""},
|
{"sh", "Serbo-Croatian", ""},
|
||||||
{"SI", "Singhalese", ""},
|
{"si", "Singhalese", ""},
|
||||||
{"SK", "Slovak", "Slovenčina"},
|
{"sk", "Slovak", "Slovenčina"},
|
||||||
{"SL", "Slovenian", "Slovenščina"},
|
{"sl", "Slovenian", "Slovenščina"},
|
||||||
{"SM", "Samoan", ""},
|
{"sm", "Samoan", ""},
|
||||||
{"SN", "Shona", ""},
|
{"sn", "Shona", ""},
|
||||||
{"SO", "Somali", "Somali"},
|
{"so", "Somali", "Somali"},
|
||||||
{"SQ", "Albanian", "Shqip"},
|
{"sq", "Albanian", "Shqip"},
|
||||||
{"SR", "Serbian", "Srpski"},
|
{"sr", "Serbian", "Srpski"},
|
||||||
{"SS", "Siswati", ""},
|
{"ss", "Siswati", ""},
|
||||||
{"ST", "Sesotho", ""},
|
{"st", "Sesotho", ""},
|
||||||
{"SU", "Sudanese", ""},
|
{"su", "Sudanese", ""},
|
||||||
{"SV", "Swedish", "svenska"},
|
{"sv", "Swedish", "svenska"},
|
||||||
{"SW", "Swahili", "Kiswahili"},
|
{"sw", "Swahili", "Kiswahili"},
|
||||||
{"TA", "Tamil", ""},
|
{"ta", "Tamil", ""},
|
||||||
{"TE", "Tegulu", "తెలుగు"},
|
{"te", "Tegulu", "తెలుగు"},
|
||||||
{"TG", "Tajik", ""},
|
{"tg", "Tajik", ""},
|
||||||
{"TH", "Thai", "ภาษาไทย"},
|
{"th", "Thai", "ภาษาไทย"},
|
||||||
{"TI", "Tigrinya", ""},
|
{"ti", "Tigrinya", ""},
|
||||||
{"TK", "Turkmen", ""},
|
{"tk", "Turkmen", ""},
|
||||||
{"TL", "Tagalog", ""},
|
{"tl", "Tagalog", ""},
|
||||||
{"TN", "Setswana", ""},
|
{"tn", "Setswana", ""},
|
||||||
{"TO", "Tonga", ""},
|
{"to", "Tonga", ""},
|
||||||
{"TR", "Turkish", "Tϋrkçe"},
|
{"tr", "Turkish", "Tϋrkçe"},
|
||||||
{"TS", "Tsonga", ""},
|
{"ts", "Tsonga", ""},
|
||||||
{"TT", "Tatar", ""},
|
{"tt", "Tatar", ""},
|
||||||
{"TW", "Twi", ""},
|
{"tw", "Twi", ""},
|
||||||
{"UK", "Ukrainian", "Українська"},
|
{"uk", "Ukrainian", "Українська"},
|
||||||
{"UR", "Urdu", "اردو"},
|
{"ur", "Urdu", "اردو"},
|
||||||
{"UZ", "Uzbek", "o'zbek"},
|
{"uz", "Uzbek", "o'zbek"},
|
||||||
{"VI", "Vietnamese", "Tiếng Việt"},
|
{"vi", "Vietnamese", "Tiếng Việt"},
|
||||||
{"VO", "Volapuk", ""},
|
{"vo", "Volapuk", ""},
|
||||||
{"WO", "Wolof", "Wolof"},
|
{"wo", "Wolof", "Wolof"},
|
||||||
{"XH", "Xhosa", "isiXhosa"},
|
{"xh", "Xhosa", "isiXhosa"},
|
||||||
{"YI", "Yiddish", ""},
|
{"yi", "Yiddish", ""},
|
||||||
{"YO", "Yoruba", "Yorùbá"},
|
{"yo", "Yoruba", "Yorùbá"},
|
||||||
{"ZH", "Chinese", "中文"},
|
{"zh", "Chinese", "中文"},
|
||||||
{"ZU", "Zulu", "isiZulu"},
|
{"zu", "Zulu", "isiZulu"},
|
||||||
};
|
};
|
||||||
|
|
||||||
void GetLanguageInfos( vector<const LanguageInfo*> &vAddTo )
|
void GetLanguageInfos( vector<const LanguageInfo*> &vAddTo )
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public:
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the 2-letter RFC-639 code of the user's preferred language
|
* Get the 2-letter RFC-639 code of the user's preferred language
|
||||||
* for localized messages, in uppercase.
|
* for localized messages, in lowercase.
|
||||||
*/
|
*/
|
||||||
static RString GetPreferredLanguage();
|
static RString GetPreferredLanguage();
|
||||||
|
|
||||||
|
|||||||
@@ -65,67 +65,67 @@ static RString LangIdToString( LANGID l )
|
|||||||
{
|
{
|
||||||
switch( PRIMARYLANGID(l) )
|
switch( PRIMARYLANGID(l) )
|
||||||
{
|
{
|
||||||
case LANG_ARABIC: return "AR";
|
case LANG_ARABIC: return "ar";
|
||||||
case LANG_BULGARIAN: return "BG";
|
case LANG_BULGARIAN: return "bg";
|
||||||
case LANG_CATALAN: return "CA";
|
case LANG_CATALAN: return "ca";
|
||||||
case LANG_CHINESE: return "ZH";
|
case LANG_CHINESE: return "zh";
|
||||||
case LANG_CZECH: return "CS";
|
case LANG_CZECH: return "cs";
|
||||||
case LANG_DANISH: return "DA";
|
case LANG_DANISH: return "da";
|
||||||
case LANG_GERMAN: return "DE";
|
case LANG_GERMAN: return "de";
|
||||||
case LANG_GREEK: return "EL";
|
case LANG_GREEK: return "el";
|
||||||
case LANG_SPANISH: return "ES";
|
case LANG_SPANISH: return "es";
|
||||||
case LANG_FINNISH: return "FI";
|
case LANG_FINNISH: return "fi";
|
||||||
case LANG_FRENCH: return "FR";
|
case LANG_FRENCH: return "fr";
|
||||||
case LANG_HEBREW: return "IW";
|
case LANG_HEBREW: return "iw";
|
||||||
case LANG_HUNGARIAN: return "HU";
|
case LANG_HUNGARIAN: return "hu";
|
||||||
case LANG_ICELANDIC: return "IS";
|
case LANG_ICELANDIC: return "is";
|
||||||
case LANG_ITALIAN: return "IT";
|
case LANG_ITALIAN: return "it";
|
||||||
case LANG_JAPANESE: return "JA";
|
case LANG_JAPANESE: return "ja";
|
||||||
case LANG_KOREAN: return "KO";
|
case LANG_KOREAN: return "ko";
|
||||||
case LANG_DUTCH: return "NL";
|
case LANG_DUTCH: return "nl";
|
||||||
case LANG_NORWEGIAN: return "NO";
|
case LANG_NORWEGIAN: return "no";
|
||||||
case LANG_POLISH: return "PL";
|
case LANG_POLISH: return "pl";
|
||||||
case LANG_PORTUGUESE: return "PT";
|
case LANG_PORTUGUESE: return "pt";
|
||||||
case LANG_ROMANIAN: return "RO";
|
case LANG_ROMANIAN: return "ro";
|
||||||
case LANG_RUSSIAN: return "RU";
|
case LANG_RUSSIAN: return "ru";
|
||||||
case LANG_CROATIAN: return "HR";
|
case LANG_CROATIAN: return "hr";
|
||||||
// case LANG_SERBIAN: return "SR"; // same as LANG_CROATIAN?
|
// case LANG_SERBIAN: return "sr"; // same as LANG_CROATIAN?
|
||||||
case LANG_SLOVAK: return "SK";
|
case LANG_SLOVAK: return "sk";
|
||||||
case LANG_ALBANIAN: return "SQ";
|
case LANG_ALBANIAN: return "sq";
|
||||||
case LANG_SWEDISH: return "SV";
|
case LANG_SWEDISH: return "sv";
|
||||||
case LANG_THAI: return "TH";
|
case LANG_THAI: return "th";
|
||||||
case LANG_TURKISH: return "TR";
|
case LANG_TURKISH: return "tr";
|
||||||
case LANG_URDU: return "UR";
|
case LANG_URDU: return "ur";
|
||||||
case LANG_INDONESIAN: return "IN";
|
case LANG_INDONESIAN: return "in";
|
||||||
case LANG_UKRAINIAN: return "UK";
|
case LANG_UKRAINIAN: return "uk";
|
||||||
case LANG_SLOVENIAN: return "SL";
|
case LANG_SLOVENIAN: return "sl";
|
||||||
case LANG_ESTONIAN: return "ET";
|
case LANG_ESTONIAN: return "et";
|
||||||
case LANG_LATVIAN: return "LV";
|
case LANG_LATVIAN: return "lv";
|
||||||
case LANG_LITHUANIAN: return "LT";
|
case LANG_LITHUANIAN: return "lt";
|
||||||
case LANG_VIETNAMESE: return "VI";
|
case LANG_VIETNAMESE: return "vi";
|
||||||
case LANG_ARMENIAN: return "HY";
|
case LANG_ARMENIAN: return "hy";
|
||||||
case LANG_BASQUE: return "EU";
|
case LANG_BASQUE: return "eu";
|
||||||
case LANG_MACEDONIAN: return "MK";
|
case LANG_MACEDONIAN: return "mk";
|
||||||
case LANG_AFRIKAANS: return "AF";
|
case LANG_AFRIKAANS: return "af";
|
||||||
case LANG_GEORGIAN: return "KA";
|
case LANG_GEORGIAN: return "ka";
|
||||||
case LANG_FAEROESE: return "FO";
|
case LANG_FAEROESE: return "fo";
|
||||||
case LANG_HINDI: return "HI";
|
case LANG_HINDI: return "hi";
|
||||||
case LANG_MALAY: return "MS";
|
case LANG_MALAY: return "ms";
|
||||||
case LANG_KAZAK: return "KK";
|
case LANG_KAZAK: return "kk";
|
||||||
case LANG_SWAHILI: return "SW";
|
case LANG_SWAHILI: return "sw";
|
||||||
case LANG_UZBEK: return "UZ";
|
case LANG_UZBEK: return "uz";
|
||||||
case LANG_TATAR: return "TT";
|
case LANG_TATAR: return "tt";
|
||||||
case LANG_PUNJABI: return "PA";
|
case LANG_PUNJABI: return "pa";
|
||||||
case LANG_GUJARATI: return "GU";
|
case LANG_GUJARATI: return "gu";
|
||||||
case LANG_TAMIL: return "TA";
|
case LANG_TAMIL: return "ta";
|
||||||
case LANG_KANNADA: return "KN";
|
case LANG_KANNADA: return "kn";
|
||||||
case LANG_MARATHI: return "MR";
|
case LANG_MARATHI: return "mr";
|
||||||
case LANG_SANSKRIT: return "SA";
|
case LANG_SANSKRIT: return "sa";
|
||||||
// These aren't present in the VC6 headers. We'll never have translations to these languages anyway. -C
|
// These aren't present in the VC6 headers. We'll never have translations to these languages anyway. -C
|
||||||
//case LANG_MONGOLIAN: return "MN";
|
//case LANG_MONGOLIAN: return "mn";
|
||||||
//case LANG_GALICIAN: return "GL";
|
//case LANG_GALICIAN: return "gl";
|
||||||
default:
|
default:
|
||||||
case LANG_ENGLISH: return "EN";
|
case LANG_ENGLISH: return "en";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ RString ArchHooks::GetPreferredLanguage()
|
|||||||
RString ret = lang;
|
RString ret = lang;
|
||||||
|
|
||||||
free(lang);
|
free(lang);
|
||||||
return ret.ToUpper();
|
return ret.ToLower();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ArchHooks_darwin::EnterTimeCriticalSection()
|
void ArchHooks_darwin::EnterTimeCriticalSection()
|
||||||
|
|||||||
Reference in New Issue
Block a user