From 36b461f6e134b9b26c56c4759f69d7ea85916958 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Nov 2022 23:02:33 +0300 Subject: [PATCH 1/9] Fix Bug 59625 --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 5145a10cf..23b3f89b2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2054,7 +2054,7 @@ define([ } }; shortcuts['command+shift+=,ctrl+shift+=' + (Common.Utils.isGecko ? ',command+shift+ff=,ctrl+shift+ff=' : '')] = function(e) { - if (me.editMode && !me.toolbar.btnAddCell.isDisabled()) { + if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnAddCell.isDisabled()) { var cellinfo = me.api.asc_getCellInfo(), selectionType = cellinfo.asc_getSelectionType(); if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) { @@ -2085,7 +2085,7 @@ define([ return false; }; shortcuts['command+shift+-,ctrl+shift+-' + (Common.Utils.isGecko ? ',command+shift+ff-,ctrl+shift+ff-' : '')] = function(e) { - if (me.editMode && !me.toolbar.btnDeleteCell.isDisabled()) { + if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnDeleteCell.isDisabled()) { var cellinfo = me.api.asc_getCellInfo(), selectionType = cellinfo.asc_getSelectionType(); if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) { From a86884c73a96eaf3c74c53fc74471226494fc104 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Fri, 4 Nov 2022 22:57:10 +0300 Subject: [PATCH 2/9] [SSE] Full info for the popover comment in hint mode --- apps/common/main/lib/controller/Comments.js | 5 ++++- apps/common/main/lib/model/Comment.js | 1 + apps/common/main/lib/template/CommentsPopover.template | 10 +++++----- apps/common/main/lib/view/ReviewPopover.js | 4 +++- apps/spreadsheeteditor/main/app/controller/Main.js | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 2203d87fb..9ec25f9d0 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -74,6 +74,7 @@ define([ subEditStrings : {}, filter : undefined, hintmode : false, + fullInfoHintMode: false, viewmode: false, isSelectedComment : false, uids : [], @@ -186,7 +187,8 @@ define([ this.currentUserId = data.config.user.id; this.sdkViewName = data['sdkviewname'] || this.sdkViewName; this.hintmode = data['hintmode'] || false; - this.viewmode = data['viewmode'] || false; + this.fullInfoHintMode = data['fullInfoHintMode'] || false; + this.viewmode = data['viewmode'] || false; } }, setApi: function (api) { @@ -1355,6 +1357,7 @@ define([ removable : (this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()), hide : !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()), hint : !this.mode.canComments, + fullInfoInHint : this.fullInfoHintMode, groupName : (groupname && groupname.length>1) ? groupname[1] : null }); if (comment) { diff --git a/apps/common/main/lib/model/Comment.js b/apps/common/main/lib/model/Comment.js index 9c570db91..5be4e352b 100644 --- a/apps/common/main/lib/model/Comment.js +++ b/apps/common/main/lib/model/Comment.js @@ -82,6 +82,7 @@ define([ hide : false, filtered : false, hint : false, + fullInfoInHint : false, dummy : undefined, editable : true, removable : true diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index a0d7b0854..e7e11ba2f 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -37,7 +37,7 @@
<%=item.get("date")%>
<% if (!item.get("editTextInPopover")) { %>
<%=scope.pickLink(item.get("reply"))%>
- <% if (!hint && !scope.viewmode) { %> + <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
<% if (item.get("editable")) { %>
">
@@ -61,7 +61,7 @@ - <% if (!showReplyInPopover && !hideAddReply && !hint && !scope.viewmode) { %> + <% if (!showReplyInPopover && !hideAddReply && (fullInfoInHint || !hint) && !scope.viewmode) { %> <% if (replys.length && !add_arrow) { %> <% } else { %> @@ -73,7 +73,7 @@ <% if (!editTextInPopover && !lock) { %>
- <% if (!hint && !scope.viewmode) { %> + <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %> <% if (editable) { %>
<% } %> @@ -81,9 +81,9 @@
<% } %> <% } %> - <% if (editable && !hint && !scope.viewmode) { %> + <% if (editable && (fullInfoInHint || !hint) && !scope.viewmode) { %>
- <% } else if (!hint && (!editable || scope.viewmode) && resolved) { %> + <% } else if ((fullInfoInHint || !hint) && (!editable || scope.viewmode) && resolved) { %>
<% } %>
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 0c8c31b42..1a05dda56 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -321,7 +321,9 @@ define([ if (record.get('hint')) { me.fireEvent('comment:disableHint', [record]); - return; + + if(!record.get('fullInfoInHint')) + return; } if (btn.hasClass('btn-edit')) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 9ffd6e90b..1d4b4a67b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1458,6 +1458,7 @@ define([ commentsController.setConfig({ config : this.editorConfig, sdkviewname : '#ws-canvas-outer', + fullInfoHintMode : true, hintmode : true}, this.api); } From 169c39a58f872b4250ea6eb3550b9f8de0ff7647 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Wed, 9 Nov 2022 15:54:01 +0300 Subject: [PATCH 3/9] Added placeholder if mentions not possible --- apps/common/main/lib/template/CommentsPopover.template | 4 ++-- apps/common/main/lib/view/ReviewPopover.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index e7e11ba2f..3e006d6f5 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -11,7 +11,7 @@
<%=scope.pickLink(comment)%>
<% } else { %>
- + <% if (hideAddReply) { %> <% } else { %> @@ -93,7 +93,7 @@ <% if (showReplyInPopover) { %>
- +
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 1a05dda56..86cb533a5 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -240,13 +240,14 @@ define([ el: $('#id-comments-popover'), itemTemplate: _.template(replaceWords(commentsTemplate, { textAddReply: me.textAddReply, + textMentionReply: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textAddReply, textAdd: me.textAdd, textCancel: me.textCancel, textEdit: me.textEdit, textReply: me.textReply, textClose: me.textClose, maxCommLength: Asc.c_oAscMaxCellOrCommentLength, - textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : '' + textMentionComment: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textEnterComment }) ) }); @@ -1294,6 +1295,7 @@ define([ textFollowMove : 'Follow Move', textMention : '+mention will provide access to the document and send an email', textMentionNotify : '+mention will notify the user via email', + textEnterComment : 'Enter your comment here', textViewResolved : 'You have not permission for reopen comment', txtAccept: 'Accept', txtReject: 'Reject', From 1394b55c54104c9d53b4c91a22e1344a2623da4e Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Wed, 9 Nov 2022 23:43:45 +0300 Subject: [PATCH 4/9] Disable textarea button for comments --- apps/common/main/lib/controller/Comments.js | 4 +- .../lib/template/CommentsPopover.template | 2 +- apps/common/main/lib/view/Comments.js | 39 +++++++++++++++++-- apps/common/main/lib/view/ReviewPopover.js | 25 +++++++++++- 4 files changed, 62 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 9ec25f9d0..a5578ebea 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -968,11 +968,11 @@ define([ if (!comment) continue; - if (this.subEditStrings[saveTxtId] && !hint) { + if (this.subEditStrings[saveTxtId] && (comment.get('fullInfoInHint') || !hint)) { comment.set('editTextInPopover', true); text = this.subEditStrings[saveTxtId]; } - else if (this.subEditStrings[saveTxtReplyId] && !hint) { + else if (this.subEditStrings[saveTxtReplyId] && (comment.get('fullInfoInHint') || !hint)) { comment.set('showReplyInPopover', true); text = this.subEditStrings[saveTxtReplyId]; } diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index 3e006d6f5..8cc1e3389 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -7,7 +7,7 @@
<%= scope.getEncodedName(parsedName) %>
<%=date%>
- <% if (!editTextInPopover || hint || scope.viewmode) { %> + <% if (!editTextInPopover || (hint && !fullInfoInHint) || scope.viewmode) { %>
<%=scope.pickLink(comment)%>
<% } else { %>
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 879779f17..6d2573881 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -98,6 +98,17 @@ define([ var text = $(this.el).find('textarea'); return (text && text.length) ? text.val().trim() : ''; }, + disableTextBoxButton: function(textboxEl) { + var button = $(textboxEl.siblings('#id-comments-change')[0]); + + if(textboxEl.val().length > 0) { + button.removeAttr('disabled'); + button.removeClass('disabled'); + } else { + button.attr('disabled', true); + button.addClass('disabled'); + } + }, autoHeightTextBox: function () { var view = this, textBox = $(this.el).find('textarea'), @@ -127,13 +138,19 @@ define([ view.autoScrollToEditButtons(); } + function onTextareaInput(event) { + updateTextBoxHeight(); + view.disableTextBoxButton($(event.target)); + } + if (textBox && textBox.length) { domTextBox = textBox.get(0); + view.disableTextBoxButton(textBox); if (domTextBox) { lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25; updateTextBoxHeight(); - textBox.bind('input propertychange', updateTextBoxHeight) + textBox.bind('input propertychange', onTextareaInput) } } @@ -171,7 +188,7 @@ define([ addCommentHeight: 45, newCommentHeight: 110, - textBoxAutoSizeLocked: undefined, // disable autosize textbox + textBoxAutoSizeLocked: undefined, // disable autoHeightTextBoxsize textbox viewmode: false, _commentsViewOnItemClick: function (picker, item, record, e) { @@ -694,7 +711,17 @@ define([ this.layout.setResizeValue(0, container.height() - this.addCommentHeight); } }, + disableTextBoxButton: function(textboxEl) { + var button = $(textboxEl.parent().siblings('.add')[0]); + if(textboxEl.val().length > 0) { + button.removeAttr('disabled'); + button.removeClass('disabled'); + } else { + button.attr('disabled', true); + button.addClass('disabled'); + } + }, autoHeightTextBox: function () { var me = this, domTextBox = null, lineHeight = 0, minHeight = 44; var textBox = $('#comment-msg-new', this.el); @@ -736,9 +763,15 @@ define([ Math.min(height - contentHeight - textBoxMinHeightIndent, height - me.newCommentHeight))); } + function onTextareaInput(event) { + updateTextBoxHeight(); + me.disableTextBoxButton($(event.target)); + } + + me.disableTextBoxButton(textBox); lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25; updateTextBoxHeight(); - textBox.bind('input propertychange', updateTextBoxHeight); + textBox.bind('input propertychange', onTextareaInput); this.textBox = textBox; }, diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 86cb533a5..94a6a6e91 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -173,6 +173,17 @@ define([ var text = $(this.el).find('textarea'); return (text && text.length) ? text.val().trim() : ''; }, + disableTextBoxButton: function(textboxEl) { + var button = $(textboxEl.siblings('#id-comments-change-popover')[0]); + + if(textboxEl.val().length > 0) { + button.removeAttr('disabled'); + button.removeClass('disabled'); + } else { + button.attr('disabled', true); + button.addClass('disabled'); + } + }, autoHeightTextBox: function () { var view = this, textBox = this.$el.find('textarea'), @@ -183,6 +194,7 @@ define([ oldHeight = 0, newHeight = 0; + function updateTextBoxHeight() { scrollPos = parentView.scroller.getScrollTop(); if (domTextBox.scrollHeight > domTextBox.clientHeight) { @@ -211,13 +223,20 @@ define([ parentView.autoScrollToEditButtons(); } + function onTextareaInput(event) { + updateTextBoxHeight(); + view.disableTextBoxButton($(event.target)); + } + + if (textBox && textBox.length && parentView.scroller) { domTextBox = textBox.get(0); + view.disableTextBoxButton(textBox); if (domTextBox) { lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25; updateTextBoxHeight(); - textBox.bind('input propertychange', updateTextBoxHeight) + textBox.bind('input propertychange', onTextareaInput) } } @@ -519,8 +538,10 @@ define([ }, 'animate:before': function () { var text = me.$window.find('textarea'); - if (text && text.length) + if (text && text.length){ text.focus(); + me.commentsView.disableTextBoxButton(text); + } } }); } From ea54591658e100a0f0c7f90e7e450952fbb331f6 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Thu, 10 Nov 2022 00:07:33 +0300 Subject: [PATCH 5/9] Disable textarea button for chat --- apps/common/main/lib/view/Chat.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js index 583c90461..4a70eb397 100644 --- a/apps/common/main/lib/view/Chat.js +++ b/apps/common/main/lib/view/Chat.js @@ -336,9 +336,24 @@ define([ // text box setup autosize input text this.setupAutoSizingTextBox(); - this.txtMessage.bind('input propertychange', _.bind(this.updateHeightTextBox, this)); + this.disableTextBoxButton($(this.txtMessage)); + this.txtMessage.bind('input propertychange', _.bind(this.onTextareaInput, this)); }, + onTextareaInput: function(event) { + this.updateHeightTextBox(event); + this.disableTextBoxButton($(event.target)); + }, + disableTextBoxButton: function(textboxEl) { + var button = $(textboxEl.siblings('#chat-msg-btn-add')[0]); + if(textboxEl.val().length > 0) { + button.removeAttr('disabled'); + button.removeClass('disabled'); + } else { + button.attr('disabled', true); + button.addClass('disabled'); + } + }, updateLayout: function (applyUsersAutoSizig) { var me = this; var height = this.panelBox.height(); From a1ff76f18fcb47ada6fa9d4676d1359e0ea58a24 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2022 14:24:17 +0300 Subject: [PATCH 6/9] Fix click on the comment popover --- apps/common/main/lib/controller/Comments.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index a5578ebea..ced3f5c69 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -980,13 +980,16 @@ define([ comment.set('hint', !_.isUndefined(hint) ? hint : false); if (!hint && this.hintmode) { - if (same_uids && (this.uids.length === 0)) + if (same_uids) animate = false; if (this.oldUids.length && (0 === _.difference(this.oldUids, uids).length) && (0 === _.difference(uids, this.oldUids).length)) { animate = false; this.oldUids = []; } + + if (same_uids && !apihint && !this.isModeChanged) + this.api.asc_selectComment(comment.get('uid')); } if (this.animate) { @@ -1008,7 +1011,7 @@ define([ this.popoverComments.reset(comments); if (this.popoverComments.findWhere({hide: false})) { - if (popover.isVisible()) { + if (popover.isVisible() && (!same_uids || this.isModeChanged)) { popover.hide(); } From 4139b9b4a608efbf56ce3a13a65ea0283fd55725 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Thu, 10 Nov 2022 17:05:51 +0300 Subject: [PATCH 7/9] Fix not working disable when only spaces in textarea --- apps/common/main/lib/view/Chat.js | 2 +- apps/common/main/lib/view/Comments.js | 4 ++-- apps/common/main/lib/view/ReviewPopover.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js index 4a70eb397..4a9f78722 100644 --- a/apps/common/main/lib/view/Chat.js +++ b/apps/common/main/lib/view/Chat.js @@ -346,7 +346,7 @@ define([ disableTextBoxButton: function(textboxEl) { var button = $(textboxEl.siblings('#chat-msg-btn-add')[0]); - if(textboxEl.val().length > 0) { + if(textboxEl.val().trim().length > 0) { button.removeAttr('disabled'); button.removeClass('disabled'); } else { diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 6d2573881..3eb8ff0c5 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -101,7 +101,7 @@ define([ disableTextBoxButton: function(textboxEl) { var button = $(textboxEl.siblings('#id-comments-change')[0]); - if(textboxEl.val().length > 0) { + if(textboxEl.val().trime().length > 0) { button.removeAttr('disabled'); button.removeClass('disabled'); } else { @@ -714,7 +714,7 @@ define([ disableTextBoxButton: function(textboxEl) { var button = $(textboxEl.parent().siblings('.add')[0]); - if(textboxEl.val().length > 0) { + if(textboxEl.val().trim().length > 0) { button.removeAttr('disabled'); button.removeClass('disabled'); } else { diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 94a6a6e91..2d26dec68 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -176,7 +176,7 @@ define([ disableTextBoxButton: function(textboxEl) { var button = $(textboxEl.siblings('#id-comments-change-popover')[0]); - if(textboxEl.val().length > 0) { + if(textboxEl.val().trim().length > 0) { button.removeAttr('disabled'); button.removeClass('disabled'); } else { From 874efd100aec81103484f8e791abd9e5feb9119c Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Fri, 11 Nov 2022 15:13:13 +0300 Subject: [PATCH 8/9] Add translations for "text enter comment" --- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/main/locale/ru.json | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 78bc75cfc..31312e0b1 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -615,6 +615,7 @@ "Common.Views.ReviewPopover.textFollowMove": "Follow Move", "Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email", "Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email", + "Common.Views.ReviewPopover.textEnterComment": "Enter your comment here", "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 1dd9edcd6..9adafafe9 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -615,6 +615,7 @@ "Common.Views.ReviewPopover.textFollowMove": "Перейти на прежнее место", "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте", "Common.Views.ReviewPopover.textMentionNotify": "+упоминание отправит пользователю оповещение по почте", + "Common.Views.ReviewPopover.textEnterComment": "Введите здесь свой комментарий", "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова", "Common.Views.ReviewPopover.textReply": "Ответить", "Common.Views.ReviewPopover.textResolve": "Решить", From 570199e27b79555199ae8e2563f23b45a5ef0881 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Fri, 11 Nov 2022 16:40:05 +0300 Subject: [PATCH 9/9] Previous --- apps/presentationeditor/main/locale/en.json | 1 + apps/presentationeditor/main/locale/ru.json | 1 + apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/locale/ru.json | 1 + 4 files changed, 4 insertions(+) diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 9bc2db95f..521aad806 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -704,6 +704,7 @@ "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email", "Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email", + "Common.Views.ReviewPopover.textEnterComment": "Enter your comment here", "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index f7977a980..8ecebe1c0 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -704,6 +704,7 @@ "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте", "Common.Views.ReviewPopover.textMentionNotify": "+упоминание отправит пользователю оповещение по почте", + "Common.Views.ReviewPopover.textEnterComment": "Введите здесь свой комментарий", "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова", "Common.Views.ReviewPopover.textReply": "Ответить", "Common.Views.ReviewPopover.textResolve": "Решить", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 3e8ee1e04..cc03f6a17 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -550,6 +550,7 @@ "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email", "Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email", + "Common.Views.ReviewPopover.textEnterComment": "Enter your comment here", "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 37bba9907..7260ede21 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -550,6 +550,7 @@ "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте", "Common.Views.ReviewPopover.textMentionNotify": "+упоминание отправит пользователю оповещение по почте", + "Common.Views.ReviewPopover.textEnterComment": "Введите здесь свой комментарий", "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова", "Common.Views.ReviewPopover.textReply": "Ответить", "Common.Views.ReviewPopover.textResolve": "Решить",