Skip to content

Commit 390324b

Browse files
committed
Fixes
1 parent 085e668 commit 390324b

File tree

25 files changed

+72
-14
lines changed

25 files changed

+72
-14
lines changed

packages/Playlist/playlist/playlistMode/PlaylistPlayerControls.tsx

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,12 @@ const PlayerControls = ({ parentId = "default" }) => {
535535
}, [handleOnButtonPress, transformedHistory]);
536536

537537
useLayoutEffect(() => {
538+
if (G.PPchecklistEnabled) {
539+
setTimeout(() => {
540+
thisBot.OpenSelf();
541+
}, 200);
542+
}
543+
538544
return () => {
539545
G.IsPlaylistPlaying = false;
540546
G.IsQueuePresent = false;
@@ -880,11 +886,13 @@ const PlayerControls = ({ parentId = "default" }) => {
880886
minWidth: "max-content",
881887
}}
882888
>
883-
{showCurrent
884-
? `${t("playingNow")}:`
885-
: nextItemName?.content
886-
? `${t("playingNext")}:`
887-
: null}
889+
{G.PPchecklistEnabled && showCurrent && currIndex.index === -1
890+
? null
891+
: showCurrent
892+
? `${t("playingNow")}:`
893+
: nextItemName?.content
894+
? `${t("playingNext")}:`
895+
: null}
888896
</p>
889897
<div style={{ gap: "0.5rem" }} className="align-center">
890898
<div
@@ -935,7 +943,7 @@ const PlayerControls = ({ parentId = "default" }) => {
935943
}}
936944
>
937945
{nextItemName?.content
938-
? `${nextItemName?.content}${nextItemName?.prefix}`.substring(
946+
? `${nextItemName?.content}${nextItemName?.prefix}`?.substring(
939947
0,
940948
isMobile ? 9 : 16
941949
)
@@ -949,15 +957,15 @@ const PlayerControls = ({ parentId = "default" }) => {
949957
) : (
950958
<p
951959
style={{
952-
color: "green",
960+
color: "var(--secondaryColor)",
953961
fontSize: "12px",
954962
fontWeight: "900",
955963
fontFamily: "DM Sans",
956964
margin: "0",
957965
minWidth: "max-content",
958966
}}
959967
>
960-
Playlist Ended
968+
{t("playlist")} {t("ended")}
961969
</p>
962970
)}
963971
{!G.ValidTypes[nextItemName?.type] &&
@@ -973,7 +981,7 @@ const PlayerControls = ({ parentId = "default" }) => {
973981
}}
974982
>
975983
{isMobile
976-
? nextItemName?.type.substring(0, 10)
984+
? nextItemName?.type?.substring(0, 10)
977985
: nextItemName?.type}
978986
</p>
979987
)}
@@ -989,7 +997,7 @@ const PlayerControls = ({ parentId = "default" }) => {
989997
}}
990998
>
991999
{isMobile
992-
? currentItem?.type.substring(0, 10)
1000+
? currentItem?.type?.substring(0, 10)
9931001
: currentItem?.type}
9941002
</p>
9951003
)}
@@ -1022,7 +1030,7 @@ const PlayerControls = ({ parentId = "default" }) => {
10221030
}}
10231031
>
10241032
{currentItem?.content
1025-
? `${currentItem?.content}${currentItem?.prefix}`.substring(
1033+
? `${currentItem?.content}${currentItem?.prefix}`?.substring(
10261034
0,
10271035
isMobile ? 10 : 16
10281036
)
@@ -1036,15 +1044,17 @@ const PlayerControls = ({ parentId = "default" }) => {
10361044
) : (
10371045
<p
10381046
style={{
1039-
color: "green",
1047+
color: "var(--secondaryColor)",
10401048
fontSize: "12px",
10411049
fontWeight: "900",
10421050
fontFamily: "DM Sans",
10431051
margin: "0",
10441052
minWidth: "max-content",
10451053
}}
10461054
>
1047-
Playlist Ended
1055+
{G.PPchecklistEnabled && currIndex.index === -1
1056+
? t("checklistEnabled")
1057+
: `${isMobile ? "" : t("playlist")} {t("ended")}`}
10481058
</p>
10491059
)}
10501060

@@ -1059,7 +1069,7 @@ const PlayerControls = ({ parentId = "default" }) => {
10591069
}}
10601070
>
10611071
{isMobile
1062-
? currentItem?.type.substring(0, 10)
1072+
? currentItem?.type?.substring(0, 10)
10631073
: currentItem?.type}
10641074
</p>
10651075
)}

