From 2d4ad7d237cc7c780caa93c0a396fe27be1d6795 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Sat, 17 Sep 2016 21:41:16 +0000
Subject: [PATCH] i18n: Avoid string concatenations to make translation life
 happier

Change-Id: Iea0cef814f212662dc4403f62a2c6bea02ab1390
Closes-Bug: #1624757
(cherry picked from commit 64362120733682859e734b2f869b267226100760)
---
 .../resource-browser/resource-browser-item.controller.js      | 3 ++-
 .../launch-instance/keypair/create-keypair.controller.js      | 4 ++--
 .../workflow/launch-instance/keypair/keypair.controller.js    | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser-item.controller.js b/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser-item.controller.js
index 548cdbc88..680128cbe 100644
--- a/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser-item.controller.js
+++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/resource-browser/resource-browser-item.controller.js
@@ -214,7 +214,8 @@
       }
 
       function loadFailed(reason) {
-        toastService.add('error', gettext("resource load failed: " + reason));
+        var msg = interpolate(gettext("resource load failed: %s"), [reason]);
+        toastService.add('error', msg);
       }
     }
   }
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js
index fd4b46d91..1a6423d62 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js
@@ -90,8 +90,8 @@
           $modalInstance.close(createdKeypair);
         },
         function error() {
-          var errorMessage = gettext('Unable to generate') + ' "' + ctrl.keypair + '". ' +
-            gettext('Please try again.');
+          var errorMessage = interpolate(gettext('Unable to generate "%s". Please try again.'),
+                                         [ctrl.keypair]);
           toastService.add('error', errorMessage);
         }
       );
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js
index cb3a68072..d3b8b737b 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js
@@ -144,7 +144,9 @@
      * @returns {undefined} No return value
      */
     function notifyUserAndAssign(newKeypair) {
-      toastService.add('success', gettext('Created keypair: ' + newKeypair.name));
+      toastService.add('success',
+                       interpolate(gettext('Created keypair: %s'),
+                                   [newKeypair.name]));
       assignKeypair(newKeypair);
       ctrl.createdKeypair = newKeypair;
       ctrl.isKeypairCreated = true;