Merge branch 'movie-web:dev' into dev

sussy-code · Apr 23, 2024 · e2bd7c3 · e2bd7c3
2 parents 8e3f1a4 + f3dd80f
commit e2bd7c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
@@ -278,7 +278,8 @@
         "loadingError": "Error loading season",
         "loadingList": "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": {
         "speedLabel": "Playback speed",

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

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