Merge pull request #12075 from chennes/facemakerTranslationFix

Part: Fix translation bug in FaceMaker

src/Mod/Part/App/FaceMaker.cpp

@@ -69,7 +69,7 @@ void Part::FaceMaker::addTopoShape(const TopoShape& shape) {
             this->myInputFaces.push_back(sh);
         break;
         default:
-            throw Base::TypeError("Shape must be a wire, edge or compound. Something else was supplied.");
+            throw Base::TypeError(tr("Shape must be a wire, edge or compound. Something else was supplied.").toStdString());
         break;
     }
     this->mySourceShapes.push_back(shape);
@@ -259,12 +259,13 @@ TYPESYSTEM_SOURCE(Part::FaceMakerSimple, Part::FaceMakerPublic)
 
 std::string Part::FaceMakerSimple::getUserFriendlyName() const
 {
-    return std::string(QT_TRANSLATE_NOOP("Part_FaceMaker","Simple"));
+    return {tr("Simple").toStdString()};
 }
 
 std::string Part::FaceMakerSimple::getBriefExplanation() const
 {
-    return std::string(QT_TRANSLATE_NOOP("Part_FaceMaker","Makes separate plane face from every wire independently. No support for holes; wires can be on different planes."));
+    return {tr("Makes separate plane face from every wire independently. No support for holes; wires can be on different planes.").toStdString()};
+
 }
 
 void Part::FaceMakerSimple::Build_Essence()

src/Mod/Part/App/FaceMaker.h

@@ -28,6 +28,7 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
+#include <QCoreApplication>
 
 #include <memory>
 #include <Base/BaseClass.h>
@@ -49,6 +50,7 @@ namespace Part
  */
 class PartExport FaceMaker: public BRepBuilderAPI_MakeShape, public Base::BaseClass
 {
+    Q_DECLARE_TR_FUNCTIONS(FaceMaker);
     TYPESYSTEM_HEADER();
 
 public:

src/Mod/Part/App/FaceMakerBullseye.cpp

@@ -55,12 +55,12 @@ void FaceMakerBullseye::setPlane(const gp_Pln &plane)
 
 std::string FaceMakerBullseye::getUserFriendlyName() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker","Bull's-eye facemaker")};
+    return {tr("Bull's-eye facemaker").toStdString()};
 }
 
 std::string FaceMakerBullseye::getBriefExplanation() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker","Supports making planar faces with holes with islands.")};
+    return {tr("Supports making planar faces with holes with islands.").toStdString()};
 }
 
 void FaceMakerBullseye::Build_Essence()

src/Mod/Part/App/FaceMakerCheese.cpp

@@ -244,12 +244,12 @@ TopoDS_Shape FaceMakerCheese::makeFace(const std::vector<TopoDS_Wire>& w)
 
 std::string FaceMakerCheese::getUserFriendlyName() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker","Cheese facemaker")};
+    return {tr("Cheese facemaker").toStdString()};
 }
 
 std::string FaceMakerCheese::getBriefExplanation() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker","Supports making planar faces with holes, but no islands inside holes.")};
+    return {tr("Supports making planar faces with holes, but no islands inside holes.").toStdString()};
 }
 
 void FaceMakerCheese::Build_Essence()

src/Mod/Part/App/FeatureExtrusion.cpp

@@ -334,12 +334,12 @@ TYPESYSTEM_SOURCE(Part::FaceMakerExtrusion, Part::FaceMakerCheese)
 
 std::string FaceMakerExtrusion::getUserFriendlyName() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker", "Part Extrude facemaker")};
+    return {tr("Part Extrude facemaker").toStdString()};
 }
 
 std::string FaceMakerExtrusion::getBriefExplanation() const
 {
-    return {QT_TRANSLATE_NOOP("Part_FaceMaker", "Supports making faces with holes, does not support nesting.")};
+    return {tr("Supports making faces with holes, does not support nesting.").toStdString()};
 }
 
 #if OCC_VERSION_HEX >= 0x070600