# HG changeset patch # User souliane # Date 1445332545 -7200 # Node ID e138879873f1325d87f0334b73282c82c4c5af99 # Parent bd30a18690e7e5d03330cf756047d93fbebbced4 changes to link the crowdfunding campaign (revert to be done manually after 45 days) diff -r bd30a18690e7 -r e138879873f1 locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Tue Oct 20 10:11:27 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Tue Oct 20 11:15:45 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-18 13:27+0200\n" -"PO-Revision-Date: 2015-10-18 13:28+0100\n" +"POT-Creation-Date: 2015-10-20 11:07+0200\n" +"PO-Revision-Date: 2015-10-20 11:13+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -139,7 +139,7 @@ "the association.\n" "\n" msgstr "" -"Merci, {name}!\n" +"Merci, {name} !\n" "\n" "Nous avons reçu votre demande et nous sommes heureux de vous compter parmi " "les membres de l'association.\n" @@ -349,97 +349,97 @@ msgid "subtitles" msgstr "sous-titres" -#: sat_website/views.py:31 +#: sat_website/views.py:32 msgid "Presentation" msgstr "Présentation" -#: sat_website/views.py:32 templates/sat_website/overview.html:66 +#: sat_website/views.py:33 templates/sat_website/overview.html:66 msgid "Features" msgstr "Fonctionnalités" -#: sat_website/views.py:33 templates/sat_website/overview.html:77 +#: sat_website/views.py:34 templates/sat_website/overview.html:77 #: templates/sat_website/principles.html:60 msgid "Frontends" msgstr "Interfaces" -#: sat_website/views.py:34 +#: sat_website/views.py:35 msgid "Screenshots & Videos" msgstr "Captures d'écran et vidéos" -#: sat_website/views.py:36 +#: sat_website/views.py:37 msgid "Technical area" msgstr "Espace technique" -#: sat_website/views.py:37 templates/sat_website/principles.html:26 +#: sat_website/views.py:38 templates/sat_website/principles.html:26 msgid "Principles" msgstr "Principes" -#: sat_website/views.py:38 templates/sat_website/principles.html:46 +#: sat_website/views.py:39 templates/sat_website/principles.html:46 msgid "Specifications" msgstr "Spécifications" -#: sat_website/views.py:39 templates/sat_website/downloads.html:27 +#: sat_website/views.py:40 templates/sat_website/downloads.html:27 #: templates/sat_website/overview.html:110 msgid "Downloads" msgstr "Téléchargements" -#: sat_website/views.py:40 +#: sat_website/views.py:41 msgid "Developers corner" msgstr "Coin des développeurs" -#: sat_website/views.py:42 +#: sat_website/views.py:43 msgid "Community" msgstr "Communauté" -#: sat_website/views.py:43 +#: sat_website/views.py:44 msgid "Get in touch" msgstr "Nous contacter" -#: sat_website/views.py:44 templates/sat_website/membership.html:47 +#: sat_website/views.py:45 templates/sat_website/membership.html:74 msgid "Association" msgstr "Association" -#: sat_website/views.py:45 +#: sat_website/views.py:46 msgid "Links" msgstr "Liens" -#: sat_website/views.py:46 templates/sat_website/press.html:27 +#: sat_website/views.py:47 templates/sat_website/press.html:27 msgid "Press" msgstr "Presse" -#: sat_website/views.py:47 +#: sat_website/views.py:48 msgid "FAQ" msgstr "FAQ" -#: sat_website/views.py:51 templates/sat_website/association.html:47 -#: templates/sat_website/base.html:47 templates/sat_website/overview.html:101 +#: sat_website/views.py:52 templates/sat_website/association.html:47 +#: templates/sat_website/overview.html:101 msgid "Membership" msgstr "Adhésion" -#: sat_website/views.py:52 templates/sat_website/features.html:76 +#: sat_website/views.py:53 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:62 +#: sat_website/views.py:63 msgid "contains the backend, Primitivus and Jp" msgstr "contient le backend, Primitivus et Jp" -#: sat_website/views.py:63 +#: sat_website/views.py:64 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:64 +#: sat_website/views.py:65 msgid "console display library needed by Primitivus" msgstr "bibliothèque pour l'affichage en console de Primitivus" -#: sat_website/views.py:65 +#: sat_website/views.py:66 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:66 +#: sat_website/views.py:67 msgid "Libervia frontend (web server and client)" msgstr "interface Libervia (serveur web et partie cliente)" @@ -572,23 +572,35 @@ 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 ! Soutenez-nous en " -"adhérant à l'association !" +#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61 +msgid " days" +msgstr " jours" + +#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61 +msgid "day" +msgstr "jour" -#: templates/sat_website/base.html:89 +#: templates/sat_website/base.html:60 +msgid "left to support our" +msgstr "restants pour supporter notre" + +#: templates/sat_website/base.html:61 +msgid "crowdfunding campaign" +msgstr "campagne de financement participatif" + +#: templates/sat_website/base.html:62 +msgid "for an Android interface!" +msgstr "pour une interface Android !" + +#: templates/sat_website/base.html:105 msgid "Set language" msgstr "Changer la langue" -#: templates/sat_website/base.html:99 +#: templates/sat_website/base.html:115 msgid "\"Salut à Toi\" association" msgstr "Association « Salut à Toi »" -#: templates/sat_website/base.html:100 templates/sat_website/community.html:35 +#: templates/sat_website/base.html:116 templates/sat_website/community.html:35 msgid "(replace invalid with org)" msgstr "(remplacez invalid par org)" @@ -1216,9 +1228,7 @@ msgid "Your idea here" msgstr "Votre idée ici" -#: templates/sat_website/gallery.html:40 -#: templates/sat_website/membership.html:38 -#: templates/sat_website/video.html:35 +#: templates/sat_website/gallery.html:40 templates/sat_website/video.html:35 #, python-format msgid "" "Your browser doesn't manage the « video » tag, you should update, e.g. with " @@ -1336,11 +1346,39 @@ msgid "Join the association" msgstr "Adhérez à l'association" -#: templates/sat_website/membership.html:44 +#: templates/sat_website/membership.html:56 +msgid "" +"We are curently running a crowdfunding campaign for the development of an " +"Android application (frontend for smartphones)." +msgstr "" +"Nous sommes actuellement en campagne de financement participatif pour le " +"développement d'une interface Android (pour les smartphones)." + +#: templates/sat_website/membership.html:57 +msgid "" +"During this period, we would kindly ask you to support the campaign instead " +"of paying a membership fee. It is still and always possible to join the " +"association for free. It doesn't change anything for you but it helps the " +"campaign to succeed. Thank you!" +msgstr "" +"Pendant cette période, nous vous demanderions de bien vouloir supporter la " +"campagne plutôt que de payer une cotisation. Il est toujours possible de " +"rejoindre l'association gratuitement. Pour vous, ça ne change rien, mais ça " +"contribue au succès de la campagne. Merci !" + +#: templates/sat_website/membership.html:62 +msgid "left!" +msgstr "restants !" + +#: templates/sat_website/membership.html:65 +msgid "Crowdfunding campaign" +msgstr "Campagne de financement participatif" + +#: templates/sat_website/membership.html:71 msgid "About the association" msgstr "Concernant l'association" -#: templates/sat_website/membership.html:46 +#: templates/sat_website/membership.html:73 msgid "" "We want it to be as transparent as the software. You can read about its " "mission, its organisation and check the official documents." @@ -1349,51 +1387,11 @@ "renseigner sur sa mission, son organisation et consulter les documents " "officiels." -#: templates/sat_website/membership.html:52 +#: templates/sat_website/membership.html:79 msgid "Become a member" msgstr "Devenir membre" -#: templates/sat_website/membership.html:54 -#, python-format -msgid "" -"For 2015, we need about %(asso_finance_target)s € for:\n" -"
    \n" -"
  • two full-time salaries based on the French minimal " -"salary;
    • \n" -"
  • hosting this web site and the Libervia demo and " -"registering the domain names;
    • \n" -"
  • fees for the association's bank account and the online " -"payment system (apayer.fr);
    • \n" -"
  • administrative help such as a lawyer or an accountant;\n" -"
  • travel expenses to attend and participate in meetings;\n" -"
  • hardware to develop and test the software;
    • \n" -"
  • miscellaneous extra costs such as printing.
    • \n" -"
