From d11ee8a5dd8b8e77fc18af495ee81d143cbe0ebf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 16 Oct 2016 21:21:22 -0400 Subject: [PATCH] update recording titles --- .../emby-webcomponents/cardbuilder/cardbuilder.js | 10 +++++++--- .../recordingcreator/seriesrecordingeditor.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index da9e432f0e..b5d8c93293 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -752,6 +752,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo return html; } + function isUsingLiveTvNaming(item) { + return item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'Recording'; + } + var uniqueFooterIndex = 0; function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter, cardFooterId, vibrantSwatch) { @@ -787,7 +791,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } else { - if (item.Type === 'Program') { + if (isUsingLiveTvNaming(item)) { lines.push(item.Name); @@ -826,7 +830,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo item.AlbumArtists[0].IsFolder = true; lines.push(getTextActionButton(item.AlbumArtists[0])); } else { - lines.push(item.Type === 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); + lines.push(isUsingLiveTvNaming(item) ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); } } @@ -1343,7 +1347,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } if (!imgUrl) { - var defaultName = item.Type === 'Program' || item.Type === 'Timer' || item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item); + var defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item); cardImageContainerOpen += '
' + defaultName + '
'; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js index 15e7fe6450..58440c26e7 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js @@ -34,7 +34,7 @@ if (item.ChannelName || item.ChannelNumber) { context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#ChannelNameOnly', item.ChannelName || item.ChannelNumber); } else { - context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#AllChannels'); + context.querySelector('.optionChannelOnly').innerHTML = globalize.translate('sharedcomponents#OneChannel'); } context.querySelector('.optionAroundTime').innerHTML = globalize.translate('sharedcomponents#AroundTime', datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate)));