Translation of sketch operations

diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp
index 997c4134849595142d57bbe2c6d27cad00d83cc0..1287a605abc02332a147ba7e6b1f0bdc3b8c966c 100644 (file)
--- a/src/ModuleBase/ModuleBase_IModule.cpp
+++ b/src/ModuleBase/ModuleBase_IModule.cpp
@@ -110,7 +110,7 @@ QString ModuleBase_IModule::getFeatureError(const FeaturePtr& theFeature)
 {
   QString aMsg = ModelAPI_Tools::getFeatureError(theFeature).c_str();
   if (!aMsg.isEmpty()) {
-    std::string aStr = Config_Translator::translate(theFeature->getKind(), aMsg.toStdString()).c_str();
+    std::string aStr = Config_Translator::translate(theFeature->getKind(), aMsg.toStdString());
     std::string aCodec = Config_Translator::codec(theFeature->getKind());
     aMsg = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str());
   }

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index d82016eacb5c55c5b84c8bf190292627a6699545..ba49483764657583320424eb92c0e78903bb9ba9 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp
@@ -17,12 +17,14 @@
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
+#include <Config_Translator.h>
 
 #include <Events_Loop.h>
 
 #include <QEvent>
 #include <QLabel>
 #include <QFocusEvent>
+#include <QTextCodec>
 
 //#define DEBUG_VALUE_STATE
 
@@ -132,9 +134,23 @@ QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const
   if (anError.isEmpty() && theValueStateChecked)
     anError = getValueStateError();
 
+  anError = translateString(anError);
   return anError;
 }
 
