# HG changeset patch # User souliane # Date 1434369130 -7200 # Node ID 3d04a955bec47557b002caf5617f4d431599ecc8 # Parent ed78e205bec3dbbc08babaa44e0666a23e1d166d add membership campaign's video (for now ogv, will eventually change to webm) diff -r ed78e205bec3 -r 3d04a955bec4 locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Wed Jun 10 08:23:01 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Mon Jun 15 13:52:10 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-09 14:46+0200\n" -"PO-Revision-Date: 2015-06-09 14:41+0100\n" +"POT-Creation-Date: 2015-06-15 13:40+0200\n" +"PO-Revision-Date: 2015-06-15 13:41+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -213,72 +213,78 @@ msgid "Subscription to Salut à Toi" msgstr "Adhésion à Salut à Toi" -#: sat_website/screenshots.py:37 -msgid "Overview" -msgstr "Aperçu" +#: sat_website/screenshots.py:39 +msgid "Membership campaign for Libervia" +msgstr "Campagne d'adhésion pour Libervia" -#: sat_website/screenshots.py:38 sat_website/screenshots.py:40 -#: sat_website/screenshots.py:42 sat_website/screenshots.py:44 +#: sat_website/screenshots.py:41 sat_website/screenshots.py:44 #: sat_website/screenshots.py:46 sat_website/screenshots.py:48 #: sat_website/screenshots.py:50 sat_website/screenshots.py:52 -#: sat_website/screenshots.py:57 sat_website/screenshots.py:67 -msgid "frontend" -msgstr "interface" - -#: sat_website/screenshots.py:38 sat_website/screenshots.py:40 -#: sat_website/screenshots.py:42 sat_website/screenshots.py:44 -#: sat_website/screenshots.py:46 sat_website/screenshots.py:48 -#: sat_website/screenshots.py:50 sat_website/screenshots.py:52 -#: sat_website/screenshots.py:57 sat_website/screenshots.py:59 -#: sat_website/screenshots.py:61 sat_website/screenshots.py:63 +#: sat_website/screenshots.py:54 sat_website/screenshots.py:56 +#: sat_website/screenshots.py:58 sat_website/screenshots.py:63 #: sat_website/screenshots.py:65 sat_website/screenshots.py:67 #: sat_website/screenshots.py:69 sat_website/screenshots.py:71 +#: sat_website/screenshots.py:73 sat_website/screenshots.py:75 +#: sat_website/screenshots.py:77 msgid "version" msgstr "version" -#: sat_website/screenshots.py:38 sat_website/screenshots.py:40 -#: sat_website/screenshots.py:42 sat_website/screenshots.py:44 +#: sat_website/screenshots.py:41 sat_website/screenshots.py:44 #: sat_website/screenshots.py:46 sat_website/screenshots.py:48 #: sat_website/screenshots.py:50 sat_website/screenshots.py:52 -#: sat_website/screenshots.py:57 sat_website/screenshots.py:59 -#: sat_website/screenshots.py:61 sat_website/screenshots.py:63 +#: sat_website/screenshots.py:54 sat_website/screenshots.py:56 +#: sat_website/screenshots.py:58 sat_website/screenshots.py:63 #: sat_website/screenshots.py:65 sat_website/screenshots.py:67 #: sat_website/screenshots.py:69 sat_website/screenshots.py:71 +#: sat_website/screenshots.py:73 sat_website/screenshots.py:75 +#: sat_website/screenshots.py:77 msgid "year" msgstr "année" -#: sat_website/screenshots.py:39 +#: sat_website/screenshots.py:41 sat_website/screenshots.py:50 +#: sat_website/screenshots.py:58 sat_website/screenshots.py:65 +#: sat_website/screenshots.py:67 sat_website/screenshots.py:69 +#: sat_website/screenshots.py:75 sat_website/screenshots.py:77 +msgid "language" +msgstr "langue" + +#: sat_website/screenshots.py:43 +msgid "Overview" +msgstr "Aperçu" + +#: sat_website/screenshots.py:44 sat_website/screenshots.py:46 +#: sat_website/screenshots.py:48 sat_website/screenshots.py:50 +#: sat_website/screenshots.py:52 sat_website/screenshots.py:54 +#: sat_website/screenshots.py:56 sat_website/screenshots.py:58 +#: sat_website/screenshots.py:63 sat_website/screenshots.py:73 +msgid "frontend" +msgstr "interface" + +#: sat_website/screenshots.py:45 msgid "Optional security check" msgstr "Vérification de sécurité (optionnelle)" -#: sat_website/screenshots.py:41 +#: sat_website/screenshots.py:47 msgid "Rich text editor" msgstr "Éditeur de texte riche" -#: sat_website/screenshots.py:43 +#: sat_website/screenshots.py:49 msgid "Demo of the new Libervia UI, and of the collective radio feature" msgstr "Démo de la nouvelle interface de Libervia, et de la radio collective" -#: sat_website/screenshots.py:44 sat_website/screenshots.py:52 -#: sat_website/screenshots.py:59 sat_website/screenshots.py:61 -#: sat_website/screenshots.py:63 sat_website/screenshots.py:69 -#: sat_website/screenshots.py:71 -msgid "language" -msgstr "langue" - -#: sat_website/screenshots.py:45 +#: sat_website/screenshots.py:51 msgid "Libervia's login page" msgstr "Page d'identification de Libervia" -#: sat_website/screenshots.py:47 templates/sat_website/frontends.html:34 +#: sat_website/screenshots.py:53 templates/sat_website/frontends.html:34 msgid "Libervia's main view" msgstr "Vue principale de Libervia" -#: sat_website/screenshots.py:49 +#: sat_website/screenshots.py:55 msgid "Wix showing a french Tarot play" msgstr "Wix montrant un jeu de tarot" -#: sat_website/screenshots.py:51 +#: sat_website/screenshots.py:57 msgid "" "This video focuses on Libervia. The UI is really outdated, but we can see " "some features" @@ -286,39 +292,39 @@ "Cette vidéo se concentre sur Libervia. C'est une vieille interface, mais on " "peut voir quelques fonctionnalités" -#: sat_website/screenshots.py:56 +#: sat_website/screenshots.py:62 msgid "Server administration from the web frontend Libervia." msgstr "Administration du serveur depuis l'interface web Libervia." -#: sat_website/screenshots.py:58 +#: sat_website/screenshots.py:64 msgid "Use ad-hoc commands to control a VLC player from Libervia" msgstr "" "Utilisation des commandes ad-hoc pour contrôler un lecteur VLC depuis " "Libervia" -#: sat_website/screenshots.py:60 +#: sat_website/screenshots.py:66 msgid "Exporting a command: an FTP client is exported to a Gajim contact" msgstr "" "Export de commande: un client FTP est exporté à un contact utilisant Gajim" -#: sat_website/screenshots.py:62 +#: sat_website/screenshots.py:68 msgid "How to copy and pipe streams over XMPP" msgstr "Comment copier et transférer des flux de tubes (pipes) via XMPP" -#: sat_website/screenshots.py:64 +#: sat_website/screenshots.py:70 msgid "Cowsay sent in conversation through jp" msgstr "« Cowsay » envoyé dans une discussion via jp" -#: sat_website/screenshots.py:66 templates/sat_website/frontends.html:41 +#: sat_website/screenshots.py:72 templates/sat_website/frontends.html:41 msgid "Primitivus showing a french Tarot play" msgstr "Primitivus montrant un jeu de tarot" -#: sat_website/screenshots.py:68 +#: sat_website/screenshots.py:74 msgid "This video shows french Tarot game, and how to use Thunderbird with SàT" msgstr "" "Cette vidéo montre un jeu de tarot, et comment utiliser Thunderbird avec SàT" -#: sat_website/screenshots.py:70 +#: sat_website/screenshots.py:76 msgid "The first video shows wix, primitivus and jp" msgstr "La première vidéo montre Wix, Primitivus et Jp" @@ -372,7 +378,7 @@ msgid "Get in touch" msgstr "Nous contacter" -#: sat_website/views.py:44 templates/sat_website/membership.html:34 +#: sat_website/views.py:44 templates/sat_website/membership.html:43 msgid "Association" msgstr "Association" @@ -399,24 +405,24 @@ msgid "Social contract" msgstr "Contrat social" -#: sat_website/views.py:57 +#: sat_website/views.py:61 msgid "contains the backend, Primitivus and Jp" msgstr "contient le backend, Primitivus et Jp" -#: sat_website/views.py:58 +#: sat_website/views.py:62 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:59 +#: sat_website/views.py:63 msgid "console display library needed by Primitivus" msgstr "bibliothèque pour l'affichage en console de Primitivus" -#: sat_website/views.py:60 +#: sat_website/views.py:64 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:61 +#: sat_website/views.py:65 msgid "Libervia frontend (web server and client)" msgstr "interface Libervia (serveur web et partie cliente)" @@ -1242,16 +1248,16 @@ msgid "cultural association based in Austria" msgstr "association culturelle basée en Autriche" -#: templates/sat_website/membership.html:27 +#: templates/sat_website/membership.html:28 #: templates/sat_website/membership_form.html:27 msgid "Join the association" msgstr "Adhérez à l'association" -#: templates/sat_website/membership.html:31 +#: templates/sat_website/membership.html:40 msgid "About the association" msgstr "Concernant l'association" -#: templates/sat_website/membership.html:33 +#: templates/sat_website/membership.html:42 msgid "" "We want it to be as transparent as the software. You can read about its " "mission, its organisation and check the official documents." @@ -1260,11 +1266,11 @@ "renseigner sur sa mission, son organisation et consulter les documents " "officiels." -#: templates/sat_website/membership.html:39 +#: templates/sat_website/membership.html:48 msgid "Become a member" msgstr "Devenir membre" -#: templates/sat_website/membership.html:41 +#: templates/sat_website/membership.html:50 #, python-format msgid "" "For 2015, we need about %(asso_finance_target)s € for:\n" @@ -1304,7 +1310,7 @@ "%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n" " " -#: templates/sat_website/membership.html:56 +#: templates/sat_website/membership.html:65 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 " @@ -1314,7 +1320,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:58 +#: templates/sat_website/membership.html:67 msgid "" "To join the association without paying any subscription or to proceed with a " "bank transfer, please use our internal form:" @@ -1322,11 +1328,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:61 +#: templates/sat_website/membership.html:70 msgid "Join for free or proceed with a transfer" msgstr "Adhérer gratuitement ou procéder par virement" -#: templates/sat_website/membership.html:63 +#: templates/sat_website/membership.html:72 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 " @@ -1339,7 +1345,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:66 +#: templates/sat_website/membership.html:75 msgid "Join and proceed by card" msgstr "Adhérer et procéder par carte" diff -r ed78e205bec3 -r 3d04a955bec4 sat_website/screenshots.py --- a/sat_website/screenshots.py Wed Jun 10 08:23:01 2015 +0200 +++ b/sat_website/screenshots.py Mon Jun 15 13:52:10 2015 +0200 @@ -28,11 +28,19 @@ VideoDesc = namedtuple("VideoDesc", "path description poster data") screencasts = os.path.join(settings.MEDIA_EXTERNAL_URL, "screencasts") + "/" +video = os.path.join(settings.MEDIA_EXTERNAL_URL, "video") + "/" #list the pictures screenshots = [ + + # will use replace_language_tag filter for replacing {{LANGUAGE_CODE}} + VideoDesc(video + "libervia_adhesion_2015_{{LANGUAGE_CODE}}.ogv", + _(u"Membership campaign for Libervia"), + video + "posters/libervia_adhesion_2015.png", + {_(u"version"): "0.5", _(u"year"): "2015", _(u"language"): "{{LANGUAGE_CODE}}"}), + ImageDesc("images/screenshots/0.5/overview_libervia.png", _(u"Overview"), {_(u"frontend"): "libervia", _(u"version"): "0.5", _(u"year"): "2014"}), ImageDesc("images/screenshots/0.5/http_unsecure_warning.png", _(u"Optional security check"), diff -r ed78e205bec3 -r 3d04a955bec4 sat_website/templatetags/utils.py --- a/sat_website/templatetags/utils.py Wed Jun 10 08:23:01 2015 +0200 +++ b/sat_website/templatetags/utils.py Mon Jun 15 13:52:10 2015 +0200 @@ -81,4 +81,13 @@ lang = get_language() sep = ugettext_lazy(': ') items = ["%s%s%s" % (key.translate(lang), sep, value) for key, value in data.iteritems()] - return "(%s)" % ', '.join(items) + return replace_language_tag("(%s)" % ', '.join(items)) + +@register.filter +def replace_language_tag(text): + """Replace {{LANGUAGE_CODE}} by the current language code. + + @param text (unicode): text to process + @return: unicode + """ + return text.replace("{{LANGUAGE_CODE}}", get_language()) diff -r ed78e205bec3 -r 3d04a955bec4 static/css/sat_website.css --- a/static/css/sat_website.css Wed Jun 10 08:23:01 2015 +0200 +++ b/static/css/sat_website.css Mon Jun 15 13:52:10 2015 +0200 @@ -258,4 +258,8 @@ .fingerprint { word-wrap: break-word; font-weight: bold; -} \ No newline at end of file +} + +.video-campaign { + max-width: 100%; +} diff -r ed78e205bec3 -r 3d04a955bec4 templates/sat_website/gallery.html --- a/templates/sat_website/gallery.html Wed Jun 10 08:23:01 2015 +0200 +++ b/templates/sat_website/gallery.html Mon Jun 15 13:52:10 2015 +0200 @@ -36,7 +36,7 @@ {% for screenshot in row %}
{% if screenshot.poster %} -