From 06bfbbd2831f1952d88542acdc2e28ab1ad5d07e Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 26 Feb 2021 17:35:04 +0530 Subject: [PATCH] exclude fewer onlyoffice paths and add more annotations --- scripts/unused-translations.js | 5 ++++- www/common/notifications.js | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/unused-translations.js b/scripts/unused-translations.js index 1ace20582..98a57bf16 100644 --- a/scripts/unused-translations.js +++ b/scripts/unused-translations.js @@ -28,7 +28,10 @@ var isPossiblyGenerated = function (key) { var grep = function (pattern, cb) { var exclude = [ 'www/common/translations/*', - 'www/common/onlyoffice/*', + 'www/common/onlyoffice/v1/*', + 'www/common/onlyoffice/v2b*', + 'www/common/onlyoffice/x2t/*', + //'www/common/onlyoffice/build/*', 'www/lib/*', 'www/common/pdfjs/*', '*.css', diff --git a/www/common/notifications.js b/www/common/notifications.js index b75ead287..478b765c7 100644 --- a/www/common/notifications.js +++ b/www/common/notifications.js @@ -86,9 +86,9 @@ define([ var content = data.content; var msg = content.msg; var type = Hash.parsePadUrl(msg.content.href).type; - var key = type === 'drive' ? 'notification_folderShared' : // Msg.notification_folderShared - (type === 'file' ? 'notification_fileShared' : // Msg.notification_fileShared - 'notification_padShared'); // Msg.notification_padShared + var key = type === 'drive' ? 'notification_folderShared' : // Msg.notification_folderSharedTeam + (type === 'file' ? 'notification_fileShared' : // Msg.notification_fileSharedTeam + 'notification_padShared'); // Msg.notification_padSharedTeam var teamNotification = /^team-/.test(data.type) && Number(data.type.slice(5)); var teamName = ''; @@ -220,7 +220,7 @@ define([ var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous; var title = Util.fixHTML(msg.content.title); content.getFormatText = function() { - return Messages._getKey('owner_request', [name, title]); + return Messages._getKey('owner_request', [name, title]); // Msg.owner_request_accepted, .owner_request_declined }; // Check authenticity @@ -311,7 +311,7 @@ define([ var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous; var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name'])  || '') || Util.fixHTML(Util.find(msg, ['content', 'teamName'])); - var key = 'team_' + (msg.content.answer ? 'accept' : 'decline') + 'Invitation'; + var key = 'team_' + (msg.content.answer ? 'accept' : 'decline') + 'Invitation'; // Msg.team_acceptInvitation, team_declineInvitation content.getFormatText = function() { return Messages._getKey(key, [name, teamName]); };