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