------------------------------------------------------------
revno: 398
committer: Steven Sheehy <[email protected]>
branch nick: linuxdcpp-i18n
timestamp: Sun 2010-10-31 18:06:01 -0500
message:
Ignore LANGUAGE core setting
modified:
dcpp/DCPlusPlus.cpp
--
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
Your team LinuxDC++ Team is subscribed to branch
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n.
To unsubscribe from this branch go to
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n/+edit-subscription
=== modified file 'dcpp/DCPlusPlus.cpp'
--- dcpp/DCPlusPlus.cpp 2010-08-30 04:42:47 +0000
+++ dcpp/DCPlusPlus.cpp 2010-10-31 23:06:01 +0000
@@ -60,6 +60,7 @@
#endif
bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
ResourceManager::newInstance();
SettingsManager::newInstance();
@@ -81,16 +82,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...
+
+ // Apparently this is supposed to make gettext reload the message catalog...
_nl_msg_cat_cntr++;
}
+#endif
FavoriteManager::getInstance()->load();
CryptoManager::getInstance()->loadCertificates();
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