packages/seed-bible/app/assets/am.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "ቀጣይ",
3232
"previous": "ቀዳሚ",
3333
"exit": "ውጣ",
34+
"ended": "ተጠናቅቋል",
35+
"checklistMode": "የቼክሊስት ሁኔታ",
3436
"settings": "ቅንብሮች",
3537
"generalSettings": "አጠቃላይ ቅንብሮች",
3638
"spaceSettings": "የቦታ ቅንብሮች",

packages/seed-bible/app/assets/ar.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "التالي",
3232
"previous": "السابق",
3333
"exit": "خروج",
34+
"ended": "انتهى",
35+
"checklistMode": "وضع قائمة التحقق",
3436
"settings": "الإعدادات",
3537
"generalSettings": "الإعدادات العامة",
3638
"spaceSettings": "إعدادات المساحة",

packages/seed-bible/app/assets/bn.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "পরবর্তী",
3232
"previous": "পূর্ববর্তী",
3333
"exit": "প্রস্থান",
34+
"ended": "শেষ হয়েছে",
35+
"checklistMode": "চেকলিস্ট মোড",
3436
"settings": "সেটিংস",
3537
"generalSettings": "সাধারণ সেটিংস",
3638
"spaceSettings": "স্পেস সেটিংস",

packages/seed-bible/app/assets/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "Next",
3232
"previous": "Previous",
3333
"exit": "Exit",
34+
"ended": "Ended",
35+
"checklistMode": "Checklist Mode",
3436
"settings": "Settings",
3537
"generalSettings": "General settings",
3638
"spaceSettings": "Space settings",

packages/seed-bible/app/assets/es.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "Siguiente",
3232
"previous": "Anterior",
3333
"exit": "Salir",
34+
"ended": "Terminado",
35+
"checklistMode": "Modo lista de verificación",
3436
"settings": "Configuración",
3537
"generalSettings": "Configuración general",
3638
"spaceSettings": "Configuración de espacio",

packages/seed-bible/app/assets/fa.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "بعدی",
3232
"previous": "قبلی",
3333
"exit": "خروج",
34+
"ended": "به پایان رسید",
35+
"checklistMode": "حالت لیست بررسی",
3436
"settings": "تنظیمات",
3537
"generalSettings": "تنظیمات عمومی",
3638
"spaceSettings": "تنظیمات فضا",

packages/seed-bible/app/assets/fr.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "Suivant",
3232
"previous": "Précédent",
3333
"exit": "Quitter",
34+
"ended": "Terminé",
35+
"checklistMode": "Mode liste de contrôle",
3436
"settings": "Paramètres",
3537
"generalSettings": "Paramètres généraux",
3638
"spaceSettings": "Paramètres de l'espace",

packages/seed-bible/app/assets/hi.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "अगला",
3232
"previous": "पिछला",
3333
"exit": "बाहर निकलें",
34+
"ended": "समाप्त",
35+
"checklistMode": "चेकलिस्ट मोड",
3436
"settings": "सेटिंग्स",
3537
"generalSettings": "सामान्य सेटिंग्स",
3638
"spaceSettings": "स्पेस सेटिंग्स",

packages/seed-bible/app/assets/iid.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"next": "Berikutnya",
3232
"previous": "Sebelumnya",
3333
"exit": "Keluar",
34+
"ended": "Berakhir",
35+
"checklistMode": "Mode Daftar Periksa",
3436
"settings": "Pengaturan",
3537
"generalSettings": "Pengaturan umum",
3638
"spaceSettings": "Pengaturan ruang",

0 commit comments

Comments
 (0)