thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Restore locale <-> Common::Language conversion utils

Browse source 
This reverts commit 284b49aabc.
This commit is contained in:
Eugene Sandulenko 2011-08-20 12:05:20 +01:00
parent 4a7616c366
commit 2585de56b6
2 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

54
common/util.cpp
View file

@ -104,29 +104,29 @@ bool parseBool(const String &val, bool &valAsBool) {
const LanguageDescription g_languages[] = { const LanguageDescription g_languages[] = {
{ "zh-cn"/*, "zh_CN"*/, "Chinese (China)", ZH_CNA }, { "zh-cn", "zh_CN", "Chinese (China)", ZH_CNA },
{ "zh"/*, "zh_TW"*/, "Chinese (Taiwan)", ZH_TWN }, { "zh", "zh_TW", "Chinese (Taiwan)", ZH_TWN },
{ "cz"/*, "cs_CZ"*/, "Czech", CZ_CZE }, { "cz", "cs_CZ", "Czech", CZ_CZE },
{ "nl"/*, "nl_NL"*/, "Dutch", NL_NLD }, { "nl", "nl_NL", "Dutch", NL_NLD },
{ "en"/*, "en"*/, "English", EN_ANY }, // Generic English (when only one game version exist) { "en", "en", "English", EN_ANY }, // Generic English (when only one game version exist)
{ "gb"/*, "en_GB"*/, "English (GB)", EN_GRB }, { "gb", "en_GB", "English (GB)", EN_GRB },
{ "us"/*, "en_US"*/, "English (US)", EN_USA }, { "us", "en_US", "English (US)", EN_USA },
{ "fr"/*, "fr_FR"*/, "French", FR_FRA }, { "fr", "fr_FR", "French", FR_FRA },
{ "de"/*, "de_DE"*/, "German", DE_DEU }, { "de", "de_DE", "German", DE_DEU },
{ "gr"/*, "el_GR"*/, "Greek", GR_GRE }, { "gr", "el_GR", "Greek", GR_GRE },
{ "he"/*, "he_IL"*/, "Hebrew", HE_ISR }, { "he", "he_IL", "Hebrew", HE_ISR },
{ "hb"/*, "he_IL"*/, "Hebrew", HE_ISR }, // Deprecated { "hb", "he_IL", "Hebrew", HE_ISR }, // Deprecated
{ "hu"/*, "hu_HU"*/, "Hungarian", HU_HUN }, { "hu", "hu_HU", "Hungarian", HU_HUN },
{ "it"/*, "it_IT"*/, "Italian", IT_ITA }, { "it", "it_IT", "Italian", IT_ITA },
{ "jp"/*, "ja_JP"*/, "Japanese", JA_JPN }, { "jp", "ja_JP", "Japanese", JA_JPN },
{ "kr"/*, "ko_KR"*/, "Korean", KO_KOR }, { "kr", "ko_KR", "Korean", KO_KOR },
{ "nb"/*, "nb_NO"*/, "Norwegian Bokm\xE5l", NB_NOR }, // TODO Someone should verify the unix locale { "nb", "nb_NO", "Norwegian Bokm\xE5l", NB_NOR }, // TODO Someone should verify the unix locale
{ "pl"/*, "pl_PL"*/, "Polish", PL_POL }, { "pl", "pl_PL", "Polish", PL_POL },
{ "br"/*, "pt_BR"*/, "Portuguese", PT_BRA }, { "br", "pt_BR", "Portuguese", PT_BRA },
{ "ru"/*, "ru_RU"*/, "Russian", RU_RUS }, { "ru", "ru_RU", "Russian", RU_RUS },
{ "es"/*, "es_ES"*/, "Spanish", ES_ESP }, { "es", "es_ES", "Spanish", ES_ESP },
{ "se"/*, "sv_SE"*/, "Swedish", SE_SWE }, { "se", "sv_SE", "Swedish", SE_SWE },
{ 0/*, 0*/, 0, UNK_LANG } { 0, 0, 0, UNK_LANG }
}; };
Language parseLanguage(const String &str) { Language parseLanguage(const String &str) {
@ -142,7 +142,7 @@ Language parseLanguage(const String &str) {
return UNK_LANG; return UNK_LANG;
} }
/*Language parseLanguageFromLocale(const char *locale) { Language parseLanguageFromLocale(const char *locale) {
if (!locale || !*locale) if (!locale || !*locale)
return UNK_LANG; return UNK_LANG;
@ -153,7 +153,7 @@ Language parseLanguage(const String &str) {
} }
return UNK_LANG; return UNK_LANG;
}*/ }
const char *getLanguageCode(Language id) { const char *getLanguageCode(Language id) {
const LanguageDescription *l = g_languages; const LanguageDescription *l = g_languages;
@ -164,14 +164,14 @@ const char *getLanguageCode(Language id) {
return 0; return 0;
} }
/*const char *getLanguageLocale(Language id) { const char *getLanguageLocale(Language id) {
const LanguageDescription *l = g_languages; const LanguageDescription *l = g_languages;
for (; l->code; ++l) { for (; l->code; ++l) {
if (l->id == id) if (l->id == id)
return l->unixLocale; return l->unixLocale;
} }
return 0; return 0;
}*/ }
const char *getLanguageDescription(Language id) { const char *getLanguageDescription(Language id) {
const LanguageDescription *l = g_languages; const LanguageDescription *l = g_languages;

8
common/util.h
View file

@ -134,7 +134,7 @@ enum Language {
struct LanguageDescription { struct LanguageDescription {
const char *code; const char *code;
//const char *unixLocale; const char *unixLocale;
const char *description; const char *description;
Language id; Language id;
}; };
@ -144,13 +144,11 @@ extern const LanguageDescription g_languages[];
/** Convert a string containing a language name into a Language enum value. */ /** Convert a string containing a language name into a Language enum value. */
extern Language parseLanguage(const String &str); extern Language parseLanguage(const String &str);
extern Language parseLanguageFromLocale(const char *locale);
extern const char *getLanguageCode(Language id); extern const char *getLanguageCode(Language id);
extern const char *getLanguageLocale(Language id);
extern const char *getLanguageDescription(Language id); extern const char *getLanguageDescription(Language id);
// locale <-> Language conversion is disabled, since it is not used currently
/*extern const char *getLanguageLocale(Language id);
extern Language parseLanguageFromLocale(const char *locale);*/
/** /**
* List of game platforms. Specifying a platform for a target can be used to * List of game platforms. Specifying a platform for a target can be used to
* give the game engines a hint for which platform the game data file are. * give the game engines a hint for which platform the game data file are.