bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- made some mods to what can be translated as some of the translations interfered with the correct functioning of FlatCAM

Browse Source 
- updated the translations
This commit is contained in:
Marius Stanciu
2019-05-01 16:04:40 +03:00
committed by Marius
parent 6f3cbf1077
commit 747a0817f3
15 changed files with 5992 additions and 6108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
FlatCAMObj.py
View File

@@ -2724,7 +2724,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
# those elements are the ones used for generating GCode
self.sel_tools = {}
self.offset_item_options = [_("Path"), _("In"), _("Out"), _("Custom")]
self.offset_item_options = ["Path", "In", "Out", "Custom"]
self.type_item_options = [_("Iso"), _("Rough"), _("Finish")]
self.tool_type_item_options = ["C1", "C2", "C3", "C4", "B", "V"]
@@ -2966,7 +2966,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
self.tools.update({
self.tooluid: {
'tooldia': float(self.options["cnctooldia"]),
'offset': _('Path'),
'offset': ('Path'),
'offset_value': 0.0,
'type': _('Rough'),
'tool_type': 'C1',
@@ -3048,7 +3048,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
tool_offset = self.ui.geo_tools_table.cellWidget(current_row, 2)
if tool_offset is not None:
tool_offset_txt = tool_offset.currentText()
if tool_offset_txt == _('Custom'):
if tool_offset_txt == ('Custom'):
self.ui.tool_offset_entry.show()
self.ui.tool_offset_lbl.show()
else:
@@ -3253,7 +3253,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
self.tools.update({
self.tooluid: {
'tooldia': tooldia,
'offset': _('Path'),
'offset': ('Path'),
'offset_value': 0.0,
'type': _('Rough'),
'tool_type': 'C1',
@@ -3622,7 +3622,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
cb_txt = cw.currentText()
if cw_col == 2:
tooluid_value['offset'] = cb_txt
if cb_txt == _('Custom'):
if cb_txt == ('Custom'):
self.ui.tool_offset_entry.show()
self.ui.tool_offset_lbl.show()
else:
@@ -4095,13 +4095,13 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
diadict_key: datadict
})
if dia_cnc_dict['offset'] == 'in':
if dia_cnc_dict['offset'] == ('in'):
tool_offset = -dia_cnc_dict['tooldia'] / 2
offset_str = 'inside'
elif dia_cnc_dict['offset'].lower() == 'out':
elif dia_cnc_dict['offset'].lower() == ('out'):
tool_offset = dia_cnc_dict['tooldia'] / 2
offset_str = 'outside'
elif dia_cnc_dict['offset'].lower() == 'path':
elif dia_cnc_dict['offset'].lower() == ('path'):
offset_str = 'onpath'
tool_offset = 0.0
else:
@@ -4328,13 +4328,13 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
diadict_key: datadict
})
if dia_cnc_dict['offset'] == 'in':
if dia_cnc_dict['offset'] == ('in'):
tool_offset = -dia_cnc_dict['tooldia'] / 2
offset_str = 'inside'
elif dia_cnc_dict['offset'].lower() == 'out':
elif dia_cnc_dict['offset'].lower() == ('out'):
tool_offset = dia_cnc_dict['tooldia'] / 2
offset_str = 'outside'
elif dia_cnc_dict['offset'].lower() == 'path':
elif dia_cnc_dict['offset'].lower() == ('path'):
offset_str = 'onpath'
tool_offset = 0.0
else: