diff --git a/src/components/DownloadBlock/index.tsx b/src/components/DownloadBlock/index.tsx index 0075ecb4..65468f32 100644 --- a/src/components/DownloadBlock/index.tsx +++ b/src/components/DownloadBlock/index.tsx @@ -1,8 +1,12 @@ import React from 'react'; -import { FormattedRelativeTime } from 'react-intl'; +import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl'; import { DownloadingItem } from '../../../server/lib/downloadtracker'; import Badge from '../Common/Badge'; +const messages = defineMessages({ + estimatedtime: 'Estimated {time}', +}); + interface DownloadBlockProps { downloadItem: DownloadingItem; is4k?: boolean; @@ -12,6 +16,8 @@ const DownloadBlock: React.FC = ({ downloadItem, is4k = false, }) => { + const intl = useIntl(); + return (
@@ -48,27 +54,30 @@ const DownloadBlock: React.FC = ({
{is4k && ( - + 4K )} {downloadItem.status} - ETA{' '} - {downloadItem.estimatedCompletionTime ? ( - - ) : ( - 'N/A' - )} + {downloadItem.estimatedCompletionTime + ? intl.formatMessage(messages.estimatedtime, { + time: ( + + ), + }) + : ''}
diff --git a/src/components/RequestBlock/index.tsx b/src/components/RequestBlock/index.tsx index 4c0a1c3b..cd07e1eb 100644 --- a/src/components/RequestBlock/index.tsx +++ b/src/components/RequestBlock/index.tsx @@ -8,6 +8,7 @@ import { XIcon, } from '@heroicons/react/solid'; import axios from 'axios'; +import Link from 'next/link'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { MediaRequestStatus } from '../../../server/constants/media'; @@ -80,14 +81,22 @@ const RequestBlock: React.FC = ({ request, onUpdate }) => {
- {request.requestedBy.displayName} + + + {request.requestedBy.displayName} + +
{request.modifiedBy && (
- {request.modifiedBy?.displayName} + + + {request.modifiedBy.displayName} + +
)} @@ -186,7 +195,7 @@ const RequestBlock: React.FC = ({ request, onUpdate }) => {
)} - {(server || profile || rootFolder) && ( + {(server || profile !== null || rootFolder) && ( <>
{intl.formatMessage(messages.requestoverrides)} diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index bd32f9b0..6cb9e7f2 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -31,6 +31,7 @@ "components.Discover.upcoming": "Upcoming Movies", "components.Discover.upcomingmovies": "Upcoming Movies", "components.Discover.upcomingtv": "Upcoming Series", + "components.DownloadBlock.estimatedtime": "Estimated {time}", "components.LanguageSelector.languageServerDefault": "Default ({language})", "components.LanguageSelector.originalLanguageDefault": "All Languages", "components.Layout.LanguagePicker.changelanguage": "Change Language",