From 84b04ee1ab0becc6455126bacc6a2205624a0a3d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 1 Nov 2014 23:03:02 +0100 Subject: [PATCH] use blocktrans trimmed to have better template formatting, simplify blocktrans to trans at some places --- .../templates/accounts/delete_user.html | 4 +- .../templates/accounts/user_profile.html | 2 +- .../registration/registration_form.html | 22 +++--- nsupdate/login/templates/login.html | 2 +- nsupdate/main/templates/main/about.html | 42 ++++++---- nsupdate/main/templates/main/domain.html | 18 +++-- nsupdate/main/templates/main/domain_add.html | 12 ++- .../main/templates/main/generate_secret.html | 8 +- nsupdate/main/templates/main/home.html | 6 +- nsupdate/main/templates/main/host.html | 25 ++++-- nsupdate/main/templates/main/host_add.html | 15 ++-- .../includes/tabbed_router_configuration.html | 77 +++++++++++-------- .../main/templates/main/related_host.html | 9 ++- .../main/templates/main/related_host_add.html | 9 ++- nsupdate/main/templates/main/update.html | 4 +- .../templates/main/updater_hostconfig.html | 15 ++-- nsupdate/templates/base.html | 10 ++- 17 files changed, 181 insertions(+), 99 deletions(-) diff --git a/nsupdate/accounts/templates/accounts/delete_user.html b/nsupdate/accounts/templates/accounts/delete_user.html index a6380f3..227ddab 100644 --- a/nsupdate/accounts/templates/accounts/delete_user.html +++ b/nsupdate/accounts/templates/accounts/delete_user.html @@ -4,11 +4,11 @@ {% block content %}
-

{% blocktrans %}Delete your User Account{% endblocktrans %}

+

{% trans "Delete your User Account" %}

{% csrf_token %}

- {% blocktrans %} + {% blocktrans trimmed %} Are you sure you want to delete your user account and all your data on this service? You can not undelete your data. {% endblocktrans %} diff --git a/nsupdate/accounts/templates/accounts/user_profile.html b/nsupdate/accounts/templates/accounts/user_profile.html index f44a924..083a42a 100644 --- a/nsupdate/accounts/templates/accounts/user_profile.html +++ b/nsupdate/accounts/templates/accounts/user_profile.html @@ -34,7 +34,7 @@

{% trans "Delete User Profile" %}

