Fix language selection in sandboxed iframes

2017-09-18 14:26:54 +02:00
parent 0a656ca8d6
commit 1131ef0172
10 changed files with 25 additions and 6 deletions
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -77,5 +77,19 @@ define([], function () {
            Cryptpad.feedback('Migrate-2', true);
            userObject.version = version = 2;
        }
+
+
+
+        // Migration 3: language from localStorage to settings
+        var migrateLanguage = function () {
+            if (!localStorage.CRYPTPAD_LANG) { return; }
+            var l = localStorage.CRYPTPAD_LANG;
+            userObject.settings.language = l;
+        };
+        if (version < 3) {
+            migrateLanguage();
+            Cryptpad.feedback('Migrate-3', true);
+            userObject.version = version = 3;
+        }
    };
 });