From 1d8eec42ef2dfcec875fbfbe7bfc3b2c0734ed5d Mon Sep 17 00:00:00 2001
From: James White <james@jmwhite.co.uk>
Date: Wed, 11 Oct 2017 18:19:57 +0100
Subject: [PATCH 1/3] Added: a default name for Radarr.ics (#2163)

---
 src/NzbDrone.Api/Calendar/CalendarFeedModule.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
index 65ba3710b..6836ed5d8 100644
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -1,9 +1,10 @@
-using Nancy;
+using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ical.Net;
 using Ical.Net.DataTypes;
+using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
@@ -81,10 +82,13 @@ private Response GetCalendarFeed()
             }
 
             var movies = _movieService.GetMoviesBetweenDates(start, end, unmonitored);
-            var calendar = new Ical.Net.Calendar
-            {
-                ProductId = "-//radarr.video//Radarr//EN"
-            };
+            var calendar = new Ical.Net.Calendar();
+
+            calendar.ProductId = "-//radarr.video//Radarr//EN";
+
+            var calendarName = "Radarr Movies Calendar";
+            calendar.AddProperty(new CalendarProperty("NAME", calendarName));
+            calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
 
             foreach (var movie in movies.OrderBy(v => v.Added))
             {
@@ -114,8 +118,10 @@ private Response GetCalendarFeed()
                             occurrence.End = new CalDateTime(movie.InCinemas.Value.AddMinutes(movie.Runtime)) { HasTime = true };
                         }
                         break;
+
                     case MovieStatusType.Announced:
                         continue; // no date
+
                     default:
                         if (movie.PhysicalRelease != null)
                         {

From 805927205c26250911889a290312af376991e7a9 Mon Sep 17 00:00:00 2001
From: James White <james@jmwhite.co.uk>
Date: Wed, 11 Oct 2017 20:11:16 +0100
Subject: [PATCH 2/3] @cosmetic Simplify ical ProductId code since adding
 properties (#2164)

---
 src/NzbDrone.Api/Calendar/CalendarFeedModule.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
index 6836ed5d8..90c0ee75b 100644
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -82,9 +82,10 @@ private Response GetCalendarFeed()
             }
 
             var movies = _movieService.GetMoviesBetweenDates(start, end, unmonitored);
-            var calendar = new Ical.Net.Calendar();
-
-            calendar.ProductId = "-//radarr.video//Radarr//EN";
+            var calendar = new Ical.Net.Calendar
+            {
+                ProductId = "-//radarr.video//Radarr//EN"
+            };
 
             var calendarName = "Radarr Movies Calendar";
             calendar.AddProperty(new CalendarProperty("NAME", calendarName));

From 779a72217587f48660f6ebc217adfcd0c8c1b49b Mon Sep 17 00:00:00 2001
From: James White <james@jmwhite.co.uk>
Date: Wed, 11 Oct 2017 21:45:15 +0100
Subject: [PATCH 3/3] Changed: Adjust ambiguous date options (#2165)

(cherry picked from commit 00c307421666b55a6d08ff1c69c1871ccb541314)
---
 src/UI/Settings/UI/UiViewTemplate.hbs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/UI/Settings/UI/UiViewTemplate.hbs b/src/UI/Settings/UI/UiViewTemplate.hbs
index c0cd483b5..838c716fc 100644
--- a/src/UI/Settings/UI/UiViewTemplate.hbs
+++ b/src/UI/Settings/UI/UiViewTemplate.hbs
@@ -45,10 +45,10 @@
 
             <div class="col-sm-4 col-sm-pull-1">
                 <select name="calendarWeekColumnHeader" class="form-control">
-                    <option value="ddd M/D">Tue 3/5</option>
-                    <option value="ddd MM/DD">Tue 03/05</option>
-                    <option value="ddd D/M">Tue 5/3</option>
-                    <option value="ddd DD/MM">Tue 05/03</option>
+                    <option value="ddd M/D">Tue 3/25</option>
+                    <option value="ddd MM/DD">Tue 03/25</option>
+                    <option value="ddd D/M">Tue 25/3</option>
+                    <option value="ddd DD/MM">Tue 25/03</option>
                 </select>
             </div>
         </div>
@@ -62,12 +62,12 @@
 
             <div class="col-sm-4">
                 <select name="shortDateFormat" class="form-control">
-                    <option value="MMM D YYYY">Mar 5 2014</option>
-                    <option value="DD MMM YYYY">05 Mar 2014</option>
-                    <option value="MM/D/YYYY">03/5/2014</option>
-                    <option value="MM/DD/YYYY">03/05/2014</option>
-                    <option value="DD/MM/YYYY">05/03/2014</option>
-                    <option value="YYYY-MM-DD">2014-03-05</option>
+                    <option value="MMM D YYYY">Mar 25 2014</option>
+                    <option value="DD MMM YYYY">25 Mar 2014</option>
+                    <option value="MM/D/YYYY">03/25/2014</option>
+                    <option value="MM/DD/YYYY">03/25/2014</option>
+                    <option value="DD/MM/YYYY">25/03/2014</option>
+                    <option value="YYYY-MM-DD">2014-03-25</option>
                 </select>
             </div>
         </div>
@@ -77,8 +77,8 @@
 
             <div class="col-sm-4">
                 <select name="longDateFormat" class="form-control">
-                    <option value="dddd, MMMM D YYYY">Tuesday, March 5, 2014</option>
-                    <option value="dddd, D MMMM YYYY">Tuesday, 5 March, 2014</option>
+                    <option value="dddd, MMMM D YYYY">Tuesday, March 25, 2014</option>
+                    <option value="dddd, D MMMM YYYY">Tuesday, 25 March, 2014</option>
                 </select>
             </div>
         </div>