summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-02-11 09:58:04 -0800
committer=Corey Hulen <corey@hulen.com>2016-02-11 09:58:04 -0800
commit8a7535d7fe11a7c8aee08dface4b51d454b7f4e4 (patch)
treeb55081d45e5b77b9765e2ef032ff8a48b3efb7b1 /web/react
parentabd5a3e0d73aac5d35a0a57b06899ca03474e548 (diff)
downloadchat-8a7535d7fe11a7c8aee08dface4b51d454b7f4e4.tar.gz
chat-8a7535d7fe11a7c8aee08dface4b51d454b7f4e4.tar.bz2
chat-8a7535d7fe11a7c8aee08dface4b51d454b7f4e4.zip
Fixing socket store loc
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/channel_loader.jsx14
-rw-r--r--web/react/stores/socket_store.jsx14
2 files changed, 21 insertions, 7 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index 174c8c4e1..2aa28d5c4 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -20,31 +20,31 @@ import {intlShape, injectIntl, defineMessages} from 'mm-intl';
const holders = defineMessages({
socketError: {
id: 'channel_loader.socketError',
- defaultMessage: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.'
+ defaultMessage: SocketStore.getDefaultTranslations().socketError
},
someone: {
id: 'channel_loader.someone',
- defaultMessage: 'Someone'
+ defaultMessage: SocketStore.getDefaultTranslations().someone
},
posted: {
id: 'channel_loader.posted',
- defaultMessage: 'Posted'
+ defaultMessage: SocketStore.getDefaultTranslations().posted
},
uploadedImage: {
id: 'channel_loader.uploadedImage',
- defaultMessage: ' uploaded an image'
+ defaultMessage: SocketStore.getDefaultTranslations().uploadedImage
},
uploadedFile: {
id: 'channel_loader.uploadedFile',
- defaultMessage: ' uploaded a file'
+ defaultMessage: SocketStore.getDefaultTranslations().uploadedFile
},
something: {
id: 'channel_loader.something',
- defaultMessage: ' did something new'
+ defaultMessage: SocketStore.getDefaultTranslations().something
},
wrote: {
id: 'channel_loader.wrote',
- defaultMessage: ' wrote: '
+ defaultMessage: SocketStore.getDefaultTranslations().wrote
}
});
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index e1b65fe14..424c7fe57 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -32,6 +32,8 @@ class SocketStoreClass extends EventEmitter {
this.failCount = 0;
+ this.translations = this.getDefaultTranslations();
+
this.initialize();
}
@@ -174,6 +176,18 @@ class SocketStoreClass extends EventEmitter {
this.translations = messages;
}
+ getDefaultTranslations() {
+ return ({
+ socketError: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.',
+ someone: 'Someone',
+ posted: 'Posted',
+ uploadedImage: ' uploaded an image',
+ uploadedFile: ' uploaded a file',
+ something: ' did something new',
+ wrote: ' wrote: '
+ });
+ }
+
close() {
if (conn && conn.readyState === WebSocket.OPEN) {
conn.close();