From 3205913b2a8559a6a29a81d63dd144249db6e234 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 13 Jun 2015 19:56:59 -0400 Subject: [PATCH] support in-app connect signup --- .../Localization/JavaScript/javascript.json | 6 +++++- .../Localization/Server/server.json | 6 +++++- MediaBrowser.Server.Implementations/Sync/SyncManager.cs | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 954ed5f96e..48d3296e5e 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -804,5 +804,9 @@ "ButtonManageServer": "Manage Server", "ButtonPreferences": "Preferences", "ButtonViewArtist": "View artist", - "ButtonViewAlbum": "View album" + "ButtonViewAlbum": "View album", + "ErrorMessagePasswordNotMatchConfirm": "The password and password confirmation must match.", + "ErrorMessageUsernameInUse": "The username is already in use. Please choose a new name and try again.", + "ErrorMessageEmailInUse": "The email address is already in use. Please enter a new email address and try again, or use the forgot password feature.", + "MessageThankYouForConnectSignUp": "Thank you for signing up for Emby Connect. An email will be sent to your address with instructions on how to confirm your new account. Please confirm the account and then return here to sign in." } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 49a912012d..300b825250 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1455,5 +1455,9 @@ "ButtonUnlockGuide": "Unlock Guide", "LabelEnableFullScreen": "Enable fullscreen mode", "LabelEnableChromecastAc3Passthrough": "Enable Chromecast AC3 Passthrough", - "LabelSyncPath": "Synced content path:" + "LabelSyncPath": "Synced content path:", + "LabelEmail": "Email:", + "LabelUsername": "Username:", + "HeaderSignUp": "Sign Up", + "LabelPasswordConfirm": "Password (confirm):" } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs index 798f37d114..6c71a90a03 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs @@ -698,6 +698,10 @@ namespace MediaBrowser.Server.Implementations.Sync syncedItem.OriginalFileName = Path.ChangeExtension(syncedItem.OriginalFileName, Path.GetExtension(mediaSource.Path)); syncedItem.Item.MediaSources.Add(mediaSource); } + if (string.IsNullOrWhiteSpace(syncedItem.OriginalFileName)) + { + syncedItem.OriginalFileName = libraryItem.Name; + } return syncedItem; }