Merge "i18n: Avoid string concatenations to make translation life happier" into stable/newton
This commit is contained in:
commit
875fe73c4d
|
@ -214,7 +214,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadFailed(reason) {
|
function loadFailed(reason) {
|
||||||
toastService.add('error', gettext("resource load failed: " + reason));
|
var msg = interpolate(gettext("resource load failed: %s"), [reason]);
|
||||||
|
toastService.add('error', msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,8 +90,8 @@
|
||||||
$modalInstance.close(createdKeypair);
|
$modalInstance.close(createdKeypair);
|
||||||
},
|
},
|
||||||
function error() {
|
function error() {
|
||||||
var errorMessage = gettext('Unable to generate') + ' "' + ctrl.keypair + '". ' +
|
var errorMessage = interpolate(gettext('Unable to generate "%s". Please try again.'),
|
||||||
gettext('Please try again.');
|
[ctrl.keypair]);
|
||||||
toastService.add('error', errorMessage);
|
toastService.add('error', errorMessage);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -144,7 +144,9 @@
|
||||||
* @returns {undefined} No return value
|
* @returns {undefined} No return value
|
||||||
*/
|
*/
|
||||||
function notifyUserAndAssign(newKeypair) {
|
function notifyUserAndAssign(newKeypair) {
|
||||||
toastService.add('success', gettext('Created keypair: ' + newKeypair.name));
|
toastService.add('success',
|
||||||
|
interpolate(gettext('Created keypair: %s'),
|
||||||
|
[newKeypair.name]));
|
||||||
assignKeypair(newKeypair);
|
assignKeypair(newKeypair);
|
||||||
ctrl.createdKeypair = newKeypair;
|
ctrl.createdKeypair = newKeypair;
|
||||||
ctrl.isKeypairCreated = true;
|
ctrl.isKeypairCreated = true;
|
||||||
|
|
Loading…
Reference in New Issue