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;