From 4b1131aaed0bb66998e4ac6db2162289ede94f80 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Tue, 30 Jan 2018 04:10:38 +0900
Subject: [PATCH] i18n: Do not include html directives in translation strings

It is important not to include html directives in translation targets
as much as possible to avoid unnecessary errors when selecting
translated languages.

Note that this commit does not necessarily exclude all html directives
from translation strings. Some of them needs to be included to allow
translators to control the word order properly.
This commit mainly focuses on eliminate unrelated html directives.

Change-Id: I66a24d4b01e695aab226b7c1cd4bc4f50ab33a7f
---
 .../theme-preview/theme-preview.html          | 12 ++++++---
 .../volume_types/qos_specs/_create.html       | 27 ++++++++++---------
 .../keypair/create-keypair.html               |  4 +--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
index b98c332465..bf19efeee5 100644
--- a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
+++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
@@ -1012,32 +1012,38 @@
   <div class="row">
     <div class="col-lg-4">
       <div class="bs-component">
-        <div translate class="alert alert-dismissable alert-danger">
+        <div class="alert alert-dismissable alert-danger">
           <button type="button" class="close" data-dismiss="alert">&times;</button>
+          <translate>
           <strong>Oh snap!</strong>
           <a href="#" class="alert-link">Change a few things up</a>
           and try submitting again.
+          </translate>
         </div>
       </div>
     </div>
     <div class="col-lg-4">
       <div class="bs-component">
-        <div translate class="alert alert-dismissable alert-success">
+        <div class="alert alert-dismissable alert-success">
           <button type="button" class="close" data-dismiss="alert">&times;</button>
+          <translate>
           <strong>Well done!</strong>
           You successfully read
           <a href="#" class="alert-link">this important alert message</a>.
+          </translate>
         </div>
       </div>
     </div>
     <div class="col-lg-4">
       <div class="bs-component">
-        <div translate class="alert alert-dismissable alert-info">
+        <div class="alert alert-dismissable alert-info">
           <button type="button" class="close" data-dismiss="alert">&times;</button>
+          <translate>
           <strong>Heads up!</strong>
            This
           <a href="#" class="alert-link">alert needs your attention</a>,
            but it's not super important.
+          </translate>
         </div>
       </div>
     </div>
diff --git a/openstack_dashboard/dashboards/admin/volume_types/templates/volume_types/qos_specs/_create.html b/openstack_dashboard/dashboards/admin/volume_types/templates/volume_types/qos_specs/_create.html
index e1c7c7f10c..c229b50524 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/templates/volume_types/qos_specs/_create.html
+++ b/openstack_dashboard/dashboards/admin/volume_types/templates/volume_types/qos_specs/_create.html
@@ -3,17 +3,18 @@
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>
-  <p>{% blocktrans with key=qos_spec_name %}Create a new "spec" key-value pair for QoS Spec "{{ qos_spec_name }}".
-      Valid key names are expected in the QoS specs. The acceptable values for key are
-  <tt>"minIOPS", "maxIOPS" and "burstIOPS"</tt>. 
-  <br>
-  <br>
-  Example:
-  <br>
-  Key: minIOPS and Value:20 (number value less than maxIOPS)
-  <br>
-  Key: maxIOPS and Value:5000 (number value bigger than minIOPS)
-  <br>
-  Key: burstIOPS and Value:5000 (number value bigger than minIOPS)
-  {% endblocktrans %}</p>
+  <p>{% blocktrans trimmed %}
+    Create a new "spec" key-value pair for QoS Spec "{{ qos_spec_name }}".
+    Valid key names are expected in the QoS specs. The acceptable values for key are
+    <tt>"minIOPS", "maxIOPS" and "burstIOPS"</tt>.
+    {% endblocktrans %}
+  </p>
+  <p>
+    {% trans "Example:" %}
+    <ul>
+      <li>{% trans "Key: minIOPS and Value:20 (number value less than maxIOPS)" %}</li>
+      <li>{% trans "Key: maxIOPS and Value:5000 (number value bigger than minIOPS)" %}</li>
+      <li>{% trans "Key: burstIOPS and Value:5000 (number value bigger than minIOPS)" %}</li>
+    </ul>
+  </p>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.html
index b40325f1a9..fd882b530d 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.html
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.html
@@ -15,8 +15,8 @@
     </p>
 
     <div class="form-group" ng-class="{'has-error': (ctrl.doesKeypairExist() || wizardForm.$invalid) && wizardForm.$dirty }">
-      <label class="control-label" for="keypair-name" translate>
-        Key Pair Name
+      <label class="control-label" for="keypair-name">
+        <translate>Key Pair Name</translate>
         <span class="hz-icon-required fa fa-asterisk"></span>
       </label>
       <input class="form-control" name="name"