changeset 1997:74e956976194

don't override language setting from options.xml under Windows
author ig0rk0
date Sat, 29 Oct 2011 15:42:49 +0000
parents a0081bab7b8b
children 9031c6fab6cb
files src/core/options.cpp
diffstat 1 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/options.cpp	Sat Oct 29 13:10:32 2011 +0000
+++ b/src/core/options.cpp	Sat Oct 29 15:42:49 2011 +0000
@@ -373,14 +373,7 @@
 
 std::string Options::getLocale()
 {
-#ifdef WIN32
-	char locale[100];
-	GetLocaleInfo(LOCALE_USER_DEFAULT,
-						  LOCALE_SISO639LANGNAME,
-						  locale, sizeof(locale));
-#else
 	const char* locale = Gettext::getLocale();
-#endif
 
 	std::string locstr = "";
 	if (locale != 0)