diff --git a/frontend/src/Store/Actions/systemActions.js b/frontend/src/Store/Actions/systemActions.js
index 61b25d9bb..eac93e69c 100644
--- a/frontend/src/Store/Actions/systemActions.js
+++ b/frontend/src/Store/Actions/systemActions.js
@@ -4,6 +4,7 @@ import { setAppValue } from 'Store/Actions/appActions';
import { createThunk, handleThunks } from 'Store/thunks';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
+import translate from 'Utilities/String/translate';
import { pingServer } from './appActions';
import { set } from './baseActions';
import createFetchHandler from './Creators/createFetchHandler';
@@ -81,34 +82,34 @@ export const defaultState = {
columns: [
{
name: 'level',
- columnLabel: 'Level',
+ columnLabel: translate('Level'),
isSortable: false,
isVisible: true,
isModifiable: false
},
{
- name: 'logger',
- label: 'Component',
- isSortable: false,
+ name: 'time',
+ label: translate('Time'),
+ isSortable: true,
isVisible: true,
isModifiable: false
},
{
- name: 'message',
- label: 'Message',
+ name: 'logger',
+ label: translate('Component'),
+ isSortable: false,
isVisible: true,
isModifiable: false
},
{
- name: 'time',
- label: 'Time',
- isSortable: true,
+ name: 'message',
+ label: translate('Message'),
isVisible: true,
isModifiable: false
},
{
name: 'actions',
- columnLabel: 'Actions',
+ columnLabel: translate('Actions'),
isSortable: true,
isVisible: true,
isModifiable: false
diff --git a/frontend/src/System/Events/LogsTableRow.js b/frontend/src/System/Events/LogsTableRow.js
index cf485941b..5eca0f7db 100644
--- a/frontend/src/System/Events/LogsTableRow.js
+++ b/frontend/src/System/Events/LogsTableRow.js
@@ -58,9 +58,9 @@ class LogsTableRow extends Component {
render() {
const {
level,
+ time,
logger,
message,
- time,
exception,
columns
} = this.props;
@@ -95,6 +95,15 @@ class LogsTableRow extends Component {
);
}
+ if (name === 'time') {
+ return (
+
+ );
+ }
+
if (name === 'logger') {
return (
@@ -111,15 +120,6 @@ class LogsTableRow extends Component {
);
}
- if (name === 'time') {
- return (
-
- );
- }
-
if (name === 'actions') {
return (