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

Merge pull request #1102 from ONLYOFFICE/fix/bugfix

Browse source 
For  Bug 50233
This commit is contained in:
Julia Radzhabova 2021-08-19 21:06:08 +03:00 committed by GitHub
parent d2d85daa82 a29ab88428
commit fc5dc9e33a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1734,6 +1734,10 @@ define([
config.msg = this.errorSubmit;
break;
case Asc.c_oAscError.ID.LoadingFontError:
config.msg = this.errorLoadingFont;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2938,7 +2942,8 @@ define([
txtTableOfFigures: 'Table of figures',
txtStyle_endnote_text: 'Endnote Text',
txtTOCHeading: 'TOC Heading',
errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.',
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -862,6 +862,7 @@
"DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",

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

@ -1404,7 +1404,11 @@ define([
case Asc.c_oAscError.ID.Password:
config.msg = this.errorSetPassword;
break;
case Asc.c_oAscError.ID.LoadingFontError:
config.msg = this.errorLoadingFont;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2727,7 +2731,8 @@ define([
txtErrorLoadHistory: 'Loading history failed',
leavePageTextOnClose: 'All unsaved changes in this document will be lost.<br> Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.',
textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
txtNone: 'None'
txtNone: 'None',
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
}
})(), PE.Controllers.Main || {}))
});

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

@ -736,6 +736,7 @@
"PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"PE.Controllers.Toolbar.textAccent": "Accents",

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

@ -1711,7 +1711,11 @@ define([
case Asc.c_oAscError.ID.UplDocumentFileCount:
config.msg = this.uploadDocFileCountMessage;
break;
case Asc.c_oAscError.ID.LoadingFontError:
config.msg = this.errorLoadingFont;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2990,7 +2994,8 @@ define([
errorLocationOrDataRangeError: 'The reference for the location or data range is not valid.',
uploadDocSizeMessage: 'Maximum document size limit exceeded.',
uploadDocExtMessage: 'Unknown document format.',
uploadDocFileCountMessage: 'No documents uploaded.'
uploadDocFileCountMessage: 'No documents uploaded.',
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -1006,6 +1006,7 @@
"SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textFirstCol": "First column",
"SSE.Controllers.Print.textFirstRow": "First row",