\n" -" Which makes, with an average annual contribution of 10 € per " -"subscription, %(asso_members_target)s members before December, 31st 2015!\n" -" " -msgstr "" -"Pour 2015, nous nécessitons environ %(asso_finance_target)s € pour:\n" -"
    \n" -"
  • deux salaires à plein temps sur la base du SMIC ;
    • \n" -"
  • l'hébergement de ce site Internet et du site de " -"présentation de Libervia, l'enregistrement des noms de domaines ;
    • \n" -"
  • frais de gestion du compte bancaire de l'association et " -"du terminal de paiement virtuel (apayer.fr) ;
    • \n" -"
  • aide administrative (avocat ou comptable) ;
    • \n" -"
  • frais de déplacement pour se rendre et participer aux " -"réunions ;
    • \n" -"
  • matériel pour développer et tester le logiciel ;
    • \n" -"
  • frais divers (impression...).
    • \n" -"
\n" -" Ce qui fait, pour une cotisation annuelle moyenne de 10 €, " -"%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n" -" " - -#: templates/sat_website/membership.html:69 +#: templates/sat_website/membership.html:101 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 " @@ -1403,7 +1401,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/membership.html:71 +#: templates/sat_website/membership.html:103 msgid "" "To join the association without paying any subscription or to proceed with a " "bank transfer, please use our internal form:" @@ -1411,11 +1409,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/membership.html:74 +#: templates/sat_website/membership.html:106 msgid "Join for free or proceed with a transfer" msgstr "Adhérer gratuitement ou procéder par virement" -#: templates/sat_website/membership.html:76 +#: templates/sat_website/membership.html:108 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 " @@ -1428,7 +1426,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/membership.html:79 +#: templates/sat_website/membership.html:111 msgid "Join and proceed by card" msgstr "Adhérer et procéder par carte" @@ -2409,6 +2407,53 @@ "votre adhésion." #~ 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 ! Soutenez-nous " +#~ "en adhérant à l'association !" + +#~ msgid "" +#~ "For 2015, we need about %(asso_finance_target)s € for:\n" +#~ "
    \n" +#~ "
  • two full-time salaries based on the French minimal " +#~ "salary;
    • \n" +#~ "
  • hosting this web site and the Libervia demo and " +#~ "registering the domain names;
    • \n" +#~ "
  • fees for the association's bank account and the " +#~ "online payment system (apayer.fr);
    • \n" +#~ "
  • administrative help such as a lawyer or an accountant;" +#~ "
    • \n" +#~ "
  • travel expenses to attend and participate in meetings;" +#~ "
    • \n" +#~ "
  • hardware to develop and test the software;
    • \n" +#~ "
  • miscellaneous extra costs such as printing.
    • \n" +#~ "
