Merge pull request #37 from edx/fix-i18n-issue

fixes edx-platform translation issue

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="[email protected]",
     description=("A wiki system written for the Django framework."),

wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html

@@ -8,7 +8,7 @@
 {% if attachment.article == article %}
 <h2>{% trans "Delete" %} "{{ attachment.current_revision.get_filename }}"?</h2>
   <p class="lead">
-    {% 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 %}
   </p>
@@ -35,7 +35,7 @@ <h2>{% trans "Delete" %} "{{ attachment.current_revision.get_filename }}"?</h2>
 {% else %}
   <h2>{% trans "Remove" %} "{{ attachment.current_revision.get_filename }}"?</h2>
   <p class="lead">
-    {% 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 %}
   </p>

wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html

@@ -8,7 +8,7 @@
 <h2>{% trans "Replace" %} "{{ attachment.current_revision.get_filename }}"</h2>
 {% if attachment.articles.count > 1 %}
 <p class="lead">
-  {% 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 <strong>{{ filename }}</strong>. 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 %}
 </p>
@@ -19,7 +19,7 @@ <h3>{% trans "Articles using" %} {{ attachment.current_revision.get_filename }}<
 <hr />
 {% else %}
 <p class="lead">
-  {% 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 <strong>{{ filename }}</strong>.
   {% endblocktrans %}
 </p>

wiki/templates/wiki/dir.html

@@ -37,11 +37,11 @@
 <p>
   {% 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 %}

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 <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
   {% endblocktrans %}
 {% else %}