add translations for search/

search/forms.py

@@ -33,7 +33,7 @@ CHOICES_USER = (
     ('0', _("Active")),
     ('1', _("Disabled")),
     ('2', _("Archived")),
-    ('3', _("Not Yet Active")),
+    ('3', _("Not yet active")),
 )
 
 CHOICES_AFF = (

search/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-15 18:15+0200\n"
+"POT-Creation-Date: 2019-01-08 23:56+0100\n"
 "PO-Revision-Date: 2018-06-24 20:10+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -42,44 +42,48 @@ msgstr "Désactivés"
 msgid "Archived"
 msgstr "Archivés"
 
-#: forms.py:39
+#: forms.py:36
+msgid "Not yet active"
+msgstr "Pas encore adhéré"
+
+#: forms.py:40
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: forms.py:40
+#: forms.py:41
 msgid "Machines"
 msgstr "Machines"
 
-#: forms.py:41
+#: forms.py:42
 msgid "Invoices"
 msgstr "Factures"
 
-#: forms.py:42
+#: forms.py:43
 msgid "Bans"
 msgstr "Bannissements"
 
-#: forms.py:43
+#: forms.py:44
 msgid "Whitelists"
 msgstr "Accès gracieux"
 
-#: forms.py:44
+#: forms.py:45
 msgid "Rooms"
 msgstr "Chambres"
 
-#: forms.py:45
+#: forms.py:46
 msgid "Ports"
 msgstr "Ports"
 
-#: forms.py:46
+#: forms.py:47
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: forms.py:59 forms.py:71 templates/search/search.html:29
+#: forms.py:60 forms.py:72 templates/search/search.html:29
 #: templates/search/search.html:48
 msgid "Search"
 msgstr "Rechercher"
 
-#: forms.py:61 forms.py:73
+#: forms.py:62 forms.py:74
 msgid ""
 "Use « » and «,» to specify distinct words, «\"query\"» for an exact search "
 "and «\\» to escape a character."
@@ -87,19 +91,19 @@ msgstr ""
 "Utilisez « » et «,» pour spécifier différents mots, «\"query\"» pour une "
 "recherche exacte et «\\» pour échapper un caractère."
 
-#: forms.py:80
+#: forms.py:81
 msgid "Users filter"
 msgstr "Filtre utilisateurs"
 
-#: forms.py:87
+#: forms.py:88
 msgid "Display filter"
 msgstr "Filtre affichage"
 
-#: forms.py:95
+#: forms.py:96
 msgid "Start date"
 msgstr "Date de début"
 
-#: forms.py:99
+#: forms.py:100
 msgid "End date"
 msgstr "Date de fin"
 
@@ -136,11 +140,11 @@ msgid "Results among rooms:"
 msgstr "Résultats parmi les chambres :"
 
 #: templates/search/index.html:61
-msgid "Results among ports"
+msgid "Results among ports:"
 msgstr "Résultats parmi les ports :"
 
 #: templates/search/index.html:65
-msgid "Results among switches"
+msgid "Results among switches:"
 msgstr "Résultats parmi les commutateurs réseau :"
 
 #: templates/search/index.html:69

search/templates/search/index.html

-{% extends "search/sidebar.html" %}
+{% extends 'search/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
@@ -31,39 +31,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
     {% if users %}
         <h2>{% trans "Results among users:" %}</h2>
-        {% include "users/aff_users.html" with users_list=users %}
+        {% include 'users/aff_users.html' with users_list=users %}
     {% endif%}
     {% if clubs %}
         <h2>{% trans "Results among clubs:" %}</h2>
-        {% include "users/aff_clubs.html" with clubs_list=clubs %}
+        {% include 'users/aff_clubs.html' with clubs_list=clubs %}
     {% endif%}
     {% if machines %}
         <h2>{% trans "Results among machines:" %}</h2>
-        {% include "machines/aff_machines.html" with machines_list=machines %}
+        {% include 'machines/aff_machines.html' with machines_list=machines %}
     {% endif %}
     {% if factures %}
         <h2>{% trans "Results among invoices:" %}</h2>
-        {% include "cotisations/aff_cotisations.html" with facture_list=factures %}
+        {% include 'cotisations/aff_cotisations.html' with facture_list=factures %}
     {% endif %}
     {% if whitelists %}
         <h2>{% trans "Results among whitelists:" %}</h2>
-        {% include "users/aff_whitelists.html" with white_list=whitelists %}
+        {% include 'users/aff_whitelists.html' with white_list=whitelists %}
     {% endif %}
     {% if bans %}
         <h2>{% trans "Results among bans:" %}</h2>
-        {% include "users/aff_bans.html" with ban_list=bans %}
+        {% include 'users/aff_bans.html' with ban_list=bans %}
     {% endif %}
     {% if rooms %}
         <h2>{% trans "Results among rooms:" %}</h2>
-        {% include "topologie/aff_chambres.html" with room_list=rooms %}
+        {% include 'topologie/aff_chambres.html' with room_list=rooms %}
     {% endif %}
     {% if ports %}
-        <h2>{% trans "Results among ports" %}</h2>
-        {% include "topologie/aff_port.html" with port_list=ports search=True %}
+        <h2>{% trans "Results among ports:" %}</h2>
+        {% include 'topologie/aff_port.html' with port_list=ports search=True %}
     {% endif %}
     {% if switches %}
-        <h2>{% trans "Results among switches" %}</h2>
-        {% include "topologie/aff_switch.html" with switch_list=switches %}
+        <h2>{% trans "Results among switches:" %}</h2>
+        {% include 'topologie/aff_switch.html' with switch_list=switches %}
     {% endif %}
     {% if not users and not machines and not factures and not whitelists and not bans and not rooms and not ports and not switches %}
         <h3>{% trans "No result" %}</h3>

search/templates/search/search.html

-{% extends "search/sidebar.html" %}
+{% extends 'search/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
@@ -34,10 +34,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form">
     {% bootstrap_field search_form.q %}
     {% if search_form.u %}
-    {% include "buttons/multiple_checkbox_alt.html" with field=search_form.u %}
+    {% include 'buttons/multiple_checkbox_alt.html' with field=search_form.u %}
     {% endif %}
     {% if search_form.a %}
-    {% include "buttons/multiple_checkbox_alt.html" with field=search_form.a %}
+    {% include 'buttons/multiple_checkbox_alt.html' with field=search_form.a %}
     {% endif %}
     {% if search_form.s %}
     {% bootstrap_field search_form.s %}

search/templates/search/sidebar.html

-{% 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
@@ -26,11 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load i18n %}
 
 {% block sidebar %}
-    <a class="list-group-item list-group-item-warning" href="{% url "search:search" %}">
+    <a class="list-group-item list-group-item-warning" href="{% url 'search:search' %}">
         <i class="fa fa-search"></i>
         {% trans "Simple search" %}
     </a>
-    <a class="list-group-item list-group-item-warning" href="{% url "search:searchp" %}">
+    <a class="list-group-item list-group-item-warning" href="{% url 'search:searchp' %}">
         <i class="fa fa-search-plus"></i>
         {% trans "Advanced search" %}
     </a>