mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Auto detect first day of week for calendar 

New: Calendar will use systems first day of week when displaying
This commit is contained in:
Mark McDowall 2013-10-02 12:41:21 -07:00
parent 76089b460c
commit fe5b42696d
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NzbDrone.Api/System/SystemModule.cs
View File

@ -42,7 +42,8 @@ namespace NzbDrone.Api.System
IsLinux = OsInfo.IsLinux,
IsWindows = OsInfo.IsWindows,
Branch = _configFileProvider.Branch,
Authentication = _configFileProvider.AuthenticationEnabled
Authentication = _configFileProvider.AuthenticationEnabled,
StartOfWeek = (int)OsInfo.FirstDayOfWeek
}.AsResponse();
}

24
NzbDrone.Common/DateTimeExtensions.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Globalization;
namespace NzbDrone.Common
{
public static class DateTimeExtensions
{
public static DateTime GetFirstDayOfWeek(this DateTime dayInWeek)
{
var defaultCultureInfo = CultureInfo.CurrentCulture;
return GetFirstDayOfWeek(dayInWeek, defaultCultureInfo);
}
public static DateTime GetFirstDayOfWeek(this DateTime dayInWeek, CultureInfo cultureInfo)
{
DayOfWeek firstDay = cultureInfo.DateTimeFormat.FirstDayOfWeek;
DateTime firstDayInWeek = dayInWeek.Date;
while (firstDayInWeek.DayOfWeek != firstDay)
firstDayInWeek = firstDayInWeek.AddDays(-1);
return firstDayInWeek;
}
}
}

8
NzbDrone.Common/EnvironmentInfo/OsInfo.cs
View File

@ -28,5 +28,13 @@ namespace NzbDrone.Common.EnvironmentInfo
return !IsLinux;
}
}
public static DayOfWeek FirstDayOfWeek
{
get
{
return DateTime.Today.GetFirstDayOfWeek().DayOfWeek;
}
}
}
}

1
NzbDrone.Common/NzbDrone.Common.csproj
View File

@ -66,6 +66,7 @@
<Compile Include="Composition\Container.cs" />
<Compile Include="Composition\IContainer.cs" />
<Compile Include="Composition\ContainerBuilderBase.cs" />
<Compile Include="DateTimeExtensions.cs" />
<Compile Include="EnsureThat\Ensure.cs" />
<Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
<Compile Include="EnsureThat\EnsureCollectionExtensions.cs" />

1
UI/Calendar/CalendarView.js
View File

@ -21,6 +21,7 @@ define(
allDayDefault : false,
ignoreTimezone: false,
weekMode : 'variable',
firstDay : window.NzbDrone.ServerStatus.startOfWeek,
timeFormat : 'h(:mm)tt',
header : {
left : 'prev,next today',