mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-26 20:16:15 +08:00
Renamed IDateServices to IDateLocalizationServices.
This commit is contained in:
@@ -8,11 +8,11 @@ using Orchard.Localization.Services;
|
|||||||
|
|
||||||
namespace Orchard.Core.Common.DateEditor {
|
namespace Orchard.Core.Common.DateEditor {
|
||||||
public class DateEditorDriver : ContentPartDriver<CommonPart> {
|
public class DateEditorDriver : ContentPartDriver<CommonPart> {
|
||||||
private readonly IDateServices _dateServices;
|
private readonly IDateLocalizationServices _dateServices;
|
||||||
|
|
||||||
public DateEditorDriver(
|
public DateEditorDriver(
|
||||||
IOrchardServices services,
|
IOrchardServices services,
|
||||||
IDateServices dateServices) {
|
IDateLocalizationServices dateServices) {
|
||||||
_dateServices = dateServices;
|
_dateServices = dateServices;
|
||||||
T = NullLocalizer.Instance;
|
T = NullLocalizer.Instance;
|
||||||
Services = services;
|
Services = services;
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ using Orchard.Services;
|
|||||||
namespace Orchard.Core.Shapes {
|
namespace Orchard.Core.Shapes {
|
||||||
public class DateTimeShapes : IDependency {
|
public class DateTimeShapes : IDependency {
|
||||||
private readonly IClock _clock;
|
private readonly IClock _clock;
|
||||||
private readonly IDateServices _dateServices;
|
private readonly IDateLocalizationServices _dateServices;
|
||||||
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
||||||
|
|
||||||
public DateTimeShapes(
|
public DateTimeShapes(
|
||||||
IClock clock,
|
IClock clock,
|
||||||
IDateServices dateServices,
|
IDateLocalizationServices dateServices,
|
||||||
IDateTimeFormatProvider dateTimeLocalization
|
IDateTimeFormatProvider dateTimeLocalization
|
||||||
) {
|
) {
|
||||||
_clock = clock;
|
_clock = clock;
|
||||||
|
|||||||
@@ -14,12 +14,12 @@ namespace Orchard.ArchiveLater.Drivers {
|
|||||||
public class ArchiveLaterPartDriver : ContentPartDriver<ArchiveLaterPart> {
|
public class ArchiveLaterPartDriver : ContentPartDriver<ArchiveLaterPart> {
|
||||||
private const string TemplateName = "Parts/ArchiveLater";
|
private const string TemplateName = "Parts/ArchiveLater";
|
||||||
private readonly IArchiveLaterService _archiveLaterService;
|
private readonly IArchiveLaterService _archiveLaterService;
|
||||||
private readonly IDateServices _dateServices;
|
private readonly IDateLocalizationServices _dateServices;
|
||||||
|
|
||||||
public ArchiveLaterPartDriver(
|
public ArchiveLaterPartDriver(
|
||||||
IOrchardServices services,
|
IOrchardServices services,
|
||||||
IArchiveLaterService archiveLaterService,
|
IArchiveLaterService archiveLaterService,
|
||||||
IDateServices dateServices) {
|
IDateLocalizationServices dateServices) {
|
||||||
_archiveLaterService = archiveLaterService;
|
_archiveLaterService = archiveLaterService;
|
||||||
_dateServices = dateServices;
|
_dateServices = dateServices;
|
||||||
T = NullLocalizer.Instance;
|
T = NullLocalizer.Instance;
|
||||||
|
|||||||
@@ -17,14 +17,14 @@ namespace Orchard.Fields.Drivers {
|
|||||||
public class DateTimeFieldDriver : ContentFieldDriver<DateTimeField> {
|
public class DateTimeFieldDriver : ContentFieldDriver<DateTimeField> {
|
||||||
private const string TemplateName = "Fields/DateTime.Edit"; // EditorTemplates/Fields/DateTime.Edit.cshtml
|
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;
|
Services = services;
|
||||||
DateServices = dateServices;
|
DateServices = dateServices;
|
||||||
T = NullLocalizer.Instance;
|
T = NullLocalizer.Instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IOrchardServices Services { get; set; }
|
public IOrchardServices Services { get; set; }
|
||||||
public IDateServices DateServices { get; set; }
|
public IDateLocalizationServices DateServices { get; set; }
|
||||||
public Localizer T { get; set; }
|
public Localizer T { get; set; }
|
||||||
|
|
||||||
private static string GetPrefix(ContentField field, ContentPart part) {
|
private static string GetPrefix(ContentField field, ContentPart part) {
|
||||||
|
|||||||
@@ -18,14 +18,14 @@ namespace Orchard.PublishLater.Drivers {
|
|||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly IPublishLaterService _publishLaterService;
|
private readonly IPublishLaterService _publishLaterService;
|
||||||
private readonly IClock _clock;
|
private readonly IClock _clock;
|
||||||
private readonly IDateServices _dateServices;
|
private readonly IDateLocalizationServices _dateServices;
|
||||||
|
|
||||||
public PublishLaterPartDriver(
|
public PublishLaterPartDriver(
|
||||||
IOrchardServices services,
|
IOrchardServices services,
|
||||||
IHttpContextAccessor httpContextAccessor,
|
IHttpContextAccessor httpContextAccessor,
|
||||||
IPublishLaterService publishLaterService,
|
IPublishLaterService publishLaterService,
|
||||||
IClock clock,
|
IClock clock,
|
||||||
IDateServices dateServices) {
|
IDateLocalizationServices dateServices) {
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_publishLaterService = publishLaterService;
|
_publishLaterService = publishLaterService;
|
||||||
_clock = clock;
|
_clock = clock;
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ namespace Orchard.Tokens.Providers {
|
|||||||
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
||||||
private readonly IWorkContextAccessor _workContextAccessor;
|
private readonly IWorkContextAccessor _workContextAccessor;
|
||||||
private readonly Lazy<CultureInfo> _cultureInfo;
|
private readonly Lazy<CultureInfo> _cultureInfo;
|
||||||
private readonly IDateServices _dateServices;
|
private readonly IDateLocalizationServices _dateServices;
|
||||||
|
|
||||||
public DateTokens(
|
public DateTokens(
|
||||||
IClock clock,
|
IClock clock,
|
||||||
IDateTimeFormatProvider dateTimeLocalization,
|
IDateTimeFormatProvider dateTimeLocalization,
|
||||||
IWorkContextAccessor workContextAccessor,
|
IWorkContextAccessor workContextAccessor,
|
||||||
IDateServices dateServices) {
|
IDateLocalizationServices dateServices) {
|
||||||
_clock = clock;
|
_clock = clock;
|
||||||
_dateTimeLocalization = dateTimeLocalization;
|
_dateTimeLocalization = dateTimeLocalization;
|
||||||
_workContextAccessor = workContextAccessor;
|
_workContextAccessor = workContextAccessor;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace Orchard.Tokens.Tests {
|
|||||||
builder.RegisterType<DateTokens>().As<ITokenProvider>();
|
builder.RegisterType<DateTokens>().As<ITokenProvider>();
|
||||||
builder.RegisterType<StubClock>().As<IClock>();
|
builder.RegisterType<StubClock>().As<IClock>();
|
||||||
builder.RegisterType<CultureDateTimeFormatProvider>().As<IDateTimeFormatProvider>();
|
builder.RegisterType<CultureDateTimeFormatProvider>().As<IDateTimeFormatProvider>();
|
||||||
builder.RegisterType<DefaultDateServices>().As<IDateServices>();
|
builder.RegisterType<DefaultDateLocalizationServices>().As<IDateLocalizationServices>();
|
||||||
builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
|
builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
|
||||||
builder.RegisterType<SiteCalendarSelector>().As<ICalendarSelector>();
|
builder.RegisterType<SiteCalendarSelector>().As<ICalendarSelector>();
|
||||||
builder.RegisterType<DefaultCalendarManager>().As<ICalendarManager>();
|
builder.RegisterType<DefaultCalendarManager>().As<ICalendarManager>();
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ using Orchard.Settings;
|
|||||||
|
|
||||||
namespace Orchard.Localization.Services {
|
namespace Orchard.Localization.Services {
|
||||||
|
|
||||||
public class DefaultDateServices : IDateServices {
|
public class DefaultDateLocalizationServices : IDateLocalizationServices {
|
||||||
|
|
||||||
private readonly IWorkContextAccessor _workContextAccessor;
|
private readonly IWorkContextAccessor _workContextAccessor;
|
||||||
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
private readonly IDateTimeFormatProvider _dateTimeLocalization;
|
||||||
private readonly ICalendarManager _calendarManager;
|
private readonly ICalendarManager _calendarManager;
|
||||||
|
|
||||||
public DefaultDateServices(
|
public DefaultDateLocalizationServices(
|
||||||
IWorkContextAccessor workContextAccessor,
|
IWorkContextAccessor workContextAccessor,
|
||||||
IDateTimeFormatProvider dateTimeLocalization,
|
IDateTimeFormatProvider dateTimeLocalization,
|
||||||
ICalendarManager calendarManager) {
|
ICalendarManager calendarManager) {
|
||||||
@@ -7,7 +7,7 @@ namespace Orchard.Localization.Services {
|
|||||||
/// time zone, culture and calendar (as opposed to the system configured time zone and
|
/// time zone, culture and calendar (as opposed to the system configured time zone and
|
||||||
/// culture).
|
/// culture).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IDateServices : IDependency {
|
public interface IDateLocalizationServices : IDependency {
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Converts a non-nullable date from Gregorian calendar UTC to the Orchard configured calendar and time zone.
|
/// Converts a non-nullable date from Gregorian calendar UTC to the Orchard configured calendar and time zone.
|
||||||
@@ -265,11 +265,11 @@
|
|||||||
<Compile Include="Localization\Services\CurrentCultureWorkContext.cs" />
|
<Compile Include="Localization\Services\CurrentCultureWorkContext.cs" />
|
||||||
<Compile Include="Localization\Services\DefaultCalendarManager.cs" />
|
<Compile Include="Localization\Services\DefaultCalendarManager.cs" />
|
||||||
<Compile Include="Localization\Services\CultureDateTimeFormatProvider.cs" />
|
<Compile Include="Localization\Services\CultureDateTimeFormatProvider.cs" />
|
||||||
<Compile Include="Localization\Services\DefaultDateServices.cs" />
|
<Compile Include="Localization\Services\DefaultDateLocalizationServices.cs" />
|
||||||
<Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
|
<Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
|
||||||
<Compile Include="Localization\Services\ICalendarSelector.cs" />
|
<Compile Include="Localization\Services\ICalendarSelector.cs" />
|
||||||
<Compile Include="Localization\Services\ICalendarManager.cs" />
|
<Compile Include="Localization\Services\ICalendarManager.cs" />
|
||||||
<Compile Include="Localization\Services\IDateServices.cs" />
|
<Compile Include="Localization\Services\IDateLocalizationServices.cs" />
|
||||||
<Compile Include="Localization\Services\IDateTimeFormatProvider.cs" />
|
<Compile Include="Localization\Services\IDateTimeFormatProvider.cs" />
|
||||||
<Compile Include="Localization\Services\ILocalizedStringManager.cs" />
|
<Compile Include="Localization\Services\ILocalizedStringManager.cs" />
|
||||||
<Compile Include="Localization\Services\SiteCalendarSelector.cs" />
|
<Compile Include="Localization\Services\SiteCalendarSelector.cs" />
|
||||||
|
|||||||
Reference in New Issue
Block a user