Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > 77fe5ea127cbdaa3a1cf032eaefde0c3 > files > 6

zhu3d-4.2.6-18.mga9.src.rpm

diff -ur zhu3d-4.2.6.orig/src/fntedit.cpp zhu3d-4.2.6/src/fntedit.cpp
--- zhu3d-4.2.6.orig/src/fntedit.cpp	2013-04-19 06:07:54.000000000 +0400
+++ zhu3d-4.2.6/src/fntedit.cpp	2019-04-29 03:59:28.597962778 +0300
@@ -41,6 +41,7 @@
 /** Be aware of localzations set in main.cpp */
 extern QString zhuLocale;
 extern QTranslator zhuTranslator;
+extern QTranslator qtTranslator;
 
 
 /** Viewer update, parser checks and thread count */
@@ -208,6 +209,10 @@
 	QCoreApplication::removeTranslator(&zhuTranslator);
 	zhuTranslator.load(MYLANDIR+"zhu3d_"+zhuLocale);
 	qApp->installTranslator(&zhuTranslator);
+
+	QCoreApplication::removeTranslator(&qtTranslator);
+	qtTranslator.load("qt_"+zhuLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+	qApp->installTranslator(&qtTranslator);
 }
 
 /** Set font */
diff -ur zhu3d-4.2.6.orig/src/main.cpp zhu3d-4.2.6/src/main.cpp
--- zhu3d-4.2.6.orig/src/main.cpp	2013-04-19 06:07:54.000000000 +0400
+++ zhu3d-4.2.6/src/main.cpp	2019-04-29 04:00:37.639097296 +0300
@@ -79,6 +79,7 @@
  ** Used later on externally in modules maiWin, fntEdi and usrEdi */
 QString zhuLocale;
 QTranslator zhuTranslator;
+QTranslator qtTranslator;
 
 
 /** Install own message handler, when debugging is enabled.
@@ -139,17 +140,16 @@
 	app.setWindowIcon(appIcon);
 	appPath = QCoreApplication::applicationDirPath();
 
-	/** General internationalization stuff */
-	QTranslator qtTranslator;
-	qtTranslator.load("qt_"+zhuLocale);
-	app.installTranslator(&qtTranslator);
-
 	/** Set Zhu3D languages */
 	zhuLocale = QLocale::system().name();
 	zhuLocale.resize(zhuLocale.lastIndexOf('_'));
 	zhuTranslator.load(MYLANDIR+"zhu3d_"+zhuLocale);
 	app.installTranslator(&zhuTranslator);
 
+	/** General internationalization stuff */
+	qtTranslator.load("qt_"+zhuLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+	app.installTranslator(&qtTranslator);
+
 	/** Set LC_NUMERIC to force using the dot as decimal delimiter according to C-standard.
 	 ** This locale-behavior changed in between Qt4 .0 and Qt 4.5 sometimes. With this it
 	 ** should be independent of the QT-version/locale used */