Adding missing localization
Этот коммит содержится в:
@@ -6,6 +6,7 @@
|
|||||||
AsyncClient with requests. */
|
AsyncClient with requests. */
|
||||||
|
|
||||||
import * as AsyncClient from '../utils/async_client.jsx';
|
import * as AsyncClient from '../utils/async_client.jsx';
|
||||||
|
import * as Client from '../utils/client.jsx';
|
||||||
import SocketStore from '../stores/socket_store.jsx';
|
import SocketStore from '../stores/socket_store.jsx';
|
||||||
import ChannelStore from '../stores/channel_store.jsx';
|
import ChannelStore from '../stores/channel_store.jsx';
|
||||||
import PostStore from '../stores/post_store.jsx';
|
import PostStore from '../stores/post_store.jsx';
|
||||||
@@ -45,6 +46,14 @@ const holders = defineMessages({
|
|||||||
wrote: {
|
wrote: {
|
||||||
id: 'channel_loader.wrote',
|
id: 'channel_loader.wrote',
|
||||||
defaultMessage: ' wrote: '
|
defaultMessage: ' wrote: '
|
||||||
|
},
|
||||||
|
connectionError: {
|
||||||
|
id: 'channel_loader.connection_error',
|
||||||
|
defaultMessage: 'There appears to be a problem with your internet connection.'
|
||||||
|
},
|
||||||
|
unknownError: {
|
||||||
|
id: 'channel_loader.unknown_error',
|
||||||
|
defaultMessage: 'We received an unexpected status code from the server.'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -67,6 +76,11 @@ class ChannelLoader extends React.Component {
|
|||||||
wrote: formatMessage(holders.wrote)
|
wrote: formatMessage(holders.wrote)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Client.setTranslations({
|
||||||
|
connectionError: formatMessage(holders.connectionError),
|
||||||
|
unknownError: formatMessage(holders.unknownError)
|
||||||
|
});
|
||||||
|
|
||||||
this.state = {};
|
this.state = {};
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
|||||||
@@ -69,10 +69,8 @@ class SocketStoreClass extends EventEmitter {
|
|||||||
if (this.failCount > 0) {
|
if (this.failCount > 0) {
|
||||||
console.log('websocket re-established connection'); //eslint-disable-line no-console
|
console.log('websocket re-established connection'); //eslint-disable-line no-console
|
||||||
|
|
||||||
if (ErrorStore.getLastError()) {
|
ErrorStore.clearLastError();
|
||||||
ErrorStore.clearLastError();
|
ErrorStore.emitChange();
|
||||||
ErrorStore.emitChange();
|
|
||||||
}
|
|
||||||
|
|
||||||
AsyncClient.getChannels();
|
AsyncClient.getChannels();
|
||||||
AsyncClient.getPosts(ChannelStore.getCurrentId());
|
AsyncClient.getPosts(ChannelStore.getCurrentId());
|
||||||
|
|||||||
@@ -4,6 +4,15 @@ import BrowserStore from '../stores/browser_store.jsx';
|
|||||||
import TeamStore from '../stores/team_store.jsx';
|
import TeamStore from '../stores/team_store.jsx';
|
||||||
import ErrorStore from '../stores/error_store.jsx';
|
import ErrorStore from '../stores/error_store.jsx';
|
||||||
|
|
||||||
|
let translations = {
|
||||||
|
connectionError: 'There appears to be a problem with your internet connection.',
|
||||||
|
unknownError: 'We received an unexpected status code from the server.'
|
||||||
|
};
|
||||||
|
|
||||||
|
export function setTranslations(messages) {
|
||||||
|
translations = messages;
|
||||||
|
}
|
||||||
|
|
||||||
export function track(category, action, label, property, value) {
|
export function track(category, action, label, property, value) {
|
||||||
global.window.analytics.track(action, {category, label, property, value});
|
global.window.analytics.track(action, {category, label, property, value});
|
||||||
}
|
}
|
||||||
@@ -23,14 +32,14 @@ function handleError(methodName, xhr, status, err) {
|
|||||||
var msg = '';
|
var msg = '';
|
||||||
|
|
||||||
if (e) {
|
if (e) {
|
||||||
msg = 'error in ' + methodName + ' msg=' + e.message + ' detail=' + e.detailed_error + ' rid=' + e.request_id;
|
msg = 'method=' + methodName + ' msg=' + e.message + ' detail=' + e.detailed_error + ' rid=' + e.request_id;
|
||||||
} else {
|
} else {
|
||||||
msg = 'error in ' + methodName + ' status=' + status + ' statusCode=' + xhr.status + ' err=' + err;
|
msg = 'method=' + methodName + ' status=' + status + ' statusCode=' + xhr.status + ' err=' + err;
|
||||||
|
|
||||||
if (xhr.status === 0) {
|
if (xhr.status === 0) {
|
||||||
e = {message: 'There appears to be a problem with your internet connection'};
|
e = {message: translations.connectionError};
|
||||||
} else {
|
} else {
|
||||||
e = {message: 'We received an unexpected status code from the server (' + xhr.status + ')'};
|
e = {message: translations.unknownError + ' (' + xhr.status + ')'};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -543,6 +543,8 @@
|
|||||||
"channel_loader.uploadedFile": " uploaded a file",
|
"channel_loader.uploadedFile": " uploaded a file",
|
||||||
"channel_loader.uploadedImage": " uploaded an image",
|
"channel_loader.uploadedImage": " uploaded an image",
|
||||||
"channel_loader.wrote": " wrote: ",
|
"channel_loader.wrote": " wrote: ",
|
||||||
|
"channel_loader.connection_error": "There appears to be a problem with your internet connection.",
|
||||||
|
"channel_loader.unknown_error": "We received an unexpected status code from the server.",
|
||||||
"channel_members_modal.addNew": " Add New Members",
|
"channel_members_modal.addNew": " Add New Members",
|
||||||
"channel_members_modal.close": "Close",
|
"channel_members_modal.close": "Close",
|
||||||
"channel_memebers_modal.members": " Members",
|
"channel_memebers_modal.members": " Members",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user