From 62944941630bc5842213b8dadc8da5af62557143 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Wed, 31 Jan 2018 22:00:04 +0900
Subject: [PATCH] i18n: Fix untranslated messages

trunk-subports.help.html: The <p translate> tag was not closed
appropriately. This confused angular-gettext and as a result
translations are not used properly.

launch-instance/networkports/ports.html:
"on subnet" was marked as translation string in bug 1745873,
but one "on subnet" is forgot to mark. This commit fixes it.

Related-Bug: #1745873
Change-Id: I01c653161c9a91d499bf493590bb5f511901f31a
---
 .../workflow/launch-instance/networkports/ports.html        | 6 +++++-
 .../static/app/core/trunks/steps/trunk-subports.help.html   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.html
index 32eb66a303..a315416b56 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.html
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.html
@@ -117,7 +117,11 @@
             <td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
             <td class="rsp-p2">
                 <div ng-repeat="ip in item.fixed_ips">
-                  {$ ip.ip_address $} on subnet: {$ item.subnet_names[ip.ip_address] $}
+                  <span translate
+                        translate-params-address="ip.ip_address"
+                        translate-params-subnet="item.subnet_names[ip.ip_address]">
+                  {$ address $} on subnet {$ subnet $}
+                  </span>
                 </div>
             </td>
             <td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>
diff --git a/openstack_dashboard/static/app/core/trunks/steps/trunk-subports.help.html b/openstack_dashboard/static/app/core/trunks/steps/trunk-subports.help.html
index 8ad75522ef..e835b4e289 100644
--- a/openstack_dashboard/static/app/core/trunks/steps/trunk-subports.help.html
+++ b/openstack_dashboard/static/app/core/trunks/steps/trunk-subports.help.html
@@ -5,7 +5,7 @@
   <p translate>An arbitrary amount (0, 1, 2, ...) of regular Neutron
   ports with segmentation details (ie. type and ID). May be provided
   when the trunk is created. Also may be attached or detached later
-  during the trunk's (and the instance's) life.
+  during the trunk's (and the instance's) life.</p>
 
   <p translate>Inside the instance a particular subport's network will
   be presented as tagged frames transmitted and received on the vNIC