Compare commits

...

7 Commits

Author SHA1 Message Date
arrz.dev
1e6865f1b4 Merge 0283589242 into f3dd80f42b 2024-04-22 22:04:12 +01:00
Jorrin
f3dd80f42b Merge pull request #1150 from movie-web/fix/#962
decrease amount of margin of edit button on small screens
2024-04-22 22:45:07 +02:00
William Oldham
cfc74dfa78 Merge branch 'dev' into fix/#962 2024-04-22 21:15:23 +01:00
William Oldham
1a3144a872 Merge pull request #1153 from movie-web/feature/#754
Improve how to change seasons
2024-04-22 21:14:09 +01:00
Jorrin
ae81832037 improve how to change seasons 2024-04-22 20:26:54 +02:00
Jorrin
3da8955607 decrease amount of margin on small screens 2024-04-22 19:12:18 +02:00
André Santos
0283589242 Added retry button on Playback Error page (#847) 2024-04-04 21:11:01 +01:00
5 changed files with 30 additions and 5 deletions

View File

@@ -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",
@@ -375,6 +376,7 @@
"errorNotSupported": "The media or media provider object is not supported." "errorNotSupported": "The media or media provider object is not supported."
}, },
"homeButton": "Go home", "homeButton": "Go home",
"retryButton": "Retry",
"text": "There was an error trying to play the media. Please try again.", "text": "There was an error trying to play the media. Please try again.",
"title": "Failed to play video!" "title": "Failed to play video!"
}, },

View File

@@ -288,6 +288,7 @@
"errorNotSupported": "O objeto multimédia ou do fornecedor de multimédia não é suportado." "errorNotSupported": "O objeto multimédia ou do fornecedor de multimédia não é suportado."
}, },
"homeButton": "Ir para casa", "homeButton": "Ir para casa",
"retryButton": "Tentar novamente",
"text": "Ocorreu um erro ao tentar reproduzir o conteúdo multimédia. Por favor, tente novamente.", "text": "Ocorreu um erro ao tentar reproduzir o conteúdo multimédia. Por favor, tente novamente.",
"title": "Falha ao reproduzir o vídeo!" "title": "Falha ao reproduzir o vídeo!"
}, },

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>

View File

@@ -7,6 +7,7 @@ import { useModal } from "@/components/overlays/Modal";
import { Paragraph } from "@/components/text/Paragraph"; import { Paragraph } from "@/components/text/Paragraph";
import { Title } from "@/components/text/Title"; import { Title } from "@/components/text/Title";
import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout"; import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout";
import { playerStatus } from "@/stores/player/slices/source";
import { usePlayerStore } from "@/stores/player/store"; import { usePlayerStore } from "@/stores/player/store";
import { ErrorCardInModal } from "../errors/ErrorCard"; import { ErrorCardInModal } from "../errors/ErrorCard";
@@ -14,6 +15,8 @@ import { ErrorCardInModal } from "../errors/ErrorCard";
export function PlaybackErrorPart() { export function PlaybackErrorPart() {
const { t } = useTranslation(); const { t } = useTranslation();
const playbackError = usePlayerStore((s) => s.interface.error); const playbackError = usePlayerStore((s) => s.interface.error);
const setStatus = usePlayerStore((s) => s.setStatus);
const setPlay = usePlayerStore((s) => s.play);
const modal = useModal("error"); const modal = useModal("error");
return ( return (
@@ -31,6 +34,18 @@ export function PlaybackErrorPart() {
> >
{t("player.playbackError.homeButton")} {t("player.playbackError.homeButton")}
</Button> </Button>
<Button
onClick={() => {
setStatus(playerStatus.PLAYING);
setPlay();
}}
href="secondary"
theme="secondary"
padding="md:px-12 p-2.5"
className="mt-6"
>
{t("player.playbackError.retryButton")}
</Button>
<Button <Button
onClick={() => modal.show()} onClick={() => modal.show()}
theme="purple" theme="purple"