diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-06-10 10:47:23 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-10 10:47:23 +0200 |
| commit | ecc41fe0c3375022d2455fd563f91b2691bdd857 (patch) | |
| tree | f0986dc6a74ebddfde45c3cdacf9bc4fbd867374 | |
| parent | 6546b589ce8cdf786cc0708a8e8c0de2aa61eb50 (diff) | |
| parent | f56b86e85791a0dd0452aaef5c1ce07d67866b0b (diff) | |
| download | nextcloud-server-ecc41fe0c3375022d2455fd563f91b2691bdd857.tar.gz nextcloud-server-ecc41fe0c3375022d2455fd563f91b2691bdd857.zip | |
Merge pull request #8908 from owncloud/fix-placeholders
fix split translations. fix for the discussion in the description
| -rw-r--r-- | settings/js/users/deleteHandler.js | 2 | ||||
| -rw-r--r-- | settings/js/users/groups.js | 4 | ||||
| -rw-r--r-- | settings/js/users/users.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js index 894744ba3e9..9cbe7cd514d 100644 --- a/settings/js/users/deleteHandler.js +++ b/settings/js/users/deleteHandler.js @@ -163,7 +163,7 @@ DeleteHandler.prototype.delete = function() { dh.removeCallback(dh.oidToDelete); dh.canceled = true; } else { - OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete))); + OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete {objName}', {objName: escapeHTML(dh.oidToDelete)})); dh.undoCallback(dh.oidToDelete); } } diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js index 0ff8bdd6384..dcaf593b886 100644 --- a/settings/js/users/groups.js +++ b/settings/js/users/groups.js @@ -202,8 +202,8 @@ GroupList = { //configure undo OC.Notification.hide(); - var msg = t('settings', 'deleted') + ' %oid <span class="undo">' + - t('settings', 'undo') + '</span>'; + var msg = escapeHTML(t('settings', 'deleted {groupName}', {groupName: '%oid'})) + '<span class="undo">' + + escapeHTML(t('settings', 'undo')) + '</span>'; GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg, GroupList.show); diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 68098e03a50..a911225c5c5 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -251,8 +251,8 @@ var UserList = { //configure undo OC.Notification.hide(); - var msg = t('settings', 'deleted') + ' %oid <span class="undo">' + - t('settings', 'undo') + '</span>'; + var msg = escapeHTML(t('settings', 'deleted {userName}', {userName: '%oid'})) + '<span class="undo">' + + escapeHTML(t('settings', 'undo')) + '</span>'; UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg, UserList.show); |