From 69b621b13adc119ac4dea42177e09ec042290de3 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Wed, 2 Aug 2023 12:17:34 +0300
Subject: [PATCH] Simplify label translations in columns

Closes #8922
---
 .../SelectFolder/ImportMovieSelectFolder.js   | 12 ++----
 .../FileBrowser/FileBrowserModalContent.js    |  8 +---
 .../Table/DiscoverMovieHeader.js              |  2 +-
 ...eractiveImportSelectFolderModalContent.tsx |  8 +---
 .../InteractiveImportModalContent.tsx         | 36 +++++------------
 .../Movie/SelectMovieModalContent.tsx         | 16 ++------
 .../Movie/SelectMovieModalTableHeader.tsx     |  2 +-
 .../InteractiveSearchContent.js               | 40 +++++--------------
 .../Details/Titles/MovieTitlesTableContent.js | 12 ++----
 .../Movie/History/MovieHistoryTableContent.js | 20 +++-------
 .../Index/Select/MovieIndexSelectFooter.tsx   |  2 +-
 .../Editor/MovieFileEditorTableContent.js     | 32 ++++-----------
 .../MovieFile/Extras/ExtraFileTableContent.js | 12 ++----
 frontend/src/RootFolder/RootFolders.tsx       | 12 ++----
 .../ManageDownloadClientsModalContent.tsx     | 24 +++--------
 .../Manage/ManageImportListsModalContent.tsx  | 24 +++--------
 .../Manage/ManageIndexersModalContent.tsx     | 28 ++++---------
 frontend/src/System/Backup/Backups.js         | 10 ++---
 frontend/src/System/Logs/Files/LogFiles.js    |  8 +---
 .../src/System/Status/DiskSpace/DiskSpace.js  | 12 ++----
 frontend/src/System/Status/Health/Health.js   |  8 +---
 .../src/System/Tasks/Queued/QueuedTasks.js    | 24 +++--------
 .../System/Tasks/Scheduled/ScheduledTasks.js  | 20 +++-------
 23 files changed, 95 insertions(+), 277 deletions(-)

diff --git a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
index a633ea866..1a53a5e44 100644
--- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
+++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
@@ -18,23 +18,17 @@ import styles from './ImportMovieSelectFolder.css';
 const rootFolderColumns = [
   {
     name: 'path',
-    get label() {
-      return translate('Path');
-    },
+    label: () => translate('Path'),
     isVisible: true
   },
   {
     name: 'freeSpace',
-    get label() {
-      return translate('FreeSpace');
-    },
+    label: () => translate('FreeSpace'),
     isVisible: true
   },
   {
     name: 'unmappedFolders',
-    get label() {
-      return translate('UnmappedFolders');
-    },
+    label: () => translate('UnmappedFolders'),
     isVisible: true
   },
   {
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
index d4e6ef08b..4241bdf6d 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
@@ -20,16 +20,12 @@ import styles from './FileBrowserModalContent.css';
 const columns = [
   {
     name: 'type',
-    get label() {
-      return translate('Type');
-    },
+    label: () => translate('Type'),
     isVisible: true
   },
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isVisible: true
   }
 ];
diff --git a/frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js b/frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js
index 5ef17c836..8b5a5298f 100644
--- a/frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js
+++ b/frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js
@@ -111,7 +111,7 @@ class DiscoverMovieHeader extends Component {
                 isSortable={isSortable}
                 {...otherProps}
               >
-                {label}
+                {typeof label === 'function' ? label() : label}
               </VirtualTableHeaderCell>
             );
           })
