Draft: Fixed broken translations everywhere

This commit is contained in:
Yorik van Havre
2021-02-12 14:44:58 +01:00
parent eaae425c64
commit 43feb585ad
78 changed files with 560 additions and 1039 deletions

View File

@@ -38,7 +38,7 @@ import draftutils.utils as utils
from FreeCAD import Units as U
from draftutils.messages import _msg, _wrn, _err, _log
from draftutils.translate import _tr
from draftutils.translate import translate
# The module is used to prevent complaints from code checkers (flake8)
bool(Draft_rc.__name__)
@@ -80,7 +80,7 @@ class TaskPanelCircularArray:
def __init__(self):
self.name = "Circular array"
_log(_tr("Task panel:") + " {}".format(_tr(self.name)))
_log(translate("draft","Task panel:") + " {}".format(translate("draft","Circular array")))
# The .ui file must be loaded into an attribute
# called `self.form` so that it is displayed in the task panel.
@@ -92,7 +92,7 @@ class TaskPanelCircularArray:
pix = QtGui.QPixmap(svg)
icon = QtGui.QIcon.fromTheme(icon_name, QtGui.QIcon(svg))
self.form.setWindowIcon(icon)
self.form.setWindowTitle(_tr(self.name))
self.form.setWindowTitle(translate("draft","Circular array"))
self.form.label_icon.setPixmap(pix.scaled(32, 32))
@@ -215,35 +215,32 @@ class TaskPanelCircularArray:
the interface may not allow to input wrong data.
"""
if not selection:
_err(_tr("At least one element must be selected."))
_err(translate("draft","At least one element must be selected."))
return False
if number < 2:
_err(_tr("Number of layers must be at least 2."))
_err(translate("draft","Number of layers must be at least 2."))
return False
# TODO: this should handle multiple objects.
# Each of the elements of the selection should be tested.
obj = selection[0]
if obj.isDerivedFrom("App::FeaturePython"):
_err(_tr("Selection is not suitable for array."))
_err(_tr("Object:") + " {}".format(selection[0].Label))
_err(translate("draft","Selection is not suitable for array."))
_err(translate("draft","Object:") + " {}".format(selection[0].Label))
return False
if r_distance == 0:
_wrn(_tr("Radial distance is zero. "
"Resulting array may not look correct."))
_wrn(translate("draft","Radial distance is zero. Resulting array may not look correct."))
elif r_distance < 0:
_wrn(_tr("Radial distance is negative. "
"It is made positive to proceed."))
_wrn(translate("draft","Radial distance is negative. It is made positive to proceed."))
self.r_distance = abs(r_distance)
if tan_distance == 0:
_err(_tr("Tangential distance cannot be zero."))
_err(translate("draft","Tangential distance cannot be zero."))
return False
elif tan_distance < 0:
_wrn(_tr("Tangential distance is negative. "
"It is made positive to proceed."))
_wrn(translate("draft","Tangential distance is negative. It is made positive to proceed."))
self.tan_distance = abs(tan_distance)
# The other arguments are not tested but they should be present.
@@ -300,7 +297,7 @@ class TaskPanelCircularArray:
"App.ActiveDocument.recompute()"]
# We commit the command list through the parent command
self.source_command.commit(_tr(self.name), _cmd_list)
self.source_command.commit(translate("draft","Circular array", _cmd_list)
def get_distances(self):
"""Get the distance parameters from the widgets."""
@@ -340,7 +337,7 @@ class TaskPanelCircularArray:
self.form.input_c_z.setProperty('rawValue', 0)
self.center = self.get_center()
_msg(_tr("Center reset:")
_msg(translate("draft","Center reset:")
+ " ({0}, {1}, {2})".format(self.center.x,
self.center.y,
self.center.z))
@@ -351,7 +348,7 @@ class TaskPanelCircularArray:
state = self.tr_true
else:
state = self.tr_false
_msg(_tr("Fuse:") + " {}".format(state))
_msg(translate("draft","Fuse:") + " {}".format(state))
def set_fuse(self):
"""Execute as a callback when the fuse checkbox changes."""
@@ -365,7 +362,7 @@ class TaskPanelCircularArray:
state = self.tr_true
else:
state = self.tr_false
_msg(_tr("Create Link array:") + " {}".format(state))
_msg(translate("draft","Create Link array:") + " {}".format(state))
def set_link(self):
"""Execute as a callback when the link checkbox changes."""
@@ -382,12 +379,12 @@ class TaskPanelCircularArray:
# For example, it could take the shapes of all objects,
# make a compound and then use it as input for the array function.
sel_obj = self.selection[0]
_msg(_tr("Object:") + " {}".format(sel_obj.Label))
_msg(_tr("Radial distance:") + " {}".format(self.r_distance))
_msg(_tr("Tangential distance:") + " {}".format(self.tan_distance))
_msg(_tr("Number of circular layers:") + " {}".format(self.number))
_msg(_tr("Symmetry parameter:") + " {}".format(self.symmetry))
_msg(_tr("Center of rotation:")
_msg(translate("draft","Object:") + " {}".format(sel_obj.Label))
_msg(translate("draft","Radial distance:") + " {}".format(self.r_distance))
_msg(translate("draft","Tangential distance:") + " {}".format(self.tan_distance))
_msg(translate("draft","Number of circular layers:") + " {}".format(self.number))
_msg(translate("draft","Symmetry parameter:") + " {}".format(self.symmetry))
_msg(translate("draft","Center of rotation:")
+ " ({0}, {1}, {2})".format(self.center.x,
self.center.y,
self.center.z))
@@ -491,7 +488,7 @@ class TaskPanelCircularArray:
def reject(self):
"""Execute when clicking the Cancel button or pressing Escape."""
_msg(_tr("Aborted:") + " {}".format(_tr(self.name)))
_msg(translate("draft","Aborted:") + " {}".format(translate("draft","Circular array")))
self.finish()
def finish(self):