From 166bf8c67540eb4dcd9a298fce9bf257da96a94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 03:54:52 +0000 Subject: [PATCH 01/16] Two-factor strings --- weblate/templates/accounts/profile.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/weblate/templates/accounts/profile.html b/weblate/templates/accounts/profile.html index 00f7ca1f4568..41201bead92a 100644 --- a/weblate/templates/accounts/profile.html +++ b/weblate/templates/accounts/profile.html @@ -127,7 +127,7 @@ {% endif %} {% trans "The e-mail address can be chosen from verified addresses only." %}

- +
@@ -195,7 +195,7 @@

{% trans "Security keys (WebAuthn)" %}
{% if not webauthn_keys %} -

{% trans "There are currently no WebAuthn keys registered." %}

+

{% trans "No WebAuthn keys registered yet." %}

{% else %}
    {% for key in webauthn_keys %} @@ -217,7 +217,7 @@
    {% trans "Security keys (WebAuthn)" %}
    @@ -227,7 +227,7 @@
    {% trans "Security keys (WebAuthn)" %}
    {% trans "Authenticator apps (TOTP)" %}
    {% if not totp_keys %} -

    {% trans "There are currently no authenticator apps registered." %}

    +

    {% trans "No authenticator apps registered yet." %}

    {% else %}
      {% for key in totp_keys %} @@ -244,14 +244,14 @@
      {% trans "Authenticator apps (TOTP)" %}
      {% trans "Recovery codes" %}
      {% if recovery_keys_count == 0 %} -

      {% trans "There are currently no recovery codes generated." %}

      +

      {% trans "No recovery codes generated yet." %}

      {% trans "Generate new recovery codes" %} {% else %}

      {% blocktranslate count count=recovery_keys_count trimmed %} - {{ count }} recovery code is available. + {{ count }} recovery code available. {% plural %} - {{ count }} recovery codes are available. + {{ count }} recovery codes available. {% endblocktranslate %}

      {% trans "View recovery codes" %} @@ -300,7 +300,7 @@
      {% trans "Recovery codes" %}
      {% crispy profileform %}

      - {% blocktrans %}All of the fields on this page are optional and can be deleted at any time, and by filling them out, you're giving us consent to share this data wherever your user profile appears.{% endblocktrans %} + {% blocktrans %}All fields on this page are optional and can be deleted at any time. By filling them out, you are consent to their use wherever your user profile appears.{% endblocktrans %}

      @@ -390,7 +390,7 @@
      {% trans "Recovery codes" %}

      {% trans "Description" %}

      -

      {% blocktrans %}Contact us immediately if you see anything suspicious in the audit log.{% endblocktrans %}

      +

      {% blocktrans %}Get in contact immediately if you notice anything suspicious in the audit log.{% endblocktrans %}

      @@ -414,7 +414,7 @@
      {% trans "Recovery codes" %}
      {{ log.user_agent }} {% empty %} -{% trans "No recent activity found!" %} +{% trans "No recent activity found." %} {% endfor %} @@ -430,7 +430,7 @@
      {% trans "Recovery codes" %}

      {% documentation_icon 'api' right=True %}{% trans "API access" %}

      From 5eaae86631056559fbf8f42d1f1d8714698cea82 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 03:56:07 +0000 Subject: [PATCH 02/16] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- weblate/templates/accounts/profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/templates/accounts/profile.html b/weblate/templates/accounts/profile.html index 41201bead92a..f5b66468356c 100644 --- a/weblate/templates/accounts/profile.html +++ b/weblate/templates/accounts/profile.html @@ -127,7 +127,7 @@ {% endif %} {% trans "The e-mail address can be chosen from verified addresses only." %}

      - +
      From 156289b8ad429ac28bb98b255e0e170625734513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:15:22 +0000 Subject: [PATCH 03/16] Various two-factor and form strings --- weblate/accounts/forms.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index 6c54d5d59eaf..61e6ec5eda10 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -117,7 +117,7 @@ def clean(self, value): existing = User.objects.filter(username=value) if existing.exists() and value != self.valid: raise forms.ValidationError( - gettext("This username is already taken. Please choose another.") + gettext("This username is already taken. Pick something else.") ) return super().clean(value) @@ -197,7 +197,7 @@ class CommitForm(ProfileBaseForm): label=gettext_lazy("Commit e-mail"), choices=[("", gettext_lazy("Use account e-mail address"))], help_text=gettext_lazy( - "Used in version control commits. The address will stay in the repository forever once changes are committed by Weblate." + "Used in version-control commits. The address stays in the repository forever once changes are committed by Weblate." ), required=False, widget=forms.RadioSelect, @@ -230,7 +230,7 @@ class ProfileForm(ProfileBaseForm): public_email = forms.ChoiceField( label=gettext_lazy("Public e-mail"), - choices=[("", gettext_lazy("Do not publicly display e-mail address"))], + choices=[("", gettext_lazy("Hide e-mail address from public view"))], required=False, ) @@ -421,7 +421,7 @@ class ContactForm(forms.Form): label=gettext_lazy("Message"), required=True, help_text=gettext_lazy( - "Please contact us in English, otherwise we might " + "Please contact us in English. Otherwise we might " "be unable to process your request." ), max_length=2000, @@ -437,7 +437,7 @@ class EmailForm(UniqueEmailMixin): email = EmailField( label=gettext_lazy("E-mail"), - help_text=gettext_lazy("E-mail with a confirmation link will be sent here."), + help_text=gettext_lazy("En e-mail with a confirmation link will be sent here."), ) @@ -464,7 +464,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." ), ( "Too many failed registration attempts from this location. " @@ -586,7 +586,7 @@ def __init__(self, request: AuthenticatedHttpRequest, *args, **kwargs) -> None: class PasswordConfirmForm(EmptyConfirmForm): password = PasswordField( label=gettext_lazy("Current password"), - help_text=gettext_lazy("Leave empty if you have not yet set a password."), + help_text=gettext_lazy("Leave empty if you have not set a password yet."), required=False, ) @@ -642,7 +642,7 @@ def clean(self): ngettext( ( "Too many authentication attempts from this location. " - "Please try again in %d minute." + "Please try again in one minute." ), ( "Too many authentication attempts from this location. " @@ -916,7 +916,7 @@ def clean_sort_by(self): sort_by = self.cleaned_data.get("sort_by") if sort_by: if sort_by not in self.sort_values: - raise forms.ValidationError(gettext("Chosen sorting is not supported.")) + raise forms.ValidationError(gettext("The chosen sorting is not supported.")) return sort_by return None @@ -975,7 +975,7 @@ class TOTPDeviceForm(forms.Form): ) error_messages = { - "invalid_token": gettext_lazy("Entered token is not valid."), + "invalid_token": gettext_lazy("The entered token is wrong."), } def __init__(self, key, user, metadata=None, **kwargs): @@ -1045,7 +1045,7 @@ class OTPTokenForm(DjangoOTPTokenForm): otp_token = forms.CharField( label=gettext("Recovery token"), help_text=gettext( - "Recovery token can be used just once, mark your token as used after using it." + "Recovery token can be used just once. Mark your token as used after having using it." ), ) device_class: type[Device] = StaticDevice From a3c7a8c33a5fd6fc315bec1aada7e31966caaa62 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 04:15:59 +0000 Subject: [PATCH 04/16] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- weblate/accounts/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index 61e6ec5eda10..59e0715fc132 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -916,7 +916,9 @@ def clean_sort_by(self): sort_by = self.cleaned_data.get("sort_by") if sort_by: if sort_by not in self.sort_values: - raise forms.ValidationError(gettext("The chosen sorting is not supported.")) + raise forms.ValidationError( + gettext("The chosen sorting is not supported.") + ) return sort_by return None From 3f177fd7484fe2eb04755894e865b767c17dd853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:28:53 +0000 Subject: [PATCH 05/16] Turn off --- weblate/templates/accounts/user.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weblate/templates/accounts/user.html b/weblate/templates/accounts/user.html index 1ad5fb942b33..614c069694e4 100755 --- a/weblate/templates/accounts/user.html +++ b/weblate/templates/accounts/user.html @@ -328,14 +328,14 @@

      {% if page_user.profile.has_2fa %} - {% trans "User has two-factor authentication configured." %} + {% trans "The user has two-factor authentication configured." %} {% else %} - {% trans "User doesn't have two-factor authentication configured." %} + {% trans "The user doesn't have two-factor authentication configured." %} {% endif %}
      {% if page_user.profile.has_2fa %}
      - +
      {% endif %} From 429187d490c5e4e6c77043d763bdeecf7b466cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:30:13 +0000 Subject: [PATCH 06/16] Unwild indentation --- weblate/templates/accounts/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/templates/accounts/user.html b/weblate/templates/accounts/user.html index 614c069694e4..f4f26c1ac654 100755 --- a/weblate/templates/accounts/user.html +++ b/weblate/templates/accounts/user.html @@ -335,7 +335,7 @@

      {% if page_user.profile.has_2fa %}
      - +
      {% endif %} From 6ea8a12b2f10d233c3df290ebf617b0cb06fdb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:33:27 +0000 Subject: [PATCH 07/16] To be clear --- weblate/templates/accounts/profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/templates/accounts/profile.html b/weblate/templates/accounts/profile.html index f5b66468356c..33d0b4e2c392 100644 --- a/weblate/templates/accounts/profile.html +++ b/weblate/templates/accounts/profile.html @@ -430,7 +430,7 @@
      {% trans "Recovery codes" %}

      {% documentation_icon 'api' right=True %}{% trans "API access" %}

      -

      {% blocktrans %}You can control Weblate using the HTTP REST API and your API key is used to authenticate to it.{% endblocktrans %}

      +

      {% blocktrans %}You can control Weblate using the HTTP REST API, and your API key is used to authenticate to it.{% endblocktrans %}

      {% trans "Your personal API key:" %}
      From 495523ee7416cbcc3aaf7550b11b982b892b80ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:33:57 +0000 Subject: [PATCH 08/16] Please --- weblate/accounts/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index 59e0715fc132..d22f4081997d 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -117,7 +117,7 @@ def clean(self, value): existing = User.objects.filter(username=value) if existing.exists() and value != self.valid: raise forms.ValidationError( - gettext("This username is already taken. Pick something else.") + gettext("This username is already taken. Please pick something else.") ) return super().clean(value) From 8f13f352cf6e1fb0a576e95f85316a07f5a25e55 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 04:34:32 +0000 Subject: [PATCH 09/16] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- weblate/accounts/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index d22f4081997d..de07d9d84f25 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -117,7 +117,9 @@ def clean(self, value): existing = User.objects.filter(username=value) if existing.exists() and value != self.valid: raise forms.ValidationError( - gettext("This username is already taken. Please pick something else.") + gettext( + "This username is already taken. Please pick something else." + ) ) return super().clean(value) From 93a456872460743ed6c0bcdf257c17464ca1bbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:35:40 +0000 Subject: [PATCH 10/16] Articulate --- weblate/accounts/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index de07d9d84f25..c1ae795ed2ce 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -439,7 +439,7 @@ class EmailForm(UniqueEmailMixin): email = EmailField( label=gettext_lazy("E-mail"), - help_text=gettext_lazy("En e-mail with a confirmation link will be sent here."), + help_text=gettext_lazy("An e-mail with a confirmation link will be sent here."), ) From b80be578fa446d47b19430d4cf5d0a83111bc657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:43:17 +0000 Subject: [PATCH 11/16] The problem --- weblate/accounts/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index c1ae795ed2ce..62a66dff6f97 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -1049,7 +1049,7 @@ class OTPTokenForm(DjangoOTPTokenForm): otp_token = forms.CharField( label=gettext("Recovery token"), help_text=gettext( - "Recovery token can be used just once. Mark your token as used after having using it." + "Recovery codes can only be used once. Remember to mark used ones as expired." ), ) device_class: type[Device] = StaticDevice From 714d6e877ee9288e3bf3c0a24888b3eecaac0bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:44:09 +0000 Subject: [PATCH 12/16] As such --- weblate/templates/accounts/profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/templates/accounts/profile.html b/weblate/templates/accounts/profile.html index 33d0b4e2c392..aa3f3c4eefbc 100644 --- a/weblate/templates/accounts/profile.html +++ b/weblate/templates/accounts/profile.html @@ -300,7 +300,7 @@
      {% trans "Recovery codes" %}
      {% crispy profileform %}

      - {% blocktrans %}All fields on this page are optional and can be deleted at any time. By filling them out, you are consent to their use wherever your user profile appears.{% endblocktrans %} + {% blocktrans %}All fields on this page are optional and can be deleted at any time. By filling them out, you allow to their use wherever your user profile appears.{% endblocktrans %}

      From 9545b6c1037cab2d10fb427b23e57869b3187e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 04:50:43 +0000 Subject: [PATCH 13/16] level --- weblate/templates/addons/addon_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/templates/addons/addon_list.html b/weblate/templates/addons/addon_list.html index 7ead2b6fcb2b..8c458275fe75 100644 --- a/weblate/templates/addons/addon_list.html +++ b/weblate/templates/addons/addon_list.html @@ -53,7 +53,7 @@
      -

      {% blocktrans %}You can control Weblate using the HTTP REST API, and your API key is used to authenticate to it.{% endblocktrans %}

      +

      {% blocktrans %}Your your API key can be used to control Weblate via the HTTP REST API.{% endblocktrans %}

      {% trans "Your personal API key:" %}
      {% 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." %} {% endif %} {% if scope == "component" %} From a4e91962ccdbfdaa0c19bdf9fc8640974445c32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 9 Sep 2024 08:13:24 +0000 Subject: [PATCH 14/16] Reverted --- weblate/accounts/forms.py | 4 ++-- weblate/templates/accounts/profile.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index 62a66dff6f97..8c424757b499 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -466,7 +466,7 @@ def clean(self): ngettext( ( "Too many failed registration attempts from this location. " - "Please try again in one minute." + "Please try again in %d minute." ), ( "Too many failed registration attempts from this location. " @@ -979,7 +979,7 @@ class TOTPDeviceForm(forms.Form): ) error_messages = { - "invalid_token": gettext_lazy("The entered token is wrong."), + "invalid_token": gettext_lazy("The entered token is not valid."), } def __init__(self, key, user, metadata=None, **kwargs): diff --git a/weblate/templates/accounts/profile.html b/weblate/templates/accounts/profile.html index aa3f3c4eefbc..4fa3552aff3b 100644 --- a/weblate/templates/accounts/profile.html +++ b/weblate/templates/accounts/profile.html @@ -430,7 +430,7 @@
      {% trans "Recovery codes" %}

      {% documentation_icon 'api' right=True %}{% trans "API access" %}

      From f14ddd3f8432d777ec33546875eecb2bd8bda931 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Jamie Date: Tue, 1 Oct 2024 09:13:09 +0200 Subject: [PATCH 15/16] Update forms.py --- weblate/accounts/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index d4901f3cb2d5..75b3c32b9378 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -416,8 +416,8 @@ class ContactForm(forms.Form): label=gettext_lazy("Message"), required=True, help_text=gettext_lazy( - "Please contact us in English. Otherwise we might " - "be unable to process your request." + "Please contact us in English. Otherwise, we might " + "not process your request." ), max_length=2000, widget=forms.Textarea, From 598442d0ce2f4b15a443e2d7d7351b56002eac14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 11 Dec 2024 15:13:35 +0100 Subject: [PATCH 16/16] Update weblate/accounts/forms.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Allan Nordhøy --- weblate/accounts/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblate/accounts/forms.py b/weblate/accounts/forms.py index 75b3c32b9378..61f2787036c4 100644 --- a/weblate/accounts/forms.py +++ b/weblate/accounts/forms.py @@ -637,7 +637,7 @@ def clean(self): ngettext( ( "Too many authentication attempts from this location. " - "Please try again in one minute." + "Please try again in %d minute." ), ( "Too many authentication attempts from this location. "
      -

      {% blocktrans %}Your your API key can be used to control Weblate via the HTTP REST API.{% endblocktrans %}

      +

      {% blocktrans %}Your API key can be used to control Weblate via the HTTP REST API.{% endblocktrans %}

      {% trans "Your personal API key:" %}