fix(lang): UI string edits, round 2 (#1202)

This commit is contained in:
TheCatLady
2021-03-17 22:28:44 -04:00
committed by GitHub
parent 9ec2c468cb
commit ea1863ac3a
42 changed files with 435 additions and 313 deletions

View File

@@ -5,22 +5,22 @@ import ListView from '../Common/ListView';
import { useRouter } from 'next/router';
import { LanguageContext } from '../../context/LanguageContext';
import Header from '../Common/Header';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
import { TvDetails } from '../../../server/models/Tv';
import PageTitle from '../Common/PageTitle';
import Error from '../../pages/_error';
import useDiscover from '../../hooks/useDiscover';
import Link from 'next/link';
const messages = defineMessages({
recommendations: 'Recommendations',
recommendationssubtext: 'If you liked {title}, you might also like…',
});
const TvRecommendations: React.FC = () => {
const router = useRouter();
const intl = useIntl();
const { locale } = useContext(LanguageContext);
const { data: tvData, error: tvError } = useSWR<TvDetails>(
const { data: tvData } = useSWR<TvDetails>(
`/api/v1/tv/${router.query.tvId}?language=${locale}`
);
const {
@@ -45,14 +45,12 @@ const TvRecommendations: React.FC = () => {
<div className="mt-1 mb-5">
<Header
subtext={
tvData && !tvError
? intl.formatMessage(messages.recommendationssubtext, {
title: tvData.name,
})
: ''
<Link href={`/tv/${tvData?.id}`}>
<a className="hover:underline">{tvData?.name}</a>
</Link>
}
>
<FormattedMessage {...messages.recommendations} />
{intl.formatMessage(messages.recommendations)}
</Header>
</div>
<ListView

View File

@@ -4,23 +4,23 @@ import type { TvResult } from '../../../server/models/Search';
import ListView from '../Common/ListView';
import { useRouter } from 'next/router';
import { LanguageContext } from '../../context/LanguageContext';
import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { useIntl, defineMessages } from 'react-intl';
import type { TvDetails } from '../../../server/models/Tv';
import Header from '../Common/Header';
import PageTitle from '../Common/PageTitle';
import useDiscover from '../../hooks/useDiscover';
import Error from '../../pages/_error';
import Link from 'next/link';
const messages = defineMessages({
similar: 'Similar Series',
similarsubtext: 'Other series similar to {title}',
});
const TvSimilar: React.FC = () => {
const router = useRouter();
const intl = useIntl();
const { locale } = useContext(LanguageContext);
const { data: tvData, error: tvError } = useSWR<TvDetails>(
const { data: tvData } = useSWR<TvDetails>(
`/api/v1/tv/${router.query.tvId}?language=${locale}`
);
const {
@@ -43,14 +43,12 @@ const TvSimilar: React.FC = () => {
<div className="mt-1 mb-5">
<Header
subtext={
tvData && !tvError
? intl.formatMessage(messages.similarsubtext, {
title: tvData.name,
})
: undefined
<Link href={`/tv/${tvData?.id}`}>
<a className="hover:underline">{tvData?.name}</a>
</Link>
}
>
<FormattedMessage {...messages.similar} />
{intl.formatMessage(messages.similar)}
</Header>
</div>
<ListView