diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 636babe1..5203f08d 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -23,6 +23,7 @@ class ViewServiceProvider extends ServiceProvider 'site_name' => option_localized('site_name'), 'navbar_color' => $color, 'color_mode' => in_array($color, $lightColors) ? 'light' : 'dark', + 'locale' => str_replace('_', '-', app()->getLocale()), ]); }); diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md index 53b7a685..cf77d3ed 100644 --- a/resources/misc/changelogs/en/5.0.0.md +++ b/resources/misc/changelogs/en/5.0.0.md @@ -44,6 +44,7 @@ - Fixed the display problem for too long texture name. - Fixed that dependencies and conflicts haven't been checked before installing plugin. - Fixed retrieving search keyword from query string in skin library. +- Fixed that `lang` attribute of HTML can't be configured correctly. ## Removed diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md index 9c0b0f95..1c7e36c4 100644 --- a/resources/misc/changelogs/zh_CN/5.0.0.md +++ b/resources/misc/changelogs/zh_CN/5.0.0.md @@ -44,6 +44,7 @@ - 材质名过长时的显示问题 - 下载插件前不检查依赖和冲突的问题 - 修复皮肤库中从 query string 获取搜索关键字的问题 +- 修复未能正确设置 HTML 的 `lang` 属性的问题 ## 移除 diff --git a/resources/views/admin/base.twig b/resources/views/admin/base.twig index 8d4957e9..ef200f74 100644 --- a/resources/views/admin/base.twig +++ b/resources/views/admin/base.twig @@ -1,5 +1,5 @@ - + {{ include('shared.head') }} {% block title %}{% endblock %} - {{ site_name }} diff --git a/resources/views/admin/master.blade.php b/resources/views/admin/master.blade.php index 3a96eb78..f5154ee5 100644 --- a/resources/views/admin/master.blade.php +++ b/resources/views/admin/master.blade.php @@ -1,5 +1,5 @@ - + @include('shared.head') @yield('title') - {{ option_localized('site_name') }} diff --git a/resources/views/auth/base.twig b/resources/views/auth/base.twig index 95af0ef8..e26be33a 100644 --- a/resources/views/auth/base.twig +++ b/resources/views/auth/base.twig @@ -1,5 +1,5 @@ - + {{ include('shared.head') }} {% block title %}{% endblock %} - {{ site_name }} diff --git a/resources/views/errors/base.twig b/resources/views/errors/base.twig index 18a49d5a..b72f3fef 100644 --- a/resources/views/errors/base.twig +++ b/resources/views/errors/base.twig @@ -1,5 +1,5 @@ - + diff --git a/resources/views/home.twig b/resources/views/home.twig index 2b5dfd38..f0a6b72e 100644 --- a/resources/views/home.twig +++ b/resources/views/home.twig @@ -1,5 +1,5 @@ - + {{ include('shared.head') }} {{ site_name }} diff --git a/resources/views/setup/base.twig b/resources/views/setup/base.twig index 9933535b..dd25c7a3 100644 --- a/resources/views/setup/base.twig +++ b/resources/views/setup/base.twig @@ -1,5 +1,5 @@ - + diff --git a/resources/views/skinlib/base.twig b/resources/views/skinlib/base.twig index b3a9af2e..fb2448e4 100644 --- a/resources/views/skinlib/base.twig +++ b/resources/views/skinlib/base.twig @@ -1,5 +1,5 @@ - + {{ include('shared.head') }} {% block title %}{% endblock %} - {{ site_name }} diff --git a/resources/views/user/base.twig b/resources/views/user/base.twig index 39f01840..29239e3b 100644 --- a/resources/views/user/base.twig +++ b/resources/views/user/base.twig @@ -1,5 +1,5 @@ - + {{ include('shared.head') }} {% block title %}{% endblock %} - {{ site_name }} diff --git a/resources/views/user/master.blade.php b/resources/views/user/master.blade.php index 4790767b..2df7e58f 100644 --- a/resources/views/user/master.blade.php +++ b/resources/views/user/master.blade.php @@ -1,5 +1,5 @@ - + @include('shared.head') @yield('title') - {{ option_localized('site_name') }}