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

[DE] Fix loading translations on IE and minimized version

Browse source
This commit is contained in:
Julia Radzhabova 2019-09-17 18:24:43 +03:00
parent cca8f2aa12
commit 6061d0f2d1
2 changed files with 81 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
apps/documenteditor/main/app.js
View file

@ -169,44 +169,46 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(
function() {
require([ require([
'documenteditor/main/app/controller/Viewport', 'documenteditor/main/app/controller/Viewport',
'documenteditor/main/app/controller/DocumentHolder', 'documenteditor/main/app/controller/DocumentHolder',
'documenteditor/main/app/controller/Toolbar', 'documenteditor/main/app/controller/Toolbar',
'documenteditor/main/app/controller/Statusbar', 'documenteditor/main/app/controller/Statusbar',
'documenteditor/main/app/controller/Links', 'documenteditor/main/app/controller/Links',
'documenteditor/main/app/controller/Navigation', 'documenteditor/main/app/controller/Navigation',
'documenteditor/main/app/controller/RightMenu', 'documenteditor/main/app/controller/RightMenu',
'documenteditor/main/app/controller/LeftMenu', 'documenteditor/main/app/controller/LeftMenu',
'documenteditor/main/app/controller/Main', 'documenteditor/main/app/controller/Main',
'documenteditor/main/app/view/FileMenuPanels', 'documenteditor/main/app/view/FileMenuPanels',
'documenteditor/main/app/view/ParagraphSettings', 'documenteditor/main/app/view/ParagraphSettings',
'documenteditor/main/app/view/HeaderFooterSettings', 'documenteditor/main/app/view/HeaderFooterSettings',
'documenteditor/main/app/view/ImageSettings', 'documenteditor/main/app/view/ImageSettings',
'documenteditor/main/app/view/TableSettings', 'documenteditor/main/app/view/TableSettings',
'documenteditor/main/app/view/ShapeSettings', 'documenteditor/main/app/view/ShapeSettings',
'documenteditor/main/app/view/TextArtSettings', 'documenteditor/main/app/view/TextArtSettings',
'documenteditor/main/app/view/SignatureSettings', 'documenteditor/main/app/view/SignatureSettings',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts', 'common/main/lib/controller/Fonts',
'common/main/lib/controller/History' 'common/main/lib/controller/History'
/** coauthoring begin **/ /** coauthoring begin **/
,'common/main/lib/controller/Comments' ,'common/main/lib/controller/Comments'
,'common/main/lib/controller/Chat' ,'common/main/lib/controller/Chat'
/** coauthoring end **/ /** coauthoring end **/
,'common/main/lib/controller/Plugins' ,'common/main/lib/controller/Plugins'
,'documenteditor/main/app/view/ChartSettings' ,'documenteditor/main/app/view/ChartSettings'
,'common/main/lib/controller/ExternalDiagramEditor' ,'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ExternalMergeEditor' ,'common/main/lib/controller/ExternalMergeEditor'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop' ,'common/main/lib/controller/Desktop'
], function() { ], function() {
app.start(); app.start();
}); });
}
);
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
reqerr = window.requireTimeourError(); reqerr = window.requireTimeourError();

80
apps/documenteditor/main/app_dev.js
View file

@ -159,45 +159,47 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(
function() {
require([ require([
'documenteditor/main/app/controller/Viewport', 'documenteditor/main/app/controller/Viewport',
'documenteditor/main/app/controller/DocumentHolder', 'documenteditor/main/app/controller/DocumentHolder',
'documenteditor/main/app/controller/Toolbar', 'documenteditor/main/app/controller/Toolbar',
'documenteditor/main/app/controller/Links', 'documenteditor/main/app/controller/Links',
'documenteditor/main/app/controller/Navigation', 'documenteditor/main/app/controller/Navigation',
'documenteditor/main/app/controller/Statusbar', 'documenteditor/main/app/controller/Statusbar',
'documenteditor/main/app/controller/RightMenu', 'documenteditor/main/app/controller/RightMenu',
'documenteditor/main/app/controller/LeftMenu', 'documenteditor/main/app/controller/LeftMenu',
'documenteditor/main/app/controller/Main', 'documenteditor/main/app/controller/Main',
'documenteditor/main/app/view/FileMenuPanels', 'documenteditor/main/app/view/FileMenuPanels',
'documenteditor/main/app/view/ParagraphSettings', 'documenteditor/main/app/view/ParagraphSettings',
'documenteditor/main/app/view/HeaderFooterSettings', 'documenteditor/main/app/view/HeaderFooterSettings',
'documenteditor/main/app/view/ImageSettings', 'documenteditor/main/app/view/ImageSettings',
'documenteditor/main/app/view/TableSettings', 'documenteditor/main/app/view/TableSettings',
'documenteditor/main/app/view/ShapeSettings', 'documenteditor/main/app/view/ShapeSettings',
'documenteditor/main/app/view/TextArtSettings', 'documenteditor/main/app/view/TextArtSettings',
'documenteditor/main/app/view/SignatureSettings', 'documenteditor/main/app/view/SignatureSettings',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts', 'common/main/lib/controller/Fonts',
'common/main/lib/controller/History' 'common/main/lib/controller/History'
/** coauthoring begin **/ /** coauthoring begin **/
,'common/main/lib/controller/Comments' ,'common/main/lib/controller/Comments'
,'common/main/lib/controller/Chat' ,'common/main/lib/controller/Chat'
/** coauthoring end **/ /** coauthoring end **/
,'common/main/lib/controller/Plugins' ,'common/main/lib/controller/Plugins'
,'documenteditor/main/app/view/ChartSettings' ,'documenteditor/main/app/view/ChartSettings'
,'common/main/lib/controller/ExternalDiagramEditor' ,'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ExternalMergeEditor' ,'common/main/lib/controller/ExternalMergeEditor'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Desktop' ,'common/main/lib/controller/Desktop'
], function() { ], function() {
window.compareVersions = true; window.compareVersions = true;
app.start(); app.start();
}); });
}
);
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
reqerr = window.requireTimeourError(); reqerr = window.requireTimeourError();