From 299e51cc080e0bbc6a937e17f80e487374a72d90 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 18:23:33 +0100 Subject: [PATCH] Reword some sentences. --- .../templates/dashboard/api_key.html | 27 +++++++++---------- .../templates/dashboard/custom_domain.html | 10 +++---- .../templates/dashboard/mfa_cancel.html | 10 +++---- .../templates/dashboard/mfa_setup.html | 2 +- .../templates/dashboard/recovery_code.html | 6 ++--- .../templates/dashboard/setting.html | 9 +++---- templates/footer.html | 6 ++--- templates/header.html | 4 +-- 8 files changed, 34 insertions(+), 40 deletions(-) diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index c9a03995..2f106156 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -15,25 +15,22 @@

API Key

@@ -93,9 +90,9 @@
{{ new_api_key_form.csrf_token }} -

New Api Key

+

New API Key

- {{ new_api_key_form.name(class="form-control", placeholder="Chrome, Firefox") }} + {{ new_api_key_form.name(class="form-control", placeholder="Chrome") }} {{ render_field_errors(new_api_key_form.name) }}
Name of the api key, e.g. where it will be used.
@@ -153,4 +150,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index 3353570b..9824b1a6 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -14,21 +14,19 @@

Custom Domains

{% if not current_user.is_premium() %} {% endif %}
diff --git a/app/dashboard/templates/dashboard/mfa_cancel.html b/app/dashboard/templates/dashboard/mfa_cancel.html index 4d3183d1..ebe206ba 100644 --- a/app/dashboard/templates/dashboard/mfa_cancel.html +++ b/app/dashboard/templates/dashboard/mfa_cancel.html @@ -8,21 +8,21 @@ {% block default_content %}
-

Multi Factor Authentication

+

Two Factor Authentication

- To cancel MFA, please enter the 6-digit number in your TOTP application - (Google Authenticator, Authy, MyDigiPassword, etc) here. + To remove 2FA please enter your 2FA code from the authenticator app. + Alternatively you can enter a recovery code here instead.

{{ otp_token_form.csrf_token }}
Token
-
The 6-digit number displayed on your phone.
+
The 6-digit 2FA code or recovery code.
{{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }} - +
diff --git a/app/dashboard/templates/dashboard/mfa_setup.html b/app/dashboard/templates/dashboard/mfa_setup.html index b0995e8e..147adfec 100644 --- a/app/dashboard/templates/dashboard/mfa_setup.html +++ b/app/dashboard/templates/dashboard/mfa_setup.html @@ -11,7 +11,7 @@ {% block default_content %}
-

Multi Factor Authentication

+

Two Factor Authentication

Please open a TOTP application (Google Authenticator, Authy, MyDigiPassword, etc) on your smartphone and scan the following QR Code:

diff --git a/app/dashboard/templates/dashboard/recovery_code.html b/app/dashboard/templates/dashboard/recovery_code.html index 9fa494cf..b02f2a7e 100644 --- a/app/dashboard/templates/dashboard/recovery_code.html +++ b/app/dashboard/templates/dashboard/recovery_code.html @@ -9,8 +9,8 @@

Recovery codes

- If you lose access to your authentication device, you can use one of these backup codes to login to your - account. Each code may be used only once. Make a copy of these codes, and store it somewhere safe. + In the event you lose access to your authenticator app you can use one of these recovery codes to gain access to your account again. + Each code may be used only once and you will not be able to view these again, make sure to store them in a safe place.

    @@ -32,7 +32,7 @@
    - Beware: Generating new codes invalidates all the previous ones, make sure to write down the new ones! + Warning: Generating new codes will invalidate the older ones.
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 587fed83..85bb0aad 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -106,10 +106,9 @@
-
One-Time Password (TOTP)
+
Two Factor Authentication
- Secure your account with One-Time Password.
- This requires having applications like Google Authenticator, Authy, MyDigiPassword, etc. + Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
{% if not current_user.enable_otp %} Setup TOTP @@ -149,7 +148,7 @@ {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based on {{ AliasGeneratorEnum.uuid.name.upper() }} - +
@@ -198,7 +197,7 @@ Upgrade {% endif %} {% elif current_user.in_trial() %} - You are in the trial period. The trial ends {{ current_user.trial_end | dt }}. + Your Premium trial ends {{ current_user.trial_end | dt }}. {% else %} You are on the Free plan. {% endif %} diff --git a/templates/footer.html b/templates/footer.html index ed994c53..a251867b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -12,10 +12,10 @@ Feature Requests
  • - Dev Documentation + Developer Documentation
  • - Uptime + Status
  • Contact Us
    • @@ -119,4 +119,4 @@ } } }) - \ No newline at end of file + diff --git a/templates/header.html b/templates/header.html index 667ab045..3b50c0ef 100644 --- a/templates/header.html +++ b/templates/header.html @@ -62,9 +62,9 @@ {% if current_user.in_trial() %} - Premium ends {{ current_user.trial_end|dt }} + Premium expires {{ current_user.trial_end|dt }} + title="After you signed up you were given a free 7 day Premium trial, after this period your account will automatically be downgraded to the Free plan."> {% elif current_user.is_premium() %}