From 2eeef52077e965bb0de0236b1d38f2ce9e42dd76 Mon Sep 17 00:00:00 2001 From: GiuseppeMusso-Laser Date: Fri, 31 Mar 2017 21:29:54 +0200 Subject: [PATCH] Localization: default culture set to site culture for new content items. (#7626) Fixes #7625 --- .../Localization.ContentTranslations.Edit.cshtml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml index f7927c3d1..562f5d09c 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml @@ -74,8 +74,15 @@ TagBuilder optionTag = new TagBuilder("option"); optionTag.Attributes["data-content-dir"] = CultureInfo.GetCultureInfo(siteCulture).TextInfo.IsRightToLeft ? "rtl" : "ltr"; - if (siteCulture == culture) { - optionTag.Attributes["selected"] = "selected"; + if(string.IsNullOrEmpty(culture)) { + if (siteCulture == WorkContext.CurrentSite.SiteCulture) { + optionTag.Attributes["selected"] = "selected"; + } + } + else { + if (siteCulture == culture) { + optionTag.Attributes["selected"] = "selected"; + } } optionTag.SetInnerText(Html.Encode(siteCulture)); selectTag.InnerHtml += optionTag.ToString();