mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8908 from owncloud/fix-placeholders 

fix split translations. fix for the discussion in the description
This commit is contained in:
Morris Jobke 2014-06-10 10:47:23 +02:00
parent 6546b589ce f56b86e857
commit ecc41fe0c3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/js/users/deleteHandler.js
View File

@ -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);
}
}

4
settings/js/users/groups.js
View File

@ -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);

4
settings/js/users/users.js
View File

@ -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);