Mercurial > sat_legacy_website

changeset 72:ac83544a7645

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
display an ugly menu in <noscript> when JS is disabled
author souliane <souliane@mailoo.org>
date Wed, 27 May 2015 19:24:28 +0200
parents a14845624e01
children da355fb3a9ab
files locale/fr/LC_MESSAGES/django.po templates/sat_website/base.html
diffstat 2 files changed, 65 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Wed May 27 18:56:16 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Wed May 27 19:24:28 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-27 14:25+0200\n"
-"PO-Revision-Date: 2015-05-27 14:49+0100\n"
+"POT-Creation-Date: 2015-05-27 19:21+0200\n"
+"PO-Revision-Date: 2015-05-27 19:30+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -356,7 +356,7 @@
 msgstr "Spécifications"
 
 #: sat_website/views.py:39 templates/sat_website/downloads.html:27
-#: templates/sat_website/overview.html:109
+#: templates/sat_website/overview.html:110
 msgid "Downloads"
 msgstr "Téléchargements"
 
@@ -385,7 +385,7 @@
 msgstr "Presse"
 
 #: sat_website/views.py:50 templates/sat_website/association.html:47
-#: templates/sat_website/overview.html:100
+#: templates/sat_website/base.html:47 templates/sat_website/overview.html:101
 msgid "Adhesion"
 msgstr "Adhésion"
 
@@ -440,21 +440,6 @@
 
 #: templates/sat_website/adhesion.html:41
 #, python-format
-#| msgid ""
-#| "For 2015, we need about %(asso_finance_target)s € for:\n"
-#| "            <ul>\n"
-#| "                <li>two full-time salaries based on the French minimal "
-#| "salary;</li>\n"
-#| "                <li>hosting this web site and the Libervia demo and "
-#| "registering the domain names;</li>\n"
-#| "                <li>fees for the association's bank account and the "
-#| "online payment system (apayer.fr);</li>\n"
-#| "                <li>miscellaneous extra costs such as printing.</li>\n"
-#| "            </ul>\n"
-#| "            Which makes, with an average annual contribution of 10 € per "
-#| "subscription, %(asso_members_target)s members before December, 31<sup>st</"
-#| "sup> 2015!\n"
-#| "            "
 msgid ""
 "For 2015, we need about %(asso_finance_target)s € for:\n"
 "            <ul>\n"
@@ -493,7 +478,7 @@
 "%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n"
 "            "
 
-#: templates/sat_website/adhesion.html:55
+#: templates/sat_website/adhesion.html:56
 msgid ""
 "The membership lasts exactly one year and isn't automatically renewed: you "
 "have to renew it yourself and you can change the amount of your subscription "
@@ -503,7 +488,7 @@
 "la renouveler vous-même et vous pouvez modifier le montant de votre "
 "cotisation d'une année sur l'autre."
 
-#: templates/sat_website/adhesion.html:57
+#: templates/sat_website/adhesion.html:58
 msgid ""
 "To join the association without paying any subscription or to proceed with a "
 "bank transfer, please use our internal form:"
@@ -511,11 +496,11 @@
 "Pour rejoindre l'association sans payer de cotisation, ou bien pour procéder "
 "par virement bancaire, merci d'utiliser notre formulaire interne."
 
-#: templates/sat_website/adhesion.html:60
+#: templates/sat_website/adhesion.html:61
 msgid "Join for free or proceed with a transfer"
 msgstr "Adhérer gratuitement ou procéder par virement"
 
-#: templates/sat_website/adhesion.html:62
+#: templates/sat_website/adhesion.html:63
 msgid ""
 "If you prefer to proceed by card, you can directly use a secure payment "
 "service hosted by our bank. We unfortunately cannot pre-fill the form "
@@ -528,7 +513,7 @@
 "montant de cotisation positif parmi ceux définis dans le règlement "
 "intérieur : 10, 20, 30, 50, 80 ou 100."
 
-#: templates/sat_website/adhesion.html:65
+#: templates/sat_website/adhesion.html:66
 msgid "Join and proceed by card"
 msgstr "Adhérer et procéder par carte"
 
@@ -654,10 +639,23 @@
 msgid "Minutes"
 msgstr "Comptes rendus"
 
-#: templates/sat_website/base.html:35
+#: templates/sat_website/base.html:36
 msgid "Salut à Toi: the multi frontend, multipurpose communication tool"
 msgstr "Salut à Toi: l'outil de communication multi-interfaces et multi-usages"
 
