summaryrefslogtreecommitdiffstats
path: root/web/react/stores
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-02-03 12:11:02 -0800
committer=Corey Hulen <corey@hulen.com>2016-02-03 12:11:02 -0800
commitd3a965a362037b4872dd9a8471e60f853bfc304e (patch)
tree8c767a534b600e426418f5a0cbae02820d7bfe5e /web/react/stores
parentbdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (diff)
parent2b4af8d8c73ba5b9b683b65b1df4d4e3f24edb81 (diff)
downloadchat-d3a965a362037b4872dd9a8471e60f853bfc304e.tar.gz
chat-d3a965a362037b4872dd9a8471e60f853bfc304e.tar.bz2
chat-d3a965a362037b4872dd9a8471e60f853bfc304e.zip
Merge branch 'master' into PLT-1429
Diffstat (limited to 'web/react/stores')
-rw-r--r--web/react/stores/post_store.jsx5
-rw-r--r--web/react/stores/socket_store.jsx21
2 files changed, 16 insertions, 10 deletions
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index 7abadf2b1..08ffef822 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -446,7 +446,7 @@ class PostStoreClass extends EventEmitter {
posts = {};
}
- post.message = '(message deleted)';
+ post.message = this.delete_message;
post.state = Constants.POST_DELETED;
post.filenames = [];
@@ -581,6 +581,9 @@ class PostStoreClass extends EventEmitter {
return commentCount;
}
+ deleteMessage(msg) {
+ this.delete_message = msg;
+ }
}
var PostStore = new PostStoreClass();
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 736b0ca27..744c2c8e5 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -86,7 +86,7 @@ class SocketStoreClass extends EventEmitter {
this.failCount = this.failCount + 1;
- ErrorStore.storeLastError({connErrorCount: this.failCount, message: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.'});
+ ErrorStore.storeLastError({connErrorCount: this.failCount, message: this.translations.socketError});
ErrorStore.emitChange();
};
@@ -109,7 +109,7 @@ class SocketStoreClass extends EventEmitter {
handleMessage(msg) {
switch (msg.action) {
case SocketEvents.POSTED:
- handleNewPostEvent(msg);
+ handleNewPostEvent(msg, this.translations);
break;
case SocketEvents.POST_EDITED:
@@ -151,9 +151,12 @@ class SocketStoreClass extends EventEmitter {
this.initialize();
}
}
+ setTranslations(messages) {
+ this.translations = messages;
+ }
}
-function handleNewPostEvent(msg) {
+function handleNewPostEvent(msg, translations) {
// Store post
const post = JSON.parse(msg.props.post);
EventHelpers.emitPostRecievedEvent(post);
@@ -192,14 +195,14 @@ function handleNewPostEvent(msg) {
return;
}
- let username = 'Someone';
+ let username = translations.someone;
if (post.props.override_username && global.window.mm_config.EnablePostUsernameOverride === 'true') {
username = post.props.override_username;
} else if (UserStore.hasProfile(msg.user_id)) {
username = UserStore.getProfile(msg.user_id).username;
}
- let title = 'Posted';
+ let title = translations.posted;
if (channel) {
title = channel.display_name;
}
@@ -211,14 +214,14 @@ function handleNewPostEvent(msg) {
if (notifyText.length === 0) {
if (msgProps.image) {
- Utils.notifyMe(title, username + ' uploaded an image', channel);
+ Utils.notifyMe(title, username + translations.uploadedImage, channel);
} else if (msgProps.otherFile) {
- Utils.notifyMe(title, username + ' uploaded a file', channel);
+ Utils.notifyMe(title, username + translations.uploadedFile, channel);
} else {
- Utils.notifyMe(title, username + ' did something new', channel);
+ Utils.notifyMe(title, username + translations.something, channel);
}
} else {
- Utils.notifyMe(title, username + ' wrote: ' + notifyText, channel);
+ Utils.notifyMe(title, username + translations.wrote + notifyText, channel);
}
if (!user.notify_props || user.notify_props.desktop_sound === 'true') {
Utils.ding();