Merge remote-tracking branch 'movie-web/dev'

This commit is contained in:
Cooper Ransom 2024-04-22 18:28:54 -04:00
commit a387fa2e61
3 changed files with 13 additions and 5 deletions

View File

@ -317,7 +317,8 @@
"loadingError": "Error loading season", "loadingError": "Error loading season",
"loadingList": "Loading...", "loadingList": "Loading...",
"loadingTitle": "Loading...", "loadingTitle": "Loading...",
"unairedEpisodes": "One or more episodes in this season have been disabled because they haven't been aired yet... Whomp Whomp!" "unairedEpisodes": "One or more episodes in this season have been disabled because they haven't been aired yet.",
"seasons": "Seasons"
}, },
"playback": { "playback": {
"speedLabel": "Playback speed", "speedLabel": "Playback speed",

View File

@ -25,7 +25,7 @@ export function EditButton(props: EditButtonProps) {
> >
<span ref={parent}> <span ref={parent}>
{props.editing ? ( {props.editing ? (
<span className="mx-4 whitespace-nowrap"> <span className="mx-2 sm:mx-4 whitespace-nowrap">
{t("home.mediaList.stopEditing")} {t("home.mediaList.stopEditing")}
</span> </span>
) : ( ) : (

View File

@ -212,9 +212,16 @@ function EpisodesView({
return ( return (
<Menu.CardWithScrollable> <Menu.CardWithScrollable>
<Menu.BackLink onClick={goBack}> <Menu.BackLink
{loadingState?.value?.season.title || onClick={goBack}
t("player.menus.episodes.loadingTitle")} rightSide={
<span>
{loadingState?.value?.season.title ||
t("player.menus.episodes.loadingTitle")}
</span>
}
>
{t("player.menus.episodes.seasons")}
</Menu.BackLink> </Menu.BackLink>
{content} {content}
</Menu.CardWithScrollable> </Menu.CardWithScrollable>