diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index df402822..fed685c4 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -40,7 +40,7 @@ public class EnvelopeController : ViewControllerBase private readonly IMediator _mediator; [Obsolete("Use MediatR")] - public EnvelopeController(ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer) + public EnvelopeController(ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, MultiCulture cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer) { _envRcvService = envelopeReceiverService; _historyService = historyService; diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 09f406d8..0145f195 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -11,7 +11,7 @@ public class HomeController : ViewControllerBase { private readonly IConfiguration _configuration; - public HomeController(IConfiguration configuration, ILogger logger, Cultures cultures, IStringLocalizer localizer) : base(logger, cultures, localizer) + public HomeController(IConfiguration configuration, ILogger logger, MultiCulture cultures, IStringLocalizer localizer) : base(logger, cultures, localizer) { _configuration = configuration; } diff --git a/EnvelopeGenerator.Web/Controllers/LocalizationController.cs b/EnvelopeGenerator.Web/Controllers/LocalizationController.cs index 0c873445..a6726676 100644 --- a/EnvelopeGenerator.Web/Controllers/LocalizationController.cs +++ b/EnvelopeGenerator.Web/Controllers/LocalizationController.cs @@ -14,9 +14,9 @@ namespace EnvelopeGenerator.Web.Controllers private readonly IStringLocalizer _localizer; - private readonly Cultures _cultures; + private readonly MultiCulture _cultures; - public LocalizationController(IStringLocalizer localizer, Cultures cultures, ILogger logger) + public LocalizationController(IStringLocalizer localizer, MultiCulture cultures, ILogger logger) { _localizer = localizer; _cultures = cultures; diff --git a/EnvelopeGenerator.Web/Controllers/TFARegController.cs b/EnvelopeGenerator.Web/Controllers/TFARegController.cs index ba4da507..168dedc8 100644 --- a/EnvelopeGenerator.Web/Controllers/TFARegController.cs +++ b/EnvelopeGenerator.Web/Controllers/TFARegController.cs @@ -26,7 +26,7 @@ public class TFARegController : ViewControllerBase private readonly TFARegParams _params; [Obsolete("Use MediatR")] - public TFARegController(ILogger logger, Cultures cultures, IStringLocalizer localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions tfaRegParamsOptions) : base(logger, cultures, localizer) + public TFARegController(ILogger logger, MultiCulture cultures, IStringLocalizer localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions tfaRegParamsOptions) : base(logger, cultures, localizer) { _envRcvService = erService; _authenticator = authenticator; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs index 5e63e217..f5e3abb3 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs @@ -15,9 +15,9 @@ namespace EnvelopeGenerator.Web.Controllers.Test public class TestLocalizerController : ControllerBase { private readonly IStringLocalizer _localizer; - private readonly Cultures _cultures; + private readonly MultiCulture _cultures; - public TestLocalizerController(IStringLocalizer localizer, Cultures cultures) + public TestLocalizerController(IStringLocalizer localizer, MultiCulture cultures) { _localizer = localizer; _cultures = cultures; diff --git a/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs b/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs index 80bbbbff..05b0990e 100644 --- a/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs +++ b/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs @@ -8,10 +8,10 @@ namespace EnvelopeGenerator.Web.Controllers; public class ViewControllerBase : Controller { protected readonly ILogger _logger; - protected readonly Cultures _cultures; + protected readonly MultiCulture _cultures; protected readonly IStringLocalizer _localizer; - public ViewControllerBase(ILogger logger, Cultures cultures, IStringLocalizer localizer) + public ViewControllerBase(ILogger logger, MultiCulture cultures, IStringLocalizer localizer) { _logger = logger; _cultures = cultures; diff --git a/EnvelopeGenerator.Web/Models/Cultures.cs b/EnvelopeGenerator.Web/Models/MultiCulture.cs similarity index 91% rename from EnvelopeGenerator.Web/Models/Cultures.cs rename to EnvelopeGenerator.Web/Models/MultiCulture.cs index a1ee8bca..67195be8 100644 --- a/EnvelopeGenerator.Web/Models/Cultures.cs +++ b/EnvelopeGenerator.Web/Models/MultiCulture.cs @@ -1,6 +1,6 @@ namespace EnvelopeGenerator.Web.Models { - public class Cultures : List + public class MultiCulture : List { public IEnumerable Languages => this.Select(c => c.Language);