From d3436668d802db889b3d67f390fe925635d2449f Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:23:44 +0200 Subject: [PATCH 1/9] Enable Babel --- admin/freeposte/__init__.py | 6 +++++- admin/requirements.txt | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/freeposte/__init__.py b/admin/freeposte/__init__.py index facf4d0a..8d44fa65 100644 --- a/admin/freeposte/__init__.py +++ b/admin/freeposte/__init__.py @@ -4,6 +4,7 @@ import flask_bootstrap import flask_login import flask_script import flask_migrate +import flask_babel import os import docker @@ -23,7 +24,9 @@ default_config = { 'DEBUG': False, 'BOOTSTRAP_SERVE_LOCAL': True, 'DKIM_PATH': '/dkim/{domain}.{selector}.key', - 'DKIM_SELECTOR': 'dkim' + 'DKIM_SELECTOR': 'dkim', + 'BABEL_DEFAULT_LOCALE': 'en', + 'BABEL_DEFAULT_TIMEZONE': 'UTC' } # Load configuration from the environment if available @@ -36,6 +39,7 @@ db = flask_sqlalchemy.SQLAlchemy(app) migrate = flask_migrate.Migrate(app, db) login_manager = flask_login.LoginManager() login_manager.init_app(app) +babel = flask_babel.Babel(app) # Manager commnad manager = flask_script.Manager(app) diff --git a/admin/requirements.txt b/admin/requirements.txt index a7076531..1437717c 100644 --- a/admin/requirements.txt +++ b/admin/requirements.txt @@ -2,9 +2,10 @@ Flask Flask-Login Flask-SQLAlchemy Flask-bootstrap +Flask-Babel Flask-migrate Flask-script -flask_wtf +Flask-wtf WTForms-Components PyOpenSSL passlib From fe035114e9f05259b493b7d74684f5a3074b14dc Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:37:06 +0200 Subject: [PATCH 2/9] Enable Babel for forms --- admin/freeposte/admin/forms.py | 98 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/admin/freeposte/admin/forms.py b/admin/freeposte/admin/forms.py index 0aa0ec1f..ad1bc189 100644 --- a/admin/freeposte/admin/forms.py +++ b/admin/freeposte/admin/forms.py @@ -1,5 +1,6 @@ from wtforms import validators, fields, widgets from wtforms_components import fields as fields_ +from flask_babel import lazy_gettext as _ import flask_login import flask_wtf @@ -28,92 +29,93 @@ class DestinationField(fields.SelectMultipleField): def pre_validate(self, form): for item in self.data: if not self.validator.match(item): - raise validators.ValidationError("Invalid email address.") + raise validators.ValidationError(_('Invalid email address.')) class Confirmation(flask_wtf.FlaskForm): - submit = fields.SubmitField('Confirm') + submit = fields.SubmitField(_('Confirm')) class LoginForm(flask_wtf.FlaskForm): - email = fields.StringField('E-mail', [validators.Email()]) - pw = fields.PasswordField('Password', [validators.DataRequired()]) - submit = fields.SubmitField('Sign in') + email = fields.StringField(_('E-mail'), [validators.Email()]) + pw = fields.PasswordField(_('Password'), [validators.DataRequired()]) + submit = fields.SubmitField(_('Sign in')) class DomainForm(flask_wtf.FlaskForm): - name = fields.StringField('Domain name', [validators.DataRequired()]) - max_users = fields_.IntegerField('Maximum user count', default=10) - max_aliases = fields_.IntegerField('Maximum alias count', default=10) - comment = fields.StringField('Comment') - submit = fields.SubmitField('Create') + name = fields.StringField(_('Domain name'), [validators.DataRequired()]) + max_users = fields_.IntegerField(_('Maximum user count'), default=10) + max_aliases = fields_.IntegerField(_('Maximum alias count'), default=10) + comment = fields.StringField(_('Comment')) + submit = fields.SubmitField(_('Create')) class UserForm(flask_wtf.FlaskForm): - localpart = fields.StringField('E-mail', [validators.DataRequired()]) - pw = fields.PasswordField('Password', [validators.DataRequired()]) - pw2 = fields.PasswordField('Confirm password', [validators.EqualTo('pw')]) - quota_bytes = fields_.IntegerSliderField('Quota', default=1000000000) - enable_imap = fields.BooleanField('Allow IMAP access', default=True) - enable_pop = fields.BooleanField('Allow POP3 access', default=True) - comment = fields.StringField('Comment') - submit = fields.SubmitField('Save') + localpart = fields.StringField(_('E-mail'), [validators.DataRequired()]) + pw = fields.PasswordField(_('Password'), [validators.DataRequired()]) + pw2 = fields.PasswordField(_('Confirm password'), [validators.EqualTo('pw')]) + quota_bytes = fields_.IntegerSliderField(_('Quota'), default=1000000000) + enable_imap = fields.BooleanField(_('Allow IMAP access'), default=True) + enable_pop = fields.BooleanField(_('Allow POP3 access'), default=True) + comment = fields.StringField(_('Comment')) + submit = fields.SubmitField(_('Save')) class UserSettingsForm(flask_wtf.FlaskForm): - displayed_name = fields.StringField('Displayed name') - spam_enabled = fields.BooleanField('Enable spam filter') - spam_threshold = fields_.IntegerSliderField('Spam filter threshold') - submit = fields.SubmitField('Save settings') + displayed_name = fields.StringField(_('Displayed name')) + spam_enabled = fields.BooleanField(_('Enable spam filter')) + spam_threshold = fields_.IntegerSliderField(_('Spam filter threshold')) + submit = fields.SubmitField(_('Save settings')) class UserPasswordForm(flask_wtf.FlaskForm): - pw = fields.PasswordField('Password', [validators.DataRequired()]) - pw2 = fields.PasswordField('Password check', [validators.DataRequired()]) - submit = fields.SubmitField('Update password') + pw = fields.PasswordField(_('Password'), [validators.DataRequired()]) + pw2 = fields.PasswordField(_('Password check'), [validators.DataRequired()]) + submit = fields.SubmitField(_('Update password')) class UserForwardForm(flask_wtf.FlaskForm): - forward_enabled = fields.BooleanField('Enable forwarding') + forward_enabled = fields.BooleanField(_('Enable forwarding')) forward_destination = fields.StringField( - 'Destination', [validators.Optional(), validators.Email()] + _('Destination'), [validators.Optional(), validators.Email()] ) - submit = fields.SubmitField('Update') + submit = fields.SubmitField(_('Update')) class UserReplyForm(flask_wtf.FlaskForm): - reply_enabled = fields.BooleanField('Enable automatic reply') - reply_subject = fields.StringField('Reply subject') - reply_body = fields.StringField('Reply body', widget=widgets.TextArea()) - submit = fields.SubmitField('Update') + reply_enabled = fields.BooleanField(_('Enable automatic reply')) + reply_subject = fields.StringField(_('Reply subject')) + reply_body = fields.StringField(_('Reply body'), + widget=widgets.TextArea()) + submit = fields.SubmitField(_('Update')) class AliasForm(flask_wtf.FlaskForm): - localpart = fields.StringField('Alias', [validators.DataRequired()]) + localpart = fields.StringField(_('Alias'), [validators.DataRequired()]) wildcard = fields.BooleanField( - 'Use SQL Like Syntax (e.g. for catch-all aliases, admin-%@domain.com)') - destination = DestinationField('Destination') - comment = fields.StringField('Comment') - submit = fields.SubmitField('Create') + _('Use SQL LIKE Syntax (e.g. for catch-all aliases)')) + destination = DestinationField(_('Destination')) + comment = fields.StringField(_('Comment')) + submit = fields.SubmitField(_('Create')) class AdminForm(flask_wtf.FlaskForm): - admin = fields.SelectField('Admin email', choices=[]) - submit = fields.SubmitField('Submit') + admin = fields.SelectField(_('Admin email'), choices=[]) + submit = fields.SubmitField(_('Submit')) class ManagerForm(flask_wtf.FlaskForm): - manager = fields.SelectField('Manager email') - submit = fields.SubmitField('Submit') + manager = fields.SelectField(_('Manager email')) + submit = fields.SubmitField(_('Submit')) class FetchForm(flask_wtf.FlaskForm): - protocol = fields.SelectField('Protocol', choices=[ + protocol = fields.SelectField(_('Protocol'), choices=[ ('imap', 'IMAP'), ('pop3', 'POP3') ]) - host = fields.StringField('Hostname or IP') - port = fields.IntegerField('TCP port') - tls = fields.BooleanField('Enable TLS') - username = fields.StringField('Username') - password = fields.StringField('Password') - submit = fields.SubmitField('Submit') + host = fields.StringField(_('Hostname or IP')) + port = fields.IntegerField(_('TCP port')) + tls = fields.BooleanField(_('Enable TLS')) + username = fields.StringField(_('Username')) + password = fields.StringField(_('Password')) + submit = fields.SubmitField(_('Submit')) From a3ad45c8ac8c0d4f2c3e8604dd19e73ca962e6a8 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:43:48 +0200 Subject: [PATCH 3/9] Use babel for base views --- admin/freeposte/admin/templates/confirm.html | 4 ++-- admin/freeposte/admin/templates/login.html | 8 +++---- admin/freeposte/admin/templates/services.html | 14 +++++------ admin/freeposte/admin/templates/sidebar.html | 24 +++++++++---------- admin/freeposte/admin/templates/working.html | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/admin/freeposte/admin/templates/confirm.html b/admin/freeposte/admin/templates/confirm.html index c95db696..36ecd7f5 100644 --- a/admin/freeposte/admin/templates/confirm.html +++ b/admin/freeposte/admin/templates/confirm.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Confirm action +{% trans %}Confirm action{% endtrans %} {% endblock %} {% block subtitle %} @@ -9,6 +9,6 @@ Confirm action {% endblock %} {% block box_content %} -