- {% blocktrans %} + {% blocktrans trimmed %} If you'ld like to stop using this service and delete this user profile and all your data (especially all hosts and all domains created by this user), you can do it here. diff --git a/nsupdate/accounts/templates/registration/registration_form.html b/nsupdate/accounts/templates/registration/registration_form.html index 830249b..f86a821 100644 --- a/nsupdate/accounts/templates/registration/registration_form.html +++ b/nsupdate/accounts/templates/registration/registration_form.html @@ -17,31 +17,35 @@

  • {% trans "Password:" %} test

    • - {% blocktrans %} + {% blocktrans trimmed %} Note: if that doesn't work, the service administrator did not set up the test account yet or discontinued offering it. In that case, you can - still just register a new account.{% endblocktrans %} + still just register a new account. + {% endblocktrans %}

    -

    {% blocktrans %}test account is only for testing{% endblocktrans %}

    +

    {% trans "test account is only for testing" %}

    - {% blocktrans %} + {% blocktrans trimmed %} Any data (hosts, domains, ...) entered using the test account might be removed - at any time and without prior notice.{% endblocktrans %} + at any time and without prior notice. + {% endblocktrans %}

    - {% blocktrans %} + {% blocktrans trimmed %} So if you'ld like your stuff to stay, please register for a regular account after - finishing your initial evaluation.{% endblocktrans %} + finishing your initial evaluation. + {% endblocktrans %}

    {% trans "Register new account" %}

    - {% blocktrans %} + {% blocktrans trimmed %} Username: should be related to your person or organisation (not: to the host(s) you want to register).
    E-Mail address: must be a working one, we'll send you an activation E-Mail there.
    - Password: please use a sane one, we trust you.{% endblocktrans %} + Password: please use a sane one, we trust you. + {% endblocktrans %}


    diff --git a/nsupdate/login/templates/login.html b/nsupdate/login/templates/login.html index 941b196..2a75f7d 100644 --- a/nsupdate/login/templates/login.html +++ b/nsupdate/login/templates/login.html @@ -8,7 +8,7 @@

    {% trans "Login with a local Account" %}

    {% if form.errors %} -

    {% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

    +

    {% trans "Your username and password didn't match. Please try again." %}

    {% endif %} {% csrf_token %} diff --git a/nsupdate/main/templates/main/about.html b/nsupdate/main/templates/main/about.html index c000fcd..9fd6bc3 100644 --- a/nsupdate/main/templates/main/about.html +++ b/nsupdate/main/templates/main/about.html @@ -10,12 +10,16 @@ {% blocktrans %}{{ WWW_HOST }} is a dynamic dns service.{% endblocktrans %}

    - {% blocktrans %}You usually need it so your router (or other dyndns2-compatible + {% blocktrans trimmed %} + You usually need it so your router (or other dyndns2-compatible client) can update a hostname, so you don't need to know or find - out your current IP address.{% endblocktrans %} + out your current IP address. + {% endblocktrans %}

    - {% blocktrans %}{{ WWW_HOST }} is simple, usable, free, friendly, secure and respects your privacy.{% endblocktrans %} + {% blocktrans trimmed %} + {{ WWW_HOST }} is simple, usable, free, friendly, secure and respects your privacy. + {% endblocktrans %}

    @@ -27,8 +31,11 @@
  • {% trans "nagging its users to make a paid subscription" %}
  • {% trans "annoying its users with advertisements or spam" %}
  • {% trans "cancelling hosts or accounts after a short period of non-usage" %}
    • -
  • {% blocktrans %}hiding the few free features almost undiscoverably - between a ton of commercial-only features{% endblocktrans %}
    • +
  • + {% blocktrans trimmed %} + hiding the few free features almost undiscoverably between a ton of commercial-only features + {% endblocktrans %} +
    • @@ -37,14 +44,19 @@ {% trans "You can just try it using the test account (see Register page)." %}

    - {% blocktrans %}Also, we have + {% blocktrans trimmed %} + Also, we have documentation — there might be some interesting stuff for you in it that is - not visible or obvious on the user interface.{% endblocktrans %} + not visible or obvious on the user interface. + {% endblocktrans %}

    -

    {% blocktrans %}If you are interested in the software project, have a look at the - nsupdate.info project on GitHub.{% endblocktrans %} +

    + {% blocktrans trimmed %} + If you are interested in the software project, have a look at the + nsupdate.info project on GitHub. + {% endblocktrans %}

    @@ -63,8 +75,10 @@
  • {% trans "Don't spam us via e-mail." %}

    • - {% blocktrans %}We reserve the right to remove any account or hostname(s) that are - related to unfair use of the service - at any time and without prior notice.{% endblocktrans %} + {% blocktrans trimmed %} + We reserve the right to remove any account or hostname(s) that are + related to unfair use of the service - at any time and without prior notice. + {% endblocktrans %}

    @@ -86,8 +100,10 @@

    {% trans "Software Project Contact" %}

    - {% blocktrans %}Visit the - nsupdate.info project on GitHub to:{% endblocktrans %} + {% blocktrans trimmed %} + Visit the + nsupdate.info project on GitHub to: + {% endblocktrans %}

    diff --git a/nsupdate/main/templates/main/related_host_add.html b/nsupdate/main/templates/main/related_host_add.html index ade0d61..a8df81e 100644 --- a/nsupdate/main/templates/main/related_host_add.html +++ b/nsupdate/main/templates/main/related_host_add.html @@ -18,9 +18,12 @@

    {% trans "Help" %}

    {% trans "Here you can add related hosts (e.g. other machines on same LAN)." %}

    -

    {% blocktrans %}When we receive an update for your main host, we compute your network address - from it. To compute your related host's IPs, we just add the interface ID to the network address. - Then we update the DNS records for the related host with these addresses.{% endblocktrans %} +

    + {% blocktrans trimmed %} + When we receive an update for your main host, we compute your network address + from it. To compute your related host's IPs, we just add the interface ID to the network address. + Then we update the DNS records for the related host with these addresses. + {% endblocktrans %}

    diff --git a/nsupdate/main/templates/main/update.html b/nsupdate/main/templates/main/update.html index 6dd9742..f6ee29c 100644 --- a/nsupdate/main/templates/main/update.html +++ b/nsupdate/main/templates/main/update.html @@ -5,7 +5,9 @@

    {% trans "Browser-based Updater" %}

    - {% blocktrans %}Host {{ hostname }} will get automatically updated as long as you keep this window open.{% endblocktrans %} + {% blocktrans trimmed %} + Host {{ hostname }} will get automatically updated as long as you keep this window open. + {% endblocktrans %}

    diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html index aac0162..b897a66 100644 --- a/nsupdate/templates/base.html +++ b/nsupdate/templates/base.html @@ -107,11 +107,15 @@ {% trans "Your (http) connection is unencrypted and thus insecure." %} {% if WE_HAVE_TLS %} - {% blocktrans %}Please use our secure https site.{% endblocktrans %} + {% blocktrans trimmed %} + Please use our secure https site. + {% endblocktrans %} {% endif %} {% if COOKIE_SECURE %} - {% blocktrans %}At least some of the required cookies will only work on the secure https site, - expect malfunctioning on the http site.{% endblocktrans %} + {% blocktrans trimmed %} + At least some of the required cookies will only work on the secure https site, + expect malfunctioning on the http site. + {% endblocktrans %} {% endif %} {% endif %}