Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

merge with develop

Browse source
This commit is contained in:
Maxim Kadushkin 2018-03-04 23:41:58 +03:00
parent 9f289a6392 5f9bb6a7e7
commit 99a7be61c6
33 changed files with 100 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/ComboBox.js
View file

@ -146,7 +146,7 @@ define([
scope : me
}));
if (this.itemsTemplate)
this.cmpEl.find('ul').append(
this.cmpEl.find('ul').html(
$(this.itemsTemplate({
items : items,
scope : me

2
apps/common/main/lib/component/Window.js
View file

@ -785,7 +785,7 @@ define([
isLocked: function() {
return this.$window.hasClass('dethrone') ||
(!this.options.modal && this.$window.parent().find('.asc-window.modal:visible').length);
(!this.initConfig.modal && this.$window.parent().find('.asc-window.modal:visible').length);
},
getChild: function(selector) {

5
apps/common/main/lib/controller/ExternalDiagramEditor.js
View file

@ -141,7 +141,12 @@ define([
handler: function(result, value) {
if (this.isHandlerCalled) return;
this.isHandlerCalled = true;
if (this.diagramEditorView._isExternalDocReady)
externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
else {
this.diagramEditorView.hide();
this.isHandlerCalled = false;
}
},
setChartData: function() {

4
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -82,11 +82,9 @@ define([
disabled: true
});
this.btnCancel = new Common.UI.Button({
el: $('#id-btn-diagram-editor-cancel'),
disabled: true
el: $('#id-btn-diagram-editor-cancel')
});
this.$window.find('.tool.close').addClass('disabled');
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
},

2
apps/common/main/resources/less/layout.less
View file

@ -49,7 +49,7 @@
}
> .layout-resizer {
width: 4px;
width: 2px;
cursor: col-resize;
&.move {

7
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -361,6 +361,7 @@ define([
this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this));
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
},
onChangeCompactView: function(view, compact) {
@ -613,6 +614,12 @@ define([
}
},
onShowParaMarks: function(v) {
this.toolbar.mnuNonPrinting.items[0].setChecked(v, true);
this.toolbar.btnShowHidenChars.toggle(v, true);
Common.localStorage.setItem("de-show-hiddenchars", v);
},
onApiFocusObject: function(selectedObjects) {
if (!this.editMode) return;

24
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -3239,6 +3239,17 @@ define([
caption : '--'
});
var menuParaRefreshField = new Common.UI.MenuItem({
caption: me.textRefreshField
}).on('click', function(item, e){
me.api.asc_UpdateComplexField(item.options.fieldProps);
me.fireEvent('editcomplete', me);
});
var menuParaFieldSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.textMenu = new Common.UI.Menu({
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
@ -3353,6 +3364,14 @@ define([
menuParaTOCSettings.setVisible(in_toc);
menuParaTOCRefresh.setVisible(in_toc);
menuParaTOCSeparator.setVisible(in_toc);
var in_field = me.api.asc_GetCurrentComplexField();
menuParaRefreshField.setVisible(!!in_field);
menuParaRefreshField.setDisabled(disabled);
menuParaFieldSeparator.setVisible(!!in_field);
if (in_field) {
menuParaRefreshField.options.fieldProps = in_field;
}
},
items: [
me.menuSpellPara,
@ -3370,6 +3389,8 @@ define([
menuParaRemoveControl,
menuParaControlSettings,
menuParaControlSeparator,
menuParaRefreshField,
menuParaFieldSeparator,
menuParaTOCSettings,
menuParaTOCRefresh,
menuParaTOCSeparator,
@ -3701,7 +3722,8 @@ define([
textUpdateAll: 'Refresh entire table',
textUpdatePages: 'Refresh page numbers only',
textTOCSettings: 'Table of contents settings',
textTOC: 'Table of contents'
textTOC: 'Table of contents',
textRefreshField: 'Refresh field'
}, DE.Views.DocumentHolder || {}));
});

2
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -318,7 +318,7 @@ define([
if (this.api) {
var section = this.api.asc_GetSectionProps(),
ratio = (this._state.Height>0) ? this._state.Width/this._state.Height : 1,
pagew = section.get_W() - section.get_LeftMargin() - section.get_RightMargin(),
pagew = this.api.asc_GetCurrentColumnWidth(),
pageh = section.get_H() - section.get_TopMargin() - section.get_BottomMargin(),
pageratio = pagew/pageh,
w, h;

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1514,7 +1514,7 @@ define([
this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M'));
this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M'));
this.btnLineSpace.updateHint(this.tipLineSpace);
this.btnShowHidenChars.updateHint(this.tipShowHiddenChars);
this.btnShowHidenChars.updateHint(this.tipShowHiddenChars + Common.Utils.String.platformKey('Ctrl+*'));
this.btnMarkers.updateHint(this.tipMarkers);
this.btnNumbers.updateHint(this.tipNumbers);
this.btnMultilevels.updateHint(this.tipMultilevels);

3
apps/documenteditor/main/locale/de.json
View file

@ -231,6 +231,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Alle Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptChanges": "Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Aktuelle Änderungen annehmen",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Schließen",
"Common.Views.ReviewChanges.txtCoAuthMode": "Modus \"Gemeinsame Bearbeitung\"",
"Common.Views.ReviewChanges.txtDocLang": "Sprache",
@ -897,6 +898,7 @@
"DE.Views.DocumentHolder.textNextPage": "Nächste Seite",
"DE.Views.DocumentHolder.textPaste": "Einfügen",
"DE.Views.DocumentHolder.textPrevPage": "Vorherige Seite",
"DE.Views.DocumentHolder.textRefreshField": "Feld aktualisieren",
"DE.Views.DocumentHolder.textRemove": "Entfernen",
"DE.Views.DocumentHolder.textRemoveControl": "Inhaltssteuerelement entfernen",
"DE.Views.DocumentHolder.textSettings": "Einstellungen",
@ -1781,6 +1783,7 @@
"DE.Views.Toolbar.textTabHome": "Startseite",
"DE.Views.Toolbar.textTabInsert": "Einfügen",
"DE.Views.Toolbar.textTabLayout": "Layout",
"DE.Views.Toolbar.textTabLinks": "Quellenangaben",
"DE.Views.Toolbar.textTabProtect": "Schutz",
"DE.Views.Toolbar.textTabReview": "Review",
"DE.Views.Toolbar.textTitleError": "Fehler",

2
apps/documenteditor/main/locale/en.json
View file

@ -898,6 +898,7 @@
"DE.Views.DocumentHolder.textNextPage": "Next Page",
"DE.Views.DocumentHolder.textPaste": "Paste",
"DE.Views.DocumentHolder.textPrevPage": "Previous Page",
"DE.Views.DocumentHolder.textRefreshField": "Refresh field",
"DE.Views.DocumentHolder.textRemove": "Remove",
"DE.Views.DocumentHolder.textRemoveControl": "Remove content control",
"DE.Views.DocumentHolder.textSettings": "Settings",
@ -1784,7 +1785,6 @@
"DE.Views.Toolbar.textTabLayout": "Layout",
"DE.Views.Toolbar.textTabLinks": "References",
"DE.Views.Toolbar.textTabProtect": "Protection",
"DE.Views.Toolbar.textTabLinks": "References",
"DE.Views.Toolbar.textTabReview": "Review",
"DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "To current position",

2
apps/documenteditor/main/locale/ru.json
View file

@ -231,6 +231,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Принять все изменения",
"Common.Views.ReviewChanges.txtAcceptChanges": "Принять изменения",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение",
"Common.Views.ReviewChanges.txtChat": "Чат",
"Common.Views.ReviewChanges.txtClose": "Закрыть",
"Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования",
"Common.Views.ReviewChanges.txtDocLang": "Язык",
@ -897,6 +898,7 @@
"DE.Views.DocumentHolder.textNextPage": "Следующая страница",
"DE.Views.DocumentHolder.textPaste": "Вставить",
"DE.Views.DocumentHolder.textPrevPage": "Предыдущая страница",
"DE.Views.DocumentHolder.textRefreshField": "Обновить поле",
"DE.Views.DocumentHolder.textRemove": "Удалить",
"DE.Views.DocumentHolder.textRemoveControl": "Удалить элемент управления содержимым",
"DE.Views.DocumentHolder.textSettings": "Настройки",

2
apps/documenteditor/main/resources/less/layout.less
View file

@ -39,7 +39,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

1
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -1,5 +1,4 @@
//@tabs-bg-color: #4f6279;
@tabs-bg-color: #446995;
.toolbar {

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -146,7 +146,8 @@ define([
'Table': this.txtSldLtTTbl,
'Slide title': this.txtSlideTitle,
'Loading': this.txtLoading,
'Click to add notes': this.txtAddNotes
'Click to add notes': this.txtAddNotes,
'Click to add first slide': this.txtAddFirstSlide
}
});
@ -1994,7 +1995,8 @@ define([
txtLoading: 'Loading...',
txtAddNotes: 'Click to add notes',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
txtAddFirstSlide: 'Click to add first slide'
}
})(), PE.Controllers.Main || {}))
});

2
apps/presentationeditor/main/app/template/StatusBar.template
View file

@ -2,7 +2,7 @@
<div class="statusbar" style="display:table;">
<div class="status-group dropup">
<button id="status-btn-preview" type="button" class="btn small btn-toolbar" style="margin-left: 9px;"><i class="icon"></i></button>
<label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<div id="status-goto-box" class="dropdown-menu">
<label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
<div id="status-goto-page" style="display:inline-block;"></div>

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -559,7 +559,7 @@ define([
src.css({height: me._TtHeight + 'px', position: 'absolute', zIndex: '900', display: 'none', 'pointer-events': 'none',
'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())});
src.text(getUserName(UserId));
$('#id_main_view').append(src);
$('#id_main_parent').append(src);
me.fastcoauthtips.push(src);
src.fadeIn(150);
}

5
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -49,6 +49,9 @@ define([
'use strict';
function _onCountPages(count){
if (this.pages.get('count')<0)
$('#status-label-pages').css('display', 'inline-block');
this.pages.set('count', count);
var isDisabled = (count<=0);
if (this.btnPreview.isDisabled() !== isDisabled)
@ -90,7 +93,7 @@ define([
initialize: function (options) {
_.extend(this, options);
this.pages = new PE.Models.Pages({current:1, count:1});
this.pages = new PE.Models.Pages({current:1, count:-1});
this.pages.on('change', _.bind(_updatePagesCaption,this));
this._state = {no_paragraph: true};
},

2
apps/presentationeditor/main/locale/de.json
View file

@ -163,6 +163,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Alle Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptChanges": "Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Aktuelle Änderungen annehmen",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Schließen",
"Common.Views.ReviewChanges.txtCoAuthMode": "Modus \"Gemeinsame Bearbeitung\"",
"Common.Views.ReviewChanges.txtDocLang": "Sprache",
@ -286,6 +287,7 @@
"PE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
"PE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
"PE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
"PE.Controllers.Main.txtAddFirstSlide": "Klicken Sie, um die erste Folie hinzuzufügen",
"PE.Controllers.Main.txtAddNotes": "Klicken Sie, um Notizen hinzuzufügen",
"PE.Controllers.Main.txtArt": "Hier den Text eingeben",
"PE.Controllers.Main.txtBasicShapes": "Standardformen",

1
apps/presentationeditor/main/locale/en.json
View file

@ -287,6 +287,7 @@
"PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
"PE.Controllers.Main.titleLicenseExp": "License expired",
"PE.Controllers.Main.titleServerVersion": "Editor updated",
"PE.Controllers.Main.txtAddFirstSlide": "Click to add the first slide",
"PE.Controllers.Main.txtAddNotes": "Click to add notes",
"PE.Controllers.Main.txtArt": "Your text here",
"PE.Controllers.Main.txtBasicShapes": "Basic Shapes",

2
apps/presentationeditor/main/locale/ru.json
View file

@ -163,6 +163,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Принять все изменения",
"Common.Views.ReviewChanges.txtAcceptChanges": "Принять изменения",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение",
"Common.Views.ReviewChanges.txtChat": "Чат",
"Common.Views.ReviewChanges.txtClose": "Закрыть",
"Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования",
"Common.Views.ReviewChanges.txtDocLang": "Язык",
@ -286,6 +287,7 @@
"PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.<br>Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
"PE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии",
"PE.Controllers.Main.titleServerVersion": "Редактор обновлен",
"PE.Controllers.Main.txtAddFirstSlide": "Нажмите, чтобы добавить первый слайд",
"PE.Controllers.Main.txtAddNotes": "Нажмите, чтобы добавить заметки",
"PE.Controllers.Main.txtArt": "Введите ваш текст",
"PE.Controllers.Main.txtBasicShapes": "Основные фигуры",

2
apps/presentationeditor/main/resources/less/layout.less
View file

@ -50,7 +50,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

7
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1162,6 +1162,10 @@ define([
config.msg = this.errorDataRange;
break;
case Asc.c_oAscError.ID.MaxDataPointsError:
config.msg = this.errorMaxPoints;
break;
case Asc.c_oAscError.ID.VKeyEncrypt:
config.msg = this.errorToken;
break;
@ -2188,7 +2192,8 @@ define([
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorMaxPoints: "The maximum number of points in series per chart is 4096."
}
})(), SSE.Controllers.Main || {}))
});

7
apps/spreadsheeteditor/main/app/view/CellEditor.js
View file

@ -81,8 +81,11 @@ define([
this.$btnfunc = $('#ce-func-label', this.el);
var me = this;
this.$cellname.on('focusin', function(e){
me.$cellname.select().one('mouseup', function (e) {e.preventDefault();});
this.$cellname.on('focus', function(e){
var txt = me.$cellname[0];
txt.selectionStart = 0;
txt.selectionEnd = txt.value.length;
txt.scrollLeft = txt.scrollWidth;
});
this.$btnfunc.addClass('disabled');

7
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -1521,7 +1521,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
Common.UI.warning({msg: this.errorStockChart});
} else if (isvalid == Asc.c_oAscError.ID.MaxDataSeriesError) {
Common.UI.warning({msg: this.errorMaxRows});
} else
} else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError)
Common.UI.warning({msg: this.errorMaxPoints});
else
this.txtDataRange.cmpEl.find('input').focus();
return false;
} else
@ -1773,7 +1775,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textAltTitle: 'Title',
textAltDescription: 'Description',
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
textSurface: 'Surface'
textSurface: 'Surface',
errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.'
}, SSE.Views.ChartSettingsDlg || {}));
});

3
apps/spreadsheeteditor/main/locale/de.json
View file

@ -150,6 +150,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Alle Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptChanges": "Änderungen annehmen",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Aktuelle Änderungen annehmen",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Schließen",
"Common.Views.ReviewChanges.txtCoAuthMode": "Modus \"Gemeinsame Bearbeitung\"",
"Common.Views.ReviewChanges.txtDocLang": "Sprache",
@ -370,6 +371,7 @@
"SSE.Controllers.Main.errorLockedAll": "Die Operation kann nicht durchgeführt werden, weil das Blatt von einem anderen Benutzer gesperrt ist.",
"SSE.Controllers.Main.errorLockedCellPivot": "Die Daten innerhalb einer Pivot-Tabelle können nicht geändert werden.",
"SSE.Controllers.Main.errorLockedWorksheetRename": "Umbenennen des Blattes ist derzeit nicht möglich, denn es wird gleichzeitig von einem anderen Benutzer umbenannt.",
"SSE.Controllers.Main.errorMaxPoints": "Die maximale Punktzahl pro eine Tabelle beträgt 4096 Punkte.",
"SSE.Controllers.Main.errorMoveRange": "Es ist unmöglich einen Teil der vereinigten Zelle zu ändern",
"SSE.Controllers.Main.errorOpenWarning": "Die Länge einer der Formeln in der Datei hat<br>die zugelassene Anzahl von Zeichen überschritten und sie wurde entfernt.",
"SSE.Controllers.Main.errorOperandExpected": "Die Syntax der eingegeben Funktion ist nicht korrekt. Bitte überprüfen Sie, ob eine der Klammern - '(' oder ')' fehlt.",
@ -913,6 +915,7 @@
"SSE.Views.ChartSettings.textWidth": "Breite",
"SSE.Views.ChartSettings.textWinLossSpark": "Gewinn/Verlust",
"SSE.Views.ChartSettingsDlg.cancelButtonText": "Abbrechen",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "FEHLER! Die maximale Punktzahl pro eine Tabelle beträgt 4096 Punkte.",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "FEHLER! Die maximale Anzahl der Datenreihen per Diagramm ist 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Falsche Reihenfolge der Zeilen. Um ein Kursdiagramm zu erstellen, ordnen Sie die Daten auf dem Blatt folgendermaßen an:<br> Eröffnungspreis, Höchstpreis, Tiefstpreis, Schlusskurs.",
"SSE.Views.ChartSettingsDlg.textAlt": "Der alternative Text",

3
apps/spreadsheeteditor/main/locale/en.json
View file

@ -371,6 +371,7 @@
"SSE.Controllers.Main.errorLockedAll": "The operation could not be done as the sheet has been locked by another user.",
"SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.",
"SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user",
"SSE.Controllers.Main.errorMaxPoints": "The maximum number of points in series per chart is 4096.",
"SSE.Controllers.Main.errorMoveRange": "Cannot change part of a merged cell",
"SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.",
"SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.",
@ -914,8 +915,10 @@
"SSE.Views.ChartSettings.textWidth": "Width",
"SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss",
"SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancel",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.",
"SSE.Views.ChartSettingsDlg.textAlt": "Alternative Text",
"SSE.Views.ChartSettingsDlg.textAltDescription": "Description",
"SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",

3
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -150,6 +150,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Принять все изменения",
"Common.Views.ReviewChanges.txtAcceptChanges": "Принять изменения",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение",
"Common.Views.ReviewChanges.txtChat": "Чат",
"Common.Views.ReviewChanges.txtClose": "Закрыть",
"Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования",
"Common.Views.ReviewChanges.txtDocLang": "Язык",
@ -370,6 +371,7 @@
"SSE.Controllers.Main.errorLockedAll": "Операция не может быть произведена, так как лист заблокирован другим пользователем.",
"SSE.Controllers.Main.errorLockedCellPivot": "Нельзя изменить данные в сводной таблице.",
"SSE.Controllers.Main.errorLockedWorksheetRename": "В настоящее время лист нельзя переименовать, так как его переименовывает другой пользователь",
"SSE.Controllers.Main.errorMaxPoints": "Максимальное число точек в серии для диаграммы составляет 4096.",
"SSE.Controllers.Main.errorMoveRange": "Нельзя изменить часть объединенной ячейки",
"SSE.Controllers.Main.errorOpenWarning": "Длина одной из формул в файле превышала<br>допустимое количество символов, и формула была удалена.",
"SSE.Controllers.Main.errorOperandExpected": "Синтаксис введенной функции некорректен. Проверьте, не пропущена ли одна из скобок - '(' или ')'.",
@ -913,6 +915,7 @@
"SSE.Views.ChartSettings.textWidth": "Ширина",
"SSE.Views.ChartSettings.textWinLossSpark": "Выигрыш/проигрыш",
"SSE.Views.ChartSettingsDlg.cancelButtonText": "Отмена",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ОШИБКА! Максимальное число точек в серии для диаграммы составляет 4096.",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "ОШИБКА! Максимальное число рядов данных для одной диаграммы - 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:<br> цена открытия, максимальная цена, минимальная цена, цена закрытия.",
"SSE.Views.ChartSettingsDlg.textAlt": "Альтернативный текст",

2
apps/spreadsheeteditor/main/resources/less/layout.less
View file

@ -33,7 +33,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

7
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -827,6 +827,10 @@ define([
config.msg = this.errorDataRange;
break;
case Asc.c_oAscError.ID.MaxDataPointsError:
config.msg = this.errorMaxPoints;
break;
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
config.closable = true;
@ -1445,7 +1449,8 @@ define([
txtStyle_Currency: 'Currency',
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorMaxPoints: 'The maximum number of points in series per chart is 4096.'
}
})(), SSE.Controllers.Main || {}))
});

1
apps/spreadsheeteditor/mobile/locale/de.json
View file

@ -137,6 +137,7 @@
"SSE.Controllers.Main.errorLockedWorksheetRename": "Umbenennen des Sheets ist derzeit nicht möglich, denn es wird gleichzeitig von einem anderen Benutzer umbenannt.",
"SSE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden\t",
"SSE.Controllers.Main.errorMailMergeSaveFile": "Verbinden ist fehlgeschlagen.",
"SSE.Controllers.Main.errorMaxPoints": "Die maximale Punktzahl pro eine Tabelle beträgt 4096 Punkte.",
"SSE.Controllers.Main.errorMoveRange": "Es ist unmöglich, den Teil einer verbundenen Zelle zu ändern",
"SSE.Controllers.Main.errorOpenWarning": "Die Länge einer der Formeln in der Datei hat<br>die zugelassene Anzahl von Zeichen überschritten und sie wurde entfernt.",
"SSE.Controllers.Main.errorOperandExpected": "Die Syntax der eingegeben Funktion ist nicht korrekt. Bitte überprüfen Sie, ob eine der Klammern - '(' oder ')' fehlt.",

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -137,6 +137,7 @@
"SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user",
"SSE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
"SSE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.",
"SSE.Controllers.Main.errorMaxPoints": "The maximum number of points in series per chart is 4096.",
"SSE.Controllers.Main.errorMoveRange": "Cannot change part of a merged cell",
"SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.",
"SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.",

1
apps/spreadsheeteditor/mobile/locale/ru.json
View file

@ -137,6 +137,7 @@
"SSE.Controllers.Main.errorLockedWorksheetRename": "В настоящее время лист нельзя переименовать, так как его переименовывает другой пользователь",
"SSE.Controllers.Main.errorMailMergeLoadFile": "Сбой при загрузке",
"SSE.Controllers.Main.errorMailMergeSaveFile": "Не удалось выполнить слияние.",
"SSE.Controllers.Main.errorMaxPoints": "Максимальное число точек в серии для диаграммы составляет 4096.",
"SSE.Controllers.Main.errorMoveRange": "Нельзя изменить часть объединенной ячейки",
"SSE.Controllers.Main.errorOpenWarning": "Длина одной из формул в файле превышала<br>допустимое количество символов, и формула была удалена.",
"SSE.Controllers.Main.errorOperandExpected": "Синтаксис введенной функции некорректен. Проверьте, не пропущена ли одна из скобок - '(' или ')'.",