Simplify column translations

frontend/src/Components/Page/Sidebar/PageSidebar.js

@@ -21,22 +21,16 @@ const SIDEBAR_WIDTH = parseInt(dimensions.sidebarWidth);
 const links = [
   {
     iconName: icons.SERIES_CONTINUING,
-    get title() {
+    title: () => translate('Series'),
-      return translate('Series');
-    },
     to: '/',
     alias: '/series',
     children: [
       {
-        get title() {
+        title: () => translate('AddNew'),
-          return translate('AddNew');
-        },
         to: '/add/new'
       },
       {
-        get title() {
+        title: () => translate('LibraryImport'),
-          return translate('LibraryImport');
-        },
         to: '/add/import'
       }
     ]
@@ -44,36 +38,26 @@ const links = [
 
   {
     iconName: icons.CALENDAR,
-    get title() {
+    title: () => translate('Calendar'),
-      return translate('Calendar');
-    },
     to: '/calendar'
   },
 
   {
     iconName: icons.ACTIVITY,
-    get title() {
+    title: () => translate('Activity'),
-      return translate('Activity');
-    },
     to: '/activity/queue',
     children: [
       {
-        get title() {
+        title: () => translate('Queue'),
-          return translate('Queue');
-        },
         to: '/activity/queue',
         statusComponent: QueueStatusConnector
       },
       {
-        get title() {
+        title: () => translate('History'),
-          return translate('History');
-        },
         to: '/activity/history'
       },
       {
-        get title() {
+        title: () => translate('Blocklist'),
-          return translate('Blocklist');
-        },
         to: '/activity/blocklist'
       }
     ]
@@ -81,21 +65,15 @@ const links = [
 
   {
     iconName: icons.WARNING,
-    get title() {
+    title: () => translate('Wanted'),
-      return translate('Wanted');
-    },
     to: '/wanted/missing',
     children: [
       {
-        get title() {
+        title: () => translate('Missing'),
-          return translate('Missing');
-        },
         to: '/wanted/missing'
       },
       {
-        get title() {
+        title: () => translate('CutoffUnmet'),
-          return translate('CutoffUnmet');
-        },
         to: '/wanted/cutoffunmet'
       }
     ]
@@ -103,87 +81,59 @@ const links = [
 
   {
     iconName: icons.SETTINGS,
-    get title() {
+    title: () => translate('Settings'),
-      return translate('Settings');
-    },
     to: '/settings',
     children: [
       {
-        get title() {
+        title: () => translate('MediaManagement'),
-          return translate('MediaManagement');
-        },
         to: '/settings/mediamanagement'
       },
       {
-        get title() {
+        title: () => translate('Profiles'),
-          return translate('Profiles');
-        },
         to: '/settings/profiles'
       },
       {
-        get title() {
+        title: () => translate('Quality'),
-          return translate('Quality');
-        },
         to: '/settings/quality'
       },
       {
-        get title() {
+        title: () => translate('CustomFormats'),
-          return translate('CustomFormats');
-        },
         to: '/settings/customformats'
       },
       {
-        get title() {
+        title: () => translate('Indexers'),
-          return translate('Indexers');
-        },
         to: '/settings/indexers'
       },
       {
-        get title() {
+        title: () => translate('DownloadClients'),
-          return translate('DownloadClients');
-        },
         to: '/settings/downloadclients'
       },
       {
-        get title() {
+        title: () => translate('ImportLists'),
-          return translate('ImportLists');
-        },
         to: '/settings/importlists'
       },
       {
-        get title() {
+        title: () => translate('Connect'),
-          return translate('Connect');
-        },
         to: '/settings/connect'
       },
       {
-        get title() {
+        title: () => translate('Metadata'),
-          return translate('Metadata');
-        },
         to: '/settings/metadata'
       },
       {
-        get title() {
+        title: () => translate('MetadataSource'),
-          return translate('MetadataSource');
-        },
         to: '/settings/metadatasource'
       },
       {
-        get title() {
+        title: () => translate('Tags'),
-          return translate('Tags');
-        },
         to: '/settings/tags'
       },
       {
-        get title() {
+        title: () => translate('General'),
-          return translate('General');
-        },
         to: '/settings/general'
       },
       {
-        get title() {
+        title: () => translate('UI'),
-          return translate('UI');
-        },
         to: '/settings/ui'
       }
     ]
@@ -191,46 +141,32 @@ const links = [
 
   {
     iconName: icons.SYSTEM,
-    get title() {
+    title: () => translate('System'),
-      return translate('System');
-    },
     to: '/system/status',
     children: [
       {
-        get title() {
+        title: () => translate('Status'),
-          return translate('Status');
-        },
         to: '/system/status',
         statusComponent: HealthStatusConnector
       },
       {
-        get title() {
+        title: () => translate('Tasks'),
-          return translate('Tasks');
-        },
         to: '/system/tasks'
       },
       {
-        get title() {
+        title: () => translate('Backup'),
-          return translate('Backup');
-        },
         to: '/system/backup'
       },
       {
-        get title() {
+        title: () => translate('Updates'),
-          return translate('Updates');
-        },
         to: '/system/updates'
       },
       {
-        get title() {
+        title: () => translate('Events'),
-          return translate('Events');
-        },
         to: '/system/events'
       },
       {
-        get title() {
+        title: () => translate('LogFiles'),
-          return translate('LogFiles');
-        },
         to: '/system/logs/files'
       }
     ]

frontend/src/Components/Page/Sidebar/PageSidebarItem.js

@@ -64,7 +64,7 @@ class PageSidebarItem extends Component {
           }
 
           <span className={isChildItem ? styles.noIcon : null}>
-            {title}
+            {typeof title === 'function' ? title() : title}
           </span>
 
           {
@@ -88,7 +88,7 @@ class PageSidebarItem extends Component {
 
 PageSidebarItem.propTypes = {
   iconName: PropTypes.object,
-  title: PropTypes.string.isRequired,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   to: PropTypes.string.isRequired,
   isActive: PropTypes.bool,
   isActiveParent: PropTypes.bool,

frontend/src/RootFolder/RootFolders.tsx

@@ -13,23 +13,17 @@ import RootFolderRow from './RootFolderRow';
 const rootFolderColumns = [
   {
     name: 'path',
-    get label() {
+    label: () => translate('Path'),
-      return translate('Path');
-    },
     isVisible: true,
   },
   {
     name: 'freeSpace',
-    get label() {
+    label: () => translate('FreeSpace'),
-      return translate('FreeSpace');
-    },
     isVisible: true,
   },
   {
     name: 'unmappedFolders',
-    get label() {
+    label: () => translate('UnmappedFolders'),
-      return translate('UnmappedFolders');
-    },
     isVisible: true,
   },
   {

frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx

@@ -36,49 +36,37 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
+    label: () => translate('Implementation'),
-      return translate('Implementation');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enable',
-    get label() {
+    label: () => translate('Enabled'),
-      return translate('Enabled');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'priority',
-    get label() {
+    label: () => translate('Priority'),
-      return translate('Priority');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'removeCompletedDownloads',
-    get label() {
+    label: () => translate('RemoveCompleted'),
-      return translate('RemoveCompleted');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'removeFailedDownloads',
-    get label() {
+    label: () => translate('RemoveFailed'),
-      return translate('RemoveFailed');
-    },
     isSortable: true,
     isVisible: true,
   },

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx

@@ -36,49 +36,37 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
+    label: () => translate('Implementation'),
-      return translate('Implementation');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'qualityProfileId',
-    get label() {
+    label: () => translate('QualityProfile'),
-      return translate('QualityProfile');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'rootFolderPath',
-    get label() {
+    label: () => translate('RootFolder'),
-      return translate('RootFolder');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableAutomaticAdd',
-    get label() {
+    label: () => translate('AutoAdd'),
-      return translate('AutoAdd');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'tags',
-    get label() {
+    label: () => translate('Tags'),
-      return translate('Tags');
-    },
     isSortable: true,
     isVisible: true,
   },

frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx

@@ -36,57 +36,43 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    get label() {
+    label: () => translate('Implementation'),
-      return translate('Implementation');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableRss',
-    get label() {
+    label: () => translate('EnableRSS'),
-      return translate('EnableRSS');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableAutomaticSearch',
-    get label() {
+    label: () => translate('EnableAutomaticSearch'),
-      return translate('EnableAutomaticSearch');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enableInteractiveSearch',
-    get label() {
+    label: () => translate('EnableInteractiveSearch'),
-      return translate('EnableInteractiveSearch');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'priority',
-    get label() {
+    label: () => translate('Priority'),
-      return translate('Priority');
-    },
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'tags',
-    get label() {
+    label: () => translate('Tags'),
-      return translate('Tags');
-    },
     isSortable: true,
     isVisible: true,
   },

frontend/src/System/Backup/Backups.js

@@ -21,23 +21,17 @@ const columns = [
   },
   {
     name: 'name',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isVisible: true
   },
   {
     name: 'size',
-    get label() {
+    label: () => translate('Size'),
-      return translate('Size');
-    },
     isVisible: true
   },
   {
     name: 'time',
-    get label() {
+    label: () => translate('Time'),
-      return translate('Time');
-    },
     isVisible: true
   },
   {

frontend/src/System/Logs/Files/LogFiles.js

@@ -19,16 +19,12 @@ import LogFilesTableRow from './LogFilesTableRow';
 const columns = [
   {
     name: 'filename',
-    get label() {
+    label: () => translate('Filename'),
-      return translate('Filename');
-    },
     isVisible: true
   },
   {
     name: 'lastWriteTime',
-    get label() {
+    label: () => translate('LastWriteTime'),
-      return translate('LastWriteTime');
-    },
     isVisible: true
   },
   {

frontend/src/System/Status/DiskSpace/DiskSpace.js

@@ -15,23 +15,17 @@ import styles from './DiskSpace.css';
 const columns = [
   {
     name: 'path',
-    get label() {
+    label: () => translate('Location'),
-      return translate('Location');
-    },
     isVisible: true
   },
   {
     name: 'freeSpace',
-    get label() {
+    label: () => translate('FreeSpace'),
-      return translate('FreeSpace');
-    },
     isVisible: true
   },
   {
     name: 'totalSpace',
-    get label() {
+    label: () => translate('TotalSpace'),
-      return translate('TotalSpace');
-    },
     isVisible: true
   },
   {

frontend/src/System/Status/Health/Health.js

@@ -94,16 +94,12 @@ const columns = [
   },
   {
     name: 'message',
-    get label() {
+    label: () => translate('Message'),
-      return translate('Message');
-    },
     isVisible: true
   },
   {
     name: 'actions',
-    get label() {
+    label: () => translate('Actions'),
-      return translate('Actions');
-    },
     isVisible: true
   }
 ];

frontend/src/System/Tasks/Queued/QueuedTasks.js

@@ -15,37 +15,27 @@ const columns = [
   },
   {
     name: 'commandName',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isVisible: true
   },
   {
     name: 'queued',
-    get label() {
+    label: () => translate('Queued'),
-      return translate('Queued');
-    },
     isVisible: true
   },
   {
     name: 'started',
-    get label() {
+    label: () => translate('Started'),
-      return translate('Started');
-    },
     isVisible: true
   },
   {
     name: 'ended',
-    get label() {
+    label: () => translate('Ended'),
-      return translate('Ended');
-    },
     isVisible: true
   },
   {
     name: 'duration',
-    get label() {
+    label: () => translate('Duration'),
-      return translate('Duration');
-    },
     isVisible: true
   },
   {

frontend/src/System/Tasks/Scheduled/ScheduledTasks.js

@@ -10,37 +10,27 @@ import ScheduledTaskRowConnector from './ScheduledTaskRowConnector';
 const columns = [
   {
     name: 'name',
-    get label() {
+    label: () => translate('Name'),
-      return translate('Name');
-    },
     isVisible: true
   },
   {
     name: 'interval',
-    get label() {
+    label: () => translate('Interval'),
-      return translate('Interval');
-    },
     isVisible: true
   },
   {
     name: 'lastExecution',
-    get label() {
+    label: () => translate('LastExecution'),
-      return translate('LastExecution');
-    },
     isVisible: true
   },
   {
     name: 'lastDuration',
-    get label() {
+    label: () => translate('LastDuration'),
-      return translate('LastDuration');
-    },
     isVisible: true
   },
   {
     name: 'nextExecution',
-    get label() {
+    label: () => translate('NextExecution'),
-      return translate('NextExecution');
-    },
     isVisible: true
   },
   {