From b112cdad14ae4254f71f2be9e14bcb44c0eb102a Mon Sep 17 00:00:00 2001
From: chenqiaomin <chen.qiaomin@99cloud.net>
Date: Wed, 25 May 2016 02:03:27 +0000
Subject: [PATCH] Use 'trimmed' for blocktrans in html page

blocktrans trimmed option removes newlines from contents of blocktrans
and replaces any whitespace at the beginning and end of a line into
a single space. This makes translator life easier.
More detail is described in the bug report.

Change-Id: Ic63629a1afe5606a58797ed69bf847447cad9c02
Closes-Bug: #1585428
---
 muranodashboard/templates/catalog/index.html           | 2 +-
 muranodashboard/templates/packages/_import_bundle.html | 2 +-
 muranodashboard/templates/packages/_upload.html        | 2 +-
 muranodashboard/templates/services/_overview.html      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/muranodashboard/templates/catalog/index.html b/muranodashboard/templates/catalog/index.html
index 810f21d23..a14f13a5e 100644
--- a/muranodashboard/templates/catalog/index.html
+++ b/muranodashboard/templates/catalog/index.html
@@ -111,7 +111,7 @@
         {% else %}
             <p class="col-xs-12 alert alert-info">
             {% if no_apps %}
-            {% blocktrans %}There are no applications in the catalog. You can import apps from
+            {% blocktrans trimmed %}There are no applications in the catalog. You can import apps from
                 <a href="{{ repo_url }}" target="_blank"> {{ repo_url }}</a>.{% endblocktrans %}
                 <br><br>
                 {% blocktrans trimmed %}Go to
diff --git a/muranodashboard/templates/packages/_import_bundle.html b/muranodashboard/templates/packages/_import_bundle.html
index e74137e56..afe66815b 100644
--- a/muranodashboard/templates/packages/_import_bundle.html
+++ b/muranodashboard/templates/packages/_import_bundle.html
@@ -28,7 +28,7 @@
         <div class='description-by_name'>
             <h3>{% trans "Description" %}:</h3>
             <p><strong>{% trans "Bundle Name" %}: </strong>{% trans "Bundle's full name."%}</p>
-            <p>{% blocktrans %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
+            <p>{% blocktrans trimmed %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
         </div>
         <div class='description-by_url'>
             <h3>{% trans "Description" %}:</h3>
diff --git a/muranodashboard/templates/packages/_upload.html b/muranodashboard/templates/packages/_upload.html
index 61c7d749b..2e1c52331 100644
--- a/muranodashboard/templates/packages/_upload.html
+++ b/muranodashboard/templates/packages/_upload.html
@@ -46,7 +46,7 @@
                 <h3>{% trans "Description" %}:</h3>
                 <p><strong>{% trans "Package Name" %}: </strong>{% trans "Fully qualified package name." %}</p>
                 <p><strong>{% trans "Package Version" %}: </strong>{% trans "Version of the package (optional)." %}</p>
-                <p>{% blocktrans %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
+                <p>{% blocktrans trimmed %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
             </div>
             <div class='description-by_url'>
                 <h3>{% trans "Description" %}:</h3>
diff --git a/muranodashboard/templates/services/_overview.html b/muranodashboard/templates/services/_overview.html
index 8748dd30e..b113909bc 100644
--- a/muranodashboard/templates/services/_overview.html
+++ b/muranodashboard/templates/services/_overview.html
@@ -14,7 +14,7 @@
             </dd><br>
         {% elif key == 'Instances' %}
             {% for instance in value %}
-                <dt>{% blocktrans %}Instance{{forloop.counter}} name{% endblocktrans %}</dt>
+                <dt>{% blocktrans trimmed %}Instance{{forloop.counter}} name{% endblocktrans %}</dt>
                 <dd>
                     <a href=" {% url 'horizon:project:instances:detail' instance.id %}">
                         {{ instance.name }}
@@ -30,7 +30,7 @@
             </dd><br>
         {% elif key == 'Stacks'%}
             {% for stack in value %}
-            <dt>{% blocktrans %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt>
+            <dt>{% blocktrans trimmed %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt>
                 <dd>
                     <a href=" {% url 'horizon:project:stacks:detail' stack.id %}">
                         {{ stack.name }}