diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 7d322082..fd69eea9 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -155,7 +155,8 @@ class AdminController extends Controller $general = Option::form('general', OptionForm::AUTO_DETECT, function($form) { $form->text('site_name'); - $form->text('site_description'); + $form->text('site_description')->description(); + $form->text('site_url') ->hint() ->format(function ($url) { @@ -207,13 +208,14 @@ class AdminController extends Controller $form->checkbox('allow_sending_statistics')->label()->hint(); - })->handle(); + })->handle(function () { + Option::set('site_name_'.config('app.locale'), request('site_name')); + Option::set('site_description_'.config('app.locale'), request('site_description')); + }); $announ = Option::form('announ', OptionForm::AUTO_DETECT, function ($form) { $form->textarea('announcement')->rows(10)->description(); - })->renderWithOutTable()->with('announcement', - option('announcement_'.config('app.locale'), option('announcement')) - )->handle(function () { + })->renderWithOutTable()->handle(function () { Option::set('announcement_'.config('app.locale'), request('announcement')); }); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 3a682558..92f4b391 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -33,7 +33,7 @@ class AppServiceProvider extends ServiceProvider // Provide some application information for javascript $blessing = array_merge(array_except(config('app'), ['key', 'providers', 'aliases', 'cipher', 'log', 'url']), [ 'base_url' => url('/'), - 'site_name' => option('site_name') + 'site_name' => option_localized('site_name') ]); $event->addContent(''); diff --git a/resources/lang/en/options.yml b/resources/lang/en/options.yml index b0386010..9cd1d8b0 100644 --- a/resources/lang/en/options.yml +++ b/resources/lang/en/options.yml @@ -66,7 +66,9 @@ general: title: General Options site_name: Site Name - site_description: Site Description + site_description: + title: Site Description + description: You can also specify a different site name and description for each language. To edit a specific language's corresponding site name or description text, please switch to that language and submit your edit. site_url: title: Site URL hint: Begin with http(s)://, nerver ends with slash diff --git a/resources/lang/zh_CN/options.yml b/resources/lang/zh_CN/options.yml index 4ac5db98..e236ad73 100644 --- a/resources/lang/zh_CN/options.yml +++ b/resources/lang/zh_CN/options.yml @@ -66,7 +66,9 @@ general: title: 常规选项 site_name: 站点标题 - site_description: 站点描述 + site_description: + title: 站点描述 + description: 每种支持的语言都可以对应不同的站点标题与站点描述文本，如果想要编辑某种特定语言下的站点标题与描述，请在右上角切换至该语言后再提交修改。 site_url: title: 站点地址（URL） hint: 以 http(s):// 开头，不要以 / 结尾 diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl index d229a352..6583417b 100644 --- a/resources/views/admin/master.tpl +++ b/resources/views/admin/master.tpl @@ -3,7 +3,7 @@ - @yield('title') - {{ option('site_name') }} + @yield('title') - {{ option_localized('site_name') }} {!! bs_favicon() !!} @@ -26,7 +26,7 @@ - {{ option('site_name') }} + {{ option_localized('site_name') }} diff --git a/resources/views/auth/bind.tpl b/resources/views/auth/bind.tpl index 65d745bd..def4e7aa 100644 --- a/resources/views/auth/bind.tpl +++ b/resources/views/auth/bind.tpl @@ -6,7 +6,7 @@
diff --git a/resources/views/auth/forgot.tpl b/resources/views/auth/forgot.tpl index 1969a383..e6c53fa8 100644 --- a/resources/views/auth/forgot.tpl +++ b/resources/views/auth/forgot.tpl @@ -6,7 +6,7 @@