From a3ae6b16b572cf1cac252bf8d466c725269f0c21 Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 5 Feb 2020 18:38:57 +0300 Subject: [PATCH] Issue #3006: take into consideration language requested from command line of SALOME --- src/XGUI/XGUI_Workshop.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index dca26d8dd..0b587f157 100644 --- 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 + + /// 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"); +#endif + if(aCurrLang != "en") { aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files } -- 2.39.2