From fdd911ee6e8b447b57d7dc24b2880db0cebe2b21 Mon Sep 17 00:00:00 2001
From: dbv <dbv@opencascade.com>
Date: Thu, 29 Dec 2016 12:29:03 +0300
Subject: [PATCH] Issue #1957: error text when Build face

Fixed error messages.
---
 src/BuildPlugin/BuildPlugin_Validators.cpp |  9 ++++++--
 src/BuildPlugin/BuildPlugin_msg_en.ts      | 24 ++++++++--------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/BuildPlugin/BuildPlugin_Validators.cpp b/src/BuildPlugin/BuildPlugin_Validators.cpp
index 87e52020a..fc93bc7df 100644
--- a/src/BuildPlugin/BuildPlugin_Validators.cpp
+++ b/src/BuildPlugin/BuildPlugin_Validators.cpp
@@ -192,6 +192,11 @@ bool BuildPlugin_ValidatorBaseForFace::isValid(const std::shared_ptr<ModelAPI_Fe
     }
   }
 
+  if(anEdges.empty()) {
+    theError = "Objects not selected.";
+    return false;
+  }
+
   // Check that edges does not have intersections.
   if(anEdges.size() > 1) {
     GeomAlgoAPI_PaveFiller aPaveFiller(anEdges, false);
@@ -215,7 +220,7 @@ bool BuildPlugin_ValidatorBaseForFace::isValid(const std::shared_ptr<ModelAPI_Fe
   // Check that they are planar.
   std::shared_ptr<GeomAPI_Pln> aPln = GeomAlgoAPI_ShapeTools::findPlane(anEdges);
   if(!aPln.get()) {
-    theError = "Selected objects are not planar.";
+    theError = "Selected object(s) should belong to only one plane.";
     return false;
   }
 
@@ -224,7 +229,7 @@ bool BuildPlugin_ValidatorBaseForFace::isValid(const std::shared_ptr<ModelAPI_Fe
   GeomAlgoAPI_SketchBuilder::createFaces(aPln->location(), aPln->xDirection(),
                                          aPln->direction(), anEdges, aFaces);
   if(aFaces.empty()) {
-    theError = "Selected objects does not have closed contours.";
+    theError = "Selected objects do not generate closed contour.";
     return false;
   }
 
diff --git a/src/BuildPlugin/BuildPlugin_msg_en.ts b/src/BuildPlugin/BuildPlugin_msg_en.ts
index 025babe93..6405e316e 100644
--- a/src/BuildPlugin/BuildPlugin_msg_en.ts
+++ b/src/BuildPlugin/BuildPlugin_msg_en.ts
@@ -64,33 +64,25 @@
       <source>Empty attribute \"%1\".</source>
       <translation>Objects not selected.</translation>
     </message>
-  </context>
-  <context>
-    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
+    <message>
+      <source>Objects not selected.</source>
+      <translation>Objects not selected.</translation>
+    </message>
     <message>
       <source>Error while checking if edges intersects.</source>
       <translation>Error while checking if edges intersects.</translation>
     </message>
-  </context>
-  <context>
-    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
       <source>Selected objects have intersections.</source>
       <translation>Selected objects have intersections.</translation>
     </message>
-  </context>
-  <context>
-    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>Selected objects are not planar.</source>
-      <translation>Selected objects are not planar.</translation>
+      <source>Selected object(s) should belong to only one plane.</source>
+      <translation>Selected object(s) should belong to only one plane.</translation>
     </message>
-  </context>
-  <context>
-    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>Selected objects does not have closed contours.</source>
-      <translation>Selected objects does not have closed contours.</translation>
+      <source>Selected objects do not generate closed contour.</source>
+      <translation>Selected objects do not generate closed contour.</translation>
     </message>
   </context>
   <context>
-- 
2.39.2