Merge "Use 'trimmed' for blocktrans with multi-line contents"

horizon/templates/auth/_description.html

@@ -6,7 +6,7 @@
 {% endcomment %}
 <div class="help_text alert alert-info">
   {% block websso-help-text %}
-    {% blocktrans %}
+    {% blocktrans trimmed %}
       If you are not sure which authentication method to use, contact your administrator.
     {% endblocktrans %}
   {% endblock %}

horizon/templates/auth/_login_form.html

@@ -44,7 +44,7 @@
             </p>
             <p>
               {% url 'horizon:user_home' as home_url %}
-              {% blocktrans %}
+              {% blocktrans trimmed %}
                 Login as different user or go back to <a href="{{ home_url }}">home page</a>
               {% endblocktrans %}
             </p>

horizon/templates/horizon/common/_limit_summary.html

@@ -12,11 +12,11 @@
           <div class="quota_title" title="{{ quota.name }}" data-toggle="tooltip"> {{ quota.name }}</div>
           <div class="quota_subtitle">
             {% if quota.max|quotainf != '-1' %}
-              {% blocktrans with used=quota.used|intcomma available=quota.max|quotainf|intcomma %}
+              {% blocktrans trimmed with used=quota.used|intcomma available=quota.max|quotainf|intcomma %}
                 Used <span> {{ used }} </span>of<span> {{ available }} </span>
               {% endblocktrans %}
             {% else %}
-              {% blocktrans with used=quota.used|intcomma %}
+              {% blocktrans trimmed with used=quota.used|intcomma %}
                 Used <span> {{ used }} </span>(No Limit)
               {% endblocktrans %}
             {% endif %}

horizon/templates/horizon/common/_usage_summary.html

@@ -6,11 +6,11 @@
   <form action="?" method="get" id="date_form" class="form-inline">
     <h3>{% trans "Select a period of time to query its usage:" %}</h3>
     <div class="datepicker form-group">
-      {% blocktrans with start=form.start %}
+      {% blocktrans trimmed with start=form.start %}
       <label>From:</label> {{ start }}{% endblocktrans %}
     </div>
     <div class="datepicker form-group">
-      {% blocktrans with end=form.end %}
+      {% blocktrans trimmed with end=form.end %}
       <label>To:</label>{{ end }}{% endblocktrans %}
     </div>
     <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>