kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fixed translation system in Arch & Draft

Browse Source
This commit is contained in:
Yorik van Havre
2014-01-07 11:17:31 -02:00
parent 0e74bbb39e
commit b3fc7b7a78
24 changed files with 173 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Draft/Draft.py
View File

@@ -2697,7 +2697,7 @@ class _ViewProviderDraft:
"Draft","Defines a hatch pattern")
vobj.addProperty("App::PropertyFloat","PatternSize",
"Draft","Sets the size of the pattern")
vobj.Pattern = [str(translate("draft","None"))]+svgpatterns().keys()
vobj.Pattern = [translate("draft","None")]+svgpatterns().keys()
vobj.PatternSize = 1
def __getstate__(self):

28
src/Mod/Draft/DraftTools.py
View File

@@ -67,7 +67,7 @@ MODALT = MODS[Draft.getParam("modalt",2)]
def translate(context,text):
"convenience function for Qt translator"
return QtGui.QApplication.translate(context, text, None, QtGui.QApplication.UnicodeUTF8)
return QtGui.QApplication.translate(context, text, None, QtGui.QApplication.UnicodeUTF8).encode("utf8")
def msg(text=None,mode=None):
"prints the given message on the FreeCAD status bar"
@@ -423,7 +423,7 @@ class Line(Creator):
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Line", "Line"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Line", "Creates a 2-point line. CTRL to snap, SHIFT to constrain")}
def Activated(self,name=str(translate("draft","Line"))):
def Activated(self,name=translate("draft","Line")):
Creator.Activated(self,name)
if self.doc:
self.obj = None
@@ -565,7 +565,7 @@ class Wire(Line):
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Wire", "DWire"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Wire", "Creates a multiple-point DraftWire (DWire). CTRL to snap, SHIFT to constrain")}
def Activated(self):
Line.Activated(self,name=str(translate("draft","DWire")))
Line.Activated(self,name=translate("draft","DWire"))
class BSpline(Line):
@@ -581,7 +581,7 @@ class BSpline(Line):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_BSpline", "Creates a multiple-point b-spline. CTRL to snap, SHIFT to constrain")}
def Activated(self):
Line.Activated(self,name=str(translate("draft","BSpline")))
Line.Activated(self,name=translate("draft","BSpline"))
if self.doc:
self.bsplinetrack = bsplineTracker()
@@ -731,7 +731,7 @@ class Rectangle(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Rectangle", "Creates a 2-point rectangle. CTRL to snap")}
def Activated(self):
name = str(translate("draft","Rectangle"))
name = translate("draft","Rectangle")
Creator.Activated(self,name)
if self.ui:
self.refpoint = None
@@ -1107,14 +1107,14 @@ class Arc(Creator):
else:
self.step = 2
self.arctrack.setCenter(self.center)
self.ui.labelRadius.setText(str(translate("draft", "Start Angle")))
self.ui.labelRadius.setText(translate("draft", "Start Angle"))
self.linetrack.p1(self.center)
self.linetrack.on()
self.ui.radiusValue.setText("")
self.ui.radiusValue.setFocus()
msg(translate("draft", "Pick start angle:\n"))
elif (self.step == 2):
self.ui.labelRadius.setText(str(translate("draft", "Aperture")))
self.ui.labelRadius.setText(translate("draft", "Aperture"))
self.firstangle = math.radians(rad)
if DraftVecUtils.equals(plane.axis, Vector(1,0,0)): u = Vector(0,self.rad,0)
else: u = DraftVecUtils.scaleTo(Vector(1,0,0).cross(plane.axis), self.rad)
@@ -1155,7 +1155,7 @@ class Polygon(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Polygon", "Creates a regular polygon. CTRL to snap, SHIFT to constrain")}
def Activated(self):
name = str(translate("draft","Polygon"))
name = translate("draft","Polygon")
Creator.Activated(self,name)
if self.ui:
self.step = 0
@@ -1334,7 +1334,7 @@ class Ellipse(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Ellipse", "Creates an ellipse. CTRL to snap")}
def Activated(self):
name = str(translate("draft","Ellipse"))
name = translate("draft","Ellipse")
Creator.Activated(self,name)
if self.ui:
self.refpoint = None
@@ -1447,7 +1447,7 @@ class Text(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Text", "Creates an annotation. CTRL to snap")}
def Activated(self):
name = str(translate("draft","Text"))
name = translate("draft","Text")
Creator.Activated(self,name)
if self.ui:
self.dialog = None
@@ -1524,7 +1524,7 @@ class Dimension(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Dimension", "Creates a dimension. CTRL to snap, SHIFT to constrain, ALT to select a segment")}
def Activated(self):
name = str(translate("draft","Dimension"))
name = translate("draft","Dimension")
if self.cont:
self.finish()
elif self.hasMeasures():
@@ -1815,7 +1815,7 @@ class ShapeString(Creator):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_ShapeString", "Creates text string in shapes.")}
def Activated(self):
name = str(translate("draft","ShapeString"))
name = translate("draft","ShapeString")
Creator.Activated(self,name)
if self.ui:
self.ui.sourceCmd = self
@@ -1939,7 +1939,7 @@ class Move(Modifier):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Move", "Moves the selected objects between 2 points. CTRL to snap, SHIFT to constrain, ALT to copy")}
def Activated(self):
self.name = str(translate("draft","Move"))
self.name = translate("draft","Move")
Modifier.Activated(self,self.name)
if self.ui:
if not Draft.getSelection():
@@ -2827,7 +2827,7 @@ class Scale(Modifier):
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Scale", "Scales the selected objects from a base point. CTRL to snap, SHIFT to constrain, ALT to copy")}
def Activated(self):
self.name = str(translate("draft","Scale"))
self.name = translate("draft","Scale")
Modifier.Activated(self,self.name)
if self.ui:
if not Draft.getSelection():

12
src/Mod/Draft/InitGui.py
View File

@@ -99,7 +99,7 @@ class DraftWorkbench (Workbench):
from DraftTools import translate
FreeCADGui.addLanguagePath(":/translations")
FreeCADGui.addIconPath(":/icons")
self.appendMenu(["&Macro",str(translate("draft","Installed Macros"))],macros.macrosList)
self.appendMenu(["&Macro",translate("draft","Installed Macros")],macros.macrosList)
except:
pass
@@ -125,11 +125,11 @@ class DraftWorkbench (Workbench):
'Draft_Snap_Dimensions']
self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft creation tools"),self.cmdList)
self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft modification tools"),self.modList)
self.appendMenu(str(translate("draft","&Draft")),self.cmdList+self.modList)
self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Context tools"))],self.treecmdList)
self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Utilities"))],self.utils)
self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Wire tools"))],self.lineList)
self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Snapping"))],self.snapList)
self.appendMenu(translate("draft","&Draft"),self.cmdList+self.modList)
self.appendMenu([translate("draft","&Draft"),translate("draft","Context tools")],self.treecmdList)
self.appendMenu([translate("draft","&Draft"),translate("draft","Utilities")],self.utils)
self.appendMenu([translate("draft","&Draft"),translate("draft","Wire tools")],self.lineList)
self.appendMenu([translate("draft","&Draft"),translate("draft","Snapping")],self.snapList)
if hasattr(FreeCADGui,"draftToolBar"):
if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"):
FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft")

2
src/Mod/Draft/importDWG.py
View File

@@ -79,7 +79,7 @@ def getTeighaConverter():
if os.path.exists(teigha):
return teigha
from DraftTools import translate
FreeCAD.Console.PrintMessage(str(translate("draft","Teigha File Converter not found, DWG support is disabled.\n")))
FreeCAD.Console.PrintMessage(translate("draft","Teigha File Converter not found, DWG support is disabled.\n"))
return None
def convertToDxf(dwgfilename):