You are about to {{ action }}. Please confirm your action.

+

{% trans action %}You are about to {{ action }}. Please confirm your action.{% endtrans %}

{{ macros.form(form) }} {% endblock %} diff --git a/admin/freeposte/admin/templates/login.html b/admin/freeposte/admin/templates/login.html index 3a217046..27b63d43 100644 --- a/admin/freeposte/admin/templates/login.html +++ b/admin/freeposte/admin/templates/login.html @@ -3,10 +3,10 @@ {% block sidebar %}
@@ -14,11 +14,11 @@ {% endblock %} {% block title %} -Sign in +{% trans %}Sign in{% endtrans %} {% endblock %} {% block subtitle %} -to access the administration tools +{% trans %}to access the administration tools{% endtrans %} {% endblock %} {% block box_content %} diff --git a/admin/freeposte/admin/templates/services.html b/admin/freeposte/admin/templates/services.html index 749898db..c2b65918 100644 --- a/admin/freeposte/admin/templates/services.html +++ b/admin/freeposte/admin/templates/services.html @@ -1,19 +1,19 @@ {% extends "base.html" %} {% block title %} -Services status +{% trans %}Services status{% endtrans %} {% endblock %} {% block box %} - - - - - - + + + + + + {% for name, container in containers.items() %} diff --git a/admin/freeposte/admin/templates/sidebar.html b/admin/freeposte/admin/templates/sidebar.html index f8a24f6e..7352201a 100644 --- a/admin/freeposte/admin/templates/sidebar.html +++ b/admin/freeposte/admin/templates/sidebar.html @@ -2,61 +2,61 @@

