SourceCode Merge Request #17: Improvements to the translation system (merged)

This patch addresses one of the nuisances encountered during submission of translations: the <location> tags in .ts files will change every time you modify a source file, this almost always leads to merge conflicts.

Removing the <location> tags will keep the differences small and contain only the actual translation text. Still, it's possible to re-generate <location> tags by running make_tr.py -k (or --keep-ln), this is useful for translators. The complete translation procedure is described in README.txt in the new "Translations" section.

Also, this patch adds a small dxf2gcode.pro file which can be used to work on the project in Qt Designer.

Also, added a Makefile for easier execution of everyday tasks. 'make prepare' or just 'make' will prepare the project to run, 'make clean' will clear autogenerated files.

[chrisko]

HI,

just tried it, but i get a the following error while using windows:
Traceback (most recent call last):
File "D:\GIT_DXF2GCODE\sourcecode\source\make_tr.py", line 173, in <module>
remove_linenumbers(fpath)
File "D:\GIT_DXF2GCODE\sourcecode\source\make_tr.py", line 50, in remove_linenumbers
for line in inf.readlines():
File "C:\Program Files (x86)\Python36-32\lib\encodings\cp1252.py", line 23, in decode
return codecs.charmap_decode(input,self.errors,decoding_table)[0]
UnicodeDecodeError: 'charmap' codec can't decode byte 0x9d in position 232: character maps to <undefined>
Can you please check that?
regards
Christian </undefined></module>

[chrisko]

HI,

just tried it, but i get a the following error while using windows:
Traceback (most recent call last):
File "D:\GIT_DXF2GCODE\sourcecode\source\make_tr.py", line 173, in <module>
remove_linenumbers(fpath)
File "D:\GIT_DXF2GCODE\sourcecode\source\make_tr.py", line 50, in remove_linenumbers
for line in inf.readlines():
File "C:\Program Files (x86)\Python36-32\lib\encodings\cp1252.py", line 23, in decode
return codecs.charmap_decode(input,self.errors,decoding_table)[0]
UnicodeDecodeError: 'charmap' codec can't decode byte 0x9d in position 232: character maps to <undefined>
Can you please check that?
regards
Christian </undefined></module>

[chrisko]

Additionally i need to replace all the
subprocess.run(cmd1, shell=True)
by:
subprocess.run(cmd1)
otherwise windows cant execute maket_tr.py and make_py_uic.py

[Andrey Zabolotnyi]

Oh... seems that on Windows the default code page for files is 1252 rather than UTF-8 on Unix.
I fear this could be the cause of bad characters in the Russian translation file I've fixed earlier.
I'll do some research and submit a fix for this problem.

[Andrey Zabolotnyi]

the "shell=True" was in the original, but if I remove it, it won't run on Linux.
I will also look for a solution that will work both on Windows and Linux.

[Andrey Zabolotnyi]

Here are the fixes.

[chrisko]

Thank you Andrey, the fix works great.
Can you also remove the "shell=True" for the make_py_uic.py file and try on Linux. I will do the same on windows then.
Christian

[Andrey Zabolotnyi]

Sure, did it.

[Andrey Zabolotnyi]

By the way, what's the best place to discuss some substantial improvements I want to do in dxf2gcode? Is dxf2gcode-dev google group alive?

[chrisko]

Yes, i think its the best place. Well if it is alive is not that easy to answer. It's always dependent, sometimes yes, sometimes now ....
At least i will support the discussion :-) ....