# HG changeset patch # User souliane # Date 1449414666 -3600 # Node ID 1bdb78a2164737796a992b58f5df0a32ea09f8b2 # Parent 2c4e038a6ece823da5e12f1e76d61b0bfe029221 adapt the website after the campaign on Arizuka finished diff -r 2c4e038a6ece -r 1bdb78a21647 locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Sun Dec 06 16:11:32 2015 +0100 +++ b/locale/fr/LC_MESSAGES/django.po Sun Dec 06 16:11:06 2015 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-02 00:16+0100\n" -"PO-Revision-Date: 2015-12-02 00:18+0100\n" +"POT-Creation-Date: 2015-12-06 16:06+0100\n" +"PO-Revision-Date: 2015-12-06 16:13+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -364,11 +364,11 @@ msgid "Presentation" msgstr "Présentation" -#: sat_website/views.py:33 templates/sat_website/overview.html:92 +#: sat_website/views.py:33 templates/sat_website/overview.html:86 msgid "Features" msgstr "Fonctionnalités" -#: sat_website/views.py:34 templates/sat_website/overview.html:103 +#: sat_website/views.py:34 templates/sat_website/overview.html:97 #: templates/sat_website/principles.html:60 msgid "Frontends" msgstr "Interfaces" @@ -390,7 +390,7 @@ msgstr "Spécifications" #: sat_website/views.py:40 templates/sat_website/downloads.html:27 -#: templates/sat_website/overview.html:139 +#: templates/sat_website/overview.html:133 msgid "Downloads" msgstr "Téléchargements" @@ -406,7 +406,7 @@ msgid "Get in touch" msgstr "Nous contacter" -#: sat_website/views.py:45 templates/sat_website/membership.html:74 +#: sat_website/views.py:45 templates/sat_website/membership.html:35 msgid "Association" msgstr "Association" @@ -423,12 +423,12 @@ msgstr "FAQ" #: sat_website/views.py:52 templates/sat_website/association.html:47 -#: templates/sat_website/overview.html:130 +#: templates/sat_website/overview.html:124 msgid "Membership" msgstr "Adhésion" #: sat_website/views.py:53 templates/sat_website/features.html:76 -#: templates/sat_website/overview.html:111 +#: templates/sat_website/overview.html:105 #: templates/sat_website/principles.html:74 msgid "Social contract" msgstr "Contrat social" @@ -583,44 +583,15 @@ 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:61 templates/sat_website/membership.html:61 -#: templates/sat_website/overview.html:59 -msgid " days" -msgstr " jours" - -#: templates/sat_website/base.html:61 templates/sat_website/membership.html:61 -#: templates/sat_website/overview.html:59 -msgid "day" -msgstr "jour" - -#: templates/sat_website/base.html:62 -msgid "left to support our" -msgstr "restants pour supporter notre" - -#: templates/sat_website/base.html:63 templates/sat_website/membership.html:50 -#: templates/sat_website/membership.html:65 -#: templates/sat_website/overview.html:48 -#: templates/sat_website/overview.html:63 templates/sat_website/press.html:37 -msgid "en" -msgstr "fr" - -#: templates/sat_website/base.html:63 -msgid "crowdfunding campaign" -msgstr "campagne de financement participatif" - -#: templates/sat_website/base.html:64 -msgid "for an Android interface!" -msgstr "pour une interface Android !" - -#: templates/sat_website/base.html:107 +#: templates/sat_website/base.html:93 msgid "Set language" msgstr "Changer la langue" -#: templates/sat_website/base.html:117 +#: templates/sat_website/base.html:103 msgid "\"Salut à Toi\" association" msgstr "Association « Salut à Toi »" -#: templates/sat_website/base.html:118 templates/sat_website/community.html:35 +#: templates/sat_website/base.html:104 templates/sat_website/community.html:35 msgid "(replace invalid with org)" msgstr "(remplacez invalid par org)" @@ -1393,43 +1364,11 @@ msgid "Join the association" msgstr "Adhérez à l'association" -#: templates/sat_website/membership.html:56 -#: templates/sat_website/overview.html:54 -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 -#: templates/sat_website/overview.html:55 -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 -#: templates/sat_website/overview.html:60 -msgid "left!" -msgstr "restants !" - -#: templates/sat_website/membership.html:65 -#: templates/sat_website/overview.html:63 -msgid "Crowdfunding campaign" -msgstr "Campagne de financement participatif" - -#: templates/sat_website/membership.html:71 +#: templates/sat_website/membership.html:32 msgid "About the association" msgstr "Concernant l'association" -#: templates/sat_website/membership.html:73 +#: templates/sat_website/membership.html:34 msgid "" "We want it to be as transparent as the software. You can read about its " "mission, its organisation and check the official documents." @@ -1438,11 +1377,11 @@ "renseigner sur sa mission, son organisation et consulter les documents " "officiels." -#: templates/sat_website/membership.html:79 +#: templates/sat_website/membership.html:40 msgid "Become a member" msgstr "Devenir membre" -#: templates/sat_website/membership.html:101 +#: templates/sat_website/membership.html:62 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 " @@ -1452,7 +1391,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:103 +#: templates/sat_website/membership.html:64 msgid "" "To join the association without paying any subscription or to proceed with a " "bank transfer, please use our internal form:" @@ -1460,11 +1399,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:106 +#: templates/sat_website/membership.html:67 msgid "Join for free or proceed with a transfer" msgstr "Adhérer gratuitement ou procéder par virement" -#: templates/sat_website/membership.html:108 +#: templates/sat_website/membership.html:69 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 " @@ -1477,10 +1416,31 @@ "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:111 +#: templates/sat_website/membership.html:72 msgid "Join and proceed by card" msgstr "Adhérer et procéder par carte" +#: templates/sat_website/membership.html:78 +msgid "Donations" +msgstr "Dons" + +#: templates/sat_website/membership.html:80 +msgid "" +"If you prefer, you can also make a donation without joining the association. " +"Your bank transfer can be made to the following account:" +msgstr "" +"Si vous préférez, vous pouvez aussi faire un don sans rejoindre " +"l'association. Votre virement bancaire peut être effectuer sur le compte " +"suivant :" + +#: templates/sat_website/membership.html:82 +msgid "Payee:" +msgstr "Bénéficiaire :" + +#: templates/sat_website/membership.html:89 +msgid "Bank:" +msgstr "Banque :" + #: templates/sat_website/membership_form.html:33 msgid "Please complete this form" msgstr "Merci de bien vouloir renseigner ce formulaire" @@ -1501,7 +1461,24 @@ "l'outil de communication multi-usages, multi-interfaces, libre et " "décentralisé" -#: templates/sat_website/overview.html:71 +#: templates/sat_website/overview.html:48 templates/sat_website/press.html:37 +msgid "en" +msgstr "fr" + +#: templates/sat_website/overview.html:54 +msgid "" +"The crowdfunding campaign for a desktop and Android interface finished on " +"December 6th and it was successful." +msgstr "" +"La campagne de financement participatif pour l'interface bureau et Android " +"s'est achevée avec succès le 6 décembre." + +#: templates/sat_website/overview.html:57 +#: templates/sat_website/thank_you.html:27 +msgid "Thank you!" +msgstr "Merci !" + +#: templates/sat_website/overview.html:65 msgid "" "SàT includes several sub-projects. Libervia, a web interface to discuss and " "blog with the persons of your choice, is one of them:" @@ -1510,32 +1487,32 @@ "discuter et bloguer uniquement avec les personnes de votre choix, est l'une " "d'elle :" -#: templates/sat_website/overview.html:74 +#: templates/sat_website/overview.html:68 #, python-format msgid "Please read our %(faq)s before trying out" msgstr "Lisez s'il vous plait notre %(faq)s avant d'essayer la" -#: templates/sat_website/overview.html:75 +#: templates/sat_website/overview.html:69 msgid "Libervia demo version" msgstr "Démo de Libervia" -#: templates/sat_website/overview.html:83 +#: templates/sat_website/overview.html:77 #: templates/sat_website/principles.html:36 msgid "Multipurpose" msgstr "Multi-usages" -#: templates/sat_website/overview.html:84 +#: templates/sat_website/overview.html:78 msgid "SàT covers a large spectrum of the Internet functions and uses:" msgstr "SàT couvre un large champ des utilisations d'Internet :" -#: templates/sat_website/overview.html:86 +#: templates/sat_website/overview.html:80 msgid "" "Chat with one or many contacts, in public or private rooms." msgstr "" "discuter instantanément avec un ou plusieurs contacts, dans " "des salons privés ou publics ;" -#: templates/sat_website/overview.html:87 +#: templates/sat_website/overview.html:81 msgid "" "Organize contact groups and restrict the visibility of your " "messages." @@ -1543,14 +1520,14 @@ "gérer des groupes de contacts et restreignez la lisibilité " "de vos messages ;" -#: templates/sat_website/overview.html:88 +#: templates/sat_website/overview.html:82 msgid "" "End-to-end encryption makes your communications private." msgstr "" "le chiffrement de bout en bout rend vos conversations " "vraiment privées ;" -#: templates/sat_website/overview.html:89 +#: templates/sat_website/overview.html:83 msgid "" "Blogging system to share instant thoughts or write longer " "articles." @@ -1558,17 +1535,17 @@ "système de blogage pour partager vos réflexions du moment " "ou écrire de plus longs articles ;" -#: templates/sat_website/overview.html:90 +#: templates/sat_website/overview.html:84 msgid "File sharing, games, interaction with other networks." msgstr "" "partage de fichier, jeux, interaction avec d'autres réseaux et beaucoup plus." -#: templates/sat_website/overview.html:95 +#: templates/sat_website/overview.html:89 #: templates/sat_website/principles.html:52 msgid "Multi frontend" msgstr "Multi-interfaces" -#: templates/sat_website/overview.html:96 +#: templates/sat_website/overview.html:90 msgid "" "SàT can be used via different interfaces, each of them being a sub-project, " "but the heart of the software remains the same. You can use SàT:" @@ -1577,28 +1554,28 @@ "sous-projet, mais le cœur du logiciel reste le même. Cela signifie que vous " "pouvez utiliser SàT:" -#: templates/sat_website/overview.html:98 +#: templates/sat_website/overview.html:92 msgid "with a browser through the web interface Libervia" msgstr "avec un navigateur à travers l'interface web ;" -#: templates/sat_website/overview.html:99 +#: templates/sat_website/overview.html:93 msgid "inside a console user interface" msgstr "dans une interface console ;" -#: templates/sat_website/overview.html:100 +#: templates/sat_website/overview.html:94 msgid "through a command line" msgstr "à travers la ligne de commande." -#: templates/sat_website/overview.html:102 +#: templates/sat_website/overview.html:96 msgid "Other frontends are planned (telephones, desktop)." msgstr "D'autres interfaces sont prévues (téléphones, bureau)." -#: templates/sat_website/overview.html:109 +#: templates/sat_website/overview.html:103 #: templates/sat_website/principles.html:66 msgid "Libre" msgstr "Libre" -#: templates/sat_website/overview.html:110 +#: templates/sat_website/overview.html:104 msgid "" "SàT is not only open source, it's Libre and follows the free software " "philosophy (\"free\" as in freedom) because it's the best way to develop a " @@ -1609,12 +1586,12 @@ "Libres, non seulement parce que c'est la meilleure façon de développer des " "logiciels, mais aussi (et surtout) pour l'esprit de partage et de liberté." -#: templates/sat_website/overview.html:114 +#: templates/sat_website/overview.html:108 #: templates/sat_website/principles.html:80 msgid "Decentralised" msgstr "Décentralisé" -#: templates/sat_website/overview.html:115 +#: templates/sat_website/overview.html:109 msgid "" "SàT has many similarities with the email network. For instance, there is no " "big server where all the data is kept, but many servers managed by different " @@ -1630,11 +1607,11 @@ "souhaitez pas confier vos photos privées et messages intimes à des " "entreprises commerciales non fiables, n'est-ce pas ?" -#: templates/sat_website/overview.html:122 +#: templates/sat_website/overview.html:116 msgid "The association" msgstr "L'association" -#: templates/sat_website/overview.html:123 +#: templates/sat_website/overview.html:117 msgid "" "Salut à Toi and Libervia are developed by a non-profit and self-managed " "association. We are fighting against the hold-up of the Internet by private " @@ -1650,11 +1627,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:137 +#: templates/sat_website/overview.html:131 msgid "Run it yourself!" msgstr "Lancez-le vous même !" -#: templates/sat_website/overview.html:138 +#: templates/sat_website/overview.html:132 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 " @@ -1707,37 +1684,38 @@ msgstr "Articles" #: templates/sat_website/press.html:49 templates/sat_website/press.html:52 -#: templates/sat_website/press.html:58 templates/sat_website/press.html:61 -#: templates/sat_website/press.html:75 templates/sat_website/press.html:79 -#: templates/sat_website/press.html:92 templates/sat_website/press.html:98 -#: templates/sat_website/press.html:104 templates/sat_website/press.html:105 -#: templates/sat_website/press.html:111 templates/sat_website/press.html:112 -#: templates/sat_website/press.html:118 templates/sat_website/press.html:119 -#: templates/sat_website/press.html:120 templates/sat_website/press.html:128 -#: templates/sat_website/press.html:136 templates/sat_website/press.html:144 -#: templates/sat_website/press.html:145 +#: templates/sat_website/press.html:61 +msgid "German" +msgstr "Allemand" + +#: templates/sat_website/press.html:55 templates/sat_website/press.html:58 +#: templates/sat_website/press.html:64 templates/sat_website/press.html:67 +#: templates/sat_website/press.html:81 templates/sat_website/press.html:85 +#: templates/sat_website/press.html:98 templates/sat_website/press.html:104 +#: templates/sat_website/press.html:110 templates/sat_website/press.html:111 +#: templates/sat_website/press.html:117 templates/sat_website/press.html:118 +#: templates/sat_website/press.html:124 templates/sat_website/press.html:125 +#: templates/sat_website/press.html:126 templates/sat_website/press.html:134 +#: templates/sat_website/press.html:142 templates/sat_website/press.html:150 +#: templates/sat_website/press.html:151 msgid "French" msgstr "Français" -#: templates/sat_website/press.html:52 templates/sat_website/press.html:55 +#: templates/sat_website/press.html:58 templates/sat_website/press.html:61 #, python-format msgid "%(author)s for %(magazine)s" msgstr "%(author)s pour %(magazine)s" -#: templates/sat_website/press.html:55 -msgid "German" -msgstr "Allemand" - -#: templates/sat_website/press.html:61 +#: templates/sat_website/press.html:67 #, python-format msgid "%(magazine)s" msgstr "%(magazine)s" -#: templates/sat_website/press.html:61 +#: templates/sat_website/press.html:67 msgid "articles about Salut à Toi" msgstr "articles sur Salut à Toi" -#: templates/sat_website/press.html:66 +#: templates/sat_website/press.html:72 msgid "" "If you want to write an article about Salut à Toi, we would be pleased to " "answer your questions. Please contact us." @@ -1745,44 +1723,44 @@ "Si vous souhaitez écrire un article sur Salut à Toi, nous répondrons à vos " "questions avec plaisir. Merci de nous contacter." -#: templates/sat_website/press.html:71 +#: templates/sat_website/press.html:77 msgid "Radio" msgstr "Radio" -#: templates/sat_website/press.html:85 +#: templates/sat_website/press.html:91 msgid "Conferences" msgstr "Conférences" -#: templates/sat_website/press.html:90 +#: templates/sat_website/press.html:96 msgid "Round table on new media" msgstr "Table ronde sur les nouveaux médias" -#: templates/sat_website/press.html:92 templates/sat_website/press.html:98 -#: templates/sat_website/press.html:105 templates/sat_website/press.html:111 -#: templates/sat_website/press.html:144 +#: templates/sat_website/press.html:98 templates/sat_website/press.html:104 +#: templates/sat_website/press.html:111 templates/sat_website/press.html:117 +#: templates/sat_website/press.html:150 msgid "Libre Software Meeting" msgstr "Rencontres Mondiales du Logiciel Libre" -#: templates/sat_website/press.html:92 templates/sat_website/press.html:98 -#: templates/sat_website/press.html:104 templates/sat_website/press.html:105 -#: templates/sat_website/press.html:111 templates/sat_website/press.html:112 -#: templates/sat_website/press.html:136 templates/sat_website/press.html:144 +#: templates/sat_website/press.html:98 templates/sat_website/press.html:104 +#: templates/sat_website/press.html:110 templates/sat_website/press.html:111 +#: templates/sat_website/press.html:117 templates/sat_website/press.html:118 +#: templates/sat_website/press.html:142 templates/sat_website/press.html:150 msgid "video" msgstr "vidéo" -#: templates/sat_website/press.html:112 +#: templates/sat_website/press.html:118 msgid "part" msgstr "partie" -#: templates/sat_website/press.html:153 +#: templates/sat_website/press.html:159 msgid "Brussels" msgstr "Bruxelles" -#: templates/sat_website/press.html:153 +#: templates/sat_website/press.html:159 msgid "English" msgstr "anglais" -#: templates/sat_website/press.html:160 +#: templates/sat_website/press.html:166 msgid "" "If you think that we could bring something interesting to an event " "(conference, stand...), feel free to contact us." @@ -2396,65 +2374,65 @@ msgstr "vcard (temporaire)" #: templates/sat_website/specifications_xep.html:66 -msgid "vCard-Based Avatars" -msgstr "Avatars basés sur vCard" +msgid "Jabber Search" +msgstr "Recherche Jabber" #: templates/sat_website/specifications_xep.html:70 -msgid "Jabber Search" -msgstr "Recherche Jabber" - -#: templates/sat_website/specifications_xep.html:74 msgid "Result Set Management" msgstr "Gestion des jeux de résultats" -#: templates/sat_website/specifications_xep.html:78 +#: templates/sat_website/specifications_xep.html:74 msgid "Publish-Subscribe" msgstr "Publication et abonnement" +#: templates/sat_website/specifications_xep.html:78 +msgid "SOCKS5 Bytestreams" +msgstr "Flux d'octets SOCKS5" + #: templates/sat_website/specifications_xep.html:82 -msgid "SOCKS5 Bytestreams" -msgstr "Flux d'octets SOCKS5" - -#: templates/sat_website/specifications_xep.html:86 msgid "XHTML-IM" msgstr "XHTML-IM (XHTML pour messagerie instantanée)" -#: templates/sat_website/specifications_xep.html:90 +#: templates/sat_website/specifications_xep.html:86 msgid "In-Band Registration" msgstr "Enregistrement « in-band »" +#: templates/sat_website/specifications_xep.html:90 +msgid "Chat State Notifications" +msgstr "Notifications des états de discussion instantanée" + #: templates/sat_website/specifications_xep.html:94 -msgid "Chat State Notifications" -msgstr "Notifications des états de discussion instantanée" - -#: templates/sat_website/specifications_xep.html:98 msgid "Software Version" msgstr "Version du logiciel" -#: templates/sat_website/specifications_xep.html:102 +#: templates/sat_website/specifications_xep.html:98 msgid "Stream Initiation" msgstr "Initiation de flux" +#: templates/sat_website/specifications_xep.html:102 +msgid "SI File Transfer" +msgstr "Initiation de flux pour transfert de fichier" + #: templates/sat_website/specifications_xep.html:106 -msgid "SI File Transfer" -msgstr "Initiation de flux pour transfert de fichier" +msgid "Gateway Interaction" +msgstr "Interaction avec des passerelles" #: templates/sat_website/specifications_xep.html:110 -msgid "Gateway Interaction" -msgstr "Interaction avec des passerelles" +msgid "User Mood" +msgstr "Humeur de l'utilisateur" #: templates/sat_website/specifications_xep.html:114 msgid "Entity Capabilities" msgstr "Fonctionnalités de l'entité" #: templates/sat_website/specifications_xep.html:118 +msgid "vCard-Based Avatars" +msgstr "Avatars basés sur vCard" + +#: templates/sat_website/specifications_xep.html:122 msgid "Personal Eventing Protocol" msgstr "Protocole d'événement personnel" -#: templates/sat_website/specifications_xep.html:122 -msgid "User Mood" -msgstr "Humeur de l'utilisateur" - #: templates/sat_website/specifications_xep.html:126 msgid "Jingle" msgstr "" @@ -2503,10 +2481,6 @@ msgid "HTTP File Upload" msgstr "Téléversement de fichier HTTP" -#: templates/sat_website/thank_you.html:27 -msgid "Thank you!" -msgstr "Merci !" - #: templates/sat_website/thank_you.html:31 msgid "Below a copy of the email we just sent to you." msgstr "Ci-dessous une copie du courriel que nous venons de vous envoyer." @@ -2519,6 +2493,46 @@ "Merci de le lire attentivement, il contient les informations pour compléter " "votre adhésion." +#~ msgid " days" +#~ msgstr " jours" + +#~ msgid "day" +#~ msgstr "jour" + +#~ msgid "left to support our" +#~ msgstr "restants pour supporter notre" + +#~ msgid "crowdfunding campaign" +#~ msgstr "campagne de financement participatif" + +#~ msgid "for an Android interface!" +#~ msgstr "pour une interface Android !" + +#~ 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)." + +#~ 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 !" + +#~ msgid "left!" +#~ msgstr "restants !" + +#~ msgid "Crowdfunding campaign" +#~ msgstr "Campagne de financement participatif" + #~ msgid "Releases" #~ msgstr "Communiqués" diff -r 2c4e038a6ece -r 1bdb78a21647 sat_website/views.py --- a/sat_website/views.py Sun Dec 06 16:11:32 2015 +0100 +++ b/sat_website/views.py Sun Dec 06 16:11:06 2015 +0100 @@ -81,10 +81,6 @@ "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 2c4e038a6ece -r 1bdb78a21647 templates/sat_website/base.html --- a/templates/sat_website/base.html Sun Dec 06 16:11:32 2015 +0100 +++ b/templates/sat_website/base.html Sun Dec 06 16:11:06 2015 +0100 @@ -36,12 +36,11 @@ {% block title %}{% trans "Salut à Toi: the multi frontend, multipurpose communication tool" %}{% endblock %} - {% comment %}FIXME: remove "" and "overview" from the following test when the campaign is over{% endcomment %} - {% if category != "" and category != "overview" and category != "membership" and category != "membership_form" and category != "thank_you" %} + {% comment %} + {% if category != "membership" and category != "membership_form" and category != "thank_you" %} - {% else %} - {% endif %} + {% endcomment %}