{{ current_user }}

diff --git a/admin/freeposte/admin/templates/working.html b/admin/freeposte/admin/templates/working.html index 36c9a579..29243e20 100644 --- a/admin/freeposte/admin/templates/working.html +++ b/admin/freeposte/admin/templates/working.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block content %} - + {% endblock %} From 0beeeade41e14eb0331cd55bb2a93ef4736f7312 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:52:50 +0200 Subject: [PATCH 4/9] 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 %}
ServiceStatusPIDImageStartedLast update{% trans %}Service{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}PID{% endtrans %}{% trans %}Image{% endtrans %}{% trans %}Started{% endtrans %}{% trans %}Last update{% endtrans %}
- - + + {% 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 %} From 3ade5641d9119c2856dff774f0f871ab75c021ca Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:53:01 +0200 Subject: [PATCH 5/9] Fix the confirmation form --- admin/freeposte/admin/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/freeposte/admin/forms.py b/admin/freeposte/admin/forms.py index ad1bc189..9e79eb13 100644 --- a/admin/freeposte/admin/forms.py +++ b/admin/freeposte/admin/forms.py @@ -32,7 +32,7 @@ class DestinationField(fields.SelectMultipleField): raise validators.ValidationError(_('Invalid email address.')) -class Confirmation(flask_wtf.FlaskForm): +class ConfirmationForm(flask_wtf.FlaskForm): submit = fields.SubmitField(_('Confirm')) From 3fa44613b1b2d10bb19cb89799bb7b7e978b6afb Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 14:56:33 +0200 Subject: [PATCH 6/9] Add a default babel configuration --- admin/babel.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 admin/babel.cfg diff --git a/admin/babel.cfg b/admin/babel.cfg new file mode 100644 index 00000000..da3bbea4 --- /dev/null +++ b/admin/babel.cfg @@ -0,0 +1,3 @@ +[python: freeposte/**.py] +[jinja2: freeposte/**/templates/**.html] +extensions=jinja2.ext.autoescape,jinja2.ext.with_ From c37ad3557f4e482a9f73ffd39e575dd9e5c17f13 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 17:33:34 +0200 Subject: [PATCH 7/9] Missing translations --- admin/freeposte/admin/templates/admin/create.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/freeposte/admin/templates/admin/create.html b/admin/freeposte/admin/templates/admin/create.html index 2d9024b5..6fe7e67b 100644 --- a/admin/freeposte/admin/templates/admin/create.html +++ b/admin/freeposte/admin/templates/admin/create.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Add a global administrator +{% trans %}Add a global administrator{% endtrans %} {% endblock %} {% block box_content %} From acf4addae0ad11be5cb18d686a79b14bc3d9f5b9 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 17:35:11 +0200 Subject: [PATCH 8/9] Add initial translations, fix #37 --- .../translations/en/LC_MESSAGES/messages.po | 436 ++++++++++++++++++ .../translations/fr/LC_MESSAGES/messages.po | 436 ++++++++++++++++++ admin/messages.pot | 435 +++++++++++++++++ 3 files changed, 1307 insertions(+) create mode 100644 admin/freeposte/translations/en/LC_MESSAGES/messages.po create mode 100644 admin/freeposte/translations/fr/LC_MESSAGES/messages.po create mode 100644 admin/messages.pot diff --git a/admin/freeposte/translations/en/LC_MESSAGES/messages.po b/admin/freeposte/translations/en/LC_MESSAGES/messages.po new file mode 100644 index 00000000..b0eeb6c1 --- /dev/null +++ b/admin/freeposte/translations/en/LC_MESSAGES/messages.po @@ -0,0 +1,436 @@ +# English translations for PROJECT. +# Copyright (C) 2016 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2016-10-02 17:33+0200\n" +"PO-Revision-Date: 2016-10-02 15:02+0200\n" +"Last-Translator: FULL NAME \n" +"Language: en\n" +"Language-Team: en \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +#: freeposte/admin/forms.py:32 +msgid "Invalid email address." +msgstr "" + +#: freeposte/admin/forms.py:36 +msgid "Confirm" +msgstr "" + +#: freeposte/admin/forms.py:40 freeposte/admin/forms.py:54 +msgid "E-mail" +msgstr "" + +#: freeposte/admin/forms.py:41 freeposte/admin/forms.py:55 +#: freeposte/admin/forms.py:72 freeposte/admin/forms.py:120 +msgid "Password" +msgstr "" + +#: freeposte/admin/forms.py:42 freeposte/admin/templates/login.html:9 +#: freeposte/admin/templates/login.html:17 +msgid "Sign in" +msgstr "" + +#: freeposte/admin/forms.py:46 freeposte/admin/templates/domain/details.html:21 +#: freeposte/admin/templates/domain/list.html:19 +msgid "Domain name" +msgstr "" + +#: freeposte/admin/forms.py:47 +msgid "Maximum user count" +msgstr "" + +#: freeposte/admin/forms.py:48 +msgid "Maximum alias count" +msgstr "" + +#: freeposte/admin/forms.py:49 freeposte/admin/forms.py:60 +#: freeposte/admin/forms.py:98 freeposte/admin/templates/alias/list.html:22 +#: freeposte/admin/templates/domain/list.html:22 +msgid "Comment" +msgstr "" + +#: freeposte/admin/forms.py:50 freeposte/admin/forms.py:99 +msgid "Create" +msgstr "" + +#: freeposte/admin/forms.py:56 +msgid "Confirm password" +msgstr "" + +#: freeposte/admin/forms.py:57 +msgid "Quota" +msgstr "" + +#: freeposte/admin/forms.py:58 +msgid "Allow IMAP access" +msgstr "" + +#: freeposte/admin/forms.py:59 +msgid "Allow POP3 access" +msgstr "" + +#: freeposte/admin/forms.py:61 +msgid "Save" +msgstr "" + +#: freeposte/admin/forms.py:65 +msgid "Displayed name" +msgstr "" + +#: freeposte/admin/forms.py:66 +msgid "Enable spam filter" +msgstr "" + +#: freeposte/admin/forms.py:67 +msgid "Spam filter threshold" +msgstr "" + +#: freeposte/admin/forms.py:68 +msgid "Save settings" +msgstr "" + +#: freeposte/admin/forms.py:73 +msgid "Password check" +msgstr "" + +#: freeposte/admin/forms.py:74 freeposte/admin/templates/sidebar.html:13 +msgid "Update password" +msgstr "" + +#: freeposte/admin/forms.py:78 +msgid "Enable forwarding" +msgstr "" + +#: freeposte/admin/forms.py:80 freeposte/admin/forms.py:97 +#: freeposte/admin/templates/alias/list.html:21 +msgid "Destination" +msgstr "" + +#: freeposte/admin/forms.py:82 freeposte/admin/forms.py:90 +msgid "Update" +msgstr "" + +#: freeposte/admin/forms.py:86 +msgid "Enable automatic reply" +msgstr "" + +#: freeposte/admin/forms.py:87 +msgid "Reply subject" +msgstr "" + +#: freeposte/admin/forms.py:88 +msgid "Reply body" +msgstr "" + +#: freeposte/admin/forms.py:94 +msgid "Alias" +msgstr "" + +#: freeposte/admin/forms.py:96 +msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)" +msgstr "" + +#: freeposte/admin/forms.py:103 +msgid "Admin email" +msgstr "" + +#: freeposte/admin/forms.py:104 freeposte/admin/forms.py:109 +#: freeposte/admin/forms.py:121 +msgid "Submit" +msgstr "" + +#: freeposte/admin/forms.py:108 +msgid "Manager email" +msgstr "" + +#: freeposte/admin/forms.py:113 +msgid "Protocol" +msgstr "" + +#: freeposte/admin/forms.py:116 +msgid "Hostname or IP" +msgstr "" + +#: freeposte/admin/forms.py:117 +msgid "TCP port" +msgstr "" + +#: freeposte/admin/forms.py:118 +msgid "Enable TLS" +msgstr "" + +#: freeposte/admin/forms.py:119 freeposte/admin/templates/fetch/list.html:21 +msgid "Username" +msgstr "" + +#: freeposte/admin/templates/confirm.html:4 +msgid "Confirm action" +msgstr "" + +#: freeposte/admin/templates/confirm.html:12 +#, python-format +msgid "You are about to %(action)s. Please confirm your action." +msgstr "" + +#: freeposte/admin/templates/login.html:6 +msgid "Your account" +msgstr "" + +#: freeposte/admin/templates/login.html:21 +msgid "to access the administration tools" +msgstr "" + +#: freeposte/admin/templates/services.html:4 +#: freeposte/admin/templates/sidebar.html:40 +msgid "Services status" +msgstr "" + +#: freeposte/admin/templates/services.html:11 +msgid "Service" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:23 +#: freeposte/admin/templates/services.html:12 +msgid "Status" +msgstr "" + +#: freeposte/admin/templates/services.html:13 +msgid "PID" +msgstr "" + +#: freeposte/admin/templates/services.html:14 +msgid "Image" +msgstr "" + +#: freeposte/admin/templates/services.html:15 +msgid "Started" +msgstr "" + +#: freeposte/admin/templates/services.html:16 +msgid "Last update" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:5 +msgid "My account" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:8 +msgid "Settings" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:18 +msgid "Auto-forward" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:23 +msgid "Auto-reply" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:4 +#: freeposte/admin/templates/sidebar.html:28 +msgid "Fetched accounts" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:33 +msgid "Sign out" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:36 +msgid "Administration" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:45 +msgid "Administrators" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:52 +msgid "Mail domains" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:59 +msgid "Help" +msgstr "" + +#: freeposte/admin/templates/working.html:4 +msgid "We are still working on this feature!" +msgstr "" + +#: freeposte/admin/templates/admin/create.html:4 +msgid "Add a global administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:4 +msgid "Global administrators" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:9 +msgid "Add administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:17 +#: freeposte/admin/templates/alias/list.html:19 +#: freeposte/admin/templates/domain/list.html:17 +#: freeposte/admin/templates/fetch/list.html:19 +#: freeposte/admin/templates/manager/list.html:19 +msgid "Actions" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:18 +#: freeposte/admin/templates/alias/list.html:20 +#: freeposte/admin/templates/manager/list.html:20 +msgid "Email" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:23 +#: freeposte/admin/templates/alias/list.html:30 +#: freeposte/admin/templates/domain/list.html:32 +#: freeposte/admin/templates/fetch/list.html:31 +#: freeposte/admin/templates/manager/list.html:25 +msgid "Delete" +msgstr "" + +#: freeposte/admin/templates/alias/create.html:4 +msgid "Create alias" +msgstr "" + +#: freeposte/admin/templates/alias/edit.html:4 +msgid "Edit alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:4 +msgid "Alias list" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:12 +msgid "Add alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:23 +#: freeposte/admin/templates/domain/list.html:23 +#: freeposte/admin/templates/fetch/list.html:24 +msgid "Created" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:24 +#: freeposte/admin/templates/domain/list.html:24 +#: freeposte/admin/templates/fetch/list.html:25 +msgid "Last edit" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:29 +#: freeposte/admin/templates/domain/list.html:31 +#: freeposte/admin/templates/fetch/list.html:30 +msgid "Edit" +msgstr "" + +#: freeposte/admin/templates/domain/create.html:4 +#: freeposte/admin/templates/domain/list.html:9 +msgid "New domain" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:4 +msgid "Domain details" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:13 +msgid "Regenerate keys" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:25 +msgid "DNS MX entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:29 +msgid "DNS SPF entries" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:36 +msgid "DKIM public key" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:40 +msgid "DNS DKIM entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:44 +msgid "DNS DMARC entry" +msgstr "" + +#: freeposte/admin/templates/domain/edit.html:4 +msgid "Edit domain" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:4 +msgid "Domain list" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:18 +msgid "Manage" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:20 +msgid "Mailbox count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:21 +msgid "Alias count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:29 +msgid "Details" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:36 +msgid "Users" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:37 +msgid "Aliases" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:38 +msgid "Managers" +msgstr "" + +#: freeposte/admin/templates/fetch/create.html:4 +msgid "Add a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/edit.html:4 +msgid "Update a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:12 +msgid "Add an account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:20 +msgid "Endpoint" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:22 +msgid "Last check" +msgstr "" + +#: freeposte/admin/templates/manager/create.html:4 +msgid "Add a manager" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:4 +msgid "Manager list" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:12 +msgid "Add manager" +msgstr "" + diff --git a/admin/freeposte/translations/fr/LC_MESSAGES/messages.po b/admin/freeposte/translations/fr/LC_MESSAGES/messages.po new file mode 100644 index 00000000..804761c8 --- /dev/null +++ b/admin/freeposte/translations/fr/LC_MESSAGES/messages.po @@ -0,0 +1,436 @@ +# French translations for PROJECT. +# Copyright (C) 2016 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2016-10-02 17:33+0200\n" +"PO-Revision-Date: 2016-10-02 16:32+0200\n" +"Last-Translator: \n" +"Language: fr\n" +"Language-Team: fr \n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +#: freeposte/admin/forms.py:32 +msgid "Invalid email address." +msgstr "" + +#: freeposte/admin/forms.py:36 +msgid "Confirm" +msgstr "Confirmer" + +#: freeposte/admin/forms.py:40 freeposte/admin/forms.py:54 +msgid "E-mail" +msgstr "" + +#: freeposte/admin/forms.py:41 freeposte/admin/forms.py:55 +#: freeposte/admin/forms.py:72 freeposte/admin/forms.py:120 +msgid "Password" +msgstr "" + +#: freeposte/admin/forms.py:42 freeposte/admin/templates/login.html:9 +#: freeposte/admin/templates/login.html:17 +msgid "Sign in" +msgstr "" + +#: freeposte/admin/forms.py:46 freeposte/admin/templates/domain/details.html:21 +#: freeposte/admin/templates/domain/list.html:19 +msgid "Domain name" +msgstr "" + +#: freeposte/admin/forms.py:47 +msgid "Maximum user count" +msgstr "" + +#: freeposte/admin/forms.py:48 +msgid "Maximum alias count" +msgstr "" + +#: freeposte/admin/forms.py:49 freeposte/admin/forms.py:60 +#: freeposte/admin/forms.py:98 freeposte/admin/templates/alias/list.html:22 +#: freeposte/admin/templates/domain/list.html:22 +msgid "Comment" +msgstr "" + +#: freeposte/admin/forms.py:50 freeposte/admin/forms.py:99 +msgid "Create" +msgstr "" + +#: freeposte/admin/forms.py:56 +msgid "Confirm password" +msgstr "" + +#: freeposte/admin/forms.py:57 +msgid "Quota" +msgstr "" + +#: freeposte/admin/forms.py:58 +msgid "Allow IMAP access" +msgstr "" + +#: freeposte/admin/forms.py:59 +msgid "Allow POP3 access" +msgstr "" + +#: freeposte/admin/forms.py:61 +msgid "Save" +msgstr "" + +#: freeposte/admin/forms.py:65 +msgid "Displayed name" +msgstr "" + +#: freeposte/admin/forms.py:66 +msgid "Enable spam filter" +msgstr "" + +#: freeposte/admin/forms.py:67 +msgid "Spam filter threshold" +msgstr "" + +#: freeposte/admin/forms.py:68 +msgid "Save settings" +msgstr "" + +#: freeposte/admin/forms.py:73 +msgid "Password check" +msgstr "" + +#: freeposte/admin/forms.py:74 freeposte/admin/templates/sidebar.html:13 +msgid "Update password" +msgstr "" + +#: freeposte/admin/forms.py:78 +msgid "Enable forwarding" +msgstr "" + +#: freeposte/admin/forms.py:80 freeposte/admin/forms.py:97 +#: freeposte/admin/templates/alias/list.html:21 +msgid "Destination" +msgstr "" + +#: freeposte/admin/forms.py:82 freeposte/admin/forms.py:90 +msgid "Update" +msgstr "" + +#: freeposte/admin/forms.py:86 +msgid "Enable automatic reply" +msgstr "" + +#: freeposte/admin/forms.py:87 +msgid "Reply subject" +msgstr "" + +#: freeposte/admin/forms.py:88 +msgid "Reply body" +msgstr "" + +#: freeposte/admin/forms.py:94 +msgid "Alias" +msgstr "" + +#: freeposte/admin/forms.py:96 +msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)" +msgstr "" + +#: freeposte/admin/forms.py:103 +msgid "Admin email" +msgstr "Email de l'administrateur" + +#: freeposte/admin/forms.py:104 freeposte/admin/forms.py:109 +#: freeposte/admin/forms.py:121 +msgid "Submit" +msgstr "" + +#: freeposte/admin/forms.py:108 +msgid "Manager email" +msgstr "" + +#: freeposte/admin/forms.py:113 +msgid "Protocol" +msgstr "" + +#: freeposte/admin/forms.py:116 +msgid "Hostname or IP" +msgstr "" + +#: freeposte/admin/forms.py:117 +msgid "TCP port" +msgstr "" + +#: freeposte/admin/forms.py:118 +msgid "Enable TLS" +msgstr "" + +#: freeposte/admin/forms.py:119 freeposte/admin/templates/fetch/list.html:21 +msgid "Username" +msgstr "" + +#: freeposte/admin/templates/confirm.html:4 +msgid "Confirm action" +msgstr "Confirmer" + +#: freeposte/admin/templates/confirm.html:12 +#, python-format +msgid "You are about to %(action)s. Please confirm your action." +msgstr "Vous allez %(action)s. Merci de confirmer votre action." + +#: freeposte/admin/templates/login.html:6 +msgid "Your account" +msgstr "" + +#: freeposte/admin/templates/login.html:21 +msgid "to access the administration tools" +msgstr "" + +#: freeposte/admin/templates/services.html:4 +#: freeposte/admin/templates/sidebar.html:40 +msgid "Services status" +msgstr "" + +#: freeposte/admin/templates/services.html:11 +msgid "Service" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:23 +#: freeposte/admin/templates/services.html:12 +msgid "Status" +msgstr "" + +#: freeposte/admin/templates/services.html:13 +msgid "PID" +msgstr "" + +#: freeposte/admin/templates/services.html:14 +msgid "Image" +msgstr "" + +#: freeposte/admin/templates/services.html:15 +msgid "Started" +msgstr "" + +#: freeposte/admin/templates/services.html:16 +msgid "Last update" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:5 +msgid "My account" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:8 +msgid "Settings" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:18 +msgid "Auto-forward" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:23 +msgid "Auto-reply" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:4 +#: freeposte/admin/templates/sidebar.html:28 +msgid "Fetched accounts" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:33 +msgid "Sign out" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:36 +msgid "Administration" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:45 +msgid "Administrators" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:52 +msgid "Mail domains" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:59 +msgid "Help" +msgstr "" + +#: freeposte/admin/templates/working.html:4 +msgid "We are still working on this feature!" +msgstr "" + +#: freeposte/admin/templates/admin/create.html:4 +msgid "Add a global administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:4 +msgid "Global administrators" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:9 +msgid "Add administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:17 +#: freeposte/admin/templates/alias/list.html:19 +#: freeposte/admin/templates/domain/list.html:17 +#: freeposte/admin/templates/fetch/list.html:19 +#: freeposte/admin/templates/manager/list.html:19 +msgid "Actions" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:18 +#: freeposte/admin/templates/alias/list.html:20 +#: freeposte/admin/templates/manager/list.html:20 +msgid "Email" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:23 +#: freeposte/admin/templates/alias/list.html:30 +#: freeposte/admin/templates/domain/list.html:32 +#: freeposte/admin/templates/fetch/list.html:31 +#: freeposte/admin/templates/manager/list.html:25 +msgid "Delete" +msgstr "" + +#: freeposte/admin/templates/alias/create.html:4 +msgid "Create alias" +msgstr "" + +#: freeposte/admin/templates/alias/edit.html:4 +msgid "Edit alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:4 +msgid "Alias list" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:12 +msgid "Add alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:23 +#: freeposte/admin/templates/domain/list.html:23 +#: freeposte/admin/templates/fetch/list.html:24 +msgid "Created" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:24 +#: freeposte/admin/templates/domain/list.html:24 +#: freeposte/admin/templates/fetch/list.html:25 +msgid "Last edit" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:29 +#: freeposte/admin/templates/domain/list.html:31 +#: freeposte/admin/templates/fetch/list.html:30 +msgid "Edit" +msgstr "" + +#: freeposte/admin/templates/domain/create.html:4 +#: freeposte/admin/templates/domain/list.html:9 +msgid "New domain" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:4 +msgid "Domain details" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:13 +msgid "Regenerate keys" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:25 +msgid "DNS MX entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:29 +msgid "DNS SPF entries" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:36 +msgid "DKIM public key" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:40 +msgid "DNS DKIM entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:44 +msgid "DNS DMARC entry" +msgstr "" + +#: freeposte/admin/templates/domain/edit.html:4 +msgid "Edit domain" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:4 +msgid "Domain list" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:18 +msgid "Manage" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:20 +msgid "Mailbox count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:21 +msgid "Alias count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:29 +msgid "Details" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:36 +msgid "Users" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:37 +msgid "Aliases" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:38 +msgid "Managers" +msgstr "" + +#: freeposte/admin/templates/fetch/create.html:4 +msgid "Add a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/edit.html:4 +msgid "Update a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:12 +msgid "Add an account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:20 +msgid "Endpoint" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:22 +msgid "Last check" +msgstr "" + +#: freeposte/admin/templates/manager/create.html:4 +msgid "Add a manager" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:4 +msgid "Manager list" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:12 +msgid "Add manager" +msgstr "" + diff --git a/admin/messages.pot b/admin/messages.pot new file mode 100644 index 00000000..e251703d --- /dev/null +++ b/admin/messages.pot @@ -0,0 +1,435 @@ +# Translations template for PROJECT. +# Copyright (C) 2016 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2016. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2016-10-02 17:33+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +#: freeposte/admin/forms.py:32 +msgid "Invalid email address." +msgstr "" + +#: freeposte/admin/forms.py:36 +msgid "Confirm" +msgstr "" + +#: freeposte/admin/forms.py:40 freeposte/admin/forms.py:54 +msgid "E-mail" +msgstr "" + +#: freeposte/admin/forms.py:41 freeposte/admin/forms.py:55 +#: freeposte/admin/forms.py:72 freeposte/admin/forms.py:120 +msgid "Password" +msgstr "" + +#: freeposte/admin/forms.py:42 freeposte/admin/templates/login.html:9 +#: freeposte/admin/templates/login.html:17 +msgid "Sign in" +msgstr "" + +#: freeposte/admin/forms.py:46 freeposte/admin/templates/domain/details.html:21 +#: freeposte/admin/templates/domain/list.html:19 +msgid "Domain name" +msgstr "" + +#: freeposte/admin/forms.py:47 +msgid "Maximum user count" +msgstr "" + +#: freeposte/admin/forms.py:48 +msgid "Maximum alias count" +msgstr "" + +#: freeposte/admin/forms.py:49 freeposte/admin/forms.py:60 +#: freeposte/admin/forms.py:98 freeposte/admin/templates/alias/list.html:22 +#: freeposte/admin/templates/domain/list.html:22 +msgid "Comment" +msgstr "" + +#: freeposte/admin/forms.py:50 freeposte/admin/forms.py:99 +msgid "Create" +msgstr "" + +#: freeposte/admin/forms.py:56 +msgid "Confirm password" +msgstr "" + +#: freeposte/admin/forms.py:57 +msgid "Quota" +msgstr "" + +#: freeposte/admin/forms.py:58 +msgid "Allow IMAP access" +msgstr "" + +#: freeposte/admin/forms.py:59 +msgid "Allow POP3 access" +msgstr "" + +#: freeposte/admin/forms.py:61 +msgid "Save" +msgstr "" + +#: freeposte/admin/forms.py:65 +msgid "Displayed name" +msgstr "" + +#: freeposte/admin/forms.py:66 +msgid "Enable spam filter" +msgstr "" + +#: freeposte/admin/forms.py:67 +msgid "Spam filter threshold" +msgstr "" + +#: freeposte/admin/forms.py:68 +msgid "Save settings" +msgstr "" + +#: freeposte/admin/forms.py:73 +msgid "Password check" +msgstr "" + +#: freeposte/admin/forms.py:74 freeposte/admin/templates/sidebar.html:13 +msgid "Update password" +msgstr "" + +#: freeposte/admin/forms.py:78 +msgid "Enable forwarding" +msgstr "" + +#: freeposte/admin/forms.py:80 freeposte/admin/forms.py:97 +#: freeposte/admin/templates/alias/list.html:21 +msgid "Destination" +msgstr "" + +#: freeposte/admin/forms.py:82 freeposte/admin/forms.py:90 +msgid "Update" +msgstr "" + +#: freeposte/admin/forms.py:86 +msgid "Enable automatic reply" +msgstr "" + +#: freeposte/admin/forms.py:87 +msgid "Reply subject" +msgstr "" + +#: freeposte/admin/forms.py:88 +msgid "Reply body" +msgstr "" + +#: freeposte/admin/forms.py:94 +msgid "Alias" +msgstr "" + +#: freeposte/admin/forms.py:96 +msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)" +msgstr "" + +#: freeposte/admin/forms.py:103 +msgid "Admin email" +msgstr "" + +#: freeposte/admin/forms.py:104 freeposte/admin/forms.py:109 +#: freeposte/admin/forms.py:121 +msgid "Submit" +msgstr "" + +#: freeposte/admin/forms.py:108 +msgid "Manager email" +msgstr "" + +#: freeposte/admin/forms.py:113 +msgid "Protocol" +msgstr "" + +#: freeposte/admin/forms.py:116 +msgid "Hostname or IP" +msgstr "" + +#: freeposte/admin/forms.py:117 +msgid "TCP port" +msgstr "" + +#: freeposte/admin/forms.py:118 +msgid "Enable TLS" +msgstr "" + +#: freeposte/admin/forms.py:119 freeposte/admin/templates/fetch/list.html:21 +msgid "Username" +msgstr "" + +#: freeposte/admin/templates/confirm.html:4 +msgid "Confirm action" +msgstr "" + +#: freeposte/admin/templates/confirm.html:12 +#, python-format +msgid "You are about to %(action)s. Please confirm your action." +msgstr "" + +#: freeposte/admin/templates/login.html:6 +msgid "Your account" +msgstr "" + +#: freeposte/admin/templates/login.html:21 +msgid "to access the administration tools" +msgstr "" + +#: freeposte/admin/templates/services.html:4 +#: freeposte/admin/templates/sidebar.html:40 +msgid "Services status" +msgstr "" + +#: freeposte/admin/templates/services.html:11 +msgid "Service" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:23 +#: freeposte/admin/templates/services.html:12 +msgid "Status" +msgstr "" + +#: freeposte/admin/templates/services.html:13 +msgid "PID" +msgstr "" + +#: freeposte/admin/templates/services.html:14 +msgid "Image" +msgstr "" + +#: freeposte/admin/templates/services.html:15 +msgid "Started" +msgstr "" + +#: freeposte/admin/templates/services.html:16 +msgid "Last update" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:5 +msgid "My account" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:8 +msgid "Settings" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:18 +msgid "Auto-forward" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:23 +msgid "Auto-reply" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:4 +#: freeposte/admin/templates/sidebar.html:28 +msgid "Fetched accounts" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:33 +msgid "Sign out" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:36 +msgid "Administration" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:45 +msgid "Administrators" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:52 +msgid "Mail domains" +msgstr "" + +#: freeposte/admin/templates/sidebar.html:59 +msgid "Help" +msgstr "" + +#: freeposte/admin/templates/working.html:4 +msgid "We are still working on this feature!" +msgstr "" + +#: freeposte/admin/templates/admin/create.html:4 +msgid "Add a global administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:4 +msgid "Global administrators" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:9 +msgid "Add administrator" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:17 +#: freeposte/admin/templates/alias/list.html:19 +#: freeposte/admin/templates/domain/list.html:17 +#: freeposte/admin/templates/fetch/list.html:19 +#: freeposte/admin/templates/manager/list.html:19 +msgid "Actions" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:18 +#: freeposte/admin/templates/alias/list.html:20 +#: freeposte/admin/templates/manager/list.html:20 +msgid "Email" +msgstr "" + +#: freeposte/admin/templates/admin/list.html:23 +#: freeposte/admin/templates/alias/list.html:30 +#: freeposte/admin/templates/domain/list.html:32 +#: freeposte/admin/templates/fetch/list.html:31 +#: freeposte/admin/templates/manager/list.html:25 +msgid "Delete" +msgstr "" + +#: freeposte/admin/templates/alias/create.html:4 +msgid "Create alias" +msgstr "" + +#: freeposte/admin/templates/alias/edit.html:4 +msgid "Edit alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:4 +msgid "Alias list" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:12 +msgid "Add alias" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:23 +#: freeposte/admin/templates/domain/list.html:23 +#: freeposte/admin/templates/fetch/list.html:24 +msgid "Created" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:24 +#: freeposte/admin/templates/domain/list.html:24 +#: freeposte/admin/templates/fetch/list.html:25 +msgid "Last edit" +msgstr "" + +#: freeposte/admin/templates/alias/list.html:29 +#: freeposte/admin/templates/domain/list.html:31 +#: freeposte/admin/templates/fetch/list.html:30 +msgid "Edit" +msgstr "" + +#: freeposte/admin/templates/domain/create.html:4 +#: freeposte/admin/templates/domain/list.html:9 +msgid "New domain" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:4 +msgid "Domain details" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:13 +msgid "Regenerate keys" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:25 +msgid "DNS MX entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:29 +msgid "DNS SPF entries" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:36 +msgid "DKIM public key" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:40 +msgid "DNS DKIM entry" +msgstr "" + +#: freeposte/admin/templates/domain/details.html:44 +msgid "DNS DMARC entry" +msgstr "" + +#: freeposte/admin/templates/domain/edit.html:4 +msgid "Edit domain" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:4 +msgid "Domain list" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:18 +msgid "Manage" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:20 +msgid "Mailbox count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:21 +msgid "Alias count" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:29 +msgid "Details" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:36 +msgid "Users" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:37 +msgid "Aliases" +msgstr "" + +#: freeposte/admin/templates/domain/list.html:38 +msgid "Managers" +msgstr "" + +#: freeposte/admin/templates/fetch/create.html:4 +msgid "Add a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/edit.html:4 +msgid "Update a fetched account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:12 +msgid "Add an account" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:20 +msgid "Endpoint" +msgstr "" + +#: freeposte/admin/templates/fetch/list.html:22 +msgid "Last check" +msgstr "" + +#: freeposte/admin/templates/manager/create.html:4 +msgid "Add a manager" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:4 +msgid "Manager list" +msgstr "" + +#: freeposte/admin/templates/manager/list.html:12 +msgid "Add manager" +msgstr "" + From 984b605d05d0b4df624b52412e066f4e37a99376 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 17:38:10 +0200 Subject: [PATCH 9/9] Compile translations when building the admin container --- admin/Dockerfile | 1 + admin/babel.cfg | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 4299285b..8c3f98cd 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -10,5 +10,6 @@ COPY requirements.txt . COPY start.sh /start.sh RUN pip install -r requirements.txt +RUN pybabel compile -d freeposte/translations CMD ["/start.sh"] diff --git a/admin/babel.cfg b/admin/babel.cfg index da3bbea4..f0234b32 100644 --- a/admin/babel.cfg +++ b/admin/babel.cfg @@ -1,3 +1,3 @@ -[python: freeposte/**.py] -[jinja2: freeposte/**/templates/**.html] +[python: **.py] +[jinja2: **/templates/**.html] extensions=jinja2.ext.autoescape,jinja2.ext.with_
ActionsEmail{% trans %}Actions{% endtrans %}{% trans %}Email{% endtrans %}
- + {{ manager }}