From f56b86e85791a0dd0452aaef5c1ce07d67866b0b Mon Sep 17 00:00:00 2001
From: Volkan Gezer <volkangezer@gmail.com>
Date: Thu, 5 Jun 2014 20:30:20 +0200
Subject: [PATCH] fix split translations
---
settings/js/users/deleteHandler.js | 2 +-
settings/js/users/groups.js | 4 ++--
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);
--
GitLab