~netlandish/django-wiki

e0753d869f675bb28424237254622dca082ea9c4 — Benjamin Bach 6 years ago 32a2d54 + faaf56d
Merge pull request #884 from Ayub-Khan/remove-unnecessary-characters-from-strings

Removes unnecessary endline/startline characters from strings
M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html +1 -1
@@ 37,7 37,7 @@
{% 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>

M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html +1 -1
@@ 8,7 8,7 @@
<div class="row">
  <div class="col-lg-8">
    <p class="lead">{% trans "The following files are available for this article. Copy the markdown tag to directly refer to a file from the article text." %}</p>
    <p> {% blocktrans %}
    <p> {% blocktrans trimmed %}
      Complete markdown code syntax: <code>[attachment:id title:"text" size]</code><br>
      &nbsp;&nbsp;title: Link text replacement for the file name.
      size: Show file size after the title.

M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html +3 -3
@@ 9,12 9,12 @@
<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>
<h3>
  {% blocktrans with attachment.current_revision.get_filename as filename %}
  {% blocktrans with attachment.current_revision.get_filename as filename trimmed %}
  Articles using {{ filename }}
  {% endblocktrans %}</h3>
<ul>


@@ 23,7 23,7 @@
<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>

M src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html => src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html +1 -1
@@ 11,7 11,7 @@
<div class="row">
  <div class="lead col-xs-8">
    {% with paginator.object_list.count as cnt %}
      {% blocktrans count cnt=cnt %}
      {% blocktrans count cnt=cnt trimmed %}
        List of <strong>{{ cnt }} change</strong> in the wiki.
        {% plural %}
        List of <strong>{{ cnt }} changes</strong> in the wiki.

M src/wiki/templates/wiki/dir.html => src/wiki/templates/wiki/dir.html +1 -1
@@ 37,7 37,7 @@

<p>
  {% 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 <strong><a href="{{ self_url }}">/{{ path }}</a></strong>. There {{ articles_plur_verb }} <strong>{{ cnt }} {{ articles_plur }}</strong> in this level.
    {% endblocktrans %}
  {% endwith %}

M src/wiki/templates/wiki/includes/anonymous_blocked.html => src/wiki/templates/wiki/includes/anonymous_blocked.html +1 -1
@@ 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 <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
  {% endblocktrans %}
{% else %}

M src/wiki/templates/wiki/move.html => src/wiki/templates/wiki/move.html +1 -1
@@ 20,7 20,7 @@
        </ul>
      </div>
      <p class="col-lg-offset-2">
        {% blocktrans count cnt=urlpath.get_descendants.count %}
        {% blocktrans count cnt=urlpath.get_descendants.count trimmed %}
          {{ cnt }} nested article will also be moved.<br>
          Be careful, links to this article and {{ cnt }} article nested
          in this hierarchy will not be updated.