From bedcdee497709e94d9a6501b534b5a05fa6daf57 Mon Sep 17 00:00:00 2001 From: Adam Worley Date: Thu, 8 Oct 2020 13:24:51 +0100 Subject: [PATCH] change date format to MM-yyyy as this is generally more readable by English speaking and European countires --- src/Ombi.Helpers/StringHelper.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ombi.Helpers/StringHelper.cs b/src/Ombi.Helpers/StringHelper.cs index 5f0a2d18b..d29957e2c 100644 --- a/src/Ombi.Helpers/StringHelper.cs +++ b/src/Ombi.Helpers/StringHelper.cs @@ -97,12 +97,12 @@ namespace Ombi.Helpers (int EpisodeNumber, DateTime? Aired) first = previousEpisodes.First(); (int EpisodeNumber, DateTime? Aired) last = previousEpisodes.Last(); - epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:yyyy-MM}" : string.Empty)}, "); + epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM-yyyy}" : string.Empty)}, "); } else if (previousEpisodes.Count == 1) { (int EpisodeNumber, DateTime? Aired) = previousEpisodes.FirstOrDefault(); - epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:yyyy-MM}" : string.Empty)}, "); + epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:MM-yyyy}" : string.Empty)}, "); } // New one previousEpisodes.Clear(); @@ -116,13 +116,13 @@ namespace Ombi.Helpers // Got some left over (int EpisodeNumber, DateTime? Aired) first = previousEpisodes.First(); (int EpisodeNumber, DateTime? Aired) last = previousEpisodes.Last(); - epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:yyyy-MM}" : string.Empty)}"); + epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM-yyyy}" : string.Empty)}"); } else if (previousEpisodes.Count == 1) { (int EpisodeNumber, DateTime? Aired) = previousEpisodes.FirstOrDefault(); // string.Empty used instead of "" as extra space was being added at the end - epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:yyyy-MM-dd}" : string.Empty)}"); + epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:d}" : string.Empty)}"); } return epSb.ToString();