diff --git a/frontend/src/components/common/notice-item.js b/frontend/src/components/common/notice-item.js index 18c4f03505..58d5a3f74f 100644 --- a/frontend/src/components/common/notice-item.js +++ b/frontend/src/components/common/notice-item.js @@ -212,12 +212,11 @@ class NoticeItem extends React.Component { notice = notice.replace('{/tagB}', ''); } else { // 1. handle translate - notice = gettext('A file named {upload_file_link} is uploaded to {uploaded_link}.'); + notice = gettext('A file named {upload_file_link} is uploaded.'); // 2. handle xss(cross-site scripting) notice = notice.replace('{upload_file_link}', `${fileName}`); notice = Utils.HTMLescape(notice); - notice = notice.replace('{uploaded_link}', 'Deleted Library'); } return {avatar_url, notice}; } @@ -246,12 +245,11 @@ class NoticeItem extends React.Component { notice = notice.replace('{/tagB}', ''); } else { // 1. handle translate - notice = gettext('A folder named {upload_folder_link} is uploaded to {uploaded_link}.'); + notice = gettext('A folder named {upload_folder_link} is uploaded.'); // 2. handle xss(cross-site scripting) notice = notice.replace('{upload_folder_link}', `${folderName}`); notice = Utils.HTMLescape(notice); - notice = notice.replace('{uploaded_link}', 'Deleted Library'); } return {avatar_url, notice}; } diff --git a/seahub/notifications/models.py b/seahub/notifications/models.py index 6c4ed40d12..68bb3493ec 100644 --- a/seahub/notifications/models.py +++ b/seahub/notifications/models.py @@ -558,7 +558,7 @@ class UserNotification(models.Model): 'name': escape(name), } else: - msg = _("A file named %(file_name)s is uploaded to Deleted Library") % { + msg = _("A file named %(file_name)s is uploaded") % { 'file_name': escape(filename), } @@ -600,7 +600,7 @@ class UserNotification(models.Model): 'name': escape(name), } else: - msg = _("A folder named %(folder_name)s is uploaded to Deleted Library") % { + msg = _("A folder named %(folder_name)s is uploaded") % { 'folder_name': escape(foldername), }