diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8f969dacf..08f79a57e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -7,6 +7,7 @@ Changelog * View live / draft links in the admin now consistently open in a new window (Marco Fucci) * `ChoiceBlock` now omits the blank option if the block is required and has a default value (Andreas Nüßlein) * Fix: Help text for StreamField is now visible and does not cover block controls (Stein Strindhaug) + * Fix: "X minutes ago" timestamps are now marked for translation (Janneke Janssen, Matt Westcott) 1.8 (15.12.2016) diff --git a/docs/releases/1.9.rst b/docs/releases/1.9.rst index b93252a9e..67a7a7745 100644 --- a/docs/releases/1.9.rst +++ b/docs/releases/1.9.rst @@ -22,7 +22,8 @@ Minor features Bug fixes ~~~~~~~~~ -* Help text for StreamField is now visible and does not cover block controls (Stein Strindhaug) + * Help text for StreamField is now visible and does not cover block controls (Stein Strindhaug) + * "X minutes ago" timestamps are now marked for translation (Janneke Janssen, Matt Westcott) Upgrade considerations diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html index e910c55be..710feb62f 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html @@ -50,7 +50,7 @@ {{ revision.page.content_type.model_class.get_verbose_name }} -
{{ revision.created_at|timesince }} ago
+
{% blocktrans with time_period=revision.created_at|timesince %}{{ time_period }} ago{% endblocktrans %}
by {{ revision.user.get_full_name|default:revision.user.get_username }} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html index 2601636f1..446a616b5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html @@ -34,7 +34,7 @@ {% endif %} -
{{ revision.created_at|timesince }} ago
+
{% blocktrans with time_period=revision.created_at|timesince %}{{ time_period }} ago{% endblocktrans %}
{% include "wagtailadmin/shared/page_status_tag.html" with page=page %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html index a03aedf08..acfe76d19 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html @@ -23,7 +23,7 @@ {% block parent_page_title %} {% endblock %} - {% if parent_page.latest_revision_created_at %}
{{ parent_page.latest_revision_created_at|timesince }} ago
{% endif %} + {% if parent_page.latest_revision_created_at %}
{% blocktrans with time_period=parent_page.latest_revision_created_at|timesince %}{{ time_period }} ago{% endblocktrans %}
{% endif %} {% if not parent_page.is_root %} {{ parent_page.content_type.model_class.get_verbose_name }} @@ -62,7 +62,7 @@ {% endwith %} {% endif %} - {% if page.latest_revision_created_at %}
{{ page.latest_revision_created_at|timesince }} ago
{% endif %} + {% if page.latest_revision_created_at %}
{% blocktrans with time_period=page.latest_revision_created_at|timesince %}{{ time_period }} ago{% endblocktrans %}
{% endif %} {{ page.content_type.model_class.get_verbose_name }} {% include "wagtailadmin/shared/page_status_tag.html" with page=page %} diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html index 0d5362d24..7d19daa5b 100644 --- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html +++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html @@ -37,7 +37,7 @@ {% endif %} {{ doc.filename }} -
{{ doc.created_at|timesince }} ago
+
{% blocktrans with time_period=doc.created_at|timesince %}{{ time_period }} ago{% endblocktrans %}
{% endfor %}