diff --git a/src/components/QuotaSelector/index.tsx b/src/components/QuotaSelector/index.tsx index 3ccb2021d8..831c8fad28 100644 --- a/src/components/QuotaSelector/index.tsx +++ b/src/components/QuotaSelector/index.tsx @@ -2,8 +2,13 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; const messages = defineMessages({ - movieRequestLimit: '{quotaLimit} movie(s) per {quotaDays} day(s)', - tvRequestLimit: '{quotaLimit} season(s) per {quotaDays} day(s)', + movieRequests: + '{quotaLimit} {movies} per {quotaDays} {days}', + tvRequests: + '{quotaLimit} {seasons} per {quotaDays} {days}', + movies: '{count, plural, one {movie} other {movies}}', + seasons: '{count, plural, one {season} other {seasons}}', + days: '{count, plural, one {day} other {days}}', unlimited: 'Unlimited', }); @@ -47,9 +52,7 @@ const QuotaSelector: React.FC = ({ return (
{intl.formatMessage( - mediaType === 'movie' - ? messages.movieRequestLimit - : messages.tvRequestLimit, + mediaType === 'movie' ? messages.movieRequests : messages.tvRequests, { quotaLimit: ( ), + movies: intl.formatMessage(messages.movies, { count: quotaLimit }), + seasons: intl.formatMessage(messages.seasons, { count: quotaLimit }), + days: intl.formatMessage(messages.days, { count: quotaDays }), + quotaUnits: function quotaUnits(msg) { + return ( + + {msg} + + ); + }, } )}
diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx index b98a1d0666..eea4a43779 100644 --- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx +++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx @@ -42,7 +42,7 @@ const messages = defineMessages({ originallanguageTip: 'Filter content by original language', movierequestlimit: 'Movie Request Limit', seriesrequestlimit: 'Series Request Limit', - enableOverride: 'Enable Override', + enableOverride: 'Override Global Limit', applanguage: 'Display Language', languageDefault: 'Default ({language})', }); diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index 75fc0a951d..9f3a8849e0 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -145,8 +145,11 @@ "components.PersonDetails.lifespan": "{birthdate} – {deathdate}", "components.PlexLoginButton.signingin": "Signing In…", "components.PlexLoginButton.signinwithplex": "Sign In", - "components.QuotaSelector.movieRequestLimit": "{quotaLimit} movie(s) per {quotaDays} day(s)", - "components.QuotaSelector.tvRequestLimit": "{quotaLimit} season(s) per {quotaDays} day(s)", + "components.QuotaSelector.days": "{count, plural, one {day} other {days}}", + "components.QuotaSelector.movieRequests": "{quotaLimit} {movies} per {quotaDays} {days}", + "components.QuotaSelector.movies": "{count, plural, one {movie} other {movies}}", + "components.QuotaSelector.seasons": "{count, plural, one {season} other {seasons}}", + "components.QuotaSelector.tvRequests": "{quotaLimit} {seasons} per {quotaDays} {days}", "components.QuotaSelector.unlimited": "Unlimited", "components.RegionSelector.regionDefault": "All Regions", "components.RegionSelector.regionServerDefault": "Default ({region})", @@ -738,7 +741,7 @@ "components.UserProfile.UserSettings.UserGeneralSettings.admin": "Admin", "components.UserProfile.UserSettings.UserGeneralSettings.applanguage": "Display Language", "components.UserProfile.UserSettings.UserGeneralSettings.displayName": "Display Name", - "components.UserProfile.UserSettings.UserGeneralSettings.enableOverride": "Enable Override", + "components.UserProfile.UserSettings.UserGeneralSettings.enableOverride": "Override Global Limit", "components.UserProfile.UserSettings.UserGeneralSettings.general": "General", "components.UserProfile.UserSettings.UserGeneralSettings.generalsettings": "General Settings", "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "Default ({language})",