+#: templates/sat_website/base.html:43
+msgid ""
+"We need your support to continue and move forward! Take the time to read "
+"about what we do. If you like it, please join the association."
+msgstr ""
+"Nous avons besoin de votre aide pour continuer à avancer ! Regardez ce que "
+"l'on fait et si ça vous plait, merci de rejoindre l'association."
+
+#: templates/sat_website/base.html:89
+#| msgid "language"
+msgid "Set language"
+msgstr "Changer la langue"
+
 #: templates/sat_website/community.html:26
 msgid "Salut à Toi's community"
 msgstr "La communauté Salut à Toi"
@@ -1053,15 +1051,28 @@
 msgid "Experimental and/or non-standard features"
 msgstr "Fonctionnalités expérimentales et/ou non standardes"
 
-#: templates/sat_website/finance.html:24
+#: templates/sat_website/finance.html:27
 #, python-format
-msgid "%(members_actual)s members"
-msgstr "%(members_actual)s membres"
+#| msgid "%(members_actual)s members"
+msgid "%(actual)s members"
+msgstr "%(actual)s membres"
 
-#: templates/sat_website/finance.html:25
+#: templates/sat_website/finance.html:30
+#, python-format
+#| msgid "%(members_left)s left"
+msgid "%(left)s members left"
+msgstr "%(left)s membres restants"
+
+#: templates/sat_website/finance.html:38
 #, python-format
-msgid "%(members_left)s left"
-msgstr "%(members_left)s restants"
+msgid "%(actual)s €"
+msgstr ""
+
+#: templates/sat_website/finance.html:41
+#, python-format
+#| msgid "%(members_left)s left"
+msgid "%(left)s € left"
+msgstr "%(left)s € restants"
 
 #: templates/sat_website/frontends.html:26
 msgid "Salut à Toi's frontends"
@@ -1386,11 +1397,11 @@
 "la cotisation est laissé à votre choix, entre 0 et 100 €. Adhérer "
 "gratuitement signifie aussi quelque chose, c'est un soutien moral !"
 
-#: templates/sat_website/overview.html:107
+#: templates/sat_website/overview.html:108
 msgid "Run it yourself!"
 msgstr "Lancez-le vous même !"
 
-#: templates/sat_website/overview.html:108
+#: templates/sat_website/overview.html:109
 msgid ""
 "If you enjoyed testing our demonstration version of Libervia and if you have "
 "the technical knowledge to do it, you can download the software and run it "
@@ -2202,6 +2213,3 @@
 msgstr ""
 "Merci de le lire attentivement, il contient les informations pour compléter "
 "votre adhésion."
-
-#~ msgid "Intercept \\"
-#~ msgstr "Intercepte \\"
--- a/templates/sat_website/base.html	Wed May 27 18:56:16 2015 +0200
+++ b/templates/sat_website/base.html	Wed May 27 19:24:28 2015 +0200
@@ -20,6 +20,7 @@
 
 {% load staticfiles %}
 {% load i18n %}
+{% load utils %}
 {% get_current_language as LANGUAGE_CODE %}
 
 <!DOCTYPE html>
@@ -68,6 +69,26 @@
                 {% include "sat_website/menu.html" with style="nav navbar-nav" categories=categories %}
                 {% include "sat_website/menu.html" with style="nav navbar-nav pull-right" categories=categories_right language_select=True %}
             </div>
+            <noscript>
+                {% for cat_url, item in categories.items %}
+                    {% if item|is_tuple %}
+                        {% for subcat_url, cat_name in item.1.items %}
+                            <a class="btn btn-default" role="button" href="{{ subcat_url }}.html">{{ cat_name }}</a>
+                        {% endfor %}
+                    {% endif %}
+                {% endfor %}
+                <form id="language_form" class="form-inline" action="{% url 'set_language' %}" method="post">
+	                {% csrf_token %}
+	                <input name="next" type="hidden" value="{{ redirect_to }}" />
+	                <select id="language_select" name="language">
+	                    {% get_language_info_list for available_languages as languages %}
+	                    {% for language in languages %}
+	                        <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>{{ language.name_local|title }}</option>
+	                    {% endfor %}
+	                </select>
+	                <input type="submit" value="{% trans "Set language" %}" />
+	            </form>
+            </noscript>
         </div>
     </nav>