diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b54e2a2947..22b5661f48 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -128,6 +128,7 @@ Changelog * Fix: Prevent opening choosers multiple times for Image, Page, Document, Snippet (LB (Ben Johnston)) * Fix: Ensure subsequent changes to styles files are picked up by Gulp watch (Jason Attwood) * Fix: Ensure that programmatic page moves are correctly logged as 'move' and not 'reorder' in some cases (Andy Babic) + * Fix: Add missing translation usage in Workflow templates (Anuja Verma, Saurabh Kumar) 2.15.4 (11.02.2022) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index ddf6a6b07d..9830c76d13 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -577,8 +577,9 @@ Contributors * Stephanie Cheng Smith * Luis Espinoza * Hitansh Shah -* Saurabh kumar +* Saurabh Kumar * James Ray +* Anuja Verma Translators =========== diff --git a/docs/releases/3.0.md b/docs/releases/3.0.md index ede3da38d0..a71ff55179 100644 --- a/docs/releases/3.0.md +++ b/docs/releases/3.0.md @@ -86,6 +86,7 @@ class LandingPage(Page): * Allow bulk publishing of pages without revisions (Andy Chosak) * Stop skipping heading levels in Wagtail welcome page (Jesse Menn) * Add missing `lang` attributes to `<html>` elements (James Ray) + * Add missing translation usage in Workflow templates (Anuja Verma, Saurabh Kumar) ## Upgrade considerations diff --git a/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html b/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html index cbebb0962b..90b824958e 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html @@ -6,12 +6,12 @@ {% include "wagtailadmin/shared/header.html" with title=view.page_title subtitle=view.get_page_subtitle icon=view.header_icon %} <div class="nice-padding"> - <p>This workflow is currently in progress on {{ workflow_states_in_progress }} pages. Deleting this workflow will cancel moderation on these page. - Are you sure you want to delete this workflow?</p> + <p>{% blocktrans trimmed %}This workflow is currently in progress on {{ workflow_states_in_progress }} pages. Deleting this workflow will cancel moderation on these page. + Are you sure you want to delete this workflow?{% endblocktrans %}</p> <form action="{{ view.get_delete_url }}" method="POST"> {% csrf_token %} <input type="submit" value="{% trans 'Yes, delete' %}" class="button serious" /> - <a class="button button-secondary" href="{{ view.get_edit_url }}">No</a> + <a class="button button-secondary" href="{{ view.get_edit_url }}">{% trans 'No' %}</a> </form> </div> {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable.html b/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable.html index 74995fb580..941871b2c1 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable.html @@ -13,7 +13,7 @@ <form action="{{ view.get_delete_url }}" method="POST"> {% csrf_token %} <input type="submit" value="{% trans 'Yes, disable' %}" class="button serious" /> - <a class="button button-secondary" href="{{ view.get_edit_url }}">No</a> + <a class="button button-secondary" href="{{ view.get_edit_url }}">{% trans 'No' %}</a> </form> </div> {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable_task.html b/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable_task.html index 37d2f2df5c..997cc0a540 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable_task.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/confirm_disable_task.html @@ -13,7 +13,7 @@ <form action="{{ view.get_delete_url }}" method="POST"> {% csrf_token %} <input type="submit" value="{% trans 'Yes, disable' %}" class="button serious" /> - <a class="button button-secondary" href="{{ view.get_edit_url }}">No</a> + <a class="button button-secondary" href="{{ view.get_edit_url }}">{% trans 'No' %}</a> </form> </div> {% endblock %}