Browse Source

Use CurrentCulture as the page language.

pull/1402/head
maliming 7 years ago
parent
commit
761952412e
  1. 10
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml
  2. 10
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml
  3. 3
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml
  4. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Layout/ContentLayout.cs
  5. 1
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

10
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml

@ -1,4 +1,4 @@
@using Volo.Abp.AspNetCore.Mvc.AntiForgery @using Volo.Abp.AspNetCore.Mvc.AntiForgery
@using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook @using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook
@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Abp.AspNetCore.Mvc.UI.Layout
@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
@ -25,17 +25,11 @@
pageTitle = PageLayout.Content.Title + pageTitle; pageTitle = PageLayout.Content.Title + pageTitle;
} }
var pageLang = ViewBag.Lang == null ? "" : $" lang={ViewBag.Lang}";
if (PageLayout.Content.Lang != null)
{
pageLang = $" lang={PageLayout.Content.Lang}";
}
} }
<!DOCTYPE html> <!DOCTYPE html>
<@($"html{pageLang}")> <html lang="@CultureInfo.CurrentCulture.Name">
<head> <head>
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Application) @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Application)

10
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml

@ -1,4 +1,4 @@
@using Volo.Abp.AspNetCore.Mvc.AntiForgery @using Volo.Abp.AspNetCore.Mvc.AntiForgery
@using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook @using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook
@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Abp.AspNetCore.Mvc.UI.Layout
@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
@ -24,17 +24,11 @@
pageTitle = PageLayout.Content.Title + pageTitle; pageTitle = PageLayout.Content.Title + pageTitle;
} }
var pageLang = ViewBag.Lang == null ? "" : $" lang={ViewBag.Lang}";
if (PageLayout.Content.Lang != null)
{
pageLang = $" lang={PageLayout.Content.Lang}";
}
} }
<!DOCTYPE html> <!DOCTYPE html>
<@($"html{pageLang}")> <html lang="@CultureInfo.CurrentCulture.Name">
<head> <head>
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Empty) @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Empty)

3
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml

@ -1,3 +1,4 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @using System.Globalization
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Layout/ContentLayout.cs

@ -5,8 +5,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Layout
{ {
public class ContentLayout public class ContentLayout
{ {
public string Lang { get; set; }
public string Title { get; set; } public string Title { get; set; }
public BreadCrumb BreadCrumb { get; } public BreadCrumb BreadCrumb { get; }

1
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@ -17,7 +17,6 @@
@{ @{
ViewBag.FluidLayout = true; ViewBag.FluidLayout = true;
Layout = ThemeManager.CurrentTheme.GetEmptyLayout(); Layout = ThemeManager.CurrentTheme.GetEmptyLayout();
PageLayout.Content.Lang = Model.LanguageCode;
PageLayout.Content.Title = Model.DocumentName?.Replace("-", " "); PageLayout.Content.Title = Model.DocumentName?.Replace("-", " ");
} }
@section styles { @section styles {

Loading…
Cancel
Save