Merge branch 'master' into only-show-logo-home

jellyfin · Dec 14, 2023 · a33741e · a33741e
2 parents a3d5eb9 + fb6fdbe
commit a33741e
Show file tree

Hide file tree

Showing 15 changed files with 468 additions and 224 deletions.
diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Save old manifest version
         run: echo "oldManVersion=${{ env.oldMajor }}.${{ env.oldMinor }}.${{ env.oldBuild }}" >> $GITHUB_ENV
       - name: Save old Makefile version
-        run: awk 'BEGIN { FS=" = " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV
+        run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV
       - name: Checkout PR branch
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Save new package.json version
@@ -51,7 +51,7 @@ jobs:
         if: env.oldManVersion == env.newManVersion
         run: exit 1
       - name: Save new Makefile version
-        run: awk 'BEGIN { FS=" = " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV
+        run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV
       - name: Makefile version must be updated
         if: env.oldMakeVersion == env.newMakeVersion
         run: exit 1

diff --git a/components/WhatsNewDialog.bs b/components/WhatsNewDialog.bs
@@ -5,7 +5,7 @@ sub init()
 
     m.top.id = "OKDialog"
     m.top.height = 900
-    m.top.title = "What's New?"
+    m.top.title = m.global.app.version + " - " + tr("What's New?")
     m.top.buttons = [tr("OK")]
 
     dialogStyles = {
@@ -21,7 +21,7 @@ sub init()
         }
     }
 
-    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew.json"))
+    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew/" + m.global.app.version.ToStr().trim() + ".json"))
 
     for each item in whatsNewList
         textLine = m.content.CreateChild("StdDlgMultiStyleTextItem")

diff --git a/components/home/HomeRows.bs b/components/home/HomeRows.bs
@@ -267,6 +267,11 @@ sub createLibraryRow()
 
     sectionName = tr("My Media")
 
+    ' We don't refresh library data, so if section already exists, exit
+    if sectionExists(sectionName)
+        return
+    end if
+
     row = CreateObject("roSGNode", "HomeRow")
     row.title = sectionName
     row.imageWidth = homeRowItemSizes.WIDE_POSTER[0]
@@ -277,13 +282,6 @@ sub createLibraryRow()
         row.appendChild(item)
     end for
 
-    ' Row already exists, replace it with new content
-    if sectionExists(sectionName)
-        m.top.content.replaceChild(row, getSectionIndex(sectionName))
-        setRowItemSize()
-        return
-    end if
-
     ' Row does not exist, insert it into the home view
     m.top.content.insertChild(row, getOriginalSectionIndex("smalllibrarytiles"))
     setRowItemSize()

diff --git a/docs/api/components_WhatsNewDialog.bs.html b/docs/api/components_WhatsNewDialog.bs.html
@@ -7,7 +7,7 @@
 
     m.top.id = "OKDialog"
     m.top.height = 900
-    m.top.title = "What's New?"
+    m.top.title = m.global.app.version + " - " + tr("What's New?")
     m.top.buttons = [tr("OK")]
 
     dialogStyles = {
@@ -23,7 +23,7 @@
         }
     }
 
-    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew.json"))
+    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew/" + m.global.app.version.ToStr().trim() + ".json"))
 
     for each item in whatsNewList
         textLine = m.content.CreateChild("StdDlgMultiStyleTextItem")

diff --git a/docs/api/components_home_HomeRows.bs.html b/docs/api/components_home_HomeRows.bs.html
@@ -269,6 +269,11 @@
 
     sectionName = tr("My Media")
 
+    ' We don't refresh library data, so if section already exists, exit
+    if sectionExists(sectionName)
+        return
+    end if
+
     row = CreateObject("roSGNode", "HomeRow")
     row.title = sectionName
     row.imageWidth = homeRowItemSizes.WIDE_POSTER[0]
@@ -279,13 +284,6 @@
         row.appendChild(item)
     end for
 
-    ' Row already exists, replace it with new content
-    if sectionExists(sectionName)
-        m.top.content.replaceChild(row, getSectionIndex(sectionName))
-        setRowItemSize()
-        return
-    end if
-
     ' Row does not exist, insert it into the home view
     m.top.content.insertChild(row, getOriginalSectionIndex("smalllibrarytiles"))
     setRowItemSize()

diff --git a/docs/api/source_Main.bs.html b/docs/api/source_Main.bs.html
@@ -22,10 +22,8 @@
     m.wasMigrated = false
     runGlobalMigrations()
     runRegistryUserMigrations()
-    ' update LastRunVersion now that migrations are finished
-    showWhatsNew = false
+    ' update global LastRunVersion now that migrations are finished
     if m.global.app.version &lt;> m.global.app.lastRunVersion
-        showWhatsNew = true
         set_setting("LastRunVersion", m.global.app.version)
     end if
     if m.wasMigrated then printRegistry()
@@ -76,11 +74,16 @@
         end if
     end if
 
-    ' Show the Whats New popup
-    if showWhatsNew and m.global.session.user.settings["load.allowwhatsnew"]
-        dialog = createObject("roSGNode", "WhatsNewDialog")
-        m.scene.dialog = dialog
-        m.scene.dialog.observeField("buttonSelected", m.port)
+    ' has the current user ran this version before?
+    usersLastRunVersion = m.global.session.user.settings.lastRunVersion
+    if not isValid(usersLastRunVersion) or not versionChecker(m.global.session.user.settings.lastRunVersion, m.global.app.version)
+        set_user_setting("LastRunVersion", m.global.app.version)
+        ' show what's new popup
+        if m.global.session.user.settings["load.allowwhatsnew"]
+            dialog = createObject("roSGNode", "WhatsNewDialog")
+            m.scene.dialog = dialog
+            m.scene.dialog.observeField("buttonSelected", m.port)
+        end if
     end if
 
     ' Handle input messages

