-update locale/userLocal when default locale is use as well as when --lang= option is used so that thirdparty plugins can be in the same language as the rest of QGIS

git-svn-id: http://svn.osgeo.org/qgis/trunk@8497 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
ersts 2008-05-23 15:27:49 +00:00
parent b208dd3a48
commit 31651d0210

View File

@ -431,7 +431,6 @@ int main(int argc, char *argv[])
/* Translation file for QGIS.
*/
QSettings mySettings;
QString mySystemLocale = QLocale::languageToString(QLocale::system().language());
QString myUserLocale = mySettings.value("locale/userLocale", "").toString();
bool myLocaleOverrideFlag = mySettings.value("locale/overrideFlag",false).toBool();
QString myLocale;
@ -453,6 +452,9 @@ int main(int argc, char *argv[])
if (!myLocaleOverrideFlag || myUserLocale.isEmpty())
{
myTranslationCode = QLocale::system().name();
//setting the locale/userLocale when the --lang= option is not set will allow third party
//plugins to always use the same locale as the QGIS, otherwise they can be out of sync
mySettings.setValue("locale/userLocale", myTranslationCode);
}
else
{