diff --git a/re2o/base.py b/re2o/base.py index 023a16ff..fff2278c 100644 --- a/re2o/base.py +++ b/re2o/base.py @@ -73,9 +73,9 @@ def smtp_check(local_part): reply_code = srv.getreply()[0] srv.close() if reply_code in [250, 252]: - return True, _("This domain is already taken") + return True, _("This domain is already taken.") except: - return True, _("Smtp unreachable") + return True, _("SMTP unreachable.") return False, None diff --git a/re2o/locale/fr/LC_MESSAGES/django.po b/re2o/locale/fr/LC_MESSAGES/django.po index 9c9941b2..2f634fed 100644 --- a/re2o/locale/fr/LC_MESSAGES/django.po +++ b/re2o/locale/fr/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-23 15:03+0200\n" +"POT-Creation-Date: 2019-01-12 16:48+0100\n" "PO-Revision-Date: 2018-03-31 16:09+0002\n" "Last-Translator: Laouen Fernet \n" "Language-Team: \n" @@ -42,6 +42,14 @@ msgstr "Vous n'avez pas le droit d'accéder à ce menu." msgid "You don't have the right to edit the history." msgstr "Vous n'avez pas le droit de modifier l'historique." +#: base.py:76 +msgid "This domain is already taken." +msgstr "Ce domaine est déjà pris." + +#: base.py:78 +msgid "SMTP unreachable." +msgstr "SMTP injoignable." + #: mixins.py:111 #, python-format msgid "You don't have the right to create a %s object." @@ -87,15 +95,15 @@ msgstr "À propos de %(AssoName)s" #: templates/re2o/about.html:36 msgid "" "Re2o is an administration tool initiated by Rezo Metz and a few members of other FedeRez associations around the summer 2016.
It is " -"intended to be a tool independant from any network infrastructure so it can " -"be setup in \"a few steps\". This tool is entirely free and available under " -"a GNU Public License v2 (GPLv2) license on FedeRez gitlab.
Re2o's mainteners are " -"volunteers mainly from French schools.
If you want to get involved in " -"the development process, we will be glad to welcome you so do not hesitate " -"to contact us and come help us build the future of Re2o." +"\">Rezo Metz and a few members of other FedeRez associations around the summer 2016.
It is intended to " +"be a tool independant from any network infrastructure so it can be setup in " +"\"a few steps\". This tool is entirely free and available under a GNU Public " +"License v2 (GPLv2) license on FedeRez gitlab.
Re2o's mainteners are volunteers mainly " +"from French schools.
If you want to get involved in the development " +"process, we will be glad to welcome you so do not hesitate to contact us and " +"come help us build the future of Re2o." msgstr "" "Re2o est un outil d'administration initié par Rézo Metz et quelques membres d'autres associations de {% blocktrans %}History of {{ object }}{% endblocktrans %} - {% include "re2o/aff_history.html" with reversions=reversions %} + {% include 're2o/aff_history.html' with reversions=reversions %}


diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index f7adacbc..a6b1a8c5 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -1,4 +1,4 @@ -{% extends "re2o/sidebar.html" %} +{% extends 're2o/sidebar.html' %} {% comment %} Re2o est un logiciel d'administration développé initiallement au rezometz. Il se veut agnostique au réseau considéré, de manière à être installable en @@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "Registration" %}

{% trans "If you don't have an account yet and you want to access the Internet and the organisation's services, create your own personal account." %}

-

{% trans "Registration" %}

+

{% trans "Sign up" %}

@@ -53,8 +53,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "Logging in" %}

-

{% trans "If you already have an account, log in. You can manage your subscription to the organisation, your machines and all your services." %}

-

{% trans "Logging in" %}

+

{% trans "If you already have an account, log in. You can manage your subscriptions to the organisation, your machines and all your services." %}

+

{% trans "Log in" %}

@@ -66,7 +66,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "My profile" %}

-

{% trans "To manage your subscription, your machines and all your services, access your profile." %}

+

{% trans "To manage your subscriptions, your machines and all your services, access your profile." %}

{% trans "Access my profile" %}

diff --git a/re2o/templates/re2o/sidebar.html b/re2o/templates/re2o/sidebar.html index c9202d14..e7e58599 100644 --- a/re2o/templates/re2o/sidebar.html +++ b/re2o/templates/re2o/sidebar.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends 'base.html' %} {% comment %} Re2o est un logiciel d'administration développé initiallement au rezometz. Il se veut agnostique au réseau considéré, de manière à être installable en diff --git a/re2o/views.py b/re2o/views.py index 15becb35..0ff2774b 100644 --- a/re2o/views.py +++ b/re2o/views.py @@ -84,7 +84,7 @@ def about_page(request): git_info_commit = last_commit.hexsha git_info_commit_date = last_commit.committed_datetime except: - NO_GIT_MSG = _("Unable to get the information") + NO_GIT_MSG = _("Unable to get the information.") git_info_remote = NO_GIT_MSG git_info_branch = NO_GIT_MSG git_info_commit = NO_GIT_MSG