Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
51ecd81
)
Issue #3006: take into consideration language requested from command line of SALOME
author
vsv
<vsv@opencascade.com>
Wed, 5 Feb 2020 15:38:57 +0000
(18:38 +0300)
committer
vsr
<vsr@opencascade.com>
Mon, 10 Feb 2020 14:12:02 +0000
(17:12 +0300)
src/XGUI/XGUI_Workshop.cpp
patch
|
blob
|
history
diff --git
a/src/XGUI/XGUI_Workshop.cpp
b/src/XGUI/XGUI_Workshop.cpp
index dca26d8ddb556228f8357f5d55c4c7f2009f7e05..0b587f157be4582fc72091862fd9f7159c6a27ae 100644
(file)
--- a/
src/XGUI/XGUI_Workshop.cpp
+++ b/
src/XGUI/XGUI_Workshop.cpp
@@
-226,7
+226,15
@@
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
// Load translations
QStringList aLangs;
aLangs << "*_en.ts"; // load by default eng translations
// Load translations
QStringList aLangs;
aLangs << "*_en.ts"; // load by default eng translations
+
+ /// If version of OCCT is 7.4.0 or more then it means that
+ /// this is version of SALOME older then 9.4.0
+#if OCC_VERSION_HEX >= 0x070400
+ QString aCurrLang = aResMgr->language();
+#else
QString aCurrLang = aResMgr->stringValue("language", "language", "en");
QString aCurrLang = aResMgr->stringValue("language", "language", "en");
+#endif
+
if(aCurrLang != "en") {
aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files
}
if(aCurrLang != "en") {
aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files
}