From faaf56da0ff55df91ff7f7da01344ca7514d6d07 Mon Sep 17 00:00:00 2001 From: ayub-khan Date: Tue, 10 Jul 2018 11:46:53 +0500 Subject: [PATCH] -Removes unnecessary endline/startline characters from strings --- .../templates/wiki/plugins/attachments/delete.html | 2 +- .../templates/wiki/plugins/attachments/index.html | 2 +- .../templates/wiki/plugins/attachments/replace.html | 6 +++--- .../templates/wiki/plugins/globalhistory/globalhistory.html | 2 +- src/wiki/templates/wiki/dir.html | 2 +- src/wiki/templates/wiki/includes/anonymous_blocked.html | 2 +- src/wiki/templates/wiki/move.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html index cc45531d..01158a99 100644 --- a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html +++ b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html @@ -37,7 +37,7 @@ {% else %}

{% trans "Remove" %} "{{ attachment.current_revision.get_filename }}"?

- {% blocktrans with attachment.original_filename as filename %} + {% blocktrans with attachment.original_filename as filename trimmed %} You can remove a reference to a file, but it will retain its references on other articles. {% endblocktrans %}

diff --git a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html index 7ca45c05..c45341b7 100644 --- a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html +++ b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html @@ -8,7 +8,7 @@

{% trans "The following files are available for this article. Copy the markdown tag to directly refer to a file from the article text." %}

-

{% blocktrans %} +

{% blocktrans trimmed %} Complete markdown code syntax: [attachment:id title:"text" size]
  title: Link text replacement for the file name. size: Show file size after the title. diff --git a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html index 7bbfdd9f..3690c556 100644 --- a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html +++ b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html @@ -9,12 +9,12 @@

{% trans "Replace" %} "{{ attachment.current_revision.get_filename }}"

{% if attachment.articles.count > 1 %}

- {% blocktrans with attachment.original_filename as filename %} + {% blocktrans with attachment.original_filename as filename trimmed %} Replacing an attachment means adding a new file that will be used in its place. All references to the file will be replaced by the one you upload and the file will be downloaded as {{ filename }}. Please note that this attachment is in use on other articles, you may distort contents. However, do not hestitate to take advantage of this and make replacements for the listed articles where necessary. This way of working is more efficient.... {% endblocktrans %}

- {% blocktrans with attachment.current_revision.get_filename as filename %} + {% blocktrans with attachment.current_revision.get_filename as filename trimmed %} Articles using {{ filename }} {% endblocktrans %}

    @@ -23,7 +23,7 @@
    {% else %}

    - {% blocktrans with attachment.original_filename as filename %} + {% blocktrans with attachment.original_filename as filename trimmed %} Replacing an attachment means adding a new file that will be used in its place. All references to the file will be replaced by the one you upload and the file will be downloaded as {{ filename }}. {% endblocktrans %}

    diff --git a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html index 4a265a00..7015034b 100644 --- a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html +++ b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html @@ -11,7 +11,7 @@
    {% with paginator.object_list.count as cnt %} - {% blocktrans count cnt=cnt %} + {% blocktrans count cnt=cnt trimmed %} List of {{ cnt }} change in the wiki. {% plural %} List of {{ cnt }} changes in the wiki. diff --git a/src/wiki/templates/wiki/dir.html b/src/wiki/templates/wiki/dir.html index 31d4bdad..86b04c85 100644 --- a/src/wiki/templates/wiki/dir.html +++ b/src/wiki/templates/wiki/dir.html @@ -37,7 +37,7 @@

    {% with paginator.object_list.count as cnt %} - {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb %} + {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %} Browsing /{{ path }}. There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level. {% endblocktrans %} {% endwith %} diff --git a/src/wiki/templates/wiki/includes/anonymous_blocked.html b/src/wiki/templates/wiki/includes/anonymous_blocked.html index e78b7c69..5e1d3dac 100644 --- a/src/wiki/templates/wiki/includes/anonymous_blocked.html +++ b/src/wiki/templates/wiki/includes/anonymous_blocked.html @@ -4,7 +4,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 log in or sign up to use this function. {% endblocktrans %} {% else %} diff --git a/src/wiki/templates/wiki/move.html b/src/wiki/templates/wiki/move.html index 48f980bc..d93a3675 100644 --- a/src/wiki/templates/wiki/move.html +++ b/src/wiki/templates/wiki/move.html @@ -20,7 +20,7 @@

- {% blocktrans count cnt=urlpath.get_descendants.count %} + {% blocktrans count cnt=urlpath.get_descendants.count trimmed %} {{ cnt }} nested article will also be moved.
Be careful, links to this article and {{ cnt }} article nested in this hierarchy will not be updated. -- 2.45.2