Mercurial > sat_legacy_website

changeset 99:dd7a496bf762

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a general footer containing the email contact + add a section for this contact in the "community" section
author souliane <souliane@mailoo.org>
date Fri, 09 Oct 2015 13:02:56 +0200
parents e1df20f42e67
children 460f525e1d00
files locale/fr/LC_MESSAGES/django.po static/css/sat_website.css templates/sat_website/base.html templates/sat_website/community.html templates/sat_website/press.html
diffstat 5 files changed, 74 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Mon Sep 28 09:26:14 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Fri Oct 09 13:02:56 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 09:24+0200\n"
-"PO-Revision-Date: 2015-09-28 09:25+0100\n"
+"POT-Creation-Date: 2015-10-09 13:00+0200\n"
+"PO-Revision-Date: 2015-10-09 12:56+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -554,6 +554,14 @@
 msgid "Set language"
 msgstr "Changer la langue"
 
+#: templates/sat_website/base.html:99
+msgid "\"Salut à Toi\" association"
+msgstr "Association « Salut à Toi »"
+
+#: templates/sat_website/base.html:100 templates/sat_website/community.html:35
+msgid "(replace xyz with org)"
+msgstr "(remplacez xyz par org)"
+
 #: templates/sat_website/community.html:26
 msgid "Salut à Toi's community"
 msgstr "La communauté Salut à Toi"
@@ -564,23 +572,40 @@
 "Rejoignez nous pour discuter, contribuer et partager autour de Salut à Toi"
 
 #: templates/sat_website/community.html:32
-msgid "Enter the chat room."
+msgid "Contact the association"
+msgstr "Écrire à l'association"
+
+#: templates/sat_website/community.html:35
+msgid "To contact the managers of the association, please write an email to"
+msgstr ""
+"Pour contacter les gestionnaires de l'association, vous pouvez adresser "
+"votre courriel à"
+
+#: templates/sat_website/community.html:41
+msgid "Enter the chat room"
 msgstr "Rejoignez le salon de discussion"
 
-#: templates/sat_website/community.html:35
+#: templates/sat_website/community.html:44
 #, python-format
 msgid ""
-"Salut à Toi's multi-user chat room is <strong>*the*</strong> place to "
-"discuss the project: %(sat_muc)s"
+"Salut à Toi's multi-user chat room is the best place to discuss the project. "
+"There are many ways to join it, for example using Libervia, but if you "
+"prefer to not create any account, just click the following link: "
+"%(sat_muc)s. Please note that you can't send an email to this chat room: its "
+"identifier looks like an email address but it's not!"
 msgstr ""
-"Le salon de discussion de Salut à Toi est <strong>*le*</strong> lieu pour "
-"discuter du projet: %(sat_muc)s"
+"Le salon de discussion de Salut à Toi est le lieu privilégié pour discuter "
+"du projet. Il y a plusieurs moyens pour le rejoindre, par exemple en "
+"utilisant Libervia, mais si vous préférez ne pas créer de compte, il suffit "
+"de cliquer ici : %(sat_muc)s. Notez bien qu'il n'est pas possible d'envoyer "
+"un courriel à ce salon : son identifiant ressemble à une adresse de "
+"courriel, mais ce n'en est pas une !"
 
-#: templates/sat_website/community.html:41
-msgid "Follow the development and learn."
+#: templates/sat_website/community.html:50
+msgid "Follow the development and learn"
 msgstr "Suivre le développement, apprendre"
 
-#: templates/sat_website/community.html:44
+#: templates/sat_website/community.html:53
 #, python-format
 msgid ""
 "On the main developer's blog, you'll get recent information/reflections "
@@ -590,7 +615,7 @@
 "réflexions sur des nouvelles fonctionnalités (et des choses plus "
 "générales) : %(blog)s"
 
-#: templates/sat_website/community.html:45
+#: templates/sat_website/community.html:54
 #, python-format
 msgid ""
 "You can subscribe to the users mailing list to follow the progression, give "
@@ -599,16 +624,16 @@
 "Vous pouvez vous inscrire à la liste de diffusion « utilisateurs » pour "
 "suivre l'évolution, donner votre avis et contribuer : %(mailing_list)s"
 
-#: templates/sat_website/community.html:46
+#: templates/sat_website/community.html:55
 #, python-format
 msgid "You'll find some user documentation on the wiki: %(wiki)s"
 msgstr "Vous trouverez les documentations utilisateur sur le wiki : %(wiki)s"
 
-#: templates/sat_website/community.html:53
+#: templates/sat_website/community.html:62
 msgid "Participate !"
 msgstr "Participez !"
 
-#: templates/sat_website/community.html:56
+#: templates/sat_website/community.html:65
 msgid ""
 "SàT is an open project: come and discuss, give your opinion and share your "
 "thoughts. The more people that participate, the better the project will be. "
@@ -1665,13 +1690,12 @@
 msgstr "anglais"
 
 #: templates/sat_website/press.html:154
-#, python-format
 msgid ""
 "If you think that we could bring something interesting to an event "
