diff --git a/src/Mod/Image/ImageTools/_CommandImageScaling.py b/src/Mod/Image/ImageTools/_CommandImageScaling.py index 5c93c89e13..bab3261808 100644 --- a/src/Mod/Image/ImageTools/_CommandImageScaling.py +++ b/src/Mod/Image/ImageTools/_CommandImageScaling.py @@ -45,14 +45,8 @@ if FreeCAD.GuiUp: except (Exception): def _fromUtf8(s): return s - try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) - except (AttributeError): - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + translate = FreeCAD.Qt.translate # command class class _CommandImageScaling: @@ -141,9 +135,9 @@ def cmdCreateImageScaling(name, trackers): self.dialog.show() def retranslateUi(self, Dialog): - Dialog.setWindowTitle(_translate("Dialog", "Scale image plane", None)) - self.label.setText(_translate("Dialog", "Distance [mm]", None)) - self.label1.setText(_translate("Dialog", "Select first point", None)) + Dialog.setWindowTitle(translate("Dialog", "Scale image plane", None)) + self.label.setText(translate("Dialog", "Distance [mm]", None)) + self.label1.setText(translate("Dialog", "Select first point", None)) def accept(self): sel = FreeCADGui.Selection.getSelection() @@ -168,10 +162,10 @@ def cmdCreateImageScaling(name, trackers): self.dialog.hide() FreeCADGui.SendMsgToActiveView("ViewFit") except (ValueError, ZeroDivisionError): - self.label1.setText(_translate("Dialog", "Enter distance", None)) + self.label1.setText("" + translate("Dialog", "Enter distance", None) + "") return except (IndexError, AttributeError): - self.label1.setText(_translate("Dialog", "Select ImagePlane", None)) + self.label1.setText("" + translate("Dialog", "Select ImagePlane", None) + "") return def reject(self): @@ -196,7 +190,7 @@ def cmdCreateImageScaling(name, trackers): pos = event.getPosition() point = self.view.getPoint(pos[0],pos[1]) self.stack.append(point) - self.label1.setText(_translate("Dialog", "Select second point", None)) + self.label1.setText(translate("Dialog", "Select second point", None)) if len(self.stack)==1: self.tracker.p1(point) elif len(self.stack) == 2: @@ -205,7 +199,7 @@ def cmdCreateImageScaling(name, trackers): self.view.removeEventCallbackPivy(pvy.SoMouseButtonEvent.getClassTypeId(),self.callback) self.view.removeEventCallbackPivy(pvy.SoLocation2Event.getClassTypeId(),self.callmouse) self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True) - self.label1.setText(_translate("Dialog", "Select Image Plane and type distance", None)) + self.label1.setText(translate("Dialog", "Select Image Plane and type distance", None)) #Init if FreeCADGui.ActiveDocument is not None: