Mercurial > sat_legacy_website
changeset 76:d2ea666fb1dd
add a FAQ section, now talking about HTTPS and CAcert
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Fri, 05 Jun 2015 20:59:07 +0200 |
| parents | 085280c48363 |
| children | 13ebb548f234 |
| files | locale/fr/LC_MESSAGES/django.po sat_website/views.py static/css/sat_website.css static/images/certificate/1_cert_en.png static/images/certificate/1_cert_fr.png static/images/certificate/2_cert_en.png static/images/certificate/2_cert_fr.png templates/sat_website/faq.html |
| diffstat | 8 files changed, 196 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po Thu May 28 01:48:17 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Fri Jun 05 20:59:07 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-28 01:43+0200\n" -"PO-Revision-Date: 2015-05-28 01:43+0100\n" +"POT-Creation-Date: 2015-06-05 20:50+0200\n" +"PO-Revision-Date: 2015-06-05 20:57+0100\n" "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n" "Language-Team: français <goffi@goffi.org>\n" "Language: fr\n" @@ -384,35 +384,39 @@ msgid "Press" msgstr "Presse" -#: sat_website/views.py:50 templates/sat_website/association.html:47 +#: sat_website/views.py:47 +msgid "FAQ" +msgstr "" + +#: sat_website/views.py:51 templates/sat_website/association.html:47 #: templates/sat_website/base.html:47 templates/sat_website/overview.html:101 msgid "Adhesion" msgstr "Adhésion" -#: sat_website/views.py:51 templates/sat_website/features.html:76 +#: sat_website/views.py:52 templates/sat_website/features.html:76 #: templates/sat_website/overview.html:85 #: templates/sat_website/principles.html:74 msgid "Social contract" msgstr "Contrat social" -#: sat_website/views.py:56 +#: sat_website/views.py:57 msgid "contains the backend, Primitivus and Jp" msgstr "contient le backend, Primitivus et Jp" -#: sat_website/views.py:57 +#: sat_website/views.py:58 msgid "Images and other media needed to launch SàT" msgstr "images et autres média nécessaires au lancement de SàT" -#: sat_website/views.py:58 +#: sat_website/views.py:59 msgid "console display library needed by Primitivus" msgstr "bibliothèque pour l'affichage en console de Primitivus" -#: sat_website/views.py:59 +#: sat_website/views.py:60 msgid "PubSub server component needed for SàT experimental blogging features" msgstr "" "composant serveur PubSub pour les fonctionnalités expérimentales de blogage" -#: sat_website/views.py:60 +#: sat_website/views.py:61 msgid "Libervia frontend (web server and client)" msgstr "interface Libervia (serveur web et partie cliente)" @@ -914,6 +918,115 @@ msgid "Visit the wiki" msgstr "Visitez le wiki" +#: templates/sat_website/faq.html:28 +msgid "Frequently asked questions" +msgstr "Foire aux questions" + +#: templates/sat_website/faq.html:33 +#, python-format +msgid "What is the security warning when I visit %(demo_http)s?" +msgstr "" +"Qu'est-ce que cet avertissement de sécurité qui s'affiche quand je visite " +"%(demo_http)s ?" + +#: templates/sat_website/faq.html:35 +#, python-format +msgid "" +"This message advices you to use Libervia with HTTPS instead of HTTP. The " +"difference between the two is that HTTPS is more secure because the " +"connection between your browser and the server is encrypted. This is " +"especially recommended when you have to type a password. You should always " +"use %(demo_https)s instead of %(demo_http)s." +msgstr "" +"Ce message vous conseille d'utiliser la version HTTPS de Libervia au lieu de " +"HTTP. La différence entre les deux est que HTTPS est plus sécurisé car la " +"connexion entre votre navigateur et le serveur est chiffrée. C'est surtout " +"recommandé lorsque vous devez taper un mot de passe. Vous devriez toujours " +"utiliser %(demo_https)s et non pas %(demo_http)s." + +#: templates/sat_website/faq.html:40 +#, python-format +msgid "My browser says that %(demo_https)s is unsecure. What does it mean?" +msgstr "" +"Mon navigateur me dit que la connexion à %(demo_https)s n'est pas certifiée. " +"Qu'est-ce que cela signifie?" + +#: templates/sat_website/faq.html:42 +#, python-format +msgid "" +"The issue here is that %(cacert)s, the certification authority that we use " +"for authenticating %(demo_https)s is not recognised by your browser. The " +"fact your browser doesn't trust CAcert doesn't mean that it is unsecure. For " +"us, it is even more trustable than any other certification organism and we " +"use it on purpose. Despite some companies are offering free certificates " +"that are recognised by every browser, we prefer to support a community-" +"driven and transparent service like CAcert." +msgstr "" +"Ce problème vient du fait que %(cacert)s, l'autorité de certification que " +"nous utilisons pour authentifier %(demo_https)s, n'est pas reconnu par votre " +"navigateur. Le fait que ce dernier ne fasse pas confiance à CAcert ne " +"signifie pas pour autant qu'il y ait un réel problème de sécurité. En fait, " +"nous faisons même davantage confiance à CAcert qu'à n'importe quel autre " +"organisme de certification, et c'est bien consciemment que nous l'utilisons. " +"Bien que des sociétés proposent des certificats gratuits qui sont reconnus " +"par tous les navigateurs, nous préférons supporter un service communautaire " +"et transparent tel que CAcert." + +#: templates/sat_website/faq.html:43 +#, python-format +msgid "" +"So for this time, even if you don't know what's going on, please trust us " +"and accept the certificate. You have to do it only once and then your " +"browser will not bug you anymore when you are about to connect to " +"%(demo_https)s. If you use Mozilla Firefox, proceed this way:" +msgstr "" +"Donc pour cette fois, même si vous ne saisissez pas vraiment de quoi il " +"s'agit, merci de nous faire confiance et d'accepter le certificat. Vous ne " +"devez le faire que la première fois et ensuite votre navigateur ne vous " +"embêtera plus quand vous vous connecterez à %(demo_https)s. Si vous utilisez " +"Mozilla Firefox, suivez ces instructions :" + +#: templates/sat_website/faq.html:49 +msgid "Click \"I Understand the Risks\" and then \"Add Exception\"." +msgstr "" +"Cliquez sur « Je comprends les risques » puis sur « Ajouter une exception »." + +#: templates/sat_website/faq.html:57 +msgid "" +"Click \"View\" and check that the fingerprint matches, then click \"Confirm " +"Security Exception\"." +msgstr "" +"Cliquez sur « Voir » et vérifiez que l'empreinte correspond, ensuite cliquez " +"sur « Confirmer l'exception de sécurité »." + +#: templates/sat_website/faq.html:60 +#, python-format +msgid "" +"The SHA-256 fingerprint must be %(fingerprint)s. If this is not the case, " +"don't confirm the exception and start to worry!" +msgstr "" +"L'empreinte numérique SHA-256 doit être %(fingerprint)s. Si ce n'est pas le " +"cas, ne confirmez pas l'exception et inquiétez-vous ! " + +#: templates/sat_website/faq.html:61 +#, python-format +msgid "" +"Alternatively, you can import the CAcert root certificate to your browser. " +"This is actually a better solution because not only %(demo_https)s but all " +"the websites using the same certification organism than us will be " +"accessible without any security warning and since the first time. To do so, " +"please follow the instructions that are given here: %(cacert_wiki)s. It may " +"look complicated but it is not, for example with Firefox you just need to " +"install an add-on!" +msgstr "" +"Une autre solution est d'importer le certificat racine de CAcert dans votre " +"navigateur. C'est en fait encore mieux, car non seulement %(demo_https)s " +"mais aussi tous les sites qui utilisent le même organisme de certification " +"que nous serons tout de suite accessibles et sans aucun avertissement. Si " +"vous préférez cette alternative, vous pouvez suivre les instructions " +"directement sur %(cacert_wiki)s. Ça parait un peu compliqué mais ça ne l'est " +"pas, par exemple pour Firefox il suffit d'installer un module (plugin)." + #: templates/sat_website/features.html:26 msgid "Salut à Toi's features" msgstr "Fonctionnalités de Salut à Toi" @@ -1260,7 +1373,7 @@ #: templates/sat_website/overview.html:49 msgid "Libervia demo version" -msgstr "Vue principale de Libervia" +msgstr "Démo de Libervia" #: templates/sat_website/overview.html:57 #: templates/sat_website/principles.html:36 @@ -1678,10 +1791,6 @@ "\t\t " #: templates/sat_website/principles.html:121 -#| msgid "" -#| "Decentralised communication system with self-hosting ability - the dot on " -#| "the right is still an Internet user, but for the service it's both a user " -#| "and a server." msgid "" "Decentralised communication system with self-hosting ability - the dot on " "the right is still an Internet user, but for the communication service it's " @@ -2204,6 +2313,9 @@ "Merci de le lire attentivement, il contient les informations pour compléter " "votre adhésion." +#~ msgid "Click \"Add Exception\"." +#~ msgstr "Cliquez sur « Ajouter une exception »." + #~ msgid "" #~ "The dots represents Internet users, the lines represents physical links - " #~ "server-to-server links for the central triangle, client-to-server links "
--- a/sat_website/views.py Thu May 28 01:48:17 2015 +0200 +++ b/sat_website/views.py Fri Jun 05 20:59:07 2015 +0200 @@ -44,6 +44,7 @@ ("association", _(u"Association")), ("links", _(u"Links")), ("press", _(u"Press")), + ("faq", _(u"FAQ")), ]))), ])
--- a/static/css/sat_website.css Thu May 28 01:48:17 2015 +0200 +++ b/static/css/sat_website.css Fri Jun 05 20:59:07 2015 +0200 @@ -249,4 +249,9 @@ .schema { width: 500px; +} + +.fingerprint { + word-wrap: break-word; + font-weight: bold; } \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/sat_website/faq.html Fri Jun 05 20:59:07 2015 +0200 @@ -0,0 +1,64 @@ +{% extends "sat_website/category.html" %} + +{% comment %} +SàT website: Salut à Toi's presentation website +Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) +Copyright (C) 2015 Adrien Cossa (souliane@mailoo.org) + +This file is part of SàT website. + +SàT website is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Foobar is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with Foobar. If not, see <http://www.gnu.org/licenses/>. +{% endcomment %} + +{% load i18n %} +{% load staticfiles %} +{% get_current_language as LANGUAGE_CODE %} + +{% block headline %}{% trans "Frequently asked questions" %}{% endblock %} +{% block main_container %} + +<div class="row"><a name="html"></a> + <h5 class="alert alert-warning"> + {% blocktrans with demo_http="http://libervia.org" %}What is the security warning when I visit {{demo_http}}?{% endblocktrans %} + </h5> + <p>{% blocktrans with demo_http="http://libervia.org" demo_https="https://libervia.org" %}This message advices you to use Libervia with HTTPS instead of HTTP. The difference between the two is that HTTPS is more secure because the connection between your browser and the server is encrypted. This is especially recommended when you have to type a password. You should always use {{demo_https}} instead of {{demo_http}}.{% endblocktrans %}</p> +</div> + +<div class="row"><a name="certificate"></a> + <h5 class="alert alert-warning"> + {% blocktrans with demo_https="https://libervia.org" %}My browser says that {{demo_https}} is unsecure. What does it mean?{% endblocktrans %} + </h5> + <p>{% blocktrans with demo_https="https://libervia.org" cacert='<a href="http://www.cacert.org" target="#">CAcert</a>' %}The issue here is that {{cacert}}, the certification authority that we use for authenticating {{demo_https}} is not recognised by your browser. The fact your browser doesn't trust CAcert doesn't mean that it is unsecure. For us, it is even more trustable than any other certification organism and we use it on purpose. Despite some companies are offering free certificates that are recognised by every browser, we prefer to support a community-driven and transparent service like CAcert.{% endblocktrans %}</p> + <p>{% blocktrans with demo_https="https://libervia.org" %}So for this time, even if you don't know what's going on, please trust us and accept the certificate. You have to do it only once and then your browser will not bug you anymore when you are about to connect to {{demo_https}}. If you use Mozilla Firefox, proceed this way:{% endblocktrans %} + <div class="thumbnail"> + {% with "images/certificate/1_cert_"|add:LANGUAGE_CODE|add:'.png' as image %} + <img class="schema" src="{% static image %}" > + {% endwith %} + <div class="caption"> + {% trans 'Click "I Understand the Risks" and then "Add Exception".' %} + </div> + </div> + <div class="thumbnail"> + {% with "images/certificate/2_cert_"|add:LANGUAGE_CODE|add:'.png' as image %} + <img class="schema" src="{% static image %}" > + {% endwith %} + <div class="caption"> + {% trans 'Click "View" and check that the fingerprint matches, then click "Confirm Security Exception".' %} + </div> + </div> + {% blocktrans with fingerprint='<span class="fingerprint">9D:DF:A9:11:EB:DB:FA:E3:CA:BA:57:51:37:A4:69:29:B9:8D:BE:FE:7D:BB:80:04:FC:C4:A5:8A:47:9A:52:06</span>' %}The SHA-256 fingerprint must be {{fingerprint}}. If this is not the case, don't confirm the exception and start to worry!{% endblocktrans %}</p> + <p>{%blocktrans with demo_https="https://libervia.org" cacert_wiki='<a href="http://wiki.cacert.org/FAQ/BrowserClients" target="#">http://wiki.cacert.org/FAQ/BrowserClients</a>' %}Alternatively, you can import the CAcert root certificate to your browser. This is actually a better solution because not only {{demo_https}} but all the websites using the same certification organism than us will be accessible without any security warning and since the first time. To do so, please follow the instructions that are given here: {{cacert_wiki}}. It may look complicated but it is not, for example with Firefox you just need to install an add-on!{% endblocktrans %}</p> +</div> + +{% endblock %}