open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Time column is first column on events page

Browse Source 
(cherry picked from commit c14ef7bee7477ad5d29498f1cba94267eb11daf0)
pull/2471/head
Robin Dadswell 3 years ago committed by Qstick
parent 54161c44d3
commit 85f369b92f
3 changed files with 62 additions and 57 deletions
Show Stats Download Patch File Download Diff File

21
frontend/src/Store/Actions/systemActions.js
Unescape View File

@ -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

22
frontend/src/System/Events/LogsTableRow.js
Unescape View File

@ -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 (
<RelativeDateCellConnector
key={name}
date={time}
/>
);
}
if (name === 'logger') {
return (
<TableRowCell key={name}>
@ -111,15 +120,6 @@ class LogsTableRow extends Component {
);
}
if (name === 'time') {
return (
<RelativeDateCellConnector
key={name}
date={time}
/>
);
}
if (name === 'actions') {
return (
<TableRowCell
@ -147,9 +147,9 @@ class LogsTableRow extends Component {
LogsTableRow.propTypes = {
level: PropTypes.string.isRequired,
time: PropTypes.string.isRequired,
logger: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
time: PropTypes.string.isRequired,
exception: PropTypes.string,
columns: PropTypes.arrayOf(PropTypes.object).isRequired
};

76
src/NzbDrone.Core/Localization/Core/en.json
Unescape View File

@ -2,14 +2,14 @@
"20MinutesTwenty": "20 Minutes: {0}",
"45MinutesFourtyFive": "45 Minutes: {0}",
"60MinutesSixty": "60 Minutes: {0}",
"APIKey": "API Key",
"About": "About",
"Absolute": "Absolute",
"Actions": "Actions",
"AddImportListExclusionHelpText": "Prevent artist from being added to Lidarr by Import lists",
"AddingTag": "Adding tag",
"AddListExclusion": "Add List Exclusion",
"AddMissing": "Add missing",
"AddNewItem": "Add New Item",
"AddingTag": "Adding tag",
"AdvancedSettingsHiddenClickToShow": "Hidden, click to show",
"AdvancedSettingsShownClickToHide": "Shown, click to hide",
"AgeWhenGrabbed": "Age (when grabbed)",
@ -37,6 +37,7 @@
"AnalyticsEnabledHelpTextWarning": "Requires restart to take effect",
"AnchorTooltip": "This file is already in your library for a release you are currently importing",
"AnyReleaseOkHelpText": "Lidarr will automatically switch to the release best matching downloaded tracks",
"APIKey": "API Key",
"ApiKeyHelpTextWarning": "Requires restart to take effect",
"AppDataDirectory": "AppData directory",
"ApplyTags": "Apply Tags",
@ -53,9 +54,9 @@
"Artists": "Artists",
"Authentication": "Authentication",
"AuthenticationMethodHelpText": "Require Username and Password to access Lidarr",
"AutoRedownloadFailedHelpText": "Automatically search for and attempt to download a different release",
"Automatic": "Automatic",
"AutomaticallySwitchRelease": "Automatically Switch Release",
"AutoRedownloadFailedHelpText": "Automatically search for and attempt to download a different release",
"BackupFolderHelpText": "Relative paths will be under Lidarr's AppData directory",
"BackupIntervalHelpText": "Interval to backup the Lidarr DB and settings",
"BackupNow": "Backup Now",
@ -93,8 +94,9 @@
"CollapseMultipleAlbumsHelpText": "Collapse multiple albums releasing on the same day",
"Columns": "Columns",
"CompletedDownloadHandling": "Completed Download Handling",
"ConnectSettings": "Connect Settings",
"Component": "Component",
"Connections": "Connections",
"ConnectSettings": "Connect Settings",
"Continuing": "Continuing",
"ContinuingAllTracksDownloaded": "Continuing (All tracks downloaded)",
"ContinuingMoreAlbumsAreExpected": "More albums are expected",
@ -107,16 +109,16 @@
"CreateGroup": "Create group",
"CutoffHelpText": "Once this quality is reached Lidarr will no longer download albums",
"CutoffUnmet": "Cutoff Unmet",
"DBMigration": "DB Migration",
"Dates": "Dates",
"DBMigration": "DB Migration",
"DefaultLidarrTags": "Default Lidarr Tags",
"DefaultMetadataProfileIdHelpText": "Default Metadata Profile for artists detected in this folder",
"DefaultMonitorOptionHelpText": "Default Monitoring Options for albums by artists detected in this folder",
"DefaultQualityProfileIdHelpText": "Default Quality Profile for artists detected in this folder",
"DefaultTagsHelpText": "Default Lidarr Tags for artists detected in this folder",
"DelayingDownloadUntilInterp": "Delaying download until {0} at {1}",
"DelayProfile": "Delay Profile",
"DelayProfiles": "Delay Profiles",
"DelayingDownloadUntilInterp": "Delaying download until {0} at {1}",
"Delete": "Delete",
"DeleteBackup": "Delete Backup",
"DeleteBackupMessageText": "Are you sure you want to delete the backup '{0}'?",
@ -158,14 +160,14 @@
"DiskSpace": "Disk Space",
"Docker": "Docker",
"DownloadClient": "Download Client",
"DownloadClientSettings": "Download Client Settings",
"DownloadClients": "Download Clients",
"DownloadClientSettings": "Download Client Settings",
"DownloadFailedCheckDownloadClientForMoreDetails": "Download failed: check download client for more details",
"DownloadFailedInterp": "Download failed: {0}",
"Downloading": "Downloading",
"DownloadPropersAndRepacksHelpTexts1": "Whether or not to automatically upgrade to Propers/Repacks",
"DownloadPropersAndRepacksHelpTexts2": "Use 'Do not Prefer' to sort by preferred word score over propers/repacks",
"DownloadWarningCheckDownloadClientForMoreDetails": "Download warning: check download client for more details",
"Downloading": "Downloading",
"Duration": "Duration",
"Edit": "Edit",
"EditArtist": "Edit Artist",
@ -176,13 +178,13 @@
"EnableColorImpairedMode": "Enable Color-Impaired Mode",
"EnableColorImpairedModeHelpText": "Altered style to allow color-impaired users to better distinguish color coded information",
"EnableCompletedDownloadHandlingHelpText": "Automatically import completed downloads from download client",
"EnabledHelpText": "Check to enable release profile",
"EnableHelpText": "Enable metadata file creation for this metadata type",
"EnableInteractiveSearch": "Enable Interactive Search",
"EnableProfile": "Enable Profile",
"EnableRSS": "Enable RSS",
"EnableSSL": "Enable SSL",
"EnableSslHelpText": " Requires restart running as administrator to take effect",
"EnabledHelpText": "Check to enable release profile",
"Ended": "Ended",
"EndedAllTracksDownloaded": "Ended (All tracks downloaded)",
"EntityName": "Entity Name",
@ -204,8 +206,8 @@
"ExtraFileExtensionsHelpTexts2": "\"Examples: \".sub",
"FileDateHelpText": "Change file date on import/rescan",
"FileManagement": "File Management",
"FileNames": "File Names",
"Filename": "Filename",
"FileNames": "File Names",
"Files": "Files",
"FilterPlaceHolder": "Filter artist",
"FirstAlbum": "First Album",
@ -214,10 +216,10 @@
"Fixed": "Fixed",
"Folder": "Folder",
"Folders": "Folders",
"ForeignIdHelpText": "The Musicbrainz Id of the artist/album to exclude",
"ForMoreInformationOnTheIndividualDownloadClientsClickOnTheInfoButtons": "For more information on the individual downloadClients, click on the info buttons.",
"ForMoreInformationOnTheIndividualIndexersClickOnTheInfoButtons": "For more information on the individual indexers, click on the info buttons.",
"ForMoreInformationOnTheIndividualListsClickOnTheInfoButtons": "For more information on the individual lists, click on the info buttons.",
"ForeignIdHelpText": "The Musicbrainz Id of the artist/album to exclude",
"FutureAlbums": "Future Albums",
"FutureAlbumsData": "Monitor albums that have not released yet",
"FutureDays": "Future Days",
@ -251,15 +253,15 @@
"IgnoredHelpText": "The release will be rejected if it contains one or more of terms (case insensitive)",
"IgnoredPlaceHolder": "Add new restriction",
"IllRestartLater": "I'll restart later",
"ImportedTo": "Imported To",
"ImportExtraFiles": "Import Extra Files",
"ImportExtraFilesHelpText": "Import matching extra files (subtitles, nfo, etc) after importing an track file",
"ImportFailedInterp": "Import failed: {0}",
"ImportFailures": "Import failures",
"Importing": "Importing",
"ImportListExclusions": "Import List Exclusions",
"ImportListSettings": "Import List Settings",
"ImportLists": "Import Lists",
"ImportedTo": "Imported To",
"Importing": "Importing",
"ImportListSettings": "Import List Settings",
"IncludeHealthWarningsHelpText": "Include Health Warnings",
"IncludePreferredWhenRenaming": "Include Preferred when Renaming",
"IncludeUnknownArtistItemsHelpText": "Show items without a artist in the queue, this could include removed artists, movies or anything else in Lidarr's category",
@ -270,8 +272,8 @@
"IndexerIdvalue0IncludeInPreferredWordsRenamingFormat": "Include in {Preferred Words} renaming format",
"IndexerIdvalue0OnlySupportedWhenIndexerIsSetToAll": "Only supported when Indexer is set to (All)",
"IndexerPriority": "Indexer Priority",
"IndexerSettings": "Indexer Settings",
"Indexers": "Indexers",
"IndexerSettings": "Indexer Settings",
"InteractiveSearch": "Interactive Search",
"Interval": "Interval",
"IsCutoffCutoff": "Cutoff",
@ -292,6 +294,7 @@
"LatestAlbum": "Latest Album",
"LatestAlbumData": "Monitor the latest albums and future albums",
"LaunchBrowserHelpText": " Open a web browser and navigate to Lidarr homepage on app start.",
"Level": "Level",
"Lidarr": "Lidarr",
"LidarrSupportsAnyDownloadClientThatUsesTheNewznabStandardAsWellAsOtherDownloadClientsListedBelow": "Lidarr supports any downloadClient that uses the Newznab standard, as well as other downloadClients listed below.",
"LidarrSupportsAnyIndexerThatUsesTheNewznabStandardAsWellAsOtherIndexersListedBelow": "Lidarr supports any indexer that uses the Newznab standard, as well as other indexers listed below.",
@ -303,12 +306,11 @@
"LocalPath": "Local Path",
"LocalPathHelpText": "Path that Lidarr should use to access the remote path locally",
"LogFiles": "Log Files",
"Logging": "Logging",
"LogLevel": "Log Level",
"LogLevelvalueTraceTraceLoggingShouldOnlyBeEnabledTemporarily": "Trace logging should only be enabled temporarily",
"Logging": "Logging",
"Logs": "Logs",
"LongDateFormat": "Long Date Format",
"MIA": "MIA",
"MaintenanceRelease": "Maintenance release",
"ManageTracks": "Manage Tracks",
"ManualDownload": "Manual Download",
@ -332,6 +334,7 @@
"MetadataSettings": "Metadata Settings",
"MetadataSource": "Metadata Source",
"MetadataSourceHelpText": "Alternative Metadata Source (Leave blank for default)",
"MIA": "MIA",
"MinimumAge": "Minimum Age",
"MinimumAgeHelpText": "Usenet only: Minimum age in minutes of NZBs before they are grabbed. Use this to give new releases time to propagate to your usenet provider.",
"MinimumFreeSpace": "Minimum Free Space",
@ -351,15 +354,15 @@
"MultiDiscTrackFormat": "Multi Disc Track Format",
"MusicBrainzAlbumID": "MusicBrainz Album ID",
"MusicBrainzArtistID": "MusicBrainz Artist ID",
"MusicbrainzId": "Musicbrainz Id",
"MusicBrainzRecordingID": "MusicBrainz Recording ID",
"MusicBrainzReleaseID": "MusicBrainz Release ID",
"MusicBrainzTrackID": "MusicBrainz Track ID",
"MusicbrainzId": "Musicbrainz Id",
"MustContain": "Must Contain",
"MustNotContain": "Must Not Contain",
"NETCore": ".NET Core",
"Name": "Name",
"NamingSettings": "Naming Settings",
"NETCore": ".NET Core",
"New": "New",
"NoBackupsAreAvailable": "No backups are available",
"NoHistory": "No history.",
@ -367,11 +370,11 @@
"NoLimitForAnyRuntime": "No limit for any runtime",
"NoLogFiles": "No log files",
"NoMinimumForAnyRuntime": "No minimum for any runtime",
"NoTagsHaveBeenAddedYetAddTagsToLinkArtistsWithDelayProfilesRestrictionsOrNotificationsClickLinkTohttpswikiservarrcomlidarrsettingstagshereLinkToFindOutMoreAboutTagsInLidarr": "No tags have been added yet. Add tags to link artists with delay profiles, restrictions, or notifications. Click <Link to='https://wiki.servarr.com/lidarr/settings#tags'>here</Link> to find out more about tags in Lidarr.",
"NoUpdatesAreAvailable": "No updates are available",
"None": "None",
"NoneData": "No albums will be monitored",
"NoTagsHaveBeenAddedYetAddTagsToLinkArtistsWithDelayProfilesRestrictionsOrNotificationsClickLinkTohttpswikiservarrcomlidarrsettingstagshereLinkToFindOutMoreAboutTagsInLidarr": "No tags have been added yet. Add tags to link artists with delay profiles, restrictions, or notifications. Click <Link to='https://wiki.servarr.com/lidarr/settings#tags'>here</Link> to find out more about tags in Lidarr.",
"NotificationTriggers": "Notification Triggers",
"NoUpdatesAreAvailable": "No updates are available",
"OnDownloadFailureHelpText": "On Download Failure",
"OnGrabHelpText": "On Grab",
"OnHealthIssueHelpText": "On Health Issue",
@ -425,11 +428,9 @@
"QualityProfiles": "Quality Profiles",
"QualitySettings": "Quality Settings",
"Queue": "Queue",
"RSSSync": "RSS Sync",
"RSSSyncInterval": "RSS Sync Interval",
"Radarr": "Radarr",
"ReadTheWikiForMoreInformation": "Read the Wiki for more information",
"Readarr": "Readarr",
"ReadTheWikiForMoreInformation": "Read the Wiki for more information",
"Real": "Real",
"Reason": "Reason",
"RecycleBinCleanupDaysHelpText": "Set to 0 to disable automatic cleanup",
@ -447,15 +448,16 @@
"ReleaseGroup": "Release Group",
"ReleaseProfiles": "Release Profiles",
"ReleaseRejected": "Release Rejected",
"ReleasesHelpText": "Change release for this album",
"ReleaseStatuses": "Release Statuses",
"ReleaseWillBeProcessedInterp": "Release will be processed {0}",
"ReleasesHelpText": "Change release for this album",
"Reload": "Reload",
"RemotePath": "Remote Path",
"RemotePathHelpText": "Root path to the directory that the Download Client accesses",
"RemotePathMappings": "Remote Path Mappings",
"Remove": "Remove",
"RemoveCompletedDownloadsHelpText": "Remove imported downloads from download client history",
"RemovedFromTaskQueue": "Removed from task queue",
"RemoveFailedDownloadsHelpText": "Remove failed downloads from download client history",
"RemoveFilter": "Remove filter",
"RemoveFromBlocklist": "Remove from blocklist",
@ -466,7 +468,6 @@
"RemoveSelectedMessageText": "Are you sure you want to remove the selected items from the blocklist?",
"RemoveTagExistingTag": "Existing tag",
"RemoveTagRemovingTag": "Removing tag",
"RemovedFromTaskQueue": "Removed from task queue",
"RenameTracks": "Rename Tracks",
"RenameTracksHelpText": "Lidarr will use the existing file name if renaming is disabled",
"Reorder": "Reorder",
@ -493,10 +494,9 @@
"RootFolder": "Root Folder",
"RootFolderPathHelpText": "Root Folder list items will be added to",
"RootFolders": "Root Folders",
"RSSSync": "RSS Sync",
"RSSSyncInterval": "RSS Sync Interval",
"RssSyncIntervalHelpText": "Interval in minutes. Set to zero to disable (this will stop all automatic release grabbing)",
"SSLCertPassword": "SSL Cert Password",
"SSLCertPath": "SSL Cert Path",
"SSLPort": "SSL Port",
"SceneInformation": "Scene Information",
"SceneNumberHasntBeenVerifiedYet": "Scene number hasn't been verified yet",
"Scheduled": "Scheduled",
@ -534,6 +534,7 @@
"ShowLastAlbum": "Show Last Album",
"ShowMonitored": "Show Monitored",
"ShowMonitoredHelpText": "Show monitored status under poster",
"ShownAboveEachColumnWhenWeekIsTheActiveView": "Shown above each column when week is the active view",
"ShowName": "Show Name",
"ShowPath": "Show Path",
"ShowQualityProfile": "Show Quality Profile",
@ -545,7 +546,6 @@
"ShowSizeOnDisk": "Show Size on Disk",
"ShowTitleHelpText": "Show artist name under poster",
"ShowUnknownArtistItems": "Show Unknown Artist Items",
"ShownAboveEachColumnWhenWeekIsTheActiveView": "Shown above each column when week is the active view",
"Size": " Size",
"SkipFreeSpaceCheck": "Skip Free Space Check",
"SkipFreeSpaceCheckWhenImportingHelpText": "Use when Lidarr is unable to detect free space from your artist root folder",
@ -557,10 +557,13 @@
"Source": "Source",
"SourcePath": "Source Path",
"SpecificAlbum": "Specific Album",
"SSLCertPassword": "SSL Cert Password",
"SslCertPasswordHelpText": "Password for pfx file",
"SslCertPasswordHelpTextWarning": "Requires restart to take effect",
"SSLCertPath": "SSL Cert Path",
"SslCertPathHelpText": "Path to pfx file",
"SslCertPathHelpTextWarning": "Requires restart to take effect",
"SSLPort": "SSL Port",
"SslPortHelpTextWarning": "Requires restart to take effect",
"StandardTrackFormat": "Standard Track Format",
"StartTypingOrSelectAPathBelow": "Start typing or select a path below",
@ -574,12 +577,12 @@
"SupportsSearchvalueSearchIsNotSupportedWithThisIndexer": "Search is not supported with this indexer",
"SupportsSearchvalueWillBeUsedWhenAutomaticSearchesArePerformedViaTheUIOrByLidarr": "Will be used when automatic searches are performed via the UI or by Lidarr",
"SupportsSearchvalueWillBeUsedWhenInteractiveSearchIsUsed": "Will be used when interactive search is used",
"TBA": "TBA",
"TagAudioFilesWithMetadata": "Tag Audio Files with Metadata",
"TagIsNotUsedAndCanBeDeleted": "Tag is not used and can be deleted",
"Tags": "Tags",
"TagsHelpText": "Release profiles will apply to artists with at least one matching tag. Leave blank to apply to all artists",
"Tasks": "Tasks",
"TBA": "TBA",
"Term": "Term",
"TestAll": "Test All",
"TestAllClients": "Test All Clients",
@ -588,6 +591,7 @@
"TheAlbumsFilesWillBeDeleted": "The album's files will be deleted.",
"TheArtistFolderStrongpathstrongAndAllOfItsContentWillBeDeleted": "The artist folder <strong>{path}</strong> and all of its content will be deleted.",
"ThisWillApplyToAllIndexersPleaseFollowTheRulesSetForthByThem": "This will apply to all indexers, please follow the rules set forth by them",
"Time": "Time",
"TimeFormat": "Time Format",
"TorrentDelay": "Torrent Delay",
"TorrentDelayHelpText": "Delay in minutes to wait before grabbing a torrent",
@ -597,19 +601,18 @@
"Track": "Track",
"TrackArtist": "Track Artist",
"TrackDownloaded": "Track Downloaded",
"TrackFileCountTrackCountTotalTotalTrackCountInterp": "{0} / {1} (Total: {2})",
"TrackFileCounttotalTrackCountTracksDownloadedInterp": "{0}/{1} tracks downloaded",
"TrackFileCountTrackCountTotalTotalTrackCountInterp": "{0} / {1} (Total: {2})",
"TrackFilesCountMessage": "No track files",
"TrackMissingFromDisk": "Track missing from disk",
"TrackNaming": "Track Naming",
"TrackNumber": "Track Number",
"Tracks": "Tracks",
"TrackStatus": "Track status",
"TrackTitle": "Track Title",
"Tracks": "Tracks",
"Type": "Type",
"UILanguage": "UI Language",
"UISettings": "UI Settings",
"URLBase": "URL Base",
"UnableToAddANewDownloadClientPleaseTryAgain": "Unable to add a new download client, please try again.",
"UnableToAddANewImportListExclusionPleaseTryAgain": "Unable to add a new import list exclusion, please try again.",
"UnableToAddANewIndexerPleaseTryAgain": "Unable to add a new indexer, please try again.",
@ -652,18 +655,19 @@
"UpdateAll": "Update all",
"UpdateAutomaticallyHelpText": "Automatically download and install updates. You will still be able to install from System: Updates",
"UpdateMechanismHelpText": "Use Lidarr's built-in updater or a script",
"UpdateScriptPathHelpText": "Path to a custom script that takes an extracted update package and handle the remainder of the update process",
"Updates": "Updates",
"UpdateScriptPathHelpText": "Path to a custom script that takes an extracted update package and handle the remainder of the update process",
"UpdatingIsDisabledInsideADockerContainerUpdateTheContainerImageInstead": "Updating is disabled inside a docker container. Update the container image instead.",
"UpgradeAllowedHelpText": "If disabled qualities will not be upgraded",
"Uptime": "Uptime",
"URLBase": "URL Base",
"UrlBaseHelpText": "For reverse proxy support, default is empty",
"UrlBaseHelpTextWarning": "Requires restart to take effect",
"UseHardlinksInsteadOfCopy": "Use Hardlinks instead of Copy",
"UseProxy": "Use Proxy",
"Usenet": "Usenet",
"UsenetDelay": "Usenet Delay",
"UsenetDelayHelpText": "Delay in minutes to wait before grabbing a release from Usenet",
"UseProxy": "Use Proxy",
"UserAgentProvidedByTheAppThatCalledTheAPI": "User-Agent provided by the app that called the API",
"Username": "Username",
"UsingExternalUpdateMechanismBranchToUseToUpdateLidarr": "Branch to use to update Lidarr",

Write Preview
Loading…
Cancel
Save