@@ -571,15 +571,15 @@ void Game::loadLanguages()
 		std::string lang = locale.substr(0, locale.find_first_of('-'));
 		// Try to load full locale
 		Unicode::replace(path, defaultLang, locale);
-		if (CrossPlatform::fileExists(path))
+		if (Language::isSupported(locale) && CrossPlatform::fileExists(path))
 		{
 			currentLang = locale;
 		}
 		else
 		{
 			// Try to load language locale
 			Unicode::replace(path, locale, lang);
-			if (CrossPlatform::fileExists(path))
+			if (Language::isSupported(lang) && CrossPlatform::fileExists(path))
 			{
 				currentLang = lang;
 			}
 
@@ -46,7 +46,9 @@ Language::Language() : _handler(0), _direction(DIRECTION_LTR), _wrap(WRAP_WORDS)
 	{
 		_names["en-US"] = "English (US)";
 		_names["en-GB"] = "English (UK)";
+		// _names["ar"] = "العربية"; needs fonts
 		_names["bg"] = "Български";
+		_names["ca-ES"] = "Català";
 		_names["cs"] = "Česky";
 		_names["cy"] = "Cymraeg";
 		_names["da"] = "Dansk";
@@ -58,9 +60,11 @@ Language::Language() : _handler(0), _direction(DIRECTION_LTR), _wrap(WRAP_WORDS)
 		_names["fr"] = "Français (FR)";
 		_names["fr-CA"] = "Français (CA)";
 		_names["fi"] = "Suomi";
+		_names["ga"] = "Gaeilge";
 		_names["hr"] = "Hrvatski";
 		_names["hu"] = "Magyar";
 		_names["it"] = "Italiano";
+		_names["is"] = "Íslenska";
 		_names["ja"] = "日本語";
 		_names["ko"] = "한국어";
 		_names["lb"] = "Lëtzebuergesch";
@@ -75,9 +79,10 @@ Language::Language() : _handler(0), _direction(DIRECTION_LTR), _wrap(WRAP_WORDS)
 		_names["sk"] = "Slovenčina";
 		_names["sl"] = "Slovenščina";
 		_names["sv"] = "Svenska";
-		_names["th"] = "ไทย";
+		// _names["th"] = "ไทย"; needs fonts
 		_names["tr"] = "Türkçe";
 		_names["uk"] = "Українська";
+		_names["vi"] = "Tiếng Việt";
 		_names["zh-CN"] = "中文";
 		_names["zh-TW"] = "文言";
 	}
 
@@ -59,6 +59,8 @@ class Language
 	~Language();
 	/// Gets list of languages in the data directory.
 	static void getList(std::vector<std::string> &files, std::vector<std::string> &names);
+	/// Checks if a language is in the supported name list.
+	static bool isSupported(const std::string& lang) { return _names.find(lang) != _names.end(); }
 	/// Loads the language from an external file.
 	void loadFile(const std::string &filename);
 	/// Loads the language from a ruleset file.
Original file line number	Diff line number	Diff line change
`@@ -571,15 +571,15 @@ void Game::loadLanguages()`
`571`	`571`	`std::string lang = locale.substr(0, locale.find_first_of('-'));`
`572`	`572`	`// Try to load full locale`
`573`	`573`	`Unicode::replace(path, defaultLang, locale);`
`574`		`- if (CrossPlatform::fileExists(path))`
	`574`	`+ if (Language::isSupported(locale) && CrossPlatform::fileExists(path))`
`575`	`575`	`{`
`576`	`576`	`currentLang = locale;`
`577`	`577`	`}`
`578`	`578`	`else`
`579`	`579`	`{`
`580`	`580`	`// Try to load language locale`
`581`	`581`	`Unicode::replace(path, locale, lang);`
`582`		`- if (CrossPlatform::fileExists(path))`
	`582`	`+ if (Language::isSupported(lang) && CrossPlatform::fileExists(path))`
`583`	`583`	`{`
`584`	`584`	`currentLang = lang;`
`585`	`585`	`}`