From 53c449e20fefa5338c7cdacda1919fe68c6cf691 Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Fri, 25 Jul 2014 14:07:47 +0200 Subject: [PATCH] Renamed IDateServices to IDateLocalizationServices. --- src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs | 4 ++-- src/Orchard.Web/Core/Shapes/DateTimeShapes.cs | 4 ++-- .../Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs | 4 ++-- .../Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs | 4 ++-- .../Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs | 4 ++-- .../Modules/Orchard.Tokens/Providers/DateTokens.cs | 4 ++-- .../Modules/Orchard.Tokens/Tests/DateTokenTests.cs | 2 +- ...aultDateServices.cs => DefaultDateLocalizationServices.cs} | 4 ++-- .../{IDateServices.cs => IDateLocalizationServices.cs} | 2 +- src/Orchard/Orchard.Framework.csproj | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) rename src/Orchard/Localization/Services/{DefaultDateServices.cs => DefaultDateLocalizationServices.cs} (98%) rename src/Orchard/Localization/Services/{IDateServices.cs => IDateLocalizationServices.cs} (99%) diff --git a/src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs b/src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs index bcb6740e3..d8859c7e5 100644 --- a/src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs +++ b/src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs @@ -8,11 +8,11 @@ using Orchard.Localization.Services; namespace Orchard.Core.Common.DateEditor { public class DateEditorDriver : ContentPartDriver { - private readonly IDateServices _dateServices; + private readonly IDateLocalizationServices _dateServices; public DateEditorDriver( IOrchardServices services, - IDateServices dateServices) { + IDateLocalizationServices dateServices) { _dateServices = dateServices; T = NullLocalizer.Instance; Services = services; diff --git a/src/Orchard.Web/Core/Shapes/DateTimeShapes.cs b/src/Orchard.Web/Core/Shapes/DateTimeShapes.cs index b6856c3d0..d39f23adc 100644 --- a/src/Orchard.Web/Core/Shapes/DateTimeShapes.cs +++ b/src/Orchard.Web/Core/Shapes/DateTimeShapes.cs @@ -11,12 +11,12 @@ using Orchard.Services; namespace Orchard.Core.Shapes { public class DateTimeShapes : IDependency { private readonly IClock _clock; - private readonly IDateServices _dateServices; + private readonly IDateLocalizationServices _dateServices; private readonly IDateTimeFormatProvider _dateTimeLocalization; public DateTimeShapes( IClock clock, - IDateServices dateServices, + IDateLocalizationServices dateServices, IDateTimeFormatProvider dateTimeLocalization ) { _clock = clock; diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs index 5fde3dd45..5d9d031d7 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs @@ -14,12 +14,12 @@ namespace Orchard.ArchiveLater.Drivers { public class ArchiveLaterPartDriver : ContentPartDriver { private const string TemplateName = "Parts/ArchiveLater"; private readonly IArchiveLaterService _archiveLaterService; - private readonly IDateServices _dateServices; + private readonly IDateLocalizationServices _dateServices; public ArchiveLaterPartDriver( IOrchardServices services, IArchiveLaterService archiveLaterService, - IDateServices dateServices) { + IDateLocalizationServices dateServices) { _archiveLaterService = archiveLaterService; _dateServices = dateServices; T = NullLocalizer.Instance; diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs index 4b84f0d31..365ac45f7 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs @@ -17,14 +17,14 @@ namespace Orchard.Fields.Drivers { public class DateTimeFieldDriver : ContentFieldDriver { private const string TemplateName = "Fields/DateTime.Edit"; // EditorTemplates/Fields/DateTime.Edit.cshtml - public DateTimeFieldDriver(IOrchardServices services, IDateServices dateServices) { + public DateTimeFieldDriver(IOrchardServices services, IDateLocalizationServices dateServices) { Services = services; DateServices = dateServices; T = NullLocalizer.Instance; } public IOrchardServices Services { get; set; } - public IDateServices DateServices { get; set; } + public IDateLocalizationServices DateServices { get; set; } public Localizer T { get; set; } private static string GetPrefix(ContentField field, ContentPart part) { diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs index 8197fc1af..8a5581adf 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs @@ -18,14 +18,14 @@ namespace Orchard.PublishLater.Drivers { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IPublishLaterService _publishLaterService; private readonly IClock _clock; - private readonly IDateServices _dateServices; + private readonly IDateLocalizationServices _dateServices; public PublishLaterPartDriver( IOrchardServices services, IHttpContextAccessor httpContextAccessor, IPublishLaterService publishLaterService, IClock clock, - IDateServices dateServices) { + IDateLocalizationServices dateServices) { _httpContextAccessor = httpContextAccessor; _publishLaterService = publishLaterService; _clock = clock; diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/DateTokens.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/DateTokens.cs index 54b59b103..317bd200b 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/DateTokens.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/DateTokens.cs @@ -11,13 +11,13 @@ namespace Orchard.Tokens.Providers { private readonly IDateTimeFormatProvider _dateTimeLocalization; private readonly IWorkContextAccessor _workContextAccessor; private readonly Lazy _cultureInfo; - private readonly IDateServices _dateServices; + private readonly IDateLocalizationServices _dateServices; public DateTokens( IClock clock, IDateTimeFormatProvider dateTimeLocalization, IWorkContextAccessor workContextAccessor, - IDateServices dateServices) { + IDateLocalizationServices dateServices) { _clock = clock; _dateTimeLocalization = dateTimeLocalization; _workContextAccessor = workContextAccessor; diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/DateTokenTests.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/DateTokenTests.cs index 74ddaedba..473a5c4c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/DateTokenTests.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/DateTokenTests.cs @@ -23,7 +23,7 @@ namespace Orchard.Tokens.Tests { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); - builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard/Localization/Services/DefaultDateServices.cs b/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs similarity index 98% rename from src/Orchard/Localization/Services/DefaultDateServices.cs rename to src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs index 2877d4346..cd6e1fa22 100644 --- a/src/Orchard/Localization/Services/DefaultDateServices.cs +++ b/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs @@ -5,13 +5,13 @@ using Orchard.Settings; namespace Orchard.Localization.Services { - public class DefaultDateServices : IDateServices { + public class DefaultDateLocalizationServices : IDateLocalizationServices { private readonly IWorkContextAccessor _workContextAccessor; private readonly IDateTimeFormatProvider _dateTimeLocalization; private readonly ICalendarManager _calendarManager; - public DefaultDateServices( + public DefaultDateLocalizationServices( IWorkContextAccessor workContextAccessor, IDateTimeFormatProvider dateTimeLocalization, ICalendarManager calendarManager) { diff --git a/src/Orchard/Localization/Services/IDateServices.cs b/src/Orchard/Localization/Services/IDateLocalizationServices.cs similarity index 99% rename from src/Orchard/Localization/Services/IDateServices.cs rename to src/Orchard/Localization/Services/IDateLocalizationServices.cs index d22147fbf..020e86556 100644 --- a/src/Orchard/Localization/Services/IDateServices.cs +++ b/src/Orchard/Localization/Services/IDateLocalizationServices.cs @@ -7,7 +7,7 @@ namespace Orchard.Localization.Services { /// time zone, culture and calendar (as opposed to the system configured time zone and /// culture). /// - public interface IDateServices : IDependency { + public interface IDateLocalizationServices : IDependency { /// /// Converts a non-nullable date from Gregorian calendar UTC to the Orchard configured calendar and time zone. diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 2adfa28a5..a1c48c56b 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -265,11 +265,11 @@ - + - +