From 29b45d6e4547db357886118a4a8bfa2e5fdea620 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Wed, 23 Jul 2014 22:59:50 -0700 Subject: [PATCH] Consistifying tabs and spaces. --- .../Services/DefaultDateServices.cs | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/src/Orchard/Localization/Services/DefaultDateServices.cs b/src/Orchard/Localization/Services/DefaultDateServices.cs index 2877d4346..ee6a5fcd7 100644 --- a/src/Orchard/Localization/Services/DefaultDateServices.cs +++ b/src/Orchard/Localization/Services/DefaultDateServices.cs @@ -5,11 +5,11 @@ using Orchard.Settings; namespace Orchard.Localization.Services { - public class DefaultDateServices : IDateServices { + public class DefaultDateServices : IDateServices { private readonly IWorkContextAccessor _workContextAccessor; - private readonly IDateTimeFormatProvider _dateTimeLocalization; - private readonly ICalendarManager _calendarManager; + private readonly IDateTimeFormatProvider _dateTimeLocalization; + private readonly ICalendarManager _calendarManager; public DefaultDateServices( IWorkContextAccessor workContextAccessor, @@ -20,154 +20,154 @@ namespace Orchard.Localization.Services { _calendarManager = calendarManager; } - public virtual DateTime? ConvertToLocal(DateTime date) { - return ConvertToLocal(ToNullable(date)); - } + public virtual DateTime? ConvertToLocal(DateTime date) { + return ConvertToLocal(ToNullable(date)); + } - public virtual DateTime? ConvertToLocal(DateTime? date) { - if (!date.HasValue) { - return null; - } + public virtual DateTime? ConvertToLocal(DateTime? date) { + if (!date.HasValue) { + return null; + } var workContext = _workContextAccessor.GetContext(); return TimeZoneInfo.ConvertTimeFromUtc(date.Value, workContext.CurrentTimeZone); - } + } - public virtual string ConvertToLocalString(DateTime date, string nullText = null) { - return ConvertToLocalString(ToNullable(date), _dateTimeLocalization.LongDateTimeFormat, nullText); - } + public virtual string ConvertToLocalString(DateTime date, string nullText = null) { + return ConvertToLocalString(ToNullable(date), _dateTimeLocalization.LongDateTimeFormat, nullText); + } - public virtual string ConvertToLocalString(DateTime date, string format, string nullText = null) { - return ConvertToLocalString(ToNullable(date), format, nullText); - } + public virtual string ConvertToLocalString(DateTime date, string format, string nullText = null) { + return ConvertToLocalString(ToNullable(date), format, nullText); + } - public virtual string ConvertToLocalString(DateTime? date, string format, string nullText = null) { - var localDate = ConvertToLocal(date); - if (!localDate.HasValue) { - return nullText; - } + public virtual string ConvertToLocalString(DateTime? date, string format, string nullText = null) { + var localDate = ConvertToLocal(date); + if (!localDate.HasValue) { + return nullText; + } - // If the configured current calendar is different from the default calendar - // of the configured current culture we must override the conversion process. - // We do this by using a custom CultureInfo modified to use GregorianCalendar - // (means no calendar conversion will be performed as part of the string - // formatting) and instead perform the calendar conversion ourselves. + // If the configured current calendar is different from the default calendar + // of the configured current culture we must override the conversion process. + // We do this by using a custom CultureInfo modified to use GregorianCalendar + // (means no calendar conversion will be performed as part of the string + // formatting) and instead perform the calendar conversion ourselves. - var cultureInfo = CurrentCulture; - var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); - if (!usingCultureCalendar) { - cultureInfo = (CultureInfo)CurrentCulture.Clone(); - cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); - var calendar = CurrentCalendar; - localDate = new DateTime(calendar.GetYear(localDate.Value), calendar.GetMonth(localDate.Value), calendar.GetDayOfMonth(localDate.Value), calendar.GetHour(localDate.Value), calendar.GetMinute(localDate.Value), calendar.GetSecond(localDate.Value)); - } + var cultureInfo = CurrentCulture; + var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); + if (!usingCultureCalendar) { + cultureInfo = (CultureInfo)CurrentCulture.Clone(); + cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); + var calendar = CurrentCalendar; + localDate = new DateTime(calendar.GetYear(localDate.Value), calendar.GetMonth(localDate.Value), calendar.GetDayOfMonth(localDate.Value), calendar.GetHour(localDate.Value), calendar.GetMinute(localDate.Value), calendar.GetSecond(localDate.Value)); + } - return localDate.Value.ToString(format, cultureInfo); - } + return localDate.Value.ToString(format, cultureInfo); + } - public virtual string ConvertToLocalDateString(DateTime date, string nullText = null) { - return ConvertToLocalDateString(ToNullable(date), nullText); - } + public virtual string ConvertToLocalDateString(DateTime date, string nullText = null) { + return ConvertToLocalDateString(ToNullable(date), nullText); + } - public virtual string ConvertToLocalDateString(DateTime? date, string nullText = null) { - return ConvertToLocalString(date, _dateTimeLocalization.ShortDateFormat, nullText); - } + public virtual string ConvertToLocalDateString(DateTime? date, string nullText = null) { + return ConvertToLocalString(date, _dateTimeLocalization.ShortDateFormat, nullText); + } - public virtual string ConvertToLocalTimeString(DateTime date, string nullText = null) { - return ConvertToLocalTimeString(ToNullable(date), nullText); - } + public virtual string ConvertToLocalTimeString(DateTime date, string nullText = null) { + return ConvertToLocalTimeString(ToNullable(date), nullText); + } - public virtual string ConvertToLocalTimeString(DateTime? date, string nullText = null) { - return ConvertToLocalString(date, _dateTimeLocalization.ShortTimeFormat, nullText); - } + public virtual string ConvertToLocalTimeString(DateTime? date, string nullText = null) { + return ConvertToLocalString(date, _dateTimeLocalization.ShortTimeFormat, nullText); + } - public virtual DateTime? ConvertFromLocal(DateTime date) { - return ConvertFromLocal(ToNullable(date)); - } + public virtual DateTime? ConvertFromLocal(DateTime date) { + return ConvertFromLocal(ToNullable(date)); + } - public virtual DateTime? ConvertFromLocal(DateTime? date) { - if (!date.HasValue) { - return null; - } + public virtual DateTime? ConvertFromLocal(DateTime? date) { + if (!date.HasValue) { + return null; + } var workContext = _workContextAccessor.GetContext(); - return TimeZoneInfo.ConvertTimeToUtc(date.Value, workContext.CurrentTimeZone); - } + return TimeZoneInfo.ConvertTimeToUtc(date.Value, workContext.CurrentTimeZone); + } - public virtual DateTime? ConvertFromLocalString(string dateString) { - if (String.IsNullOrWhiteSpace(dateString)) { - return null; - } + public virtual DateTime? ConvertFromLocalString(string dateString) { + if (String.IsNullOrWhiteSpace(dateString)) { + return null; + } - // If the configured current calendar is different from the default calendar - // of the configured current culture we must override the conversion process. - // We do this by using a custom CultureInfo modified to use GregorianCalendar - // (means no calendar conversion will be performed as part of the string - // parsing) and instead perform the calendar conversion ourselves. + // If the configured current calendar is different from the default calendar + // of the configured current culture we must override the conversion process. + // We do this by using a custom CultureInfo modified to use GregorianCalendar + // (means no calendar conversion will be performed as part of the string + // parsing) and instead perform the calendar conversion ourselves. - var cultureInfo = CurrentCulture; - var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); - if (!usingCultureCalendar) { - cultureInfo = (CultureInfo)CurrentCulture.Clone(); - cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); - } + var cultureInfo = CurrentCulture; + var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); + if (!usingCultureCalendar) { + cultureInfo = (CultureInfo)CurrentCulture.Clone(); + cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); + } - var localDate = DateTime.Parse(dateString, CurrentCulture); + var localDate = DateTime.Parse(dateString, CurrentCulture); - if (!usingCultureCalendar) { - var calendar = CurrentCalendar; - localDate = calendar.ToDateTime(localDate.Year, localDate.Month, localDate.Day, localDate.Hour, localDate.Minute, localDate.Second, localDate.Millisecond); - } + if (!usingCultureCalendar) { + var calendar = CurrentCalendar; + localDate = calendar.ToDateTime(localDate.Year, localDate.Month, localDate.Day, localDate.Hour, localDate.Minute, localDate.Second, localDate.Millisecond); + } - return ConvertFromLocal(localDate); - } + return ConvertFromLocal(localDate); + } - public virtual DateTime? ConvertFromLocalString(string dateString, string timeString) { - if (String.IsNullOrWhiteSpace(dateString) && String.IsNullOrWhiteSpace(timeString)) { - return null; - } + public virtual DateTime? ConvertFromLocalString(string dateString, string timeString) { + if (String.IsNullOrWhiteSpace(dateString) && String.IsNullOrWhiteSpace(timeString)) { + return null; + } - // If the configured current calendar is different from the default calendar - // of the configured current culture we must override the conversion process. - // We do this by using a custom CultureInfo modified to use GregorianCalendar - // (means no calendar conversion will be performed as part of the string - // parsing) and instead perform the calendar conversion ourselves. + // If the configured current calendar is different from the default calendar + // of the configured current culture we must override the conversion process. + // We do this by using a custom CultureInfo modified to use GregorianCalendar + // (means no calendar conversion will be performed as part of the string + // parsing) and instead perform the calendar conversion ourselves. - var cultureInfo = CurrentCulture; - var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); - if (!usingCultureCalendar) { - cultureInfo = (CultureInfo)CurrentCulture.Clone(); - cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); - } + var cultureInfo = CurrentCulture; + var usingCultureCalendar = CurrentCulture.DateTimeFormat.Calendar.GetType().IsInstanceOfType(CurrentCalendar); + if (!usingCultureCalendar) { + cultureInfo = (CultureInfo)CurrentCulture.Clone(); + cultureInfo.DateTimeFormat.Calendar = new GregorianCalendar(); + } - var localDate = !String.IsNullOrWhiteSpace(dateString) ? DateTime.Parse(dateString, cultureInfo) : new DateTime(1980, 1, 1); - var localTime = !String.IsNullOrWhiteSpace(timeString) ? DateTime.Parse(timeString, cultureInfo) : new DateTime(1980, 1, 1, 12, 0, 0); - var localDateTime = new DateTime(localDate.Year, localDate.Month, localDate.Day, localTime.Hour, localTime.Minute, localTime.Second); + var localDate = !String.IsNullOrWhiteSpace(dateString) ? DateTime.Parse(dateString, cultureInfo) : new DateTime(1980, 1, 1); + var localTime = !String.IsNullOrWhiteSpace(timeString) ? DateTime.Parse(timeString, cultureInfo) : new DateTime(1980, 1, 1, 12, 0, 0); + var localDateTime = new DateTime(localDate.Year, localDate.Month, localDate.Day, localTime.Hour, localTime.Minute, localTime.Second); - if (!usingCultureCalendar) { - var calendar = CurrentCalendar; - localDateTime = calendar.ToDateTime(localDateTime.Year, localDateTime.Month, localDateTime.Day, localDateTime.Hour, localDateTime.Minute, localDateTime.Second, localDateTime.Millisecond); - } + if (!usingCultureCalendar) { + var calendar = CurrentCalendar; + localDateTime = calendar.ToDateTime(localDateTime.Year, localDateTime.Month, localDateTime.Day, localDateTime.Hour, localDateTime.Minute, localDateTime.Second, localDateTime.Millisecond); + } - return ConvertFromLocal(localDateTime); - } + return ConvertFromLocal(localDateTime); + } - protected virtual CultureInfo CurrentCulture { - get { + protected virtual CultureInfo CurrentCulture { + get { var workContext = _workContextAccessor.GetContext(); - return CultureInfo.GetCultureInfo(workContext.CurrentCulture); - } - } + return CultureInfo.GetCultureInfo(workContext.CurrentCulture); + } + } - protected virtual Calendar CurrentCalendar { - get { + protected virtual Calendar CurrentCalendar { + get { var workContext = _workContextAccessor.GetContext(); - if (!String.IsNullOrEmpty(workContext.CurrentCalendar)) - return _calendarManager.GetCalendarByName(workContext.CurrentCalendar); - return CurrentCulture.Calendar; - } - } + if (!String.IsNullOrEmpty(workContext.CurrentCalendar)) + return _calendarManager.GetCalendarByName(workContext.CurrentCalendar); + return CurrentCulture.Calendar; + } + } - protected virtual DateTime? ToNullable(DateTime date) { - return date == DateTime.MinValue ? new DateTime?() : new DateTime?(date); - } - } + protected virtual DateTime? ToNullable(DateTime date) { + return date == DateTime.MinValue ? new DateTime?() : new DateTime?(date); + } + } } \ No newline at end of file