Browse Source

Merge branch 'dev' into fix/#962

pull/1150/head
William Oldham 1 year ago committed by GitHub
parent
commit
cfc74dfa78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      src/assets/locales/en.json
  2. 13
      src/components/player/atoms/Episodes.tsx

3
src/assets/locales/en.json

@ -278,7 +278,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." "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",

13
src/components/player/atoms/Episodes.tsx

@ -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>

Loading…
Cancel
Save