Stipped leading newline from multi-line translation strings

inyoka_theme_default/templates/errors/403_csrf.html

@@ -16,46 +16,44 @@
 {% block content %}
   <h2>{% trans %}Forbidden (403){% endtrans %}</h2>
   <p>
-    {% trans %}
-      CSRF verification failed. Request aborted.
-    {% endtrans %}
+    {% trans %}CSRF verification failed. Request aborted.{% endtrans %}
   </p>
 
   {% if no_referer %}
     <p>
-      {% trans %}
+      {% trans -%}
         You are seeing this message because this HTTPS site requires a
         'Referer header' to be sent by your Web browser, but none was
         sent. This header is required for security reasons, to ensure
         that your browser is not being hijacked by third parties.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
 
     <p>
-      {% trans %}
+      {% trans -%}
         If you have configured your browser to disable 'Referer' headers,
         please re-enable them, at least for this site, for HTTPS
         connections, or for 'same-origin' requests.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
   {% endif %}
 
   {% if no_cookie %}
     <p>
-      {% trans %}
+      {% trans -%}
         You are seeing this message because this site requires a CSRF
         cookie when submitting forms. This cookie is required for
         security reasons, to ensure that your browser is not being
         hijacked by third parties.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
 
     <p>
-      {% trans %}
+      {% trans -%}
         If you have configured your browser to disable cookies, please
         re-enable them, at least for this site, or for 'same-origin'
         requests.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
   {% endif %}
 {% endblock %}

inyoka_theme_default/templates/errors/404.html

@@ -20,18 +20,18 @@
   {% else %}
     <h1>{% trans %}Page not found{% endtrans %}</h1>
     <p>
-      {% trans %}
+      {% trans -%}
         The page you requested was not found. Please check if there are any
         typos in the URL. Alternativly, you do not have the permission to
         access this site.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
     <p>
-      {% trans %}
+      {% trans -%}
         If you just posted a new reply, check first, whether your post has
         been successfull submitted. If needed, you can try to post your
         content a second time after that.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
   {% endif %}
 {% endblock %}

inyoka_theme_default/templates/forum/forum.html

@@ -81,9 +81,7 @@ <h3>
               {% if topic.has_poll %}<strong>{% trans %}Poll:{% endtrans %}</strong>{% endif %}
               <a href="{{ topic|url }}">{{ topic }}</a><br />
               <small class="text-muted">
-                {% trans %}
-                  Created on:
-                {% endtrans %}
+                {% trans %}Created on:{% endtrans %}
                 <time
                     datetime="{{ topic.first_post.pub_date|datetime('c') }}">{{ topic.first_post.pub_date|datetime }}</time>
               </small>
@@ -94,16 +92,14 @@ <h3>
                     datetime="{{ topic.last_post.pub_date|datetime('c') }}">{{ topic.last_post.pub_date|datetime }}</time>
               </a><br />
               <small class="text-muted pull-right">
-                {% trans author=topic.last_post.author|e, link=topic.last_post.author|url %}
+                {% trans author=topic.last_post.author|e, link=topic.last_post.author|url -%}
                   Last post by <a href="{{ link }}">{{ author }}</a>
-                {% endtrans %}
+                {%- endtrans %}
               </small>
             </div>
             <div class="col-sm-4 visible-xs">
               <small class="text-muted">
-                {% trans %}
-                  Last post:
-                {% endtrans %}
+                {% trans %}Last post:{% endtrans %}
                 <a href="{{ topic.last_post|url }}">
                   <time
                       datetime="{{ topic.last_post.pub_date|datetime('c') }}">{{ topic.last_post.pub_date|datetime }}</time>

inyoka_theme_default/templates/forum/index.html

@@ -38,9 +38,7 @@ <h4>{{ forum }}</h4>
     </div>
   {% else %}
     <div class="forum-no-forum">
-      {% trans %}
-      You aren't allowed to view any forum or there are no forums configured in this Inyoka instance.
-      {% endtrans %}
+      {% trans %}You aren't allowed to view any forum or there are no forums configured in this Inyoka instance.{% endtrans %}
     </div>
   {% endfor %}
 {% endblock %}

