mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-02 12:48:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/MovieDetails/MovieRecommendations.tsx
View File

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

16
src/components/MovieDetails/MovieSimilar.tsx
View File

@@ -6,21 +6,21 @@ import { useRouter } from 'next/router';
import Header from '../Common/Header';
import { LanguageContext } from '../../context/LanguageContext';
import type { MovieDetails } from '../../../server/models/Movie';
import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
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 Titles',
similarsubtext: 'Other movies similar to {title}',
});
const MovieSimilar: React.FC = () => {
const router = useRouter();
const intl = useIntl();
const { locale } = useContext(LanguageContext);
const { data: movieData, error: movieError } = useSWR<MovieDetails>(
const { data: movieData } = useSWR<MovieDetails>(
`/api/v1/movie/${router.query.movieId}?language=${locale}`
);
const {
@@ -45,14 +45,12 @@ const MovieSimilar: React.FC = () => {
<div className="mt-1 mb-5">
<Header
subtext={
movieData && !movieError
? intl.formatMessage(messages.similarsubtext, {
title: movieData.title,
})
: undefined
<Link href={`/movie/${movieData?.id}`}>
<a className="hover:underline">{movieData?.title}</a>
</Link>
}
>
<FormattedMessage {...messages.similar} />
{intl.formatMessage(messages.similar)}
</Header>
</div>
<ListView

20
src/components/MovieDetails/index.tsx
View File

@@ -1,5 +1,5 @@
import React, { useState, useContext, useMemo } from 'react';
import { defineMessages, FormattedNumber, useIntl } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
import type { MovieDetails as MovieDetailsType } from '../../../server/models/Movie';
import useSWR from 'swr';
import { useRouter } from 'next/router';
@@ -595,11 +595,10 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
<div className="media-fact">
<span>{intl.formatMessage(messages.revenue)}</span>
<span className="media-fact-value">
<FormattedNumber
currency="USD"
style="currency"
value={data.revenue}
/>
{intl.formatNumber(data.revenue, {
currency: 'USD',
style: 'currency',
})}
</span>
</div>
)}
@@ -607,11 +606,10 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
<div className="media-fact">
<span>{intl.formatMessage(messages.budget)}</span>
<span className="media-fact-value">
<FormattedNumber
currency="USD"
style="currency"
value={data.budget}
/>
{intl.formatNumber(data.budget, {
currency: 'USD',
style: 'currency',
})}
</span>
</div>
)}