mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 18:08:53 -07:00
allow separate configuration of date format
This commit is contained in:
parent
93676f6838
commit
8ec8b46394
@ -87,10 +87,5 @@
|
|||||||
"User": "User",
|
"User": "User",
|
||||||
"System": "System",
|
"System": "System",
|
||||||
"Application": "Application",
|
"Application": "Application",
|
||||||
"Plugin": "Plugin",
|
"Plugin": "Plugin"
|
||||||
"LabelExit": "Exit",
|
|
||||||
"LabelVisitCommunity": "Visit Community",
|
|
||||||
"LabelBrowseLibrary": "Browse Library",
|
|
||||||
"LabelConfigureServer": "Configure Emby",
|
|
||||||
"LabelRestartServer": "Restart Server"
|
|
||||||
}
|
}
|
@ -2,31 +2,31 @@
|
|||||||
"Latest": "Leg\u00fajabb",
|
"Latest": "Leg\u00fajabb",
|
||||||
"ValueSpecialEpisodeName": "Special - {0}",
|
"ValueSpecialEpisodeName": "Special - {0}",
|
||||||
"Inherit": "Inherit",
|
"Inherit": "Inherit",
|
||||||
"Books": "Books",
|
"Books": "K\u00f6nyvek",
|
||||||
"Music": "Music",
|
"Music": "Zene",
|
||||||
"Games": "Games",
|
"Games": "J\u00e1t\u00e9kok",
|
||||||
"Photos": "Photos",
|
"Photos": "F\u00e9nyk\u00e9pek",
|
||||||
"MixedContent": "Mixed content",
|
"MixedContent": "Vegyes tartalom",
|
||||||
"MusicVideos": "Music videos",
|
"MusicVideos": "Zenei Vide\u00f3k",
|
||||||
"HomeVideos": "Home videos",
|
"HomeVideos": "H\u00e1zi vide\u00f3k",
|
||||||
"Playlists": "Playlists",
|
"Playlists": "Lej\u00e1tsz\u00e1si list\u00e1k",
|
||||||
"HeaderRecordingGroups": "Recording Groups",
|
"HeaderRecordingGroups": "Recording Groups",
|
||||||
"HeaderContinueWatching": "Vet\u00edt\u00e9s(ek) folytat\u00e1sa",
|
"HeaderContinueWatching": "Vet\u00edt\u00e9s(ek) folytat\u00e1sa",
|
||||||
"HeaderFavoriteArtists": "Favorite Artists",
|
"HeaderFavoriteArtists": "Kedvenc M\u0171v\u00e9szek",
|
||||||
"HeaderFavoriteSongs": "Favorite Songs",
|
"HeaderFavoriteSongs": "Kedvenc Dalok",
|
||||||
"HeaderAlbumArtists": "Album Artists",
|
"HeaderAlbumArtists": "Album El\u0151ad\u00f3k",
|
||||||
"HeaderFavoriteAlbums": "Favorite Albums",
|
"HeaderFavoriteAlbums": "Kedvenc Albumok",
|
||||||
"HeaderFavoriteEpisodes": "Kedvenc Epiz\u00f3dok",
|
"HeaderFavoriteEpisodes": "Kedvenc Epiz\u00f3dok",
|
||||||
"HeaderFavoriteShows": "Kedvenc M\u0171sorok",
|
"HeaderFavoriteShows": "Kedvenc M\u0171sorok",
|
||||||
"HeaderNextUp": "K\u00f6vetkezik",
|
"HeaderNextUp": "K\u00f6vetkezik",
|
||||||
"Favorites": "Favorites",
|
"Favorites": "Kedvencek",
|
||||||
"Collections": "Gy\u0171jtem\u00e9nyek",
|
"Collections": "Gy\u0171jtem\u00e9nyek",
|
||||||
"Channels": "Csatorn\u00e1k",
|
"Channels": "Csatorn\u00e1k",
|
||||||
"Movies": "Movies",
|
"Movies": "Filmek",
|
||||||
"Albums": "Albums",
|
"Albums": "Albumok",
|
||||||
"Artists": "Artists",
|
"Artists": "El\u0151ad\u00f3k",
|
||||||
"Folders": "Folders",
|
"Folders": "K\u00f6nyvt\u00e1rak",
|
||||||
"Songs": "Songs",
|
"Songs": "Dalok",
|
||||||
"TvShows": "TV Shows",
|
"TvShows": "TV Shows",
|
||||||
"Shows": "Shows",
|
"Shows": "Shows",
|
||||||
"Genres": "M\u0171fajok",
|
"Genres": "M\u0171fajok",
|
||||||
@ -38,15 +38,15 @@
|
|||||||
"ScheduledTaskFailedWithName": "{0} failed",
|
"ScheduledTaskFailedWithName": "{0} failed",
|
||||||
"LabelRunningTimeValue": "Running time: {0}",
|
"LabelRunningTimeValue": "Running time: {0}",
|
||||||
"ScheduledTaskStartedWithName": "{0} started",
|
"ScheduledTaskStartedWithName": "{0} started",
|
||||||
"VersionNumber": "Version {0}",
|
"VersionNumber": "Verzi\u00f3 {0}",
|
||||||
"PluginInstalledWithName": "{0} telep\u00edtve",
|
"PluginInstalledWithName": "{0} telep\u00edtve",
|
||||||
"StartupEmbyServerIsLoading": "Emby Szerver bet\u00f6lt\u0151dik. K\u00e9rj\u00fck, pr\u00f3b\u00e1ld meg \u00fajra k\u00e9s\u0151bb.",
|
"StartupEmbyServerIsLoading": "Emby Szerver bet\u00f6lt\u0151dik. K\u00e9rj\u00fck, pr\u00f3b\u00e1ld meg \u00fajra k\u00e9s\u0151bb.",
|
||||||
"PluginUpdatedWithName": "{0} was updated",
|
"PluginUpdatedWithName": "{0} friss\u00edtve",
|
||||||
"PluginUninstalledWithName": "{0} elt\u00e1vol\u00edtva",
|
"PluginUninstalledWithName": "{0} elt\u00e1vol\u00edtva",
|
||||||
"ItemAddedWithName": "{0} was added to the library",
|
"ItemAddedWithName": "{0} was added to the library",
|
||||||
"ItemRemovedWithName": "{0} was removed from the library",
|
"ItemRemovedWithName": "{0} was removed from the library",
|
||||||
"LabelIpAddressValue": "Ip address: {0}",
|
"LabelIpAddressValue": "Ip c\u00edm: {0}",
|
||||||
"DeviceOnlineWithName": "{0} is connected",
|
"DeviceOnlineWithName": "{0} bel\u00e9pett",
|
||||||
"UserOnlineFromDevice": "{0} is online from {1}",
|
"UserOnlineFromDevice": "{0} is online from {1}",
|
||||||
"ProviderValue": "Provider: {0}",
|
"ProviderValue": "Provider: {0}",
|
||||||
"SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
|
"SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
|
||||||
|
@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.Networking
|
|||||||
endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
|
endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
|
||||||
endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) ||
|
endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) ||
|
||||||
endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase) ||
|
endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase) ||
|
||||||
endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
|
//endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
|
||||||
IsInPrivateAddressSpaceAndLocalSubnet(endpoint);
|
IsInPrivateAddressSpaceAndLocalSubnet(endpoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,6 +206,23 @@ namespace Emby.Server.Implementations
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string GetTranscodingTempPath()
|
||||||
|
{
|
||||||
|
var path = TranscodingTempPath;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
path = Path.Combine(ProgramDataPath, "transcoding-temp");
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the game genre path.
|
/// Gets the game genre path.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -108,5 +108,7 @@ namespace MediaBrowser.Controller
|
|||||||
string InternalMetadataPath { get; }
|
string InternalMetadataPath { get; }
|
||||||
|
|
||||||
string ArtistsPath { get; }
|
string ArtistsPath { get; }
|
||||||
|
|
||||||
|
string GetTranscodingTempPath();
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -965,15 +965,6 @@ namespace MediaBrowser.Model.Dlna
|
|||||||
return new Tuple<PlayMethod?, List<TranscodeReason>>(PlayMethod.DirectStream, new List<TranscodeReason>());
|
return new Tuple<PlayMethod?, List<TranscodeReason>>(PlayMethod.DirectStream, new List<TranscodeReason>());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (videoStream == null)
|
|
||||||
{
|
|
||||||
_logger.Info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}",
|
|
||||||
profile.Name ?? "Unknown Profile",
|
|
||||||
mediaSource.Path ?? "Unknown path");
|
|
||||||
|
|
||||||
return new Tuple<PlayMethod?, List<TranscodeReason>>(null, new List<TranscodeReason> { TranscodeReason.UnknownVideoStreamInfo });
|
|
||||||
}
|
|
||||||
|
|
||||||
// See if it can be direct played
|
// See if it can be direct played
|
||||||
DirectPlayProfile directPlay = null;
|
DirectPlayProfile directPlay = null;
|
||||||
foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
|
foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
|
||||||
|
@ -144,12 +144,12 @@ namespace MediaBrowser.ServerApplication
|
|||||||
{
|
{
|
||||||
_uiCulture = _configurationManager.Configuration.UICulture;
|
_uiCulture = _configurationManager.Configuration.UICulture;
|
||||||
|
|
||||||
cmdExit.Text = _localization.GetLocalizedString("LabelExit");
|
cmdExit.Text = "Exit";
|
||||||
cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
|
cmdCommunity.Text = "Visit Emby Community";
|
||||||
cmdPremiere.Text = _localization.GetLocalizedString("Emby Premiere");
|
cmdPremiere.Text = "Emby Premiere";
|
||||||
cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
|
cmdBrowse.Text = "Browse Library";
|
||||||
cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureServer");
|
cmdConfigure.Text = "Configure Emby Server";
|
||||||
cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
|
cmdRestart.Text = "Restart Emby Server";
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _uiCulture;
|
private string _uiCulture;
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.34.2")]
|
[assembly: AssemblyVersion("3.2.35.1")]
|
||||||
|
Loading…
Reference in New Issue
Block a user