From c7debef1260acb553c5fd93eea2bbd9c5188998d Mon Sep 17 00:00:00 2001
From: Qian Min Chen <chen.qiaomin@99cloud.net>
Date: Wed, 18 Jul 2018 11:00:42 +0800
Subject: [PATCH] Use 'trimmed' for blocktrans in multi-line strings

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.

Change-Id: I988b79fa521b17d3e0361d487e4c4320194b11e5
Closes-bug: #1782277
---
 .../templates/share_group_types/_manage_access.html           | 2 +-
 .../share_types/templates/share_types/_manage_access.html     | 2 +-
 .../admin/shares/templates/shares/_manage_share.html          | 2 +-
 .../admin/shares/templates/shares/_migration_cancel.html      | 2 +-
 .../admin/shares/templates/shares/_migration_complete.html    | 2 +-
 .../shares/templates/shares/_migration_get_progress.html      | 2 +-
 .../admin/shares/templates/shares/_migration_start.html       | 2 +-
 .../admin/shares/templates/shares/_unmanage_share.html        | 2 +-
 .../security_services/templates/security_services/_add.html   | 4 ++--
 .../templates/security_services/_create.html                  | 4 ++--
 .../share_networks/templates/share_networks/_create.html      | 2 +-
 .../share_snapshots/templates/share_snapshots/_rule_add.html  | 2 +-
 .../dashboards/project/shares/templates/shares/_rule_add.html | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manila_ui/dashboards/admin/share_group_types/templates/share_group_types/_manage_access.html b/manila_ui/dashboards/admin/share_group_types/templates/share_group_types/_manage_access.html
index 8d2734fa..a7a82ac4 100644
--- a/manila_ui/dashboards/admin/share_group_types/templates/share_group_types/_manage_access.html
+++ b/manila_ui/dashboards/admin/share_group_types/templates/share_group_types/_manage_access.html
@@ -16,7 +16,7 @@
 </div>
 <div class="right">
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Placeholder for description of share group type access managing form.
     {% endblocktrans %}</p>
 </div>
diff --git a/manila_ui/dashboards/admin/share_types/templates/share_types/_manage_access.html b/manila_ui/dashboards/admin/share_types/templates/share_types/_manage_access.html
index cac72a09..7f00a95b 100644
--- a/manila_ui/dashboards/admin/share_types/templates/share_types/_manage_access.html
+++ b/manila_ui/dashboards/admin/share_types/templates/share_types/_manage_access.html
@@ -16,7 +16,7 @@
 </div>
 <div class="right">
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Placeholder for description of share type access managing form.
     {% endblocktrans %}</p>
 </div>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_manage_share.html b/manila_ui/dashboards/admin/shares/templates/shares/_manage_share.html
index 866913d2..125072b0 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_manage_share.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_manage_share.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     "Manage" an existing share from a Manila host.
     This will make the share visible within OpenStack.
     <br>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_migration_cancel.html b/manila_ui/dashboards/admin/shares/templates/shares/_migration_cancel.html
index 9366eb42..21e2f733 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_migration_cancel.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_migration_cancel.html
@@ -3,7 +3,7 @@
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Cancel migration of a migrating share.
     <br>
     <br>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_migration_complete.html b/manila_ui/dashboards/admin/shares/templates/shares/_migration_complete.html
index 416b3e65..85b6f125 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_migration_complete.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_migration_complete.html
@@ -3,7 +3,7 @@
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Complete migration of a migrating share to another Manila host.
     This operation is expected to be disruptive.
     <br>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_migration_get_progress.html b/manila_ui/dashboards/admin/shares/templates/shares/_migration_get_progress.html
index a26237e7..32d3ea15 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_migration_get_progress.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_migration_get_progress.html
@@ -3,7 +3,7 @@
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Obtains migration progress of a migrating share.
     <br>
     <br>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_migration_start.html b/manila_ui/dashboards/admin/shares/templates/shares/_migration_start.html
