lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 10:07:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Localization: Code styling in FrontEndCultureSelector, displaying culture name instead of code in AdminCultureSelector

Browse Source
This commit is contained in:
Lombiq
2019-08-13 16:25:07 +02:00
committed by Benedek Farkas
parent eba6f118dd
commit b03d83473f
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Orchard.Web/Modules/Orchard.Localization/Views/AdminCultureSelector.cshtml
View File

@@ -1,4 +1,6 @@
@{
@using System.Globalization
@{
var currentCulture = WorkContext.CurrentCulture;
var supportedCultures = (IList<string>)Model.SupportedCultures;
}
@@ -6,15 +8,20 @@
<div id="culture-selection">
<ul>
@foreach (var supportedCulture in supportedCultures) {
var url = Url.Action("ChangeCulture", "AdminCultureSelector", new { area = "Orchard.Localization", culture = supportedCulture, returnUrl = Html.ViewContext.HttpContext.Request.RawUrl });
var culture = CultureInfo.GetCultureInfo(supportedCulture);
<li>
@if (supportedCulture.Equals(currentCulture)) {
<a href="@url">@T("{0} (current)", supportedCulture)</a>
} else {
<a href="@url">@supportedCulture</a>
}
</li>
if (culture is object)
{
var url = Url.Action("ChangeCulture", "AdminCultureSelector", new { area = "Orchard.Localization", culture = supportedCulture, returnUrl = Html.ViewContext.HttpContext.Request.RawUrl });
<li>
@if (supportedCulture.Equals(currentCulture)) {
<a href="@url">@T("{0} (current)", culture.DisplayName)</a>
} else {
<a href="@url">@culture.DisplayName</a>
}
</li>
}
}
</ul>
</div>

37
src/Orchard.Web/Modules/Orchard.Localization/Views/FrontEndCultureSelector.cshtml
View File

@@ -3,6 +3,7 @@
@using Orchard.ContentManagement
@using Orchard.ContentManagement.Aspects
@using Orchard.Localization.Services
@{
var localizableAspects = Enumerable.Empty<ILocalizableAspect>();
var homePage = WorkContext.Resolve<IHomeAliasService>().GetHomePage();
@@ -12,26 +13,24 @@
localizableAspects = localizationService.GetLocalizations(homePage).Concat(new[] { homePage.As<ILocalizableAspect>() });
}
}
@if (localizableAspects.Any()) {
<div>
<ul>
@foreach (var localization in localizableAspects) {
<div>
<ul>
@foreach (var localization in localizableAspects.Where(localization => !string.IsNullOrEmpty(localization.Culture))) {
var culture = CultureInfo.GetCultureInfo(localization.Culture);
if (localization.Culture == null) {
continue;
if (culture is object) {
<li>
@if (localization.Culture.Equals(WorkContext.CurrentCulture, StringComparison.InvariantCultureIgnoreCase)) {
<a href="@Url.ItemDisplayUrl(localization)">@T("{0} (current)", culture.DisplayName)</a>
}
else {
<a href="@Url.ItemDisplayUrl(localization)">@culture.DisplayName</a>
}
</li>
}
}
var culture = CultureInfo.GetCultureInfo(localization.Culture);
<li>
@if (localization.Culture.Equals(WorkContext.CurrentCulture, StringComparison.InvariantCultureIgnoreCase)) {
<a href="@Url.ItemDisplayUrl(localization)">@T("{0} (current)", culture.DisplayName)</a>
}
else {
<a href="@Url.ItemDisplayUrl(localization)">@T("{0}", culture.DisplayName)</a>
}
</li>
}
</ul>
</div>
</ul>
</div>
}