+
+QString ModuleBase_ModelWidget::translateString(const QString& theMsg) const
+{
+  if (!theMsg.isEmpty()) {
+    std::string aContext = feature()->getKind();
+    std::string aStr = Config_Translator::translate(aContext, theMsg.toStdString().c_str());
+    std::string aCodec = Config_Translator::codec(aContext);
+    return QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str());
+  }
+  return theMsg;
+}
+
+
 void ModuleBase_ModelWidget::enableFocusProcessing()
 {
   QList<QWidget*> aMyControls = getControls();

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index b8417dd6e8d8af7daa229f57a14d5bfe7f76e55b..997c6bca2b43e71bdb7f22df3ff6377ee19867a7 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -284,6 +284,8 @@ protected:
   /// The method called when widget is activated
   virtual void activateCustom() {};
 
+  QString translateString(const QString& theMsg) const;
+
 protected slots:
   /// Processing of values changed in model widget by store the current value to the feature
   void onWidgetValuesChanged();

diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts
index e2281644f8ed88fcc138d64045189888be6bc4bb..32b56ab36a2cddd6b9891fe5bd86df87d8e195a9 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_en.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_en.ts
@@ -17,19 +17,39 @@
     <name>SketchCircle</name>
     <message>
       <source>CircleRadius - GeomValidators_Positive: Double is not positive.</source>
-      <translation>Set a positive number for the radius value</translation>
+      <translation>Radius value is not defined</translation>
     </message>
     <message>
       <source>Model_FeatureValidator: Attribute "CircleCenter" is not initialized.</source>
+      <translation>A center point is not selected</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "FirstPoint" is not initialized.</source>
+      <translation>A first point is not selected</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "SecondPoint" is not initialized.</source>
+      <translation>A second point is not selected</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ThirdPoint" is not initialized.</source>
+      <translation>A third point is not selected</translation>
+    </message>
+    <message>
+      <source>Attribute "CircleCenter" is locked by modification value in the viewer.</source>
       <translation>Select a center point</translation>
     </message>
+    <message>
+      <source>Attribute "CircleRadius" is locked by modification value in the viewer.</source>
+      <translation>Select a radius distance</translation>
+    </message>
   </context>
   
   <context>
     <name>SketchConstraintHorizontal</name>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>Select a line for the constraint</translation>
+      <translation>Line is not selected</translation>
     </message>
     <message>
       <source>ModelAPI_StateInvalidArgument</source>
@@ -41,11 +61,11 @@
     <name>SketchConstraintPerpendicular</name>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>Select first line for the perpendicular constraint</translation>
+      <translation>First line is not selected</translation>
     </message>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
-      <translation>Select second line for the perpendicular constraint</translation>
+      <translation>Select second line is not selected</translation>
     </message>
   </context>
   
@@ -53,7 +73,7 @@
     <name>SketchConstraintRadius</name>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>Select a circle for the radius definition</translation>
+      <translation>Circle is nopt selected</translation>
     </message>
   </context>
   
@@ -65,7 +85,7 @@
     </message>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>Select a line for the constraint</translation>
+      <translation>Line is not selected</translation>
     </message>
   </context>
   
@@ -73,11 +93,95 @@
     <name>SketchLine</name>
     <message>
       <source>GeomValidators_Different: Attributes StartPoint and EndPoint are equal.</source>
-      <translation>Drag mouse pointer to select an end point</translation>
+      <translation>Start point and end point are the same</translation>
     </message>
     <message>
       <source>Model_FeatureValidator: Attribute "EndPoint" is not initialized.</source>
-      <translation>Click to select an end point for the line</translation>
+      <translation>End point is not selected</translation>
+    </message>
+    <message>
+      <source>Attribute "EndPoint" is locked by modification value in the viewer.</source>
+      <translation>Select an end point in the viewer</translation>
+    </message>
+    <message>
+      <source>Attribute "StartPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a start point in the viewer</translation>
+    </message>
+  </context>
+  
+  <context>
+    <name>SketchPoint</name>
+    <message>
+      <source>Model_FeatureValidator: Attribute "PointCoordindates" is not initialized.</source>
+      <translation>Point is not defined</translation>
+    </message>
+    <message>
+      <source>Attribute "PointCoordindates" is locked by modification value in the viewer.</source>
+      <translation>Select a point</translation>
+    </message>
+  </context>
+  
+  <context>
+    <name>SketchRectangle</name>
+    <message>
+      <source>GeomValidators_Different: Attributes RectStartPoint and RectEndPoint are equal.</source>
+      <translation>Start point and end point must be different</translation>
+    </message>
+    <message>
+      <source>Attribute "RectEndPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a end point of the rectangle</translation>
+    </message>
+    <message>
+      <source>Attribute "RectStartPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a first point of the rectangle</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchArc</name>
+    <message>
+      <source>ArcRadius - GeomValidators_Positive: Double is not initialized.</source>
+      <translation>Radius is not defined</translation>
+    </message>
+    <message>
+      <source>ArcTangentPoint - SketchPlugin_ArcTangentPoint: The attribute ArcTangentPoint should be a point</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Attribute "ArcCenter" is locked by modification value in the viewer.</source>
+      <translation>Select a center point</translation>
+    </message>
+    <message>
+      <source>Attribute "ArcCenter" is not initialized.</source>
+      <translation>Center point is not defined</translation>
+    </message>
+    <message>
+      <source>Attribute "ArcEndPoint" is locked by modification value in the viewer.</source>
+      <translation>Select an end point</translation>
+    </message>
+    <message>
+      <source>Attribute "ArcPassedPoint" is locked by modification value in the viewer.</source>
+      <translation>Select an intermediate point</translation>
+    </message>
+    <message>
+      <source>Attribute "ArcStartPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a start point</translation>
+    </message>
+    <message>
+      <source>GeomValidators_Different: Attributes ArcCenter and ArcStartPoint are equal.</source>
+      <translation>Center point and end point must be different</translation>
+    </message>
+    <message>
+      <source>GeomValidators_Different: Attributes ArcStartPoint and ArcEndPoint are equal.</source>
+      <translation>Start point and end point must be different</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ArcEndPoint" is not initialized.</source>
+      <translation>End point is not defined</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ArcPassedPoint" is not initialized.</source>
+      <translation>Intermediate point is not defined</translation>
     </message>
   </context>
 </TS>