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

[SSE] Fix Bug 36965

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-27 10:58:30 +03:00
parent 5b14c0960a
commit 6fe96a17b2
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1158,6 +1158,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;
@ -2194,7 +2198,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/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 || {}));
});

2
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 ')'.",
@ -916,6 +917,7 @@
"SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancel",
"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.",

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/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 ')'.",