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

Path: Fix Slot operation translation issue #6340

Merged
merged 3 commits into from Feb 11, 2022

Conversation

Russ4262
Copy link
Contributor

@Russ4262 Russ4262 commented Feb 11, 2022

Fixes for translation issues recently introduced by upstream bug fix in translation code within the greater FreeCAD code base.
Corrections made per request by @sliptonic.

No specific forum thread for these fixes, but tangible thread is Path OPs don't work with translated UI.

Testing is needed. These fixes appear to not affect my English language usage, but I would appreciate testing by users of other languages to know if the proposed changes here do indeed fix the translation problem for the Slot operation.

Thank you for creating a pull request to contribute to FreeCAD! To ease integration, we ask you to conform to the following items. Pull requests which don't satisfy all the items below might be rejected. If you are in doubt with any of the items below, don't hesitate to ask for help in the FreeCAD forum!

  • 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

And please remember to update the Wiki with the features added or changed once this PR is merged.
Note: If you don't have wiki access, then please mention your contribution on the 0.20 Changelog Forum Thread.


@github-actions github-actions bot added the WB CAM Related to the CAM/Path Workbench label Feb 11, 2022
@freecadci
Copy link

pipeline status for feature branch PR_6340. Pipeline 468688264 was triggered at b0977f9. All CI branches and pipelines.

@Russ4262
Copy link
Contributor Author

Russ4262 commented Feb 11, 2022

Checked pipeline for error info. Found the commit that caused the error and fixed that renaming issue that I missed.

@sliptonic
Copy link
Member

This looks great. Passes tests locally
Thanks for cleaning up the duplicate populateCombobox() stuff.

I'll merge as soon as it passes the CI check

Thanks!

@Russ4262
Copy link
Contributor Author

Please forgive the combined Black formatting in the Slot operation fix commit. I did not think to separate out the Black formatting into a separate commit as in the past.

@freecadci
Copy link

pipeline status for feature branch PR_6340. Pipeline 469288403 was triggered at 68ec48a. All CI branches and pipelines.

@sliptonic sliptonic merged commit f179acf into FreeCAD:master Feb 11, 2022
@Russ4262 Russ4262 deleted the fix/slot_translation branch March 20, 2022 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WB CAM Related to the CAM/Path Workbench
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants