From 6d7af0a8ae812db96d8ee059c4f09a1d17a7803f Mon Sep 17 00:00:00 2001 From: Jo-Be-Co Date: Fri, 17 Apr 2026 21:43:42 +0200 Subject: [PATCH 1/2] Some optimizations after last update to AudibleApi --- .../Templates/LocaleDto.cs | 36 ++++--------------- 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/Source/LibationFileManager/Templates/LocaleDto.cs b/Source/LibationFileManager/Templates/LocaleDto.cs index 6e8da8f8..b6a7347f 100644 --- a/Source/LibationFileManager/Templates/LocaleDto.cs +++ b/Source/LibationFileManager/Templates/LocaleDto.cs @@ -17,17 +17,13 @@ public partial record LocaleDto : IFormattable private string DefaultFormat { get; } - public LocaleDto(string hint) : this(hint, "{O}") + public LocaleDto(string hint, string defaultFormat = "{O}") : this(Localization.Get(hint), hint, defaultFormat) { } - public LocaleDto(string hint, string defaultFormat) : this(Localization.Get(hint), hint, defaultFormat) + private LocaleDto(Locale locale, string hint, string defaultFormat) { - } - - public LocaleDto(Locale locale, string hint, string defaultFormat) - { - var (regionInfo, cultureInfo) = GetRegion(locale.Language, locale.CountryCode, hint); + var (regionInfo, cultureInfo) = GetRegion(locale.Language, hint); Original = hint; Locale = locale; @@ -36,34 +32,14 @@ public partial record LocaleDto : IFormattable DefaultFormat = defaultFormat; } - private static (RegionInfo?, CultureInfo?) GetRegion(string language, string countrcode, string input) + private static (RegionInfo?, CultureInfo?) GetRegion(string languageFromLocale, string input) { - CultureInfo? culture = null; - if (language != string.Empty) - try - { - culture = CultureInfo.GetCultureInfo(language.Length == 2 ? $"{language}-{countrcode}" : language); - } - catch - { - // ignored - } - try { - return (new RegionInfo(countrcode), culture); - } - catch - { - // ignored - } + if (languageFromLocale == string.Empty) return (new RegionInfo(input), null); - if (culture is not null) + var culture = CultureInfo.GetCultureInfo(languageFromLocale); return (new RegionInfo(culture.Name), culture); - - try - { - return (new RegionInfo(input), culture); } catch { From 87e8c6a32a1e080c73e6f71b34f2bc21a47f7b16 Mon Sep 17 00:00:00 2001 From: Jo-Be-Co Date: Fri, 17 Apr 2026 23:48:22 +0200 Subject: [PATCH 2/2] fixed pr remarks --- Source/LibationFileManager/Templates/LocaleDto.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/LibationFileManager/Templates/LocaleDto.cs b/Source/LibationFileManager/Templates/LocaleDto.cs index b6a7347f..40ee2550 100644 --- a/Source/LibationFileManager/Templates/LocaleDto.cs +++ b/Source/LibationFileManager/Templates/LocaleDto.cs @@ -36,7 +36,8 @@ public partial record LocaleDto : IFormattable { try { - if (languageFromLocale == string.Empty) return (new RegionInfo(input), null); + if (languageFromLocale == string.Empty) + return (new RegionInfo(input), null); var culture = CultureInfo.GetCultureInfo(languageFromLocale); return (new RegionInfo(culture.Name), culture);