index 876da821..16fe27ff 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_migration_start.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_migration_start.html
@@ -3,7 +3,7 @@
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Migrate an existing share to another Manila host.
     This will move all your share data from one host to another.
     <br>
diff --git a/manila_ui/dashboards/admin/shares/templates/shares/_unmanage_share.html b/manila_ui/dashboards/admin/shares/templates/shares/_unmanage_share.html
index e4bc090e..72989a8c 100644
--- a/manila_ui/dashboards/admin/shares/templates/shares/_unmanage_share.html
+++ b/manila_ui/dashboards/admin/shares/templates/shares/_unmanage_share.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     When a share is "unmanaged", the share will no longer be visible within OpenStack.
     Note that the share will not be deleted.
     <br>
diff --git a/manila_ui/dashboards/project/security_services/templates/security_services/_add.html b/manila_ui/dashboards/project/security_services/templates/security_services/_add.html
index bf582847..af311cbd 100644
--- a/manila_ui/dashboards/project/security_services/templates/security_services/_add.html
+++ b/manila_ui/dashboards/project/security_services/templates/security_services/_add.html
@@ -16,8 +16,8 @@
 </div>
 <div class="right">
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
-    The security service can be used by backend drivers to 
+  <p>{% blocktrans trimmed %}
+    The security service can be used by backend drivers to
     configure clients, for more secure using of share.
     {% endblocktrans %}</p>
 </div>
diff --git a/manila_ui/dashboards/project/security_services/templates/security_services/_create.html b/manila_ui/dashboards/project/security_services/templates/security_services/_create.html
index 28844e3d..791047ab 100644
--- a/manila_ui/dashboards/project/security_services/templates/security_services/_create.html
+++ b/manila_ui/dashboards/project/security_services/templates/security_services/_create.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
-    The security service can be used by backend drivers to 
+  <p>{% blocktrans trimmed %}
+    The security service can be used by backend drivers to
     configure clients, for more secure using of share.
     {% endblocktrans %}</p>
 {% endblock %}
diff --git a/manila_ui/dashboards/project/share_networks/templates/share_networks/_create.html b/manila_ui/dashboards/project/share_networks/templates/share_networks/_create.html
index 0759a677..2151fba2 100644
--- a/manila_ui/dashboards/project/share_networks/templates/share_networks/_create.html
+++ b/manila_ui/dashboards/project/share_networks/templates/share_networks/_create.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
     Share networks contain network data, that will be used
     for creation of service VM, where will be hosted shares.
     {% endblocktrans %}</p>
diff --git a/manila_ui/dashboards/project/share_snapshots/templates/share_snapshots/_rule_add.html b/manila_ui/dashboards/project/share_snapshots/templates/share_snapshots/_rule_add.html
index db417421..030e6822 100644
--- a/manila_ui/dashboards/project/share_snapshots/templates/share_snapshots/_rule_add.html
+++ b/manila_ui/dashboards/project/share_snapshots/templates/share_snapshots/_rule_add.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
       Add policy rule to snapshot, 'ip' rule represents ip address,
       'user' rule represents username or usergroup,
       'cephx' rule represents ceph auth ID, and 'cert' rule represents
diff --git a/manila_ui/dashboards/project/shares/templates/shares/_rule_add.html b/manila_ui/dashboards/project/shares/templates/shares/_rule_add.html
index 81ad45f3..623c89c4 100644
--- a/manila_ui/dashboards/project/shares/templates/shares/_rule_add.html
+++ b/manila_ui/dashboards/project/shares/templates/shares/_rule_add.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modal-body-right %}
   <h3>{% trans "Description" %}:</h3>
-  <p>{% blocktrans %}
+  <p>{% blocktrans trimmed %}
       Add policy rule to share, 'ip' rule represents ipv4 address,
       'user' rule represents username or usergroup,
       'cephx' rule represents ceph auth ID.