inyoka_theme_default/templates/ikhaya/detail.html

@@ -148,7 +148,7 @@ <h3 id="comment-section">{% trans %}Comments{% endtrans %}</h3>
   {% endfor %}
 
   {% if article.comments_enabled and can_post_comment %}
-    <h3 id="new_comment">{% trans %}Write new Comment{% endtrans %}</h3>
+    <h3 id="new_comment">{% trans %}Write new comment{% endtrans %}</h3>
     {% call macros.outer_form(csrf_token(), form, action=article|url + '#new_comment') %}
       <input type="submit" name="preview" value="{% trans %}Preview{% endtrans %}" />
     {% endcall %}

inyoka_theme_default/templates/ikhaya/reportlist.html

@@ -17,9 +17,7 @@
 
 {% block content %}
   <h2>
-    {% trans %}
-    Newest Reports
-    {% endtrans %}
+    {% trans %}Newest Reports{% endtrans %}
   </h2>
 
   {{ render_reports(inside_reportlist=True) }}

inyoka_theme_default/templates/ikhaya/suggest_delete.html

@@ -17,9 +17,7 @@
   <p><textarea name="note"></textarea></p>
 
   <p class="note">
-    {% trans %}
-      Leave this field empty if the suggestion should be deleted without an explanation.
-    {% endtrans %}
+    {% trans %}Leave this field empty if the suggestion should be deleted without an explanation.{% endtrans %}
   </p>
 
   <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" />

inyoka_theme_default/templates/ikhaya/suggest_new.html

@@ -19,19 +19,15 @@
 {% block content %}
   <h2>{% trans %}Suggest new article{% endtrans %}</h2>
   <p>
-    {% trans %}
-      If you want to suggest a new article please submit your article below.
-    {% endtrans %}
+    {% trans %}If you want to suggest a new article please submit your article below.{% endtrans %}
   </p>
   <p>
-    {% trans %}
-      It is not possible to submit images along with the article. If you want to use images please upload them elsewhere and insert the links in the article.
-    {% endtrans %}
+    {% trans %}It is not possible to submit images along with the article. If you want to use images please upload them elsewhere and insert the links in the article.{% endtrans %}
   </p>
   <p>
-    {% trans link_license=href('wiki', 'Wiki/Lizenz'), link_rules=href('wiki', 'Wiki/ubuntuusers/Moderatoren/Portalregeln') %}
+    {% trans link_license=href('wiki', 'Wiki/Lizenz'), link_rules=href('wiki', 'Wiki/ubuntuusers/Moderatoren/Portalregeln') -%}
       I assure that my submission does not violate any other legal rights and it does not violate the <a href="{{ link_rules }}">platform rules</a>. Additionally I accept that my submission is published under the <a href="{{ link_license }}">license</a> of the platform.
-    {% endtrans %}
+    {%- endtrans %}
   </p>
   {% call macros.outer_form(csrf_token(), form) %}
     <input type="submit" value="{% trans %}Preview{% endtrans %}" name="preview" />

inyoka_theme_default/templates/ikhaya/suggestions.html

@@ -101,7 +101,7 @@ <h3 class="title">
 
       {% if suggestion.notes_rendered %}
         <div class="ikhaya-suggestion-footer">
-          <h4>{% trans %}Proposers's notes to the admins{% endtrans %}</h4>
+          <h4>{% trans %}Proposer's notes to the admins{% endtrans %}</h4>
           {{ suggestion.notes_rendered }}
         </div>
       {% endif %}

inyoka_theme_default/templates/pastebin/add.html

@@ -24,12 +24,12 @@
 
 {% block content %}
   <p>
-    {% trans %}
+    {% trans -%}
       This is a pastebin where you can save error messages, logs, configuration files
       or source codes to keep threads or IRC channels clean. To do this, just copy
       the text in the box below and choose the appropriate language. After that, you
       copy the URL into the topic or the channel.
-    {% endtrans %}
+    {%- endtrans %}
   </p>
 
   {{ macros.outer_form(csrf_token(), form) }}

