From 168ba70d96d0b9a448d305d1d3eddeda45f7125d Mon Sep 17 00:00:00 2001 From: ayub-khan <muhammadayubkhan6@gmail.com> Date: Tue, 10 Jul 2018 11:00:12 +0500 Subject: [PATCH] fix-i18n-issues --- lms/templates/logout.html | 2 +- lms/templates/wiki/includes/anonymous_blocked.html | 2 +- lms/templates/wiki/includes/editor_widget.html | 2 +- .../templates/schedules/edx_ace/courseupdate/email/subject.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/templates/logout.html b/lms/templates/logout.html index 8223e3a73ff..29e02376345 100644 --- a/lms/templates/logout.html +++ b/lms/templates/logout.html @@ -7,7 +7,7 @@ <h1>{% trans "You have signed out." %}</h1> <p style="text-align: center; margin-bottom: 20px;"> - {% blocktrans %} + {% blocktrans trimmed %} If you are not redirected within 5 seconds, <a href="{{ target }}">click here to go to the home page</a>. {% endblocktrans %} </p> diff --git a/lms/templates/wiki/includes/anonymous_blocked.html b/lms/templates/wiki/includes/anonymous_blocked.html index de673d6cd7b..83faee974e7 100644 --- a/lms/templates/wiki/includes/anonymous_blocked.html +++ b/lms/templates/wiki/includes/anonymous_blocked.html @@ -3,7 +3,7 @@ {% url 'wiki:signup' as signup_url %} {% url 'wiki:login' as login_url %} {% if login_url and signup_url %} - {% blocktrans %} + {% blocktrans trimmed %} You need to <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function. {% endblocktrans %} {% else %} diff --git a/lms/templates/wiki/includes/editor_widget.html b/lms/templates/wiki/includes/editor_widget.html index 511ce492c7a..7dadc50dc59 100644 --- a/lms/templates/wiki/includes/editor_widget.html +++ b/lms/templates/wiki/includes/editor_widget.html @@ -1,6 +1,6 @@ {% load i18n %} <p id="hint_id_content" class="help-block"> - {% blocktrans with start_link="<a id='cheatsheetLink' href='#cheatsheetModal' rel='leanModal'>" end_link="</a>" %} + {% blocktrans with start_link="<a id='cheatsheetLink' href='#cheatsheetModal' rel='leanModal'>" end_link="</a>" trimmed %} Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help. {% endblocktrans %} </p> diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/subject.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/subject.txt index bc3c1573b35..72dc10d90d7 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/subject.txt +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/subject.txt @@ -1,5 +1,5 @@ {% autoescape off %} {% load i18n %} -{% blocktrans %}Welcome to week {{ week_num }} {% endblocktrans %} +{% blocktrans trimmed %}Welcome to week {{ week_num }} {% endblocktrans %} {% endautoescape %} -- GitLab