alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update selection buttons

Browse Source
This commit is contained in:
Luke Pulverenti
2015-07-14 12:39:34 -04:00
parent b1be4939df
commit 7736bab314
6 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
View File

@@ -256,7 +256,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
NotificationType = type
};
notification.Variables["ItemName"] = item.Name;
if (e.Item != null)
{
notification.Variables["ItemName"] = GetItemName(e.Item);
}
else
{
notification.Variables["ItemName"] = item.Name;
}
notification.Variables["UserName"] = user == null ? "Unknown user" : user.Name;
notification.Variables["AppName"] = e.ClientName;
notification.Variables["DeviceName"] = e.DeviceName;

5
MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
View File

@@ -1,13 +1,10 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Naming.Common;
using MediaBrowser.Naming.Video;
using MediaBrowser.Server.Implementations.Logging;
using System;
using System.IO;
using System.Linq;
using MediaBrowser.Server.Implementations.Logging;
namespace MediaBrowser.Server.Implementations.Library.Resolvers
{

3
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@@ -1467,5 +1467,6 @@
"HeaderDisplay": "Display",
"HeaderNavigation": "Navigation",
"LegendTheseSettingsShared": "These settings are shared on all devices",
"OptionEnableAutomaticServerUpdates": "Enable automatic server updates"
"OptionEnableAutomaticServerUpdates": "Enable automatic server updates",
"OptionOtherTrailers": "Include trailers from older movies"
}