FashionFreedom / Seamly2D

Open source patternmaking software to democratize fashion.
https://seamly.io
GNU General Public License v3.0
617 stars 111 forks source link

lupdate: remove location tags to avoid excessive conflicts #1141

Closed DSCaskey closed 4 months ago

DSCaskey commented 4 months ago

This removes the location tags from the translation (ts) files to avoid resolving excessive conflicts when merging develop back into a local feature branch.

This closes issue #1140

csett86 commented 4 months ago

So this is essentially a revert of #1072, do I see that right? So downside is that Linugist wont show the forms after this has landed? Not blocking it, just checking whether I have a correct understanding.

To keep it consistent, please also remove it from the .pro file: https://github.com/FashionFreedom/Seamly2D/blob/develop/Seamly2D.pro#L18

DSCaskey commented 4 months ago

@csett

Yes... it effectively reverts #1072. The issue is the fact the location(s) refer to the line where each tr() is located. When another dev changes even 1 line, it then creates a ripple effect when another attempts to locally merge develop into a branch that has also made changes to the same file. MainWindow being the worst case, as a large portion of the ui resides there. @Onetchou and I have come to the conclusion that the best way forward is to eliminate the location(s) from the main repo, and then if someone wishes to translate they will have to locally run lupdate to include the location(s), translate, run lupdate to remove the translation(s), then push the changes. @Onetchou is going to add a translation guide to the wiki outlining this fact.

I forgot about the pro file and will make that change.