diff --git a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx
index 7de3bbf00..8059dee43 100644
--- a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx
+++ b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx
@@ -25,15 +25,11 @@ import styles from './InteractiveImportSelectFolderModalContent.css';
 const recentFoldersColumns = [
   {
     name: 'folder',
-    get label() {
-      return translate('Folder');
-    },
+    label: () => translate('Folder'),
   },
   {
     name: 'lastUsed',
-    get label() {
-      return translate('LastUsed');
-    },
+    label: () => translate('LastUsed'),
   },
   {
     name: 'actions',
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx
index 162e59104..ff1c2494c 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx
@@ -71,48 +71,36 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'relativePath',
-    get label() {
-      return translate('RelativePath');
-    },
+    label: () => translate('RelativePath'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'movie',
-    get label() {
-      return translate('Movie');
-    },
+    label: () => translate('Movie'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'releaseGroup',
-    get label() {
-      return translate('ReleaseGroup');
-    },
+    label: () => translate('ReleaseGroup'),
     isVisible: true,
   },
   {
     name: 'quality',
-    get label() {
-      return translate('Quality');
-    },
+    label: () => translate('Quality'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'languages',
-    get label() {
-      return translate('Languages');
-    },
+    label: () => translate('Languages'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'size',
-    get label() {
-      return translate('Size');
-    },
+    label: () => translate('Size'),
     isSortable: true,
     isVisible: true,
   },
@@ -139,22 +127,16 @@ const COLUMNS = [
 const importModeOptions = [
   {
     key: 'chooseImportMode',
-    get value() {
-      return translate('ChooseImportMode');
-    },
+    value: () => translate('ChooseImportMode'),
     disabled: true,
   },
   {
     key: 'move',
-    get value() {
-      return translate('MoveFiles');
-    },
+    value: () => translate('MoveFiles'),
   },
   {
     key: 'copy',
-    get value() {
-      return translate('HardlinkCopyFiles');
-    },
+    value: () => translate('HardlinkCopyFiles'),
   },
 ];
 
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
index 952f16576..9acb1da0c 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
@@ -29,30 +29,22 @@ import styles from './SelectMovieModalContent.css';
 const columns = [
   {
     name: 'title',
-    get label() {
-      return translate('Title');
-    },
+    label: () => translate('Title'),
     isVisible: true,
   },
   {
     name: 'year',
-    get label() {
-      return translate('Year');
-    },
+    label: () => translate('Year'),
     isVisible: true,
   },
   {
     name: 'imdbId',
-    get label() {
-      return translate('ImdbId');
-    },
+    label: () => translate('ImdbId'),
     isVisible: true,
   },
   {
     name: 'tmdbId',
-    get label() {
-      return translate('TmdbId');
-    },
+    label: () => translate('TmdbId'),
     isVisible: true,
   },
 ];
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
index 6471e614e..f8b8a6a66 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
@@ -30,7 +30,7 @@ function SelectMovieModalTableHeader(props: SelectMovieModalTableHeaderProps) {
             }
             name={name}
           >
-            {label}
+            {typeof label === 'function' ? label() : label}
           </VirtualTableHeaderCell>
         );
       })}
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchContent.js b/frontend/src/InteractiveSearch/InteractiveSearchContent.js
index 65836dfc3..6eec4d461 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchContent.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchContent.js
@@ -13,17 +13,13 @@ import styles from './InteractiveSearchContent.css';
 const columns = [
   {
     name: 'protocol',
-    get label() {
-      return translate('Source');
-    },
+    label: () => translate('Source'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'age',
-    get label() {
-      return translate('Age');
-    },
+    label: () => translate('Age'),
     isSortable: true,
     isVisible: true
   },
@@ -43,66 +39,50 @@ const columns = [
   },
   {
     name: 'title',
-    get label() {
-      return translate('Title');
-    },
+    label: () => translate('Title'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'indexer',
-    get label() {
-      return translate('Indexer');
-    },
+    label: () => translate('Indexer'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'history',
-    get label() {
-      return translate('History');
-    },
+    label: () => translate('History'),
     isSortable: true,
     fixedSortDirection: sortDirections.ASCENDING,
     isVisible: true
   },
   {
     name: 'size',
-    get label() {
-      return translate('Size');
-    },
+    label: () => translate('Size'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'peers',
-    get label() {
-      return translate('Peers');
-    },
+    label: () => translate('Peers'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'languages',
-    get label() {
-      return translate('Language');
-    },
+    label: () => translate('Language'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'qualityWeight',
-    get label() {
-      return translate('Quality');
-    },
+    label: () => translate('Quality'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'customFormat',
-    get label() {
-      return translate('Formats');
-    },
+    label: () => translate('Formats'),
     isSortable: true,
     isVisible: true
   },
diff --git a/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js b/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js
index 704d44b0f..c21106d55 100644
--- a/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js
+++ b/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js
@@ -10,23 +10,17 @@ import styles from './MovieTitlesTableContent.css';
 const columns = [
   {
     name: 'altTitle',
-    get label() {
-      return translate('AlternativeTitle');
-    },
+    label: () => translate('AlternativeTitle'),
     isVisible: true
   },
   {
     name: 'language',
-    get label() {
-      return translate('Language');
-    },
+    label: () => translate('Language'),
     isVisible: true
   },
   {
     name: 'sourceType',
-    get label() {
-      return translate('Type');
-    },
+    label: () => translate('Type'),
     isVisible: true
   }
 ];
diff --git a/frontend/src/Movie/History/MovieHistoryTableContent.js b/frontend/src/Movie/History/MovieHistoryTableContent.js
index 39adf0183..8b8a3cb6b 100644
--- a/frontend/src/Movie/History/MovieHistoryTableContent.js
+++ b/frontend/src/Movie/History/MovieHistoryTableContent.js
@@ -17,30 +17,22 @@ const columns = [
   },
   {
     name: 'sourceTitle',
-    get label() {
-      return translate('SourceTitle');
-    },
+    label: () => translate('SourceTitle'),
     isVisible: true
   },
   {
     name: 'languages',
-    get label() {
-      return translate('Languages');
-    },
+    label: () => translate('Languages'),
     isVisible: true
   },
   {
     name: 'quality',
-    get label() {
-      return translate('Quality');
-    },
+    label: () => translate('Quality'),
     isVisible: true
   },
   {
     name: 'customFormats',
-    get label() {
-      return translate('CustomFormats');
-    },
+    label: () => translate('CustomFormats'),
     isSortable: false,
     isVisible: true
   },
@@ -55,9 +47,7 @@ const columns = [
   },
   {
     name: 'date',
-    get label() {
-      return translate('Date');
-    },
+    label: () => translate('Date'),
     isVisible: true
   },
   {
diff --git a/frontend/src/Movie/Index/Select/MovieIndexSelectFooter.tsx b/frontend/src/Movie/Index/Select/MovieIndexSelectFooter.tsx
index 5fca21244..53998f794 100644
--- a/frontend/src/Movie/Index/Select/MovieIndexSelectFooter.tsx
+++ b/frontend/src/Movie/Index/Select/MovieIndexSelectFooter.tsx
@@ -166,7 +166,7 @@ function MovieIndexSelectFooter() {
             isDisabled={!anySelected || isOrganizingMovies}
             onPress={onOrganizePress}
           >
-            {translate('Rename Files')}
+            {translate('RenameFiles')}
           </SpinnerButton>
 
           <SpinnerButton
diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js b/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js
index 069712748..5e49bbdd6 100644
--- a/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js
+++ b/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js
@@ -11,58 +11,42 @@ import styles from './MovieFileEditorTableContent.css';
 const columns = [
   {
     name: 'title',
-    get label() {
-      return translate('RelativePath');
-    },
+    label: () => translate('RelativePath'),
     isVisible: true
   },
   {
     name: 'videoCodec',
-    get label() {
-      return translate('VideoCodec');
-    },
+    label: () => translate('VideoCodec'),
     isVisible: true
   },
   {
     name: 'audioInfo',
-    get label() {
-      return translate('AudioInfo');
-    },
+    label: () => translate('AudioInfo'),
     isVisible: true
   },
   {
     name: 'size',
-    get label() {
-      return translate('Size');
-    },
+    label: () => translate('Size'),
     isVisible: true
   },
   {
     name: 'languages',
-    get label() {
-      return translate('Languages');
-    },
+    label: () => translate('Languages'),
     isVisible: true
   },
   {
     name: 'quality',
-    get label() {
-      return translate('Quality');
-    },
+    label: () => translate('Quality'),
     isVisible: true
   },
   {
     name: 'releaseGroup',
-    get label() {
-      return translate('ReleaseGroup');
-    },
+    label: () => translate('ReleaseGroup'),
     isVisible: true
   },
   {
     name: 'quality.customFormats',
-    get label() {
-      return translate('Formats');
-    },
+    label: () => translate('Formats'),
     isVisible: true
   },
   {
diff --git a/frontend/src/MovieFile/Extras/ExtraFileTableContent.js b/frontend/src/MovieFile/Extras/ExtraFileTableContent.js
index 089b0e9bc..ae560d5d8 100644
--- a/frontend/src/MovieFile/Extras/ExtraFileTableContent.js
+++ b/frontend/src/MovieFile/Extras/ExtraFileTableContent.js
@@ -11,23 +11,17 @@ import styles from './ExtraFileTableContent.css';
 const columns = [
   {
     name: 'relativePath',
-    get label() {
-      return translate('RelativePath');
-    },
+    label: () => translate('RelativePath'),
     isVisible: true
   },
   {
     name: 'extension',
-    get label() {
-      return translate('Extension');
-    },
+    label: () => translate('Extension'),
     isVisible: true
   },
   {
     name: 'type',
-    get label() {
-      return translate('Type');
-    },
+    label: () => translate('Type'),
     isVisible: true
   },
   {
diff --git a/frontend/src/RootFolder/RootFolders.tsx b/frontend/src/RootFolder/RootFolders.tsx
index 961797abe..d887b5b56 100644
--- a/frontend/src/RootFolder/RootFolders.tsx
+++ b/frontend/src/RootFolder/RootFolders.tsx
@@ -13,23 +13,17 @@ import RootFolderRow from './RootFolderRow';
 const rootFolderColumns = [
   {
     name: 'path',
-    get label() {
-      return translate('Path');
-    },
+    label: () => translate('Path'),
     isVisible: true,
   },
   {
     name: 'freeSpace',
-    get label() {
-      return translate('FreeSpace');
-    },
+    label: () => translate('FreeSpace'),
     isVisible: true,
   },
   {
     name: 'unmappedFolders',
-    get label() {
-      return translate('UnmappedFolders');
-    },
+    label: () => translate('UnmappedFolders'),
     isVisible: true,
   },
   {
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
index 4a2f95348..d663c735f 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
@@ -36,49 +36,37 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
-      return translate('Implementation');
-    },
+    label: () => translate('Implementation'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enable',
-    get label() {
-      return translate('Enabled');
-    },
+    label: () => translate('Enabled'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'priority',
-    get label() {
-      return translate('Priority');
-    },
+    label: () => translate('Priority'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'removeCompletedDownloads',
-    get label() {
-      return translate('RemoveCompleted');
-    },
+    label: () => translate('RemoveCompleted'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'removeFailedDownloads',
-    get label() {
-      return translate('RemoveFailed');
-    },
+    label: () => translate('RemoveFailed'),
     isSortable: true,
     isVisible: true,
   },
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx
index 783481c6b..4f64fd76d 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx
@@ -36,49 +36,37 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
-      return translate('Implementation');
-    },
+    label: () => translate('Implementation'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'qualityProfileId',
-    get label() {
-      return translate('QualityProfile');
-    },
+    label: () => translate('QualityProfile'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'rootFolderPath',
-    get label() {
-      return translate('RootFolder');
-    },
+    label: () => translate('RootFolder'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableAuto',
-    get label() {
-      return translate('AutomaticAdd');
-    },
+    label: () => translate('AutomaticAdd'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'tags',
-    get label() {
-      return translate('Tags');
-    },
+    label: () => translate('Tags'),
     isSortable: true,
     isVisible: true,
   },
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
index 7b577d345..7c1a7db63 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
@@ -36,57 +36,43 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
-      return translate('Implementation');
-    },
+    label: () => translate('Implementation'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableRss',
-    get label() {
-      return translate('EnableRSS');
-    },
+    label: () => translate('EnableRSS'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableAutomaticSearch',
-    get label() {
-      return translate('EnableAutomaticSearch');
-    },
+    label: () => translate('EnableAutomaticSearch'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableInteractiveSearch',
-    get label() {
-      return translate('EnableInteractiveSearch');
-    },
+    label: () => translate('EnableInteractiveSearch'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'priority',
-    get label() {
-      return translate('Priority');
-    },
+    label: () => translate('Priority'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'tags',
-    get label() {
-      return translate('Tags');
-    },
+    label: () => translate('Tags'),
     isSortable: true,
     isVisible: true,
   },
diff --git a/frontend/src/System/Backup/Backups.js b/frontend/src/System/Backup/Backups.js
index 6e6752cd2..8f7a5b0a5 100644
--- a/frontend/src/System/Backup/Backups.js
+++ b/frontend/src/System/Backup/Backups.js
@@ -21,21 +21,17 @@ const columns = [
   },
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isVisible: true
   },
   {
     name: 'size',
-    label: 'Size',
+    label: () => translate('Size'),
     isVisible: true
   },
   {
     name: 'time',
-    get label() {
-      return translate('Time');
-    },
+    label: () => translate('Time'),
     isVisible: true
   },
   {
diff --git a/frontend/src/System/Logs/Files/LogFiles.js b/frontend/src/System/Logs/Files/LogFiles.js
index 1220dc0fe..d6a67c92d 100644
--- a/frontend/src/System/Logs/Files/LogFiles.js
+++ b/frontend/src/System/Logs/Files/LogFiles.js
@@ -19,16 +19,12 @@ import LogFilesTableRow from './LogFilesTableRow';
 const columns = [
   {
     name: 'filename',
-    get label() {
-      return translate('Filename');
-    },
+    label: () => translate('Filename'),
     isVisible: true
   },
   {
     name: 'lastWriteTime',
-    get label() {
-      return translate('LastWriteTime');
-    },
+    label: () => translate('LastWriteTime'),
     isVisible: true
   },
   {
diff --git a/frontend/src/System/Status/DiskSpace/DiskSpace.js b/frontend/src/System/Status/DiskSpace/DiskSpace.js
index 24deb7eae..1f50295da 100644
--- a/frontend/src/System/Status/DiskSpace/DiskSpace.js
+++ b/frontend/src/System/Status/DiskSpace/DiskSpace.js
@@ -15,23 +15,17 @@ import styles from './DiskSpace.css';
 const columns = [
   {
     name: 'path',
-    get label() {
-      return translate('Location');
-    },
+    label: () => translate('Location'),
     isVisible: true
   },
   {
     name: 'freeSpace',
-    get label() {
-      return translate('FreeSpace');
-    },
+    label: () => translate('FreeSpace'),
     isVisible: true
   },
   {
     name: 'totalSpace',
-    get label() {
-      return translate('TotalSpace');
-    },
+    label: () => translate('TotalSpace'),
     isVisible: true
   },
   {
diff --git a/frontend/src/System/Status/Health/Health.js b/frontend/src/System/Status/Health/Health.js
index 7a6bd7089..06b630bf9 100644
--- a/frontend/src/System/Status/Health/Health.js
+++ b/frontend/src/System/Status/Health/Health.js
@@ -94,16 +94,12 @@ const columns = [
   },
   {
     name: 'message',
-    get label() {
-      return translate('Message');
-    },
+    label: () => translate('Message'),
     isVisible: true
   },
   {
     name: 'actions',
-    get label() {
-      return translate('Actions');
-    },
+    label: () => translate('Actions'),
     isVisible: true
   }
 ];
diff --git a/frontend/src/System/Tasks/Queued/QueuedTasks.js b/frontend/src/System/Tasks/Queued/QueuedTasks.js
index ac209f5b3..074e0b91c 100644
--- a/frontend/src/System/Tasks/Queued/QueuedTasks.js
+++ b/frontend/src/System/Tasks/Queued/QueuedTasks.js
@@ -10,44 +10,32 @@ import QueuedTaskRowConnector from './QueuedTaskRowConnector';
 const columns = [
   {
     name: 'trigger',
-    get label() {
-      return translate('Trigger');
-    },
+    label: () => translate('Trigger'),
     isVisible: true
   },
   {
     name: 'commandName',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isVisible: true
   },
   {
     name: 'queued',
-    get label() {
-      return translate('Queued');
-    },
+    label: () => translate('Queued'),
     isVisible: true
   },
   {
     name: 'started',
-    get label() {
-      return translate('Started');
-    },
+    label: () => translate('Started'),
     isVisible: true
   },
   {
     name: 'ended',
-    get label() {
-      return translate('Ended');
-    },
+    label: () => translate('Ended'),
     isVisible: true
   },
   {
     name: 'duration',
-    get label() {
-      return translate('Duration');
-    },
+    label: () => translate('Duration'),
     isVisible: true
   },
   {
diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
index c1b17122d..bec151613 100644
--- a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
+++ b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
@@ -10,37 +10,27 @@ import ScheduledTaskRowConnector from './ScheduledTaskRowConnector';
 const columns = [
   {
     name: 'name',
-    get label() {
-      return translate('Name');
-    },
+    label: () => translate('Name'),
     isVisible: true
   },
   {
     name: 'interval',
-    get label() {
-      return translate('Interval');
-    },
+    label: () => translate('Interval'),
     isVisible: true
   },
   {
     name: 'lastExecution',
-    get label() {
-      return translate('LastExecution');
-    },
+    label: () => translate('LastExecution'),
     isVisible: true
   },
   {
     name: 'lastDuration',
-    get label() {
-      return translate('LastDuration');
-    },
+    label: () => translate('LastDuration'),
     isVisible: true
   },
   {
     name: 'nextExecution',
-    get label() {
-      return translate('NextExecution');
-    },
+    label: () => translate('NextExecution'),
     isVisible: true
   },
   {