From 283d27380271597963069d3a3e07e3e1eee34af3 Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 27 Apr 2021 12:50:15 -0400 Subject: [PATCH] Move LocalizationController to System.Text.Json --- .../Localization/LocalizationController.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Prowlarr.Api.V1/Localization/LocalizationController.cs b/src/Prowlarr.Api.V1/Localization/LocalizationController.cs index 4a7888f37..ea1a6b7c5 100644 --- a/src/Prowlarr.Api.V1/Localization/LocalizationController.cs +++ b/src/Prowlarr.Api.V1/Localization/LocalizationController.cs @@ -1,5 +1,6 @@ +using System.Text.Json; using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; +using NzbDrone.Common.Serializer; using NzbDrone.Core.Localization; using Prowlarr.Http; @@ -9,25 +10,20 @@ namespace Prowlarr.Api.V1.Localization public class LocalizationController : Controller { private readonly ILocalizationService _localizationService; + private readonly JsonSerializerOptions _serializerSettings; public LocalizationController(ILocalizationService localizationService) { _localizationService = localizationService; + _serializerSettings = STJson.GetSerializerSettings(); + _serializerSettings.DictionaryKeyPolicy = null; + _serializerSettings.PropertyNamingPolicy = null; } [HttpGet] public string GetLocalizationDictionary() { - // We don't want camel case for transation strings, create new serializer settings - var serializerSettings = new JsonSerializerSettings - { - DateTimeZoneHandling = DateTimeZoneHandling.Utc, - NullValueHandling = NullValueHandling.Ignore, - Formatting = Formatting.Indented, - DefaultValueHandling = DefaultValueHandling.Include - }; - - return JsonConvert.SerializeObject(_localizationService.GetLocalizationDictionary().ToResource(), serializerSettings); + return JsonSerializer.Serialize(_localizationService.GetLocalizationDictionary().ToResource(), _serializerSettings); } } }