Skip to content

Commit

Permalink
Merge branch 'jf-1481-next-up-all' of https://github.com/jellyfin/jel…
Browse files Browse the repository at this point in the history
…lyfin-roku into jf-1481-next-up-all
  • Loading branch information
jimdogx committed Jul 25, 2024
2 parents 4514456 + ace1ae9 commit 746957d
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/home/LoadItemsTask.bs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sub loadItems()
params["SortOrder"] = "Descending"
params["ImageTypeLimit"] = 1
params["UserId"] = m.global.session.user.id
params["EnableRewatching"] = false
params["EnableRewatching"] = m.global.session.user.settings["ui.details.enablerewatchingnextup"]
params["DisableFirstEpisode"] = false
params["limit"] = 24
params["EnableTotalRecordCount"] = false
Expand Down
2 changes: 1 addition & 1 deletion docs/api/components_home_LoadItemsTask.bs.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
params["SortOrder"] = "Descending"
params["ImageTypeLimit"] = 1
params["UserId"] = m.global.session.user.id
params["EnableRewatching"] = false
params["EnableRewatching"] = m.global.session.user.settings["ui.details.enablerewatchingnextup"]
params["DisableFirstEpisode"] = false
params["limit"] = 24
params["EnableTotalRecordCount"] = false
Expand Down
2 changes: 1 addition & 1 deletion docs/api/source_utils_quickplay.bs.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"SortOrder": "Descending",
"ImageTypeLimit": 1,
"UserId": m.global.session.user.id,
"EnableRewatching": false,
"EnableRewatching": m.global.session.user.settings["ui.details.enablerewatchingnextup"],
"DisableFirstEpisode": false,
"EnableTotalRecordCount": false
})
Expand Down
12 changes: 11 additions & 1 deletion locale/en_US/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1276,5 +1276,15 @@
<translation>View All Next Up</translation>
<extracomment>Title for viewing all episodes available in the Next Up section</extracomment>
</message>
<message>
<source>Rewatching Next Up</source>
<translation>Rewatching Next Up</translation>
<extracomment>User Setting - Setting title</extracomment>
</message>
<message>
<source>Show already watched episodes in 'Next Up' sections.</source>
<translation>Show already watched episodes in 'Next Up' sections.</translation>
<extracomment>User Setting - Setting description</extracomment>
</message>
</context>
</TS>
</TS>
7 changes: 7 additions & 0 deletions settings/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,13 @@
"type": "integer",
"default": "365"
},
{
"title": "Rewatching Next Up",
"description": "Show already watched episodes in 'Next Up' sections.",
"settingName": "ui.details.enablerewatchingnextup",
"type": "bool",
"default": "false"
},
{
"title": "Show What's New Popup",
"description": "Show What's New popup when Jellyfin is updated to a new version.",
Expand Down
2 changes: 1 addition & 1 deletion source/utils/quickplay.bs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ namespace quickplay
"SortOrder": "Descending",
"ImageTypeLimit": 1,
"UserId": m.global.session.user.id,
"EnableRewatching": false,
"EnableRewatching": m.global.session.user.settings["ui.details.enablerewatchingnextup"],
"DisableFirstEpisode": false,
"EnableTotalRecordCount": false
})
Expand Down

0 comments on commit 746957d

Please sign in to comment.