2 files changed, 22 insertions, 6 deletions

diff --git a/webapp/action_creators/global_actions.jsx b/webapp/action_creators/global_actions.jsx
index ab38532a6..7322f1150 100644
--- a/webapp/action_creators/global_actions.jsx
+++ b/webapp/action_creators/global_actions.jsx
@@ -264,6 +264,15 @@ export function newLocalizationSelected(locale) {
     }
 }
 
+export function loadBrowserLocale() {
+    let locale = (navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] :
+        (navigator.language || navigator.userLanguage)).split('-')[0];
+    if (!I18n.getLanguages()[locale]) {
+        locale = 'en';
+    }
+    return newLocalizationSelected(locale);
+}
+
 export function viewLoggedIn() {
     AsyncClient.getChannels();
     AsyncClient.getChannelExtraInfo();
diff --git a/webapp/action_creators/websocket_actions.jsx b/webapp/action_creators/websocket_actions.jsx
index 611d53bf7..bb46db149 100644
--- a/webapp/action_creators/websocket_actions.jsx
+++ b/webapp/action_creators/websocket_actions.jsx
@@ -7,6 +7,7 @@ import PostStore from 'stores/post_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
 import ErrorStore from 'stores/error_store.jsx';
+import NotificationStore from 'stores/notification_store.jsx'; //eslint-disable-line no-unused-vars
 
 import * as Utils from 'utils/utils.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
@@ -21,6 +22,7 @@ const WEBSOCKET_RETRY_TIME = 3000;
 var conn = null;
 var connectFailCount = 0;
 var pastFirstInit = false;
+var manuallyClosed = false;
 
 export function initialize() {
     if (window.WebSocket && !conn) {
@@ -35,6 +37,8 @@ export function initialize() {
             console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
         }
 
+        manuallyClosed = false;
+
         conn = new WebSocket(connUrl);
 
         conn.onopen = () => {
@@ -69,12 +73,14 @@ export function initialize() {
             ErrorStore.setConnectionErrorCount(connectFailCount);
             ErrorStore.emitChange();
 
-            setTimeout(
-                () => {
-                    initialize();
-                },
-                WEBSOCKET_RETRY_TIME
-            );
+            if (!manuallyClosed) {
+                setTimeout(
+                    () => {
+                        initialize();
+                    },
+                    WEBSOCKET_RETRY_TIME
+                );
+            }
         };
 
         conn.onerror = (evt) => {
@@ -147,6 +153,7 @@ export function sendMessage(msg) {
 }
 
 export function close() {
+    manuallyClosed = true;
     if (conn && conn.readyState === WebSocket.OPEN) {
         conn.close();
     }