inyoka_theme_default/templates/portal/base.html

@@ -21,7 +21,7 @@
 {% endblock %}
 
 {% block sidebar %}
-  {% call macros.sidebar(_('Member informations')) %}
+  {% call macros.sidebar(_('Member information')) %}
     {{ macros.sidebar_item(_('Members'), href('portal', 'users')) }}
     {{ macros.sidebar_item(_('Who is online?'), href('portal', 'whoisonline')) }}
     {{ macros.sidebar_item(_('Groups'), href('portal', 'groups')) }}

inyoka_theme_default/templates/portal/index.html

@@ -10,24 +10,18 @@
 
 {% block content %}
   <h1 class="portal-welcome">
-    {% trans %}
-      Welcome!
-    {% endtrans %}
+    {% trans %}Welcome!{% endtrans %}
   </h1>
 
   {{ welcome_message_rendered|default('', True) }}
 
   <h2 class="portal-calendar">
-    {% trans %}
-      Upcoming Events
-    {% endtrans %}
+    {% trans %}Upcoming Event{% endtrans %}
   </h2>
   {{ calendar_events|safe }}
 
   <h2 class="portal-inyoka">
-    {% trans %}
-      Latest News
-    {% endtrans %}
+    {% trans %}Latest New{% endtrans %}
   </h2>
   <div class="portal-inyoka-overview">
     {% if ikhaya_latest %}

inyoka_theme_default/templates/portal/user_edit_privileges.html

@@ -38,9 +38,9 @@ <h3>{% trans %}Privileges{% endtrans %}</h3>
       <label for="perm_{{ id }}">{{ name|e }}</label>
       {% if derived %}
         <span class="text-muted">
-          {% trans grouplist=render_grouplist(derived) %}
+          {% trans grouplist=render_grouplist(derived) -%}
             (Derived from {{ grouplist }})
-          {% endtrans %}
+          {%- endtrans %}
         </span>
       {% endif %}
       <br />
@@ -49,9 +49,7 @@ <h3>{% trans %}Privileges{% endtrans %}</h3>
     <h4>{% trans %}Forum privileges{% endtrans %}</h4>
     <div id="forum_rights">
       <p class="text-danger">
-        {% trans %}
-          Sorry, you need to enable JavaScript to edit forum privileges.
-        {% endtrans %}
+        {% trans %}Sorry, you need to enable JavaScript to edit forum privileges.{% endtrans %}
       </p>
     </div>
   {% endcall %}

inyoka_theme_default/templates/portal/usercp/change_password.html

@@ -19,9 +19,7 @@
 
 {% block content %}
   <h2>{% trans %}Change password{% endtrans %}</h2>
-  {% trans %}
-    You can change your password with this form. For security reasons, you need to enter your old password.
-  {% endtrans %}
+  {% trans %}You can change your password with this form. For security reasons, you need to enter your old password.{% endtrans %}
 
   {% call macros.outer_form(csrf_token(), form,  submit_label=_('Change password')) %}
   {% endcall %}

inyoka_theme_default/templates/wiki/action_attach.html

@@ -24,14 +24,12 @@
   <h1>{% trans %}Existing attachments{% endtrans %}</h1>
   {% if attachments %}
     <p>
-      {% trans count=attachments|count %}
+      {% trans count=attachments|count -%}
         There is currently one attachment assigned to this page.
-      {% pluralize %}
+      {%- pluralize -%}
         There are currently {{ count }} attachments assigned to this page.
-      {% endtrans %}
-      {% trans %}
-        To refer to an attachment you can either link to the corresponding wiki page or include it with the <code>[[Bild()]]</code> macro.
-      {% endtrans %}
+      {%- endtrans %}
+      {% trans %}To refer to an attachment you can either link to the corresponding wiki page or include it with the <code>[[Bild()]]</code> macro.{% endtrans %}
     </p>
     <ul class="attachments">
       {% for attachment in attachments %}
@@ -45,9 +43,9 @@ <h1>{% trans %}Existing attachments{% endtrans %}</h1>
             {% set modified_by = attachment.rev.remote_addr|e %}
           {% endif %}
 
