Author: jghali
Date: Sat Apr 20 22:43:54 2019
New Revision: 22959
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22959
Log:
Fix language strings being displayed in incorrect language after startup
Modified:
trunk/Scribus/scribus/scribuscore.cpp
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22959&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Sat Apr 20 22:43:54 2019
@@ -32,6 +32,7 @@
#include "commonstrings.h"
#include "filewatcher.h"
#include "iconmanager.h"
+#include "langmgr.h"
#include "localemgr.h"
#include "pluginmanager.h"
#include "prefsmanager.h"
@@ -162,6 +163,8 @@
int ScribusCore::initScribusCore(bool showSplash, bool showFontInfo, bool
showProfileInfo, const QString newGuiLanguage)
{
CommonStrings::languageChange();
+ LanguageManager::instance()->languageChange();
+
m_iconManager = IconManager::instance();
if (!m_iconManager->setup())
return EXIT_FAILURE;
@@ -172,8 +175,8 @@
m_prefsManager = PrefsManager::instance();
m_prefsManager->setup();
//CB #4428 Get fonts before prefs are set to default
- bool haveFonts=false;
- haveFonts=ScCore->initFonts(showFontInfo);
+ bool haveFonts = false;
+ haveFonts = ScCore->initFonts(showFontInfo);
if (!haveFonts)
return EXIT_FAILURE;
m_prefsManager->initDefaults();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
