Fix initial document language in OO

pull/1/head
yflory 3 years ago
parent c8384f42c9
commit a2b295c42c

@ -1512,6 +1512,8 @@ define([
// defined but never used // defined but never used
//var mode = (content && content.version > 2 && lock) ? "view" : "edit"; //var mode = (content && content.version > 2 && lock) ? "view" : "edit";
var lang = (window.cryptpadLanguage || navigator.language || navigator.userLanguage || '').slice(0,2);
// Config // Config
APP.ooconfig = { APP.ooconfig = {
"document": { "document": {
@ -1538,7 +1540,7 @@ define([
"name": metadataMgr.getUserData().name || Messages.anonymous, "name": metadataMgr.getUserData().name || Messages.anonymous,
}, },
"mode": "edit", "mode": "edit",
"lang": (window.cryptpadLanguage || navigator.language || navigator.userLanguage || '').slice(0,2) "lang": lang
}, },
"events": { "events": {
"onAppReady": function(/*evt*/) { "onAppReady": function(/*evt*/) {
@ -1667,10 +1669,17 @@ define([
ooChannel.lastHash = hash; ooChannel.lastHash = hash;
}); });
} }
if (APP.startNew) {
var w = getWindow();
if (lang === "fr") { lang = 'fr-fr'; }
var l = w.Common.util.LanguageInfo.getLocalLanguageCode(lang);
getEditor().asc_setDefaultLanguage(l);
}
} }
delete APP.startNew;
if (fromContent && !lock && Array.isArray(fromContent.content)) { if (fromContent && !lock && Array.isArray(fromContent.content)) {
console.warn(fromContent);
makePatch(fromContent.content); makePatch(fromContent.content);
} }
@ -2734,6 +2743,8 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
Title.updateTitle(Title.defaultTitle); Title.updateTitle(Title.defaultTitle);
} }
APP.startNew = isNew;
var version = CURRENT_VERSION + '/'; var version = CURRENT_VERSION + '/';
var msg; var msg;
// Old version detected: use the old OO and start the migration if we can // Old version detected: use the old OO and start the migration if we can

Loading…
Cancel
Save