-          {% trans date=attachment.rev.change_date|datetime, user=modified_by %}
+          {% trans date=attachment.rev.change_date|datetime, user=modified_by -%}
             (last modified on {{ date }} by {{ user }})
-          {% endtrans %}
+          {%- endtrans %}
         </li>
       {% endfor %}
     </ul>

inyoka_theme_default/templates/wiki/action_backlinks.html

@@ -36,15 +36,13 @@
 
   {% if page.embedders %}
     <p>
-      {% trans %}
-        The following pages embed this articles as attachment.
-      {% endtrans %}
+      {% trans %}The following pages embed this articles as attachment.{% endtrans %}
       {% if not page.rev.attachment %}
-        {% trans %}
+        {% trans -%}
           But the article itself is not listed as an attachment, perhaps
           these pages are using the article mistakenly or an old revision
           was an attachment.
-        {% endtrans %}
+        {%- endtrans %}
       {% endif %}
     </p>
     <ul>
@@ -57,13 +55,9 @@
   {% if not page.backlinks and not page.embedders %}
     <p>
       {% if page.rev.attachment %}
-        {% trans %}
-          This attachment is an orphan and not referenced by any site.
-        {% endtrans %}
+        {% trans %}This attachment is an orphan and not referenced by any site.{% endtrans %}
       {% else %}
-        {% trans %}
-          This article is an orphan and not referenced by any site.
-        {% endtrans %}
+        {% trans %}This article is an orphan and not referenced by any site.{% endtrans %}
       {% endif %}
     </p>
   {% endif %}

inyoka_theme_default/templates/wiki/action_rename.html

@@ -13,10 +13,7 @@
 {% call macros.outer_form(csrf_token(), action=page|url('rename')|e,
                     submit_label=_('Rename'), manually_rendered=True) %}
   <p>
-    {% trans %}
-      If you rename this page, all revisions will be renamed.
-      The old page will redirect to the new one.
-    {% endtrans %}
+    {% trans %}If you rename this page, all revisions will be renamed. The old page will redirect to the new one.{% endtrans %}
   </p>
   <p>
     <label for="id_new_name">{% trans %}New page name:{% endtrans %}</label>
@@ -30,9 +27,7 @@
   </p>
   {% if force %}
     <strong>
-      {% trans %}
-        Duplicate attachments on the target page will be overwritten!
-      {% endtrans %}
+      {% trans %}Duplicate attachments on the target page will be overwritten!{% endtrans %}
     </strong>
   {% endif %}
 {% endcall %}

inyoka_theme_default/templates/wiki/action_show.html

@@ -25,16 +25,14 @@ <h1>{{ page.short_title|e }}</h1>
   <div class="wiki-meta">
     <p>
        {% trans rev_link=page.rev|url, date=page.rev.change_date|datetime,
-                author_link=macros.render_user_link(page.rev.user) %}
+                author_link=macros.render_user_link(page.rev.user) -%}
           <a href="{{ rev_link }}">This revision</a> was created on {{ date }} by {{ author_link }}.
-      {% endtrans %}
+      {%- endtrans %}
     </p>
 
     <p>
       {% if tags %}
-        {% trans %}
-          At this page the following tags have been assigned:
-        {% endtrans %}
+        {% trans %}At this page the following tags have been assigned{% endtrans %}
         {% for tag in tags %}
           <a href="{{ href('wiki', 'wiki', 'tags', tag|e) }}">{{ tag|e }}</a>{% if not loop.last %}, {% endif %}
         {% endfor %}

inyoka_theme_default/templates/wiki/missingpages.html

@@ -49,9 +49,7 @@ <h1>{% trans %}Missing Pages{% endtrans %}</h1>
     </div>
   {% else %}
     <p>
-      {% trans %}
-        There aren't any links to missing pages in the wiki. Congratulations!
-      {% endtrans %}
+      {% trans %}There aren't any links to missing pages in the wiki. Congratulations!{% endtrans %}
     </p>
   {% endif %}
 {% endblock %}