From 2910afc4b1e3062862c39c3feb4a6cd6d492b2c6 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 19 Apr 2016 18:53:55 +0200 Subject: [PATCH] update post card and list, update locale --- README.rst | 2 +- app/locale/fr/LC_MESSAGES/django.mo | Bin 3052 -> 3116 bytes app/locale/fr/LC_MESSAGES/django.po | 93 ++++++++++----------- app/templates/blog/blog_post_detail.html | 6 +- app/templates/blog/includes/post_card.html | 2 +- 5 files changed, 45 insertions(+), 58 deletions(-) diff --git a/README.rst b/README.rst index 2e7b1437..f4561dd8 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,7 @@ On MacOSX or Windows install the `Docker Toolbox BsR@MZKF2PK8!Y6t8HzKeWbWjS1uF3 z(lEJ|{Grb52tEi>kjf#m)%YG8a2dn+-Tmd-Dzgav4VcCR)?*emZUmd~0CwPUWN5*z zP|?8a?riOb-N7jR^SA~dxr?}#_7W(~Ybl!~(d^jS9@ zTJa!mz=Nm(Cr}gQk;|sNJ&StoKCZ__)I6`ezk~|xli&Y}DcV6+rx&+k8}`N6{}w8T z>Ck{YYHKce`snTE# z>qo6X(RPxxihrq#ineK0}&QqzItY6DUH9YD6M89?YwI}6vy%NYK2-^r1Dea;~3nPLEf(T|4L0F)O z5V(p65?Uy3N&=%*(H|m=qELdQG9ueVL4kdLGsnxE`OKZU_s+TZzIpd5zgL9w*&}jvRF#J2J5gHX%gBI zF4VElJsCf+0bI-dbGQyKx!16m`b|_Kcm4hZD$yDDh5G@O$RcW-pQuEZv4rzJf%~WxdW;#6GkuMR8GAc+wcTxfE%a;N8K^Me+#uTPmr(-^`~5LgVw3*-0aj9fiF)xD+=PFz2CFixzdGcZ zK9jctsQMwV_aber-|MH4!_IKh3SC4k`4!X_4x$ntLaoegEWvTqk8c_^;iss6Z$mEB za31yI1!U`@qR&Lxs-Xr^#sx$>(Ln4W)JLV7Py#E3VWM%HQ4`Y-R;4N?+73-DY~iHu zUi-S0P\n" "Language-Team: LANGUAGE \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 0f51376c..b14781b5 100644 --- 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 %}
- {% trans "Posted by" %}: - {% with blog_post.user as author %} - {{ author.get_full_name|default:author.username }} - {% endwith %} - {% blocktrans with sometime=blog_post.publish_date|timesince %}{{ sometime }} ago{% endblocktrans %} + {% trans "published on" %} {{ blog_post.publish_date|date:"DATE_FORMAT" }}
{% endeditable %} {% endblock %} diff --git a/app/templates/blog/includes/post_card.html b/app/templates/blog/includes/post_card.html index fe2fc96a..110ffe29 100644 --- a/app/templates/blog/includes/post_card.html +++ b/app/templates/blog/includes/post_card.html @@ -13,7 +13,7 @@ {{ post.title }} - {{ post.publish_date|date:"DATE_FORMAT" }} + {% trans "published on" %} {{ post.publish_date|date:"DATE_FORMAT" }} -- 2.39.5