Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Fix translation issues #5370

Merged
merged 4 commits into from Jan 13, 2022

Conversation

Roy-043
Copy link
Contributor

@Roy-043 Roy-043 commented Jan 10, 2022

PR to fix multiple translation issues. Mostly caused by the wrong context.

  • Your pull request is confined strictly to a single module. That is, all the files changed by your pull request are either in App, Base, Gui or one of the Mod subfolders. If you need to make changes in several locations, make several pull requests and wait for the first one to be merged before submitting the next ones
  • In case your pull request does more than just fixing small bugs, make sure you discussed your ideas with other developers on the FreeCAD forum
  • Your branch is rebased on latest master git pull --rebase upstream master
  • All FreeCAD unit tests are confirmed to pass by running ./bin/FreeCAD --run-test 0
  • All commit messages are well-written ex: Fixes typo in Draft Move command text
  • Your pull request is well written and has a good description, and its title starts with the module name, ex: Draft: Fixed typos
  • Commit messages include issue #<id> or fixes #<id> where <id> is the FreeCAD bug tracker issue number in case a particular commit solves or is related to an existing issue on the tracker. Ex: Draft: fix typos - fixes #0004805

@github-actions github-actions bot added the WB Draft Related to the Draft Workbench label Jan 10, 2022
@yorikvanhavre
Copy link
Member

Thanks... There are still many of those lingering, since the Great Draft Upgrade ;)

@luzpaz
Copy link
Contributor

luzpaz commented Jan 10, 2022

JFYI, there are open Draft related translations issues in https://github.com/FreeCAD/FreeCAD-translations/issues?q=is%3Aissue+is%3Aopen+draft+label%3ADraft

@freecadci
Copy link

pipeline status for feature branch PR_5370. Pipeline 445061541 was triggered at 63f4ac1. All CI branches and pipelines.

@donovaly
Copy link
Member

The CI failed. Can you please have a look?

@Roy-043
Copy link
Contributor Author

Roy-043 commented Jan 11, 2022

Note that some translation issues still remain:
FreeCAD/FreeCAD-translations#44
FreeCAD/FreeCAD-translations#45
FreeCAD/FreeCAD-translations#56

This whole translation business is a bit complex, but these issues are even more complex. The GUI elements involved are not 'normal' menus or toolbars. They will have to be addressed in a separate PR.

@freecadci
Copy link

pipeline status for feature branch PR_5370. Pipeline 446453934 was triggered at 59755b9. All CI branches and pipelines.

@Roy-043
Copy link
Contributor Author

Roy-043 commented Jan 12, 2022

The last commit should take care of the remaining translation issues. I have used a dictionary for the tooltips of the snapping commands. For the context I have used "draft", although the command names could have also been used.

Note that in the Draft code both "Draft" and "draft" are used as the context for translations. The latter more often. This is awkward as the context is case-sensitive. Changing "Draft" to "draft", or vice versa, will break translations. I wonder how this can be fixed?

Minor refactoring: The init_grid_button function has been removed.

@Roy-043
Copy link
Contributor Author

Roy-043 commented Jan 12, 2022

There seems to be an issue with the gui_arrays.py file. AFAICT it is not caused by the edit in this commit.

@luzpaz
Copy link
Contributor

luzpaz commented Jan 12, 2022

@yorikvanhavre after this gets merged can you run a crowdin push/pull (so we can get these translations to see if the fix worked?)

@freecadci
Copy link

pipeline status for feature branch PR_5370. Pipeline 446837438 was triggered at 843ea92. All CI branches and pipelines.

@yorikvanhavre
Copy link
Member

Yes, saw the "draft" vs "Draft" context issues already. Not sure what's the best way to solve this or if i is possible without disrupting translations...

@yorikvanhavre yorikvanhavre merged commit 99ae628 into FreeCAD:master Jan 13, 2022
@chennes
Copy link
Member

chennes commented Jan 13, 2022

Does CrowdIn have any way to bulk-push translations up to it, from something like the translation TS files?

@Roy-043 Roy-043 deleted the Draft-Fix-translation-issues branch January 15, 2022 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WB Draft Related to the Draft Workbench
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants