Messages for SocketStore and small fixes
Этот коммит содержится в:
@@ -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();
|
||||
|
||||
Ссылка в новой задаче
Block a user