Skip to content

Commit

Permalink
Merge pull request #167 from wood-galaxy/translation-fix
Browse files Browse the repository at this point in the history
Fix some utf8 encode
  • Loading branch information
yorikvanhavre committed May 18, 2016
2 parents 885050d + 149a5a1 commit 7a99b34
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/Mod/Arch/importOBJ.py
Expand Up @@ -53,11 +53,11 @@ def getIndices(shape,offset):
if not isinstance(e.Curve,Part.Line):
if not curves:
curves = shape.tessellate(1)
FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating\n"))
FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating\n").decode('utf8'))
break
except: # unimplemented curve type
curves = shape.tessellate(1)
FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating\n"))
FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating\n").decode('utf8'))
break
if curves:
for v in curves[0]:
Expand Down Expand Up @@ -124,7 +124,7 @@ def export(exportList,filename):
for f in flist:
outfile.write("f" + f + "\n")
outfile.close()
FreeCAD.Console.PrintMessage(translate("Arch","successfully written ")+filename+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","successfully written ").decode('utf8')+filename+"\n")



2 changes: 1 addition & 1 deletion src/Mod/Arch/importWebGL.py
Expand Up @@ -117,7 +117,7 @@ def export(exportList,filename):
outfile = pythonopen(filename,"wb")
outfile.write(html)
outfile.close()
FreeCAD.Console.PrintMessage(translate("Arch","successfully written ")+filename+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","successfully written ").decode("utf8")+filename+"\n")

def getHTML(objectsList):
"returns the complete HTML code of a viewer for the given objects"
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Path/PathScripts/PathMachine.py
Expand Up @@ -109,7 +109,7 @@ def onChanged(self,obj,prop):
class _ViewProviderMachine:
def __init__(self,vobj):
vobj.Proxy = self
vobj.addProperty("App::PropertyBool","ShowLimits","Path",translate("ShowMinMaxTravel","Switch the machine max and minimum travel bounding box on/off"))
vobj.addProperty("App::PropertyBool","ShowLimits","Path",translate("ShowMinMaxTravel","Switch the machine max and minimum travel bounding box on/off".decode("utf8")))
mode = 2
vobj.setEditorMode('LineWidth',mode)
vobj.setEditorMode('MarkerColor',mode)
Expand Down

0 comments on commit 7a99b34

Please sign in to comment.