\n" +#~ " Which makes, with an average annual contribution of 10 € per " +#~ "subscription, %(asso_members_target)s members before December, 31st 2015!\n" +#~ " " +#~ msgstr "" +#~ "Pour 2015, nous nécessitons environ %(asso_finance_target)s € pour:\n" +#~ "
    \n" +#~ "
  • deux salaires à plein temps sur la base du SMIC ;\n" +#~ "
  • l'hébergement de ce site Internet et du site de " +#~ "présentation de Libervia, l'enregistrement des noms de domaines ;
    • \n" +#~ "
  • frais de gestion du compte bancaire de l'association " +#~ "et du terminal de paiement virtuel (apayer.fr) ;
    • \n" +#~ "
  • aide administrative (avocat ou comptable) ;
    • \n" +#~ "
  • frais de déplacement pour se rendre et participer aux " +#~ "réunions ;
    • \n" +#~ "
  • matériel pour développer et tester le logiciel ;\n" +#~ "
  • frais divers (impression...).
    • \n" +#~ "
\n" +#~ " Ce qui fait, pour une cotisation annuelle moyenne de 10 €, " +#~ "%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n" +#~ " " + +#~ msgid "" #~ "Salut à Toi's multi-user chat room is *the* place to " #~ "discuss the project: %(sat_muc)s" #~ msgstr "" diff -r bd30a18690e7 -r e138879873f1 sat_website/views.py --- a/sat_website/views.py Tue Oct 20 10:11:27 2015 +0200 +++ b/sat_website/views.py Tue Oct 20 11:15:45 2015 +0200 @@ -26,6 +26,7 @@ from django.utils.translation import ugettext_lazy as _ from django.template import RequestContext from collections import OrderedDict +import datetime import media, social_contract, utils, forms CATEGORIES = OrderedDict([('frontends', (_(u"Presentation"), @@ -80,6 +81,10 @@ "category": category, "libervia_demo_url": utils.get_libervia_demo_url(), "subscription_amounts": utils.get_asso_subscr_amounts(), + + # FIXME: dirty implementation just for the duration of the campaign! + # http://stackoverflow.com/questions/4327021/python-count-down-to-event-in-days-and-hours + "campaign_countdown": (datetime.datetime(2015, 12, 6) - datetime.datetime.now()).days, }) context.update(csrf(request)) diff -r bd30a18690e7 -r e138879873f1 static/images/misc/campagne_android.png Binary file static/images/misc/campagne_android.png has changed diff -r bd30a18690e7 -r e138879873f1 templates/sat_website/base.html --- a/templates/sat_website/base.html Tue Oct 20 10:11:27 2015 +0200 +++ b/templates/sat_website/base.html Tue Oct 20 11:15:45 2015 +0200 @@ -38,7 +38,10 @@ {% if category != "membership" and category != "membership_form" and category != "thank_you" %} + +# FIXME: dirty implementation just for the duration of the campaign! +{% endcomment %}
+
+

