linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2279
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-10-31 17:00:23 -0500
message:
  i18n changes for linux
modified:
  dcpp/DCPlusPlus.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/DCPlusPlus.cpp'
--- dcpp/DCPlusPlus.cpp	2010-08-23 16:04:27 +0000
+++ dcpp/DCPlusPlus.cpp	2010-10-31 22:00:23 +0000
@@ -64,6 +64,7 @@
 #endif
 
 	bindtextdomain(PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(PACKAGE, "UTF-8");
 
 	ResourceManager::newInstance();
 	SettingsManager::newInstance();
@@ -89,16 +90,15 @@
 
 	SettingsManager::getInstance()->load();
 
+#ifdef _WIN32
 	if(!SETTING(LANGUAGE).empty()) {
-#ifdef _WIN32
 		string language = "LANGUAGE=" + SETTING(LANGUAGE);
 		putenv(language.c_str());
-#else
-		setenv("LANGUAGE", SETTING(LANGUAGE).c_str(), true);
-#endif
+
 		// Apparently this is supposted to make gettext reload the message catalog...
 		_nl_msg_cat_cntr++;
 	}
+#endif
 
 	FavoriteManager::getInstance()->load();
 	CryptoManager::getInstance()->loadCertificates();