diff --git a/PlexRequests.UI/Modules/DonationLinkModule.cs b/PlexRequests.UI/Modules/DonationLinkModule.cs index 645ead898..9ede62e41 100644 --- a/PlexRequests.UI/Modules/DonationLinkModule.cs +++ b/PlexRequests.UI/Modules/DonationLinkModule.cs @@ -28,31 +28,23 @@ namespace PlexRequests.UI.Modules private async Task GetCustomDonationUrl(ISettingsService pr) { - PlexRequestSettings settings = pr.GetSettings(); + PlexRequestSettings settings = await pr.GetSettingsAsync(); try { if (settings.EnableCustomDonationUrl) { - JObject o = new JObject(); - o["url"] = "\""+ settings.CustomDonationUrl + "\""; - o["message"] = "\"" + settings.CustomDonationMessage + "\""; - return Response.AsJson(o); + return Response.AsJson(new { url = settings.CustomDonationUrl, message = settings.CustomDonationMessage }); } else { - JObject o = new JObject(); - o["url"] = "https://www.paypal.me/PlexRequestsNet"; - return Response.AsJson(o); + return Response.AsJson(new { url = settings.CustomDonationUrl, message = settings.CustomDonationMessage }); } } catch (Exception e) { Log.Warn("Exception Thrown when attempting to check the custom donation url"); Log.Warn(e); - JObject o = new JObject(); - o["url"] = "donationLinkError"; - o["message"] = "\"" + "Donate to Library Maintainer" + "\""; - return Response.AsJson(o); + return Response.AsJson(new { url = settings.CustomDonationUrl, message = settings.CustomDonationMessage }); } } } diff --git a/PlexRequests.UI/Resources/UI.resx b/PlexRequests.UI/Resources/UI.resx index 4f23fce97..883e20be1 100644 --- a/PlexRequests.UI/Resources/UI.resx +++ b/PlexRequests.UI/Resources/UI.resx @@ -443,4 +443,7 @@ View In Plex + + Donate to Library Maintainer + \ No newline at end of file diff --git a/PlexRequests.UI/Resources/UI1.Designer.cs b/PlexRequests.UI/Resources/UI1.Designer.cs index 6cd282c32..acb53c9bb 100644 --- a/PlexRequests.UI/Resources/UI1.Designer.cs +++ b/PlexRequests.UI/Resources/UI1.Designer.cs @@ -114,6 +114,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Donate to Library Maintainer. + /// + public static string Custom_Donation_Default { + get { + return ResourceManager.GetString("Custom_Donation_Default", resourceCulture); + } + } + /// /// Looks up a localized string similar to Issue. /// diff --git a/PlexRequests.UI/Views/Shared/Partial/_Navbar.cshtml b/PlexRequests.UI/Views/Shared/Partial/_Navbar.cshtml index 5a63cc4a2..8a1826a07 100644 --- a/PlexRequests.UI/Views/Shared/Partial/_Navbar.cshtml +++ b/PlexRequests.UI/Views/Shared/Partial/_Navbar.cshtml @@ -39,7 +39,7 @@ {
  • } - +