update post card and list, update locale

diff --git a/README.rst b/README.rst
index 2e7b14371213dc1b57f2310392c36d2b7be3d919..f4561dd86ab33c3afaee0716736fae34e23836b4 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -16,7 +16,7 @@ On MacOSX or Windows install the `Docker Toolbox <https://www.docker.com/product
 
 Then run these commands::
 
-    git clone --recursive git://git@git.forge.ircam.fr/Manifeste.git
+    git clone --recursive git+ssh://git@git.forge.ircam.fr/Manifeste.git
     cd Manifeste
     docker-compose up db
 

diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index 278d8fcaa7a6dc7cf0535a8d539f763f0f2d882d..d4e8d0a15e9ed9106f509a45281aca3000e7356f 100644 (file)
Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index 460de6c39f4a4f9e4952a79068788cd4acf03eeb..3cf9a47c9c36dddad10e890f0cf88f3d87a1310a 100644 (file)
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-13 09:41+0200\n"
+"POT-Creation-Date: 2016-04-19 18:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,39 +156,39 @@ msgstr "Jouer la vidéo"
 msgid "Videos"
 msgstr "Vidéos"
 
-#: sandbox/local_settings.py:81
+#: local_settings.py:81
 msgid "Content"
 msgstr ""
 
-#: sandbox/local_settings.py:84
+#: local_settings.py:84
 msgid "Media Library"
 msgstr ""
 
-#: sandbox/local_settings.py:85
+#: local_settings.py:85
 msgid "Site"
 msgstr ""
 
-#: sandbox/local_settings.py:86
+#: local_settings.py:86
 msgid "Users"
 msgstr ""
 
-#: sandbox/local_settings.py:87
+#: local_settings.py:87
 msgid "Festival"
 msgstr ""
 
-#: sandbox/settings.py:45
+#: settings.py:45
 msgid "Top navigation bar"
 msgstr ""
 
-#: sandbox/settings.py:47
+#: settings.py:47
 msgid "Footer"
 msgstr ""
 
-#: sandbox/settings.py:104
+#: settings.py:104
 msgid "French"
 msgstr ""
 
-#: sandbox/settings.py:105
+#: settings.py:105
 msgid "English"
 msgstr ""
 
@@ -267,40 +267,37 @@ msgstr ""
 
 #: templates/agenda/event_detail.html:45
 #: templates/agenda/includes/event_card.html:66
-#: templates/blog/blog_post_detail.html:43
-#: templates/blog/blog_post_list.html:139
+#: templates/blog/blog_post_detail.html:39
 #: templates/generic/includes/comments.html:3
 msgid "Comments"
 msgstr ""
 
 #: templates/agenda/event_detail.html:48
 #: templates/agenda/includes/event_card.html:70
-#: templates/blog/blog_post_detail.html:46
-#: templates/blog/blog_post_list.html:143
+#: templates/blog/blog_post_detail.html:42
 #, python-format
 msgid "%(comments_count)s comment"
 msgid_plural "%(comments_count)s comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/agenda/event_detail.html:83 templates/agenda/event_detail.html:87
+#: templates/agenda/event_detail.html:84 templates/agenda/event_detail.html:88
 msgid "Add to"
 msgstr ""
 
-#: templates/agenda/event_detail.html:115
+#: templates/agenda/event_detail.html:116
 #: templates/agenda/includes/event_card.html:52
 #: templates/agenda/includes/filter_panel.html:74
-#: templates/blog/blog_post_detail.html:74
-#: templates/blog/blog_post_list.html:124
+#: templates/blog/blog_post_detail.html:70
 #: templates/blog/includes/filter_panel.html:56
 msgid "Tags"
 msgstr ""
 
-#: templates/agenda/event_detail.html:139
+#: templates/agenda/event_detail.html:140
 msgid "Previous event"
 msgstr "Évenement précédent"
 
-#: templates/agenda/event_detail.html:147
+#: templates/agenda/event_detail.html:148
 msgid "Next event"
 msgstr "Évenement suivant"
 
@@ -374,28 +371,11 @@ msgid "Archive"
 msgstr ""
 
 #: templates/blog/blog_post_detail.html:29
-msgid "Posted by"
-msgstr ""
-
-#: templates/blog/blog_post_detail.html:33
-#: templates/blog/blog_post_list.html:100
-#: templates/generic/includes/comment.html:22
-#: templates/generic/includes/comment.html:59 templates/twitter/tweets.html:19
-#, python-format
-msgid "%(sometime)s ago"
-msgstr ""
-
-#: templates/blog/blog_post_detail.html:93
-#: templates/includes/share_buttons.html:8
-msgid "Share on Twitter"
-msgstr "Partagez sur Twitter"
+#: templates/blog/includes/post_card.html:16
+msgid "published on"
+msgstr "publié le"
 
-#: templates/blog/blog_post_detail.html:94
-#: templates/includes/share_buttons.html:5
-msgid "Share on Facebook"
-msgstr "Partagez sur Facebook"
-
-#: templates/blog/blog_post_detail.html:119
+#: templates/blog/blog_post_detail.html:117
 msgid "Related posts"
 msgstr "Articles associés"
 
@@ -423,22 +403,15 @@ msgstr "Les articles postés depuis"
 msgid "Viewing posts by"
 msgstr ""
 
-#: templates/blog/blog_post_list.html:94
-msgid "in"
+#: templates/blog/blog_post_list.html:72
+#: templates/blog/includes/filter_panel.html:43
+msgid "Categories"
 msgstr ""
 
-#: templates/blog/blog_post_list.html:133 templates/search_results.html:47
-msgid "read more"
-msgstr "lire la suite"
-
 #: templates/blog/includes/filter_panel.html:6
 msgid "Recent Posts"
 msgstr ""
 
-#: templates/blog/includes/filter_panel.html:43
-msgid "Categories"
-msgstr ""
-
 #: templates/blog/includes/filter_panel.html:72
 msgid "Authors"
 msgstr ""
@@ -566,6 +539,12 @@ msgstr ""
 msgid "Sorry, an error occurred."
 msgstr ""
 
+#: templates/generic/includes/comment.html:22
+#: templates/generic/includes/comment.html:59 templates/twitter/tweets.html:19
+#, python-format
+msgid "%(sometime)s ago"
+msgstr ""
+
 #: templates/generic/includes/comment.html:30
 msgid "Link"
 msgstr ""
@@ -647,6 +626,14 @@ msgstr ""
 msgid "Go"
 msgstr ""
 
+#: templates/includes/share_buttons.html:5
+msgid "Share on Facebook"
+msgstr "Partagez sur Facebook"
+
+#: templates/includes/share_buttons.html:8
+msgid "Share on Twitter"
+msgstr "Partagez sur Twitter"
+
 #: templates/includes/share_buttons.html:11
 msgid "Share by email"
 msgstr "Partager par email"
@@ -714,6 +701,10 @@ msgid ""
 "matching your query: %(query)s\n"
 msgstr ""
 
+#: templates/search_results.html:47
+msgid "read more"
+msgstr "lire la suite"
+
 #: templates/styles.html:4 templates/styles.html.py:6
 msgid "Styles"
 msgstr ""

diff --git a/app/templates/blog/blog_post_detail.html b/app/templates/blog/blog_post_detail.html
index 0f51376c30345bb87d001bf5d12df93ec4e3858d..b14781b58b8c914ccc3418db845533679cf2025b 100644 (file)
--- a/app/templates/blog/blog_post_detail.html
+++ b/app/templates/blog/blog_post_detail.html
@@ -26,11 +26,7 @@
 {% block blog_post_detail_postedby %}
 {% editable blog_post.publish_date %}
 <h6 class="post-meta">
-    {% trans "Posted by" %}:
-    {% with blog_post.user as author %}
-    <a href="{% url "blog_post_list_author" author %}">{{ author.get_full_name|default:author.username }}</a>
-    {% endwith %}
-    {% blocktrans with sometime=blog_post.publish_date|timesince %}{{ sometime }} ago{% endblocktrans %}
+    {% trans "published on" %} {{ blog_post.publish_date|date:"DATE_FORMAT" }}
 </h6>
 {% endeditable %}
 {% endblock %}

diff --git a/app/templates/blog/includes/post_card.html b/app/templates/blog/includes/post_card.html
index fe2fc96af7dfc2f0a0a2f46ef167aec0624d49e5..110ffe29606544662669890254e2a4f964f1baa3 100644 (file)
--- a/app/templates/blog/includes/post_card.html
+++ b/app/templates/blog/includes/post_card.html
@@ -13,7 +13,7 @@
                     {{ post.title }}
                 </span>
             </h3>
-            <span class="artist__item__date">{{ post.publish_date|date:"DATE_FORMAT" }}</span>
+            <span class="artist__item__date">{% trans "published on" %} {{ post.publish_date|date:"DATE_FORMAT" }}</span>
         </a>
     </div>
 </div>