Intermediate translation to French changes

diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
index 017f9cb0fccba0a47d463e3e393a0564b5806c21..1e6248d309958a8030544f3a0d43a532d86f85d0 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
@@ -1743,7 +1743,7 @@
   <context>
     <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "base" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>L&apos;objet de base pour l&apos;extrusion n&apos;est pas sélectionné.</translation>
     </message>
   </context>

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index aa05113a834f7bd5e395ec2b56747ca7feffc528..2db766fc6523b6a5155021c3e9533597291a08bc 100644 (file)
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -59,6 +59,7 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& th
           aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
         theError = "Attribute \"%1\" is not initialized.";
         theError.addParameter(anAttr->id());
+        theError.setContext(theFeature->getKind() + ":" + anAttr->id());
         return false;
       }
     }

diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts
index 3f891bcb01001bcb8229834bfb79fa56c6d1cad6..be3f8db6602140bb33a7cfc53b0a47245dd6c75e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_fr.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts
@@ -3499,6 +3499,38 @@
       <translation>Impossible de créer un arc perpendiculaire sur %1</translation>
     </message>
   </context>
+  <context>
+    <name>SketchMacroArc:end_point_2</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Sélectionnez un point dans la vue</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_3</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Sélectionnez un point dans la vue.</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Sélectionnez un point dans la vue.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Sélectionnez un point dans la vue.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:start_point_2</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Sélectionnez un point dans la vue.</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchMacroCircle</name>

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index ed7de14923afe69e69c5d8811679a1f264f26498..88386696d1aa2190e1dfcbac18a8a6be5686f142 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -219,9 +219,11 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
 
   // Load translations
   QStringList aLangs;
-  aLangs << "*_en.ts"; // load by default eng translations
+  //aLangs << "*_en.ts"; // load by default eng translations
   QString aCurrLang = aResMgr->stringValue("language", "language", "en");
-  if(aCurrLang != "en") {
+  if(aCurrLang == "en") {
+    aLangs << "*_en.ts";
+  } else {
     aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files
   }