Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 17:45:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issue of loading the correct instance of RetroShare.conf when switching locations (Patch from AsamK #3423256)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-10-14 21:16:34 +00:00
parent 7a98e83df1
commit 6989a40312
6 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/lang/languagesupport.cpp
View file

@ -123,6 +123,15 @@ LanguageSupport::translate(const QString &languageCode)
{
if (!isValidLanguageCode(languageCode))
return false;
static QTranslator *retroshareTranslator = NULL;
if (retroshareTranslator) {
// remove the previous translator, is needed, when switching to en
QApplication::removeTranslator(retroshareTranslator);
delete(retroshareTranslator);
retroshareTranslator = NULL;
}
if (languageCode == "en")
return true;
@ -144,7 +153,7 @@ LanguageSupport::translate(const QString &languageCode)
}
/* Install a translator for RetroShare's UI widgets */
QTranslator *retroshareTranslator = new QTranslator(rApp);
retroshareTranslator = new QTranslator(rApp);
Q_CHECK_PTR(retroshareTranslator);
if (retroshareTranslator->load(":/lang/retroshare_" + languageCode + ".qm")) {
@ -152,5 +161,6 @@ LanguageSupport::translate(const QString &languageCode)
return true;
}
delete retroshareTranslator;
retroshareTranslator = NULL;
return false;
}