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

Two-factor strings #12448

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Two-factor strings #12448

wants to merge 16 commits into from

Conversation

comradekingu
Copy link
Contributor

@comradekingu comradekingu commented Sep 9, 2024

Proposed changes

Checklist

  • Lint and unit tests pass locally with my changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added documentation to describe my feature.
  • I have squashed my commits into logic units.
  • I have described the changes in the commit messages.

Other information

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Enhanced clarity and conciseness of user-facing messages related to security keys, authenticator apps, recovery codes, and API access.
    • Improved user-facing messages in forms, including validation errors and help texts for better comprehension.
  • Bug Fixes

    • Improved readability of messages to eliminate redundancy and confusion.
    • Made error messages more user-friendly and standardized.
  • Documentation

    • Updated consent message and audit log warning for better user understanding.

Copy link

coderabbitai bot commented Sep 9, 2024

Walkthrough

The 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

Files Change Summary
weblate/accounts/forms.py Updates to validation error messages, help texts, and labels across multiple form classes to improve clarity and readability.
weblate/templates/accounts/profile.html Textual modifications to enhance clarity and conciseness of user-facing messages regarding security keys, authenticator apps, recovery codes, and API access.
weblate/templates/accounts/user.html Minor textual modifications to improve clarity and formality of two-factor authentication messages.
weblate/templates/addons/addon_list.html Alteration of a translatable string to enhance clarity regarding add-on installation levels.

Possibly related PRs

Tip

New features

Walkthrough comment now includes:

  • Possibly related PRs: A list of potentially related PRs to help you recall past context.
  • Suggested labels: CodeRabbit can now suggest labels by learning from your past PRs. You can also provide custom labeling instructions in the UI or configuration file.

Notes:

  • Please share any feedback in the discussion post on our Discord.
  • Possibly related PRs, automatic label suggestions based on past PRs, learnings, and possibly related issues require data opt-in (enabled by default).

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?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 9a01e7d and 5eaae86.

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

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 5eaae86 and a3c7a8c.

Files selected for processing (1)
  • weblate/accounts/forms.py (11 hunks)
Files skipped from review due to trivial changes (1)
  • weblate/accounts/forms.py

@@ -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."
Copy link
Contributor Author

@comradekingu comradekingu Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was GTK for whatever reason this isn't allowed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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." %}
Copy link
Contributor Author

@comradekingu comradekingu Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{% 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." %}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{% trans "The user doesn't have two-factor authentication configured." %}
{% trans "The user doesn't have two-factor authentication." %}

@comradekingu comradekingu changed the title WIP: Two-factor strings Two-factor strings Sep 9, 2024
@@ -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."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@@ -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."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...same here.

weblate/accounts/forms.py Outdated Show resolved Hide resolved
@@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double "your".

@@ -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."
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Please try again in one minute."
"Please try again in %d minute."

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between a3c7a8c and a4e9196.

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

Copy link

github-actions bot commented Nov 1, 2024

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!

@github-actions github-actions bot added the wontfix Nobody will work on this. label Nov 1, 2024
@orangesunny orangesunny removed the wontfix Nobody will work on this. label Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants