Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ILocalizationService instead of get all cultures #14934

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Use ILocalizationService instead of get all cultures #14934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ccaf6b
Use ILocalizationService instead of get all cultures
hishamco Dec 21, 2023
a86135d
Merge branch 'main' into hishamco/all-cultures
hishamco Dec 21, 2023
b55e056
Add missing comma
hishamco Dec 21, 2023
6c12fc1
Fix merge conflict issue
hishamco Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class AdminController : Controller
private readonly INotifier _notifier;
private readonly ILogger _logger;
private readonly IOptions<TemplateOptions> _templateOptions;
private readonly ILocalizationService _localizationService;

public AdminController(
ISession session,
Expand All @@ -69,8 +70,8 @@ public AdminController(
IOptions<ElasticsearchOptions> elasticSearchOptions,
INotifier notifier,
ILogger<AdminController> logger,
IOptions<TemplateOptions> templateOptions
)
IOptions<TemplateOptions> templateOptions,
ILocalizationService localizationService)
{
_session = session;
_siteService = siteService;
Expand All @@ -89,6 +90,7 @@ IOptions<TemplateOptions> templateOptions
_notifier = notifier;
_logger = logger;
_templateOptions = templateOptions;
_localizationService = localizationService;
}

public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
Expand Down Expand Up @@ -209,8 +211,13 @@ public async Task<ActionResult> EditPost(ElasticIndexSettingsViewModel model, st

if (!ModelState.IsValid)
{
model.Cultures = CultureInfo.GetCultures(CultureTypes.AllCultures)
.Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name });
var supportedCultures = await _localizationService.GetSupportedCulturesAsync();

model.Cultures = supportedCultures.Select(c => new SelectListItem
{
Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
Value = c
});

model.Analyzers = _elasticSearchOptions.Analyzers
.Select(x => new SelectListItem { Text = x.Key, Value = x.Key });
Expand Down
16 changes: 12 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class AdminController : Controller
protected readonly IHtmlLocalizer H;
private readonly ILogger _logger;
private readonly IOptions<TemplateOptions> _templateOptions;
private readonly ILocalizationService _localizationService;

public AdminController(
ISession session,
Expand All @@ -69,7 +70,8 @@ public AdminController(
IStringLocalizer<AdminController> stringLocalizer,
IHtmlLocalizer<AdminController> htmlLocalizer,
ILogger<AdminController> logger,
IOptions<TemplateOptions> templateOptions)
IOptions<TemplateOptions> templateOptions,
ILocalizationService localizationService)
{
_session = session;
_luceneIndexManager = luceneIndexManager;
Expand All @@ -83,12 +85,12 @@ public AdminController(
_notifier = notifier;
_pagerOptions = pagerOptions.Value;
_javaScriptEncoder = javaScriptEncoder;

New = shapeFactory;
S = stringLocalizer;
H = htmlLocalizer;
_logger = logger;
_templateOptions = templateOptions;
_localizationService = localizationService;
}

public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
Expand Down Expand Up @@ -208,8 +210,14 @@ public async Task<ActionResult> EditPost(LuceneIndexSettingsViewModel model, str

if (!ModelState.IsValid)
{
model.Cultures = CultureInfo.GetCultures(CultureTypes.AllCultures)
.Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
var supportedCultures = await _localizationService.GetSupportedCulturesAsync();

model.Cultures = supportedCultures
.Select(c => new SelectListItem
{
Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
Value = c
}).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
model.Analyzers = _luceneAnalyzerManager.GetAnalyzers()
.Select(x => new SelectListItem { Text = x.Name, Value = x.Name });
return View(model);
Expand Down