OSYSTEM: Add API to query the system locale.

I also adapted the SDL backend to implement the API.

svn-id: r54479

4 files changed, 72 insertions, 23 deletions

diff --git a/common/system.cpp b/common/system.cpp
index e14e5ea7d3..1da5367f22 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -90,3 +90,7 @@ void OSystem::logMessage(LogMessageType::Type type, const char *message) {
 	fflush(output);
 }
 
+Common::Language OSystem::getSystemLanguage() const {
+	return Common::UNK_LANG;
+}
+
diff --git a/common/system.h b/common/system.h
index 83d11998a4..4870efc854 100644
--- a/common/system.h
+++ b/common/system.h
@@ -30,6 +30,7 @@
 #include "common/noncopyable.h"
 #include "common/rect.h"
 #include "common/list.h" // For OSystem::getSupportedFormats()
+#include "common/util.h" // For Common::Language
 
 #include "graphics/pixelformat.h"
 
@@ -1050,6 +1051,25 @@ public:
 	 */
 	virtual void logMessage(LogMessageType::Type type, const char *message);
 
+	/**
+	 * Returns the locale of the system.
+	 *
+	 * This returns the currently set up locale of the system, on which
+	 * ScummVM is run.
+	 *
+	 * In case the locale can not be prepresented by Common::Language the
+	 * backend should return Common::UNK_LANG.
+	 *
+	 * @see Common::Language
+	 * @see Common::UNK_LANG
+	 *
+	 * The default implementation returns Common::UNK_LANG.
+	 *
+	 *
+	 * @return locale of the system
+	 */
+	virtual Common::Language getSystemLanguage() const;
+
 	//@}
 };
 
diff --git a/common/util.cpp b/common/util.cpp
index 533795ca9e..d9e51c6be2 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -107,29 +107,29 @@ bool parseBool(const Common::String &val, bool &valAsBool) {
 
 
 const LanguageDescription g_languages[] = {
-	{ "zh-cn", "Chinese (China)", ZH_CNA },
-	{ "zh", "Chinese (Taiwan)", ZH_TWN },
-	{ "cz", "Czech", CZ_CZE },
-	{ "nl", "Dutch", NL_NLD },
-	{ "en", "English", EN_ANY }, // Generic English (when only one game version exist)
-	{ "gb", "English (GB)", EN_GRB },
-	{ "us", "English (US)", EN_USA },
-	{ "fr", "French", FR_FRA },
-	{ "de", "German", DE_DEU },
-	{ "gr", "Greek", GR_GRE },
-	{ "he", "Hebrew", HE_ISR },
-	{ "hb", "Hebrew", HE_ISR }, // Deprecated
-	{ "hu", "Hungarian", HU_HUN },
-	{ "it", "Italian", IT_ITA },
-	{ "jp", "Japanese", JA_JPN },
-	{ "kr", "Korean", KO_KOR },
-	{ "nb", "Norwegian Bokm\xE5l", NB_NOR },
-	{ "pl", "Polish", PL_POL },
-	{ "br", "Portuguese", PT_BRA },
-	{ "ru", "Russian", RU_RUS },
-	{ "es", "Spanish", ES_ESP },
-	{ "se", "Swedish", SE_SWE },
-	{ 0, 0, UNK_LANG }
+	{ "zh-cn", "zh_CN", "Chinese (China)", ZH_CNA },
+	{    "zh", "zh_TW", "Chinese (Taiwan)", ZH_TWN },
+	{    "cz", "cs_CZ", "Czech", CZ_CZE },
+	{    "nl", "nl_NL", "Dutch", NL_NLD },
+	{    "en",    "en", "English", EN_ANY }, // Generic English (when only one game version exist)
+	{    "gb", "en_GB", "English (GB)", EN_GRB },
+	{    "us", "en_US", "English (US)", EN_USA },
+	{    "fr", "fr_FR", "French", FR_FRA },
+	{    "de", "de_DE", "German", DE_DEU },
+	{    "gr", "el_GR", "Greek", GR_GRE },
+	{    "he", "he_IL", "Hebrew", HE_ISR },
+	{    "hb", "he_IL", "Hebrew", HE_ISR }, // Deprecated
+	{    "hu", "hu_HU", "Hungarian", HU_HUN },
+	{    "it", "it_IT", "Italian", IT_ITA },
+	{    "jp", "ja_JP", "Japanese", JA_JPN },
+	{    "kr", "ko_KR", "Korean", KO_KOR },
+	{    "nb", "nb_NO", "Norwegian Bokm\xE5l", NB_NOR }, // TODO Someone should verify the unix locale
+	{    "pl", "pl_PL", "Polish", PL_POL },
+	{    "br", "pt_BR", "Portuguese", PT_BRA },
+	{    "ru", "ru_RU", "Russian", RU_RUS },
+	{    "es", "es_ES", "Spanish", ES_ESP },
+	{    "se", "sv_SE", "Swedish", SE_SWE },
+	{       0,       0, 0, UNK_LANG }
 };
 
 Language parseLanguage(const String &str) {
@@ -145,6 +145,19 @@ Language parseLanguage(const String &str) {
 	return UNK_LANG;
 }
 
+Language parseLanguageFromLocale(const char *locale) {
+	if (!locale || !*locale)
+		return UNK_LANG;
+
+	const LanguageDescription *l = g_languages;
+	for (; l->code; ++l) {
+		if (!strcmp(l->unixLocale, locale))
+			return l->id;
+	}
+
+	return UNK_LANG;
+}
+
 const char *getLanguageCode(Language id) {
 	const LanguageDescription *l = g_languages;
 	for (; l->code; ++l) {
@@ -154,6 +167,15 @@ const char *getLanguageCode(Language id) {
 	return 0;
 }
 
+const char *getLanguageLocale(Language id) {
+	const LanguageDescription *l = g_languages;
+	for (; l->code; ++l) {
+		if (l->id == id)
+			return l->unixLocale;
+	}
+	return 0;
+}
+
 const char *getLanguageDescription(Language id) {
 	const LanguageDescription *l = g_languages;
 	for (; l->code; ++l) {
diff --git a/common/util.h b/common/util.h
index 699653918a..fae4975a9b 100644
--- a/common/util.h
+++ b/common/util.h
@@ -133,6 +133,7 @@ enum Language {
 
 struct LanguageDescription {
 	const char *code;
+	const char *unixLocale;
 	const char *description;
 	Common::Language id;
 };
@@ -142,7 +143,9 @@ extern const LanguageDescription g_languages[];
 
 /** Convert a string containing a language name into a Language enum value. */
 extern Language parseLanguage(const String &str);
+extern Language parseLanguageFromLocale(const char *locale);
 extern const char *getLanguageCode(Language id);
+extern const char *getLanguageLocale(Language id);
 extern const char *getLanguageDescription(Language id);
 
 /**