-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
FEAT(client): Add option to toggle TTS in settings menu #5565
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only cosmetic stuff, the code itself looks good to me!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As already written on IRC: The commits need to be adjusted to match our commit guidelines and the code needs to be formatted using clang-format 10. If you don't have that, I can do the formatting for you.
Furthermore, you'll have to run the script scripts/updatetranslations.py
to update the translation source strings so that they can be properly translated on our external platform (Weblate).
Note that in the end you should end up with only 2 commits:
- The commit that makes the changes to add the new checkbox in the settings (that should be a plain
FEAT(client): ...
commit as it adds a feature, but doesn't change an existing one (the old checkbox for TTS in the dropwdown continues to exist) what would be implied byFEAT/CHANGE
- The commit created by the translation script. No changes necessary for that one (the scripts will commit it in the proper format already)
That means that after you have taken care of the formatting, you squash all your commits into a single one, reword the commit message for that to match our guideline and then you can run the script for the translations. After that you perform a git pull -f
to update your remote branch and with that, this PR :)
Alright - we still have to sort out the commit history. As you can see, this PR now consists of 6 instead of 2 commits. In order to change the commit history, you'll have to perform a rebase. The first thing to do, would be to replace For the remaining 4 commits, ignore the topmost one and for the others, replace
Save and exit. After this, git should tell you, that the rebase has been performed successfully. The last step to do is now to update your remote branch (and with that this PR). Since you have performed a rebase, you will have to use a force-push via If you want to update your branch to the latest and greatest changes from our upstream master branch, you can rebase your changes on top of that, before pushing to your remote branch, via |
Is the code I added Clang-10 compliant now? Also - big thank you to Krzmbrzl, davidebeatrici and Terry137 from the Matrix channel for guiding me through this process! I won't lie, git is still pretty confusing to me, I hope to understand it more in time. Thank you and let me know if there is anything else I need to change! |
92c838f
to
ce9cd3b
Compare
Previously TTS could only be toggled from the Configure dropdown menu, but not from within the settings. This was confusing, especially since other TTS related settings were editable from within the settings UI. This commit introduces a new checkbox into the settings UI that allows users to toggle TTS right then and there, which should take care of the created confusion. Fixes mumble-voip#5561
ce9cd3b
to
3d585c1
Compare
Kinda forgot about this PR... Sorry for that. Thanks for working on this, though 👍 |
For sure! Thank you for code reviewing and assisting me with this merge request! |
Checks
Added option to enable/disable TTS from within settings menu.
Closes issue #5561