From 0beeeade41e14eb0331cd55bb2a93ef4736f7312 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:52:50 +0200 Subject: [PATCH] Enable Babel for all views --- .../freeposte/admin/templates/admin/list.html | 12 ++++--- .../admin/templates/alias/create.html | 2 +- .../freeposte/admin/templates/alias/edit.html | 2 +- .../freeposte/admin/templates/alias/list.html | 20 ++++++------ .../admin/templates/domain/create.html | 2 +- .../admin/templates/domain/details.html | 16 +++++----- .../admin/templates/domain/edit.html | 2 +- .../admin/templates/domain/list.html | 32 +++++++++---------- .../admin/templates/fetch/create.html | 2 +- .../freeposte/admin/templates/fetch/edit.html | 2 +- .../freeposte/admin/templates/fetch/list.html | 22 ++++++------- .../admin/templates/manager/create.html | 2 +- .../admin/templates/manager/list.html | 10 +++--- 13 files changed, 64 insertions(+), 62 deletions(-) diff --git a/admin/freeposte/admin/templates/admin/list.html b/admin/freeposte/admin/templates/admin/list.html index 01054991..d286fb3f 100644 --- a/admin/freeposte/admin/templates/admin/list.html +++ b/admin/freeposte/admin/templates/admin/list.html @@ -1,24 +1,26 @@ {% extends "base.html" %} {% block title %} -Global administrators +{% trans %}Global administrators{% endtrans %} {% endblock %} {% block main_action %} -Add administrator + + {% trans %}Add administrator{% endtrans %} + {% endblock %} {% block box %} - - + + {% for admin in admins %} diff --git a/admin/freeposte/admin/templates/alias/create.html b/admin/freeposte/admin/templates/alias/create.html index 30377984..c848464b 100644 --- a/admin/freeposte/admin/templates/alias/create.html +++ b/admin/freeposte/admin/templates/alias/create.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Create alias +{% trans %}Create alias{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/alias/edit.html b/admin/freeposte/admin/templates/alias/edit.html index e446dbf7..b28ea170 100644 --- a/admin/freeposte/admin/templates/alias/edit.html +++ b/admin/freeposte/admin/templates/alias/edit.html @@ -1,7 +1,7 @@ {% extends "alias/create.html" %} {% block title %} -Edit alias +{% trans %}Edit alias{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/alias/list.html b/admin/freeposte/admin/templates/alias/list.html index 3d752329..d7380ef5 100644 --- a/admin/freeposte/admin/templates/alias/list.html +++ b/admin/freeposte/admin/templates/alias/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Alias list +{% trans %}Alias list{% endtrans %} {% endblock %} {% block subtitle %} @@ -9,25 +9,25 @@ Alias list {% endblock %} {% block main_action %} -Add alias +{% trans %}Add alias{% endtrans %} {% endblock %} {% block box %}
ActionsEmail{% trans %}Actions{% endtrans %}{% trans %}Email{% endtrans %}
- + {{ admin }}
- - - - - - + + + + + + {% for alias in domain.aliases %} diff --git a/admin/freeposte/admin/templates/domain/create.html b/admin/freeposte/admin/templates/domain/create.html index c6bb5455..29a4f431 100644 --- a/admin/freeposte/admin/templates/domain/create.html +++ b/admin/freeposte/admin/templates/domain/create.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -New domain +{% trans %}New domain{% endtrans %} {% endblock %} {% block box_content %} diff --git a/admin/freeposte/admin/templates/domain/details.html b/admin/freeposte/admin/templates/domain/details.html index c70120fd..9a98f944 100644 --- a/admin/freeposte/admin/templates/domain/details.html +++ b/admin/freeposte/admin/templates/domain/details.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Domain details +{% trans %}Domain details{% endtrans %} {% endblock %} {% block subtitle %} @@ -10,7 +10,7 @@ Domain details {% block main_action %} {% if current_user.global_admin %} -Regenerate keys +{% trans %}Regenerate keys{% endtrans %} {% endif %} {% endblock %} @@ -18,30 +18,30 @@ Domain details
ActionsEmailDestinationCommentCreatedLast edit{% trans %}Actions{% endtrans %}{% trans %}Email{% endtrans %}{% trans %}Destination{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}Created{% endtrans %}{% trans %}Last edit{% endtrans %}
-   - +   + {{ alias }} {{ alias.destination|join(', ') or '-' }}
- + - + - + {% if domain.dkim_publickey %} - + - + - + {% endif %} diff --git a/admin/freeposte/admin/templates/domain/edit.html b/admin/freeposte/admin/templates/domain/edit.html index f1be7741..13af23a5 100644 --- a/admin/freeposte/admin/templates/domain/edit.html +++ b/admin/freeposte/admin/templates/domain/edit.html @@ -1,7 +1,7 @@ {% extends "domain/create.html" %} {% block title %} -Edit domain +{% trans %}Edit domain{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/domain/list.html b/admin/freeposte/admin/templates/domain/list.html index 4aa150e4..ea81e4c3 100644 --- a/admin/freeposte/admin/templates/domain/list.html +++ b/admin/freeposte/admin/templates/domain/list.html @@ -1,12 +1,12 @@ {% extends "base.html" %} {% block title %} -Domain list +{% trans %}Domain list{% endtrans %} {% endblock %} {% block main_action %} {% if current_user.global_admin %} -New domain +{% trans %}New domain{% endtrans %} {% endif %} {% endblock %} @@ -14,28 +14,28 @@ Domain list
Domain name{% trans %}Domain name{% endtrans %} {{ domain.name }}
DNS MX entry{% trans %}DNS MX entry{% endtrans %}
{{ domain.name }}. 600 IN MX 10 {{ config["HOSTNAME"] }}.
DNS SPF entries{% trans %}DNS SPF entries{% endtrans %}
 {{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ config["HOSTNAME"] }} -all"
 {{ domain.name }}. 600 IN SPF "v=spf1 mx a:{{ config["HOSTNAME"] }} -all"
DKIM public key{% trans %}DKIM public key{% endtrans %}
{{ domain.dkim_publickey }}
DNS DKIM entry{% trans %}DNS DKIM entry{% endtrans %}
{{ config["DKIM_SELECTOR"] }}._domainkey.{{ domain.name }}. IN 600 TXT "v=DKIM1; k=rsa; p={{ domain.dkim_publickey }}"
DNS DMARC entry{% trans %}DNS DMARC entry{% endtrans %}
_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["POSTMASTER"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"
- - - - - - - - + + + + + + + + {% for domain in current_user.get_managed_domains() %} diff --git a/admin/freeposte/admin/templates/fetch/create.html b/admin/freeposte/admin/templates/fetch/create.html index f0b470e3..f5d8618a 100644 --- a/admin/freeposte/admin/templates/fetch/create.html +++ b/admin/freeposte/admin/templates/fetch/create.html @@ -1,7 +1,7 @@ {% extends "form.html" %} {% block title %} -Add a fetched account +{% trans %}Add a fetched account{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/fetch/edit.html b/admin/freeposte/admin/templates/fetch/edit.html index bac05427..749df5b7 100644 --- a/admin/freeposte/admin/templates/fetch/edit.html +++ b/admin/freeposte/admin/templates/fetch/edit.html @@ -1,7 +1,7 @@ {% extends "form.html" %} {% block title %} -Update a fetched account +{% trans %}Update a fetched account{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/fetch/list.html b/admin/freeposte/admin/templates/fetch/list.html index b4782c3d..1e82cb78 100644 --- a/admin/freeposte/admin/templates/fetch/list.html +++ b/admin/freeposte/admin/templates/fetch/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Fetched accounts +{% trans %}Fetched accounts{% endtrans %} {% endblock %} {% block subtitle %} @@ -9,26 +9,26 @@ Fetched accounts {% endblock %} {% block main_action %} -Add an account +{% trans %}Add an account{% endtrans %} {% endblock %} {% block box %}
ActionsManageDomain nameMailbox countAlias countCommentCreatedLast edit{% trans %}Actions{% endtrans %}{% trans %}Manage{% endtrans %}{% trans %}Domain name{% endtrans %}{% trans %}Mailbox count{% endtrans %}{% trans %}Alias count{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}Created{% endtrans %}{% trans %}Last edit{% endtrans %}
-   +   {% if current_user.global_admin %} -   -   +   +   {% endif %} -   -   -   +   +   +   {{ domain.name }} {{ domain.users | count }} / {{ domain.max_users or '∞' }}
- - - - - - - + + + + + + + {% for fetch in user.fetches %} diff --git a/admin/freeposte/admin/templates/manager/create.html b/admin/freeposte/admin/templates/manager/create.html index 29bb0fb1..8eb386b3 100644 --- a/admin/freeposte/admin/templates/manager/create.html +++ b/admin/freeposte/admin/templates/manager/create.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Add a manager +{% trans %}Add a manager{% endtrans %} {% endblock %} {% block subtitle %} diff --git a/admin/freeposte/admin/templates/manager/list.html b/admin/freeposte/admin/templates/manager/list.html index d1c9da2d..00f7ee47 100644 --- a/admin/freeposte/admin/templates/manager/list.html +++ b/admin/freeposte/admin/templates/manager/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Manager list +{% trans %}Manager list{% endtrans %} {% endblock %} {% block subtitle %} @@ -9,20 +9,20 @@ Manager list {% endblock %} {% block main_action %} -Add manager +{% trans %}Add manager{% endtrans %} {% endblock %} {% block box %}
ActionsEndpointUsernameLast checkStatusCreatedLast edit{% trans %}Actions{% endtrans %}{% trans %}Endpoint{% endtrans %}{% trans %}Username{% endtrans %}{% trans %}Last check{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}Created{% endtrans %}{% trans %}Last edit{% endtrans %}
-   - +   + {{ fetch.protocol }}{{ 's' if fetch.tls else '' }}://{{ fetch.host }}:{{ fetch.port }} {{ fetch.username }}
- - + + {% for manager in domain.managers %}
ActionsEmail{% trans %}Actions{% endtrans %}{% trans %}Email{% endtrans %}
- + {{ manager }}