From 988393e7273e427a5dd0c89eb2282352dde0a3af Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 May 2015 00:55:19 -0400 Subject: update card layouts --- .../Localization/JavaScript/javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 27884a012..e76f7e01d 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -97,7 +97,7 @@ "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to sync, premium plugins, internet channel content, and more. {0}Learn more{1}.", "LabelSyncNoTargetsHelp": "It looks like you don't currently have any apps that support sync.", "HeaderWelcomeToProjectServerDashboard": "Welcome to the Emby Server Dashboard", - "HeaderWelcomeToProjectWebClient": "Welcome to the Emby Web Client", + "HeaderWelcomeToProjectWebClient": "Welcome to Emby", "ButtonTakeTheTour": "Take the tour", "HeaderWelcomeBack": "Welcome back!", "TitlePlugins": "Plugins", -- cgit v1.2.3 From 838473eb803e98fd843c65f45dff5fad2bc02913 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 May 2015 23:24:25 -0400 Subject: update video player osd --- MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 13 +++++++++++-- .../Localization/JavaScript/javascript.json | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 4d5b669e2..9f5424b0c 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -792,11 +792,13 @@ namespace MediaBrowser.MediaEncoding.Encoder public bool HasExited; public int? ExitCode; private readonly MediaEncoder _mediaEncoder; + private readonly ILogger _logger; - public ProcessWrapper(Process process, MediaEncoder mediaEncoder) + public ProcessWrapper(Process process, MediaEncoder mediaEncoder, ILogger logger) { Process = process; this._mediaEncoder = mediaEncoder; + _logger = logger; Process.Exited += Process_Exited; } @@ -806,7 +808,14 @@ namespace MediaBrowser.MediaEncoding.Encoder HasExited = true; - ExitCode = process.ExitCode; + try + { + ExitCode = process.ExitCode; + } + catch (Exception ex) + { + _logger.ErrorException("Error determing process exit code", ex); + } lock (_mediaEncoder._runningProcesses) { diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index e76f7e01d..51a1e7a91 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -772,5 +772,8 @@ "ButtonSignInWithConnect": "Sign in with Emby Connect", "HeaderNewServer": "New Server", "MyDevice": "My Device", - "ButtonRemote": "Remote" + "ButtonRemote": "Remote", + "TabInfo": "Info", + "TabCast": "Cast", + "TabScenes": "Scenes" } -- cgit v1.2.3 From 6eb2d975ae460a76542425e1904584036d59ed8c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 17 May 2015 21:27:48 -0400 Subject: fix fullscreen button with IE --- .../Localization/JavaScript/javascript.json | 1 + .../Localization/Server/server.json | 1 - MediaBrowser.WebDashboard/Api/PackageCreator.cs | 25 ++++++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 51a1e7a91..4811a026e 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -40,6 +40,7 @@ "TitleLiveTV": "Live TV", "TitleSync": "Sync", "ButtonDonate": "Donate", + "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.", "HeaderMyMedia": "My Media", "TitleNotifications": "Notifications", "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.", diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index acea93d69..f2999ea02 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1262,7 +1262,6 @@ "HeaderDeveloperInfo": "Developer Info", "HeaderRevisionHistory": "Revision History", "ButtonViewWebsite": "View website", - "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.", "HeaderXmlSettings": "Xml Settings", "HeaderXmlDocumentAttributes": "Xml Document Attributes", "HeaderXmlDocumentAttribute": "Xml Document Attribute", diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 5da1bee1f..b98dd2930 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.IO; +using System.Text.RegularExpressions; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Localization; using MediaBrowser.Model.Logging; @@ -288,17 +289,28 @@ namespace MediaBrowser.WebDashboard.Api private string ModifyForCordova(string html) { // Strip everything between CORDOVA_EXCLUDE_START and CORDOVA_EXCLUDE_END - html = ReplaceBetween(html, "CORDOVA_EXCLUDE_START", "CORDOVA_EXCLUDE_END", string.Empty); + html = ReplaceBetween(html, "", "", string.Empty); // Replace CORDOVA_REPLACE_SUPPORTER_SUBMIT_START - html = ReplaceBetween(html, "CORDOVA_REPLACE_SUPPORTER_SUBMIT_START", "CORDOVA_REPLACE_SUPPORTER_SUBMIT_END", "${ButtonDonate}"); + html = ReplaceBetween(html, "", "", "${ButtonDonate}"); return html; } private string ReplaceBetween(string html, string startToken, string endToken, string newHtml) { - return html; + var start = html.IndexOf(startToken, StringComparison.OrdinalIgnoreCase); + var end = html.IndexOf(endToken, StringComparison.OrdinalIgnoreCase); + + if (start == -1 || end == -1) + { + return html; + } + + string result = html.Substring(start + 1, end - start - 1); + html = html.Replace(result, newHtml); + + return ReplaceBetween(html, startToken, endToken, newHtml); } private string GetLocalizationToken(string phrase) @@ -600,7 +612,6 @@ namespace MediaBrowser.WebDashboard.Api "livetvstatus.js", "loginpage.js", - "logpage.js", "medialibrarypage.js", "metadataconfigurationpage.js", "metadataimagespage.js", @@ -626,15 +637,11 @@ namespace MediaBrowser.WebDashboard.Api "scheduledtaskspage.js", "search.js", "selectserver.js", - "streamingsettings.js", "supporterkeypage.js", - "supporterpage.js", "syncactivity.js", "syncsettings.js", "thememediaplayer.js", - "tvlatest.js", "useredit.js", - "usernew.js", "myprofile.js", "userpassword.js", "userprofilespage.js", -- cgit v1.2.3 From 1f2fb01b77b0c35dee6fade297121ba7565017fb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 26 May 2015 13:48:05 -0400 Subject: update live tv loading --- .../Localization/JavaScript/javascript.json | 12 +++++++++++- .../Localization/Server/server.json | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 4811a026e..dc077c69c 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -776,5 +776,15 @@ "ButtonRemote": "Remote", "TabInfo": "Info", "TabCast": "Cast", - "TabScenes": "Scenes" + "TabScenes": "Scenes", + "HeaderUnlockApp": "Unlock App", + "MessageUnlockAppWithPurchase": "Unlock the full features of the app with a small one-time purchase.", + "MessageUnlockAppWithPurchaseOrSupporter": "Unlock the full features of the app with a small one-time purchase, or by signing in with an active Emby Supporter Membership.", + "MessageUnlockAppWithSupporter": "Unlock the full features of the app by signing in with an active Emby Supporter Membership.", + "MessageToValidateSupporter": "To validate your Emby Supporter Membership, simply sign into the app using your Wifi connection within your home network.", + "MessagePaymentServicesUnavailable": "Payment services are currently unavailable. Please try again later.", + "ButtonUnlockWithSupporter": "Unlock with Emby Supporter Membership", + "MessagePleaseSignInLocalNetwork": "Before proceeding, please ensure that you're connected to your local network using a Wifi or LAN connection.", + "ButtonUnlockWithPurchase": "Unlock with Purchase", + "MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience." } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 9d45451a8..11afa97fc 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1448,5 +1448,6 @@ "HeaderExport": "Export", "HeaderColumns": "Columns", "ButtonReset": "Reset", - "OptionEnableExternalVideoPlayers": "Enable external video players" + "OptionEnableExternalVideoPlayers": "Enable external video players", + "ButtonUnlockGuide": "Unlock Guide" } -- cgit v1.2.3