Two-factor strings #12448
Two-factor strings #12448
Conversation
WalkthroughThe pull request introduces textual modifications across multiple files, focusing on enhancing the clarity and readability of user-facing messages in forms and templates. Changes include rephrasing validation error messages, help texts, and labels to make them more direct and understandable, while also improving the overall user experience. Changes
Possibly related PRs
Tip New featuresWalkthrough comment now includes:
Notes:
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
for more information, see https://pre-commit.ci
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- weblate/templates/accounts/profile.html (8 hunks)
Files skipped from review due to trivial changes (1)
- weblate/templates/accounts/profile.html
for more information, see https://pre-commit.ci
weblate/accounts/forms.py
Outdated
| @@ -464,7 +466,7 @@ def clean(self): | |||
| ngettext( | |||
| ( | |||
| "Too many failed registration attempts from this location. " | |||
| "Please try again in %d minute." | |||
| "Please try again in one minute." | |||
There was a problem hiding this comment.
It was GTK for whatever reason this isn't allowed?
There was a problem hiding this comment.
Yes, this fails:
>>> ngettext('one apple', '%d apples', 1) % 1
Traceback (most recent call last):
File "<console>", line 1, in <module>
TypeError: not all arguments converted during string formatting
| @@ -328,14 +328,14 @@ <h4 class="panel-title"> | |||
| </div> | |||
| <div class="panel-body"> | |||
| {% if page_user.profile.has_2fa %} | |||
| {% trans "User has two-factor authentication configured." %} | |||
| {% trans "The user has two-factor authentication configured." %} | |||
There was a problem hiding this comment.
| {% trans "The user has two-factor authentication configured." %} | |
| {% trans "The user has two-factor authentication." %} |
adding "in Weblate" might help specify that it isn't for one of the other OAuths
| {% else %} | ||
| {% trans "User doesn't have two-factor authentication configured." %} | ||
| {% trans "The user doesn't have two-factor authentication configured." %} |
There was a problem hiding this comment.
| {% trans "The user doesn't have two-factor authentication configured." %} | |
| {% trans "The user doesn't have two-factor authentication." %} |
weblate/accounts/forms.py
Outdated
| @@ -464,7 +466,7 @@ def clean(self): | |||
| ngettext( | |||
| ( | |||
| "Too many failed registration attempts from this location. " | |||
| "Please try again in %d minute." | |||
| "Please try again in one minute." | |||
There was a problem hiding this comment.
Yes, this fails:
>>> ngettext('one apple', '%d apples', 1) % 1
Traceback (most recent call last):
File "<console>", line 1, in <module>
TypeError: not all arguments converted during string formatting
weblate/accounts/forms.py
Outdated
| @@ -642,7 +644,7 @@ def clean(self): | |||
| ngettext( | |||
| ( | |||
| "Too many authentication attempts from this location. " | |||
| "Please try again in %d minute." | |||
| "Please try again in one minute." | |||
| @@ -430,7 +430,7 @@ <h5>{% trans "Recovery codes" %}</h5> | |||
| <div class="panel-heading"><h4 class="panel-title">{% documentation_icon 'api' right=True %}{% trans "API access" %}</h4></div> | |||
| <table class="table"> | |||
| <tr><td colspan="2"> | |||
| <p>{% blocktrans %}You can control Weblate using the HTTP REST API and your API key is used to authenticate to it.{% endblocktrans %}</p> | |||
| <p>{% blocktrans %}Your your API key can be used to control Weblate via the HTTP REST API.{% endblocktrans %}</p> | |||
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (4)
- weblate/accounts/forms.py (10 hunks)
- weblate/templates/accounts/profile.html (8 hunks)
- weblate/templates/accounts/user.html (1 hunks)
- weblate/templates/addons/addon_list.html (1 hunks)
Files skipped from review due to trivial changes (3)
- weblate/templates/accounts/profile.html
- weblate/templates/accounts/user.html
- weblate/templates/addons/addon_list.html
Files skipped from review as they are similar to previous changes (1)
- weblate/accounts/forms.py
|
This pull request has been automatically marked as stale because there wasn’t any recent activity. It will be closed soon if no further action occurs. Thank you for your contributions! |
|
This pull request has been automatically marked as stale because there wasn’t any recent activity. It will be closed soon if no further action occurs. Thank you for your contributions! |
Co-authored-by: Allan Nordhøy <[email protected]>
| @@ -53,7 +53,7 @@ | |||
| </table> | |||
| <div class="panel-footer"> | |||
| {% if scope == "sitewide" %} | |||
| {% trans "Add-ons can be installed on project and component scope as well." %} | |||
| {% trans "Add-ons can be also be installed on project- and component level." %} | |||
There was a problem hiding this comment.
Double be, how is this related to two-factor strings?
|
Due to recent cleanups in the templates, this pull request is not something we can easily merge due to massive conflicts. This is caused by the pull request being stale for a long time. This in turn is caused by its size and changing several unrelated files, what makes it challenging to review. Doing smaller pull requests would make the review and merging much easier, please consider it next time. I will extract parts of this into separate pull requests for easier review. |
Proposed changes
Checklist
Other information
Summary by CodeRabbit
Summary by CodeRabbit
New Features
Bug Fixes
Documentation