Skip to content
Snippets Groups Projects
Commit ecc41fe0 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #8908 from owncloud/fix-placeholders

fix split translations. fix for the discussion in the description
parents 6546b589 f56b86e8
No related branches found
No related tags found
No related merge requests found
...@@ -163,7 +163,7 @@ DeleteHandler.prototype.delete = function() { ...@@ -163,7 +163,7 @@ DeleteHandler.prototype.delete = function() {
dh.removeCallback(dh.oidToDelete); dh.removeCallback(dh.oidToDelete);
dh.canceled = true; dh.canceled = true;
} else { } 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); dh.undoCallback(dh.oidToDelete);
} }
} }
......
...@@ -202,8 +202,8 @@ GroupList = { ...@@ -202,8 +202,8 @@ GroupList = {
//configure undo //configure undo
OC.Notification.hide(); OC.Notification.hide();
var msg = t('settings', 'deleted') + ' %oid <span class="undo">' + var msg = escapeHTML(t('settings', 'deleted {groupName}', {groupName: '%oid'})) + '<span class="undo">' +
t('settings', 'undo') + '</span>'; escapeHTML(t('settings', 'undo')) + '</span>';
GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg, GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
GroupList.show); GroupList.show);
......
...@@ -251,8 +251,8 @@ var UserList = { ...@@ -251,8 +251,8 @@ var UserList = {
//configure undo //configure undo
OC.Notification.hide(); OC.Notification.hide();
var msg = t('settings', 'deleted') + ' %oid <span class="undo">' + var msg = escapeHTML(t('settings', 'deleted {userName}', {userName: '%oid'})) + '<span class="undo">' +
t('settings', 'undo') + '</span>'; escapeHTML(t('settings', 'undo')) + '</span>';
UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg, UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
UserList.show); UserList.show);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment