Merge remote-tracking branch 'origin/location' into development

1 files changed, 2 insertions, 1 deletions

diff --git a/gui.js b/gui.js
index 329e0ef..fc83b2e 100644
--- a/gui.js
+++ b/gui.js
@@ -185,7 +185,7 @@ IDE_Morph.prototype.init = function (isAutoFill) {
     MorphicPreferences.globalFontFamily = 'Helvetica, Arial';
 
     // restore saved user preferences
-    this.userLanguage = null; // user language preference for startup
+    this.userLanguage = null;
     this.applySavedSettings();
 
     // additional properties:
@@ -3442,6 +3442,7 @@ IDE_Morph.prototype.setLanguage = function (lang, callback) {
     if (lang === 'en') {
         return this.reflectLanguage('en', callback);
     }
+    myself.userLanguage = lang;
     translation = document.createElement('script');
     translation.id = 'language';
     translation.onload = function () {