-"(conference, stand...), feel free to write to %(email)s"
+"(conference, stand...), feel free to contact us."
 msgstr ""
 "Si vous pensez que nous pourrions apporter quelque chose à un événement "
-"(conférence, stand...), n'hésitez pas à nous écrire à %(email)s"
+"(conférence, stand...), n'hésitez pas à nous écrire."
 
 #: templates/sat_website/principles.html:27
 msgid "Some technical words to explain the project."
@@ -2353,3 +2377,10 @@
 msgstr ""
 "Merci de le lire attentivement, il contient les informations pour compléter "
 "votre adhésion."
+
+#~ msgid ""
+#~ "Salut à Toi's multi-user chat room is <strong>*the*</strong> place to "
+#~ "discuss the project: %(sat_muc)s"
+#~ msgstr ""
+#~ "Le salon de discussion de Salut à Toi est <strong>*le*</strong> lieu pour "
+#~ "discuter du projet: %(sat_muc)s"
--- a/static/css/sat_website.css	Mon Sep 28 09:26:14 2015 +0200
+++ b/static/css/sat_website.css	Fri Oct 09 13:02:56 2015 +0200
@@ -21,13 +21,18 @@
 
 body {
   padding-top: 50px;
-  padding-bottom: 30px;
+  padding-bottom: 10px;
 }
 
 header {
     margin-bottom: 20px;
 }
 
+footer {
+	padding-top: 40px;
+    font-size: smaller;
+}
+
 h1, h2, h3, h4, h5, h6 {
     font-weight: bold;
 }
--- a/templates/sat_website/base.html	Mon Sep 28 09:26:14 2015 +0200
+++ b/templates/sat_website/base.html	Fri Oct 09 13:02:56 2015 +0200
@@ -94,6 +94,12 @@
 
     <script src="{% static "js/jquery.min.js" %}"></script>
     {% block content %}{% endblock %}
+	<footer class="text-center">
+		<address>
+			{% trans '"Salut à Toi" association' %} -
+			<a href="mailto:contact@salut-a-toi.xyz">contact</a> {% trans "(replace xyz with org)" %}
+		</address>
+	</footer>
     <script src="{% static "bootstrap/js/bootstrap.min.js" %}"></script>
     <script src="{% static "js/sat_website.js" %}"></script>
 </body>
--- a/templates/sat_website/community.html	Mon Sep 28 09:26:14 2015 +0200
+++ b/templates/sat_website/community.html	Fri Oct 09 13:02:56 2015 +0200
@@ -29,16 +29,25 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-    {% trans "Enter the chat room." %}
+    {% trans "Contact the association" %}
     </h5>
     <div class="info">
-        <p>{% blocktrans with sat_muc="<a target=\"#\" href=\"xmpp:sat@chat.jabberfr.org?join\">sat@chat.jabberfr.org</a>" %}Salut à Toi's multi-user chat room is <strong>*the*</strong> place to discuss the project: {{ sat_muc }}{% endblocktrans %}</p>
+        <p>{% trans "To contact the managers of the association, please write an email to" %} <a href="mailto:contact@salut-a-toi.xyz">contact@salut-a-toi.xyz</a> {% trans "(replace xyz with org)" %}.</p>
     </div>
 </div>
 
 <div class="row">
     <h5 class="alert alert-success">
-    {% trans "Follow the development and learn." %}
+    {% trans "Enter the chat room" %}
+    </h5>
+    <div class="info">
+        <p>{% blocktrans with sat_muc="<a target=\"#\" href=\"http://chat.jabberfr.org/muckl_int/index.php?room=sat\">xmpp:sat@chat.jabberfr.org</a>" %}Salut à Toi's multi-user chat room is the best place to discuss the project. There are many ways to join it, for example using Libervia, but if you prefer to not create any account, just click the following link: {{ sat_muc }}. Please note that you can't send an email to this chat room: its identifier looks like an email address but it's not!{% endblocktrans %}</p>
+    </div>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">
+    {% trans "Follow the development and learn" %}
     </h5>
     <div class="info">
         <p>{% blocktrans with blog="<a target=\"#\" href=\"http://www.goffi.org\">http://www.goffi.org</a>" %}On the main developer's blog, you'll get recent information/reflections about SàT's features (and also more general ones): {{ blog }}{% endblocktrans %}</p>
--- a/templates/sat_website/press.html	Mon Sep 28 09:26:14 2015 +0200
+++ b/templates/sat_website/press.html	Fri Oct 09 13:02:56 2015 +0200
@@ -151,13 +151,11 @@
     </div>
     <div class="info">
         <div class="row">
-            <div class="col-md-12">{% blocktrans with email="contact \"at\" salut-a-toi.org"%}If you think that we could bring something interesting to an event (conference, stand...), feel free to write to {{email}}{% endblocktrans %}</div>
+            <div class="col-md-12">{% blocktrans %}If you think that we could bring something interesting to an event (conference, stand...), feel free to contact us.{% endblocktrans %}</div>
         </div>
     </div>
 </div>
 
 {% endblock %}
-conférence : demandez nous si vous en voulez
 
 
-