2 files changed, 17 insertions, 2 deletions
diff --git a/webapp/actions/admin_actions.jsx b/webapp/actions/admin_actions.jsx
index fdaeb8732..ac02ac058 100644
--- a/webapp/actions/admin_actions.jsx
+++ b/webapp/actions/admin_actions.jsx
@@ -383,3 +383,16 @@ export function getPostsPerDayAnalytics(teamId) {
 export function getUsersPerDayAnalytics(teamId) {
     AdminActions.getUsersPerDayAnalytics(teamId)(dispatch, getState);
 }
+
+export function elasticsearchTest(config, success, error) {
+    AdminActions.testElasticsearch(config)(dispatch, getState).then(
+        (data) => {
+            if (data && success) {
+                success(data);
+            } else if (data == null && error) {
+                const serverError = getState().requests.admin.testElasticsearch.error;
+                error({id: serverError.server_error_id, ...serverError});
+            }
+        }
+    );
+}
diff --git a/webapp/actions/file_actions.jsx b/webapp/actions/file_actions.jsx
index 9a565a07c..1d9617901 100644
--- a/webapp/actions/file_actions.jsx
+++ b/webapp/actions/file_actions.jsx
@@ -6,6 +6,8 @@ import request from 'superagent';
 
 import store from 'stores/redux_store.jsx';
 
+import * as Utils from 'utils/utils.jsx';
+
 import {FileTypes} from 'mattermost-redux/action_types';
 import {forceLogoutIfNecessary} from 'mattermost-redux/actions/helpers';
 import {getLogErrorAction} from 'mattermost-redux/actions/errors';
@@ -20,9 +22,9 @@ export function uploadFile(file, name, channelId, clientId, successCallback, err
             if (res && res.body && res.body.id) {
                 e = res.body;
             } else if (err.status === 0 || !err.status) {
-                e = {message: this.translations.connectionError};
+                e = {message: Utils.localizeMessage('channel_loader.connection_error', 'There appears to be a problem with your internet connection.')};
             } else {
-                e = {message: this.translations.unknownError + ' (' + err.status + ')'};
+                e = {message: Utils.localizeMessage('channel_loader.unknown_error', 'We received an unexpected status code from the server.') + ' (' + err.status + ')'};
             }
 
             forceLogoutIfNecessary(err, dispatch);