Mercurial > sat_legacy_website

changeset 125:699b9b130368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes i18n of the campaign's links
author souliane <souliane@mailoo.org>
date Mon, 23 Nov 2015 15:18:35 +0100
parents 5aad1b36183f
children 90d5f6a80c4e
files locale/fr/LC_MESSAGES/django.po templates/sat_website/base.html templates/sat_website/membership.html templates/sat_website/overview.html
diffstat 4 files changed, 38 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Fri Nov 06 10:15:33 2015 +0100
+++ b/locale/fr/LC_MESSAGES/django.po	Mon Nov 23 15:18:35 2015 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-06 10:14+0100\n"
-"PO-Revision-Date: 2015-11-06 10:14+0100\n"
+"POT-Creation-Date: 2015-11-23 15:15+0100\n"
+"PO-Revision-Date: 2015-11-23 15:16+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -349,97 +349,97 @@
 msgid "subtitles"
 msgstr "sous-titres"
 
-#: sat_website/views.py:32
+#: sat_website/views.py:33
 msgid "Presentation"
 msgstr "Présentation"
 
-#: sat_website/views.py:33 templates/sat_website/overview.html:92
+#: sat_website/views.py:34 templates/sat_website/overview.html:92
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: sat_website/views.py:34 templates/sat_website/overview.html:103
+#: sat_website/views.py:35 templates/sat_website/overview.html:103
 #: templates/sat_website/principles.html:60
 msgid "Frontends"
 msgstr "Interfaces"
 
-#: sat_website/views.py:35
+#: sat_website/views.py:36
 msgid "Screenshots & Videos"
 msgstr "Captures d'écran et vidéos"
 
-#: sat_website/views.py:37
+#: sat_website/views.py:38
 msgid "Technical area"
 msgstr "Espace technique"
 
-#: sat_website/views.py:38 templates/sat_website/principles.html:26
+#: sat_website/views.py:39 templates/sat_website/principles.html:26
 msgid "Principles"
 msgstr "Principes"
 
-#: sat_website/views.py:39 templates/sat_website/principles.html:46
+#: sat_website/views.py:40 templates/sat_website/principles.html:46
 msgid "Specifications"
 msgstr "Spécifications"
 
-#: sat_website/views.py:40 templates/sat_website/downloads.html:27
+#: sat_website/views.py:41 templates/sat_website/downloads.html:27
 #: templates/sat_website/overview.html:139
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: sat_website/views.py:41
+#: sat_website/views.py:42
 msgid "Developers corner"
 msgstr "Coin des développeurs"
 
-#: sat_website/views.py:43
+#: sat_website/views.py:44
 msgid "Community"
 msgstr "Communauté"
 
-#: sat_website/views.py:44
+#: sat_website/views.py:45
 msgid "Get in touch"
 msgstr "Nous contacter"
 
-#: sat_website/views.py:45 templates/sat_website/membership.html:74
+#: sat_website/views.py:46 templates/sat_website/membership.html:74
 msgid "Association"
 msgstr "Association"
 
-#: sat_website/views.py:46
+#: sat_website/views.py:47
 msgid "Links"
 msgstr "Liens"
 
-#: sat_website/views.py:47 templates/sat_website/press.html:27
+#: sat_website/views.py:48 templates/sat_website/press.html:27
 msgid "Press"
 msgstr "Presse"
 
-#: sat_website/views.py:48
+#: sat_website/views.py:49
 msgid "FAQ"
 msgstr "FAQ"
 
-#: sat_website/views.py:52 templates/sat_website/association.html:47
+#: sat_website/views.py:53 templates/sat_website/association.html:47
 #: templates/sat_website/overview.html:130
 msgid "Membership"
 msgstr "Adhésion"
 
-#: sat_website/views.py:53 templates/sat_website/features.html:76
+#: sat_website/views.py:54 templates/sat_website/features.html:76
 #: templates/sat_website/overview.html:111
 #: templates/sat_website/principles.html:74
 msgid "Social contract"
 msgstr "Contrat social"
 
-#: sat_website/views.py:63
+#: sat_website/views.py:64
 msgid "contains the backend, Primitivus and Jp"
 msgstr "contient le backend, Primitivus et Jp"
 
-#: sat_website/views.py:64
+#: sat_website/views.py:65
 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:65