+ + + +

+

 

+

+ {% trans "We are curently running a crowdfunding campaign for the development of an Android application (frontend for smartphones)." %} + {% trans "During this period, we would kindly ask you to support the campaign instead of paying a membership fee. It is still and always possible to join the association for free. It doesn't change anything for you but it helps the campaign to succeed. Thank you!" %} +

+

+ {{ campaign_countdown }} + {% if campaign_countdown > 1 %}{% trans " days" %}{% else %}{% trans "day" %}{% endif %} + {% trans "left!" %} +

+

+ {% trans "Crowdfunding campaign" %} +

+
+
+ +
{% trans "About the association" %}

{% trans "We want it to be as transparent as the software. You can read about its mission, its organisation and check the official documents." %}

@@ -51,6 +78,8 @@
{% trans "Become a member" %}
+ + {% comment %}

{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for:

  • two full-time salaries based on the French minimal salary;
    • @@ -66,17 +95,19 @@

    {% include "sat_website/finance.html" with obj="members" %} {% include "sat_website/finance.html" %} + {% endcomment %} +

    {% trans "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 every year." %}

    {% trans "To join the association without paying any subscription or to proceed with a bank transfer, please use our internal form:" %}

    -

    - {% trans "Join for free or proceed with a transfer" %} +

    + {% trans "Join for free or proceed with a transfer" %}

    {% trans "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 fields. Please enter a positive amount from those defined in the Rules of Procedure: 10, 20, 30, 50, 80 or 100." %}

    -

    - {% trans "Join and proceed by card" %} +

    + {% trans "Join and proceed by card" %}