diff --git a/setup.py b/setup.py index eb5e40f83..b57461967 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def build_media_pattern(base_folder, file_extension): setup( name = "django-wiki", - version="0.0.18", + version="0.0.19", author="Benjamin Bach", author_email="benjamin@overtag.dk", description=("A wiki system written for the Django framework."), diff --git a/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html b/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html index 0f143bba2..f0d7026ae 100644 --- a/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html +++ b/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html @@ -8,7 +8,7 @@ {% if attachment.article == article %}

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

- {% blocktrans with attachment.original_filename as filename %} + {% blocktrans with attachment.original_filename as filename trimmed %} The file may be referenced on other articles. Deleting it means that they will loose their references to this file. The following articles reference this file: {% endblocktrans %}

@@ -35,7 +35,7 @@

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

{% 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/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html b/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html index e8a7f3b8b..795ec75b5 100644 --- a/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html +++ b/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html @@ -8,7 +8,7 @@

{% 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 %}

@@ -19,7 +19,7 @@

{% trans "Articles using" %} {{ attachment.current_revision.get_filename }}<
{% 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/wiki/templates/wiki/dir.html b/wiki/templates/wiki/dir.html index 4456fc999..a4d35b1e6 100644 --- a/wiki/templates/wiki/dir.html +++ b/wiki/templates/wiki/dir.html @@ -37,11 +37,11 @@

{% with paginator.object_list.count as cnt %} {% if filter_query %} - {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("matches,match") as match_plur %} + {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("matches,match") as match_plur trimmed %} {{ cnt }} {{ articles_plur }} in this level {{ match_plur }} your search. {% endblocktrans %} {% else %} - {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb %} + {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %} There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level. {% endblocktrans %} {% endif %} diff --git a/wiki/templates/wiki/includes/anonymous_blocked.html b/wiki/templates/wiki/includes/anonymous_blocked.html index d6e8a7b12..78dc3cc39 100644 --- a/wiki/templates/wiki/includes/anonymous_blocked.html +++ b/wiki/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 log in or sign up to use this function. {% endblocktrans %} {% else %}