+#: sat_website/views.py:66
 msgid "console display library needed by Primitivus"
 msgstr "bibliothèque pour l'affichage en console de Primitivus"
 
-#: sat_website/views.py:66
+#: sat_website/views.py:67
 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:67
+#: sat_website/views.py:68
 msgid "Libervia frontend (web server and client)"
 msgstr "interface Libervia (serveur web et partie cliente)"
 
@@ -586,6 +586,13 @@
 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
+msgid "en"
+msgstr "fr"
+
 #: templates/sat_website/base.html:63
 msgid "crowdfunding campaign"
 msgstr "campagne de financement participatif"
--- a/templates/sat_website/base.html	Fri Nov 06 10:15:33 2015 +0100
+++ b/templates/sat_website/base.html	Mon Nov 23 15:18:35 2015 +0100
@@ -58,7 +58,7 @@
 	            	{{ campaign_countdown }}
 	            	{% if campaign_countdown > 1 %}{% trans " days" %}{% else %}{% trans "day" %}{% endif %}
 	            	{% trans "left to support our" %}
-	            	<a class="btn btn-default" style="float:none" href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#" role="button">{% trans "crowdfunding campaign" %}</a>
+	            	<a class="btn btn-default" style="float:none" href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#" role="button">{% trans "crowdfunding campaign" %}</a>
 					{% trans "for an Android interface!" %}
 				</div>
 
--- a/templates/sat_website/membership.html	Fri Nov 06 10:15:33 2015 +0100
+++ b/templates/sat_website/membership.html	Mon Nov 23 15:18:35 2015 +0100
@@ -32,8 +32,8 @@
 <div class="row">
     <div class="info text-center">
 	    <video class="video-campaign" poster="http://ftp.goffi.org/media/video/posters/libervia_adhesion_2015.png" controls preload="none">
-            <source src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{{LANGUAGE_CODE}}.webm" type='video/webm; codecs="vp8.0, vorbis"'>
-            <source src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{{LANGUAGE_CODE}}.ogv" type='video/ogg; codecs="theora, vorbis"'>
+            <source src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{% trans "en" %}.webm" type='video/webm; codecs="vp8.0, vorbis"'>
+            <source src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{% trans "en" %}.ogv" type='video/ogg; codecs="theora, vorbis"'>
             {% get_language_info for LANGUAGE_CODE as lang %}
 		    <track label="{{lang.name_local}}" src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{{LANGUAGE_CODE}}.vtt" kind="subtitles" srclang="{{LANGUAGE_CODE}}" default />
             {% blocktrans with firefox="<a href=\"http://www.mozilla.org/\">Firefox</a>" %}Your browser doesn't manage the « video » tag, you should update, e.g. with the last {{ firefox }}.{% endblocktrans %}
@@ -47,7 +47,7 @@
 <div class="row">
 	<div class="alert alert-info">
 		<p style="text-align: center">
-			<a href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#">
+			<a href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#">
 				<img src="{% static "images/misc/campagne_android.png" %}" style="max-width:100%;" />
 			</a>
 		</p>
@@ -62,7 +62,7 @@
          	{% trans "left!" %}
 		</p>
 	    <p style="text-align: center">
-	    	<a class="btn btn-primary btn-lg" href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#" role="button">{% trans "Crowdfunding campaign" %}</a>
+	    	<a class="btn btn-primary btn-lg" href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#" role="button">{% trans "Crowdfunding campaign" %}</a>
 	    </p>
 	</div>
 </div>
--- a/templates/sat_website/overview.html	Fri Nov 06 10:15:33 2015 +0100
+++ b/templates/sat_website/overview.html	Mon Nov 23 15:18:35 2015 +0100
@@ -44,7 +44,7 @@
 		<div class="row">
 			<div class="alert alert-info">
 				<p style="text-align: center">
-					<a href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#">
+					<a href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#">
 						<img src="{% static "images/misc/campagne_android.png" %}" style="max-width:100%;" />
 					</a>
 				</p>
@@ -59,7 +59,7 @@
 			     	{% trans "left!" %}
 				</p>
 			    <p style="text-align: center">
-			    	<a class="btn btn-primary btn-lg" href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#" role="button">{% trans "Crowdfunding campaign" %}</a>
+			    	<a class="btn btn-primary btn-lg" href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#" role="button">{% trans "Crowdfunding campaign" %}</a>
 			    </p>
 			</div>
 		</div>