diff --git a/docs/api/source_migrations.bs.html b/docs/api/source_migrations.bs.html
@@ -73,7 +73,7 @@
                 ' app versions &lt; 2.0.0 didn't save LastRunVersion at the user level
                 ' fall back to using the apps lastRunVersion
                 lastRunVersion = m.global.app.lastRunVersion
-                registry_write("LastRunVersion", m.global.app.version, section)
+                registry_write("LastRunVersion", lastRunVersion, section)
             end if
 
             ' BASE_MIGRATION

diff --git a/locale/de_DE/translations.ts b/locale/de_DE/translations.ts
@@ -14252,5 +14252,145 @@
         <translation>Die Quelldatei ist vollständig kompatibel mit diesem Client, und die Sitzung empfängt die Datei ohne Änderungen.</translation>
         <extracomment>Direct play info box text in GetPlaybackInfoTask.brs</extracomment>
     </message>
+    <message>
+        <source>On Now</source>
+        <translation>Läuft gerade</translation>
+    </message>
+    <message>
+        <source>RELEASE_DATE</source>
+        <translation>Veröffentlichungsdatum</translation>
+    </message>
+    <message>
+        <source>yesterday</source>
+        <translation>gestern</translation>
+        <extracomment>Previous day</extracomment>
+    </message>
+    <message>
+        <source>tomorrow</source>
+        <translation>morgen</translation>
+        <extracomment>Next day</extracomment>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Mittwoch</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Started at</source>
+        <translation>Gestartet bei</translation>
+        <extracomment>(Past Tense) For defining time when a program started today (e.g. Started at 08:00) </extracomment>
+    </message>
+    <message>
+        <source>Ended at</source>
+        <translation>Geendet bei</translation>
+        <extracomment>(Past Tense) For defining time when a program will ended (e.g. Ended at 08:00) </extracomment>
+    </message>
+    <message>
+        <source>Repeat</source>
+        <translation>Wiederholung</translation>
+        <extracomment>If TV Shows has previously been broadcasted</extracomment>
+    </message>
+    <message>
+        <source>Record</source>
+        <translation>Aufnehmen</translation>
+    </message>
+    <message>
+        <source>Cancel Recording</source>
+        <translation>Aufnahme abbrechen</translation>
+    </message>
+    <message>
+        <source>Connecting to Server</source>
+        <translation>Verbindung zum Server wird hergestellt</translation>
+        <extracomment>Message to display to user while client is attempting to connect to the server</extracomment>
+    </message>
+    <message>
+        <source>Pick a Jellyfin server from the local network</source>
+        <translation>Wähle einen verfügbaren Jellyfin Server aus deinem localen Netzwerk</translation>
+        <extracomment>Instructions on initial app launch when the user is asked to pick a server from a list</extracomment>
+    </message>
+    <message>
+        <source>Change Server</source>
+        <translation>Server wechseln</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Dienstag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Record Series</source>
+        <translation>Serie Aufnehmen</translation>
+    </message>
+    <message>
+        <source>Sign Out</source>
+        <translation>Ausloggen</translation>
+    </message>
+    <message>
+        <source>Episodes</source>
+        <translation>Episoden</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Sonntag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Montag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Donnerstag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation>Gestartet</translation>
+        <extracomment>(Past Tense) For defining a day and time when a program started (e.g. Started Wednesday, 08:00) </extracomment>
+    </message>
+    <message>
+        <source>Channels</source>
+        <translation>Sender</translation>
+        <extracomment>Menu option for showing Live TV Channel List</extracomment>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Freitag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>...or enter server URL manually:</source>
+        <translation>Wenn oben kein Server angezeigt wird, kannst du auch eine Server URL manuell eingeben:</translation>
+        <extracomment>Instructions on initial app launch when the user is asked to manually enter a server URL</extracomment>
+    </message>
+    <message>
+        <source>An error was encountered while playing this item.</source>
+        <translation>Ein Fehler bei der Wiedergabe dieses Inhalts ist aufgetreten.</translation>
+        <extracomment>Dialog detail when error occurs during playback</extracomment>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Samstag</translation>
+        <extracomment>Day of Week</extracomment>
+    </message>
+    <message>
+        <source>Not found</source>
+        <translation>Wurde nicht gefunden</translation>
+        <extracomment>Title of message box when the requested content is not found on the server</extracomment>
+    </message>
+    <message>
+        <source>IMDB_RATING</source>
+        <translation>IMDb Bewertung</translation>
+    </message>
+    <message>
+        <source>Error Retrieving Content</source>
+        <translation>Fehler biem laden des Inhalts</translation>
+        <extracomment>Dialog title when unable to load Content from Server</extracomment>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
 </context>
 </TS>
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
@@ -1241,5 +1241,10 @@
             <translation>Make the arrangement of the Roku home view sections match the web client's home screen. Jellyfin will need to be closed and reopened for change to take effect.</translation>
             <extracomment>User Setting - Setting description</extracomment>
         </message>
+        <message>
+            <source>What's New?</source>
+            <translation>What's New?</translation>
+            <extracomment>Popup title - Popup displays all the major changes to the app since the last version</extracomment>
+        </message>
     </context>
 </TS>