Fixed translations of dashboard page title

2025-01-18 05:58:18 +01:00 · 2015-11-11 14:57:02 +08:00 · 2015-11-11 14:57:02 +08:00 · be1fccd682
commit be1fccd682
parent 37011ad1ff
11 changed files with 24 additions and 22 deletions
--- a/app/Http/Controllers/Dashboard/ComponentController.php
+++ b/app/Http/Controllers/Dashboard/ComponentController.php
@ -49,7 +49,7 @@ class ComponentController extends Controller
            'components' => [
                'title'  => trans('dashboard.components.components'),
                'url'    => route('dashboard.components.index'),
-                'icon'   => 'ion-outlet',
+                'icon'   => 'ion-ios-browsers',
                'active' => false,
            ],
            'groups' => [
--- a/app/Http/Controllers/Dashboard/IncidentController.php
+++ b/app/Http/Controllers/Dashboard/IncidentController.php
@ -70,7 +70,6 @@ class IncidentController extends Controller
    public function showIncidents()
    {
        $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
-
        return View::make('dashboard.incidents.index')
            ->withPageTitle(trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'))
            ->withIncidents($incidents);
--- a/app/Http/Controllers/Dashboard/ScheduleController.php
+++ b/app/Http/Controllers/Dashboard/ScheduleController.php
@ -69,8 +69,9 @@ class ScheduleController extends Controller
    public function showIndex()
    {
        $schedule = Incident::scheduled()->orderBy('created_at')->get();
-
-        return View::make('dashboard.schedule.index')->withSchedule($schedule);
+        return View::make('dashboard.schedule.index')
+            ->withPageTitle(trans('dashboard.schedule.schedule').' - '.trans('dashboard.dashboard'))
+            ->withSchedule($schedule);
    }

    /**
@ -83,6 +84,7 @@ class ScheduleController extends Controller
        $incidentTemplates = IncidentTemplate::all();

        return View::make('dashboard.schedule.add')
+            ->withPageTitle(trans('dashboard.schedule.add.title').' - '.trans('dashboard.dashboard'))
            ->withIncidentTemplates($incidentTemplates);
    }

@ -123,6 +125,7 @@ class ScheduleController extends Controller
        $incidentTemplates = IncidentTemplate::all();

        return View::make('dashboard.schedule.edit')
+            ->withPageTitle(trans('dashboard.schedule.edit.title').' - '.trans('dashboard.dashboard'))
            ->withIncidentTemplates($incidentTemplates)
            ->withSchedule($schedule);
    }
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@ -100,7 +100,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['setup']['url']);

        return View::make('dashboard.settings.app-setup')
-            ->withPageTitle('Application Setup - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.app-setup.app-setup').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu);
    }

@ -116,7 +116,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['analytics']['url']);

        return View::make('dashboard.settings.analytics')
-            ->withPageTitle('Analytics - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.analytics.analytics').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu);
    }

@ -132,7 +132,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['localization']['url']);

        return View::make('dashboard.settings.localization')
-            ->withPageTitle('Localization - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.localization.localization').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu);
    }

@ -148,7 +148,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['theme']['url']);

        return View::make('dashboard.settings.theme')
-            ->withPageTitle('Theme - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.theme.theme').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu);
    }

@ -166,7 +166,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['security']['url']);

        return View::make('dashboard.settings.security')
-            ->withPageTitle('Security - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.security.security').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu)
            ->withUnsecureUsers($unsecureUsers);
    }
@ -183,7 +183,7 @@ class SettingsController extends Controller
        Session::flash('redirect_to', $this->subMenu['stylesheet']['url']);

        return View::make('dashboard.settings.stylesheet')
-            ->withPageTitle('Stylesheet - Dashboard')
+            ->withPageTitle(trans('dashboard.settings.stylesheet.stylesheet').' - '.trans('dashboard.dashboard'))
            ->withSubMenu($this->subMenu);
    }

--- a/resources/lang/zh-CN/dashboard.php
+++ b/resources/lang/zh-CN/dashboard.php
@ -53,13 +53,13 @@ return [
        'scheduled_at' => '计划在 :timestamp',
        'add'          => [
            'title'   => '添加维护计划',
-            'success' => '计划已添加。',
-            'failure' => '计划添加失败。',
+            'success' => '维护计划已添加。',
+            'failure' => '维护计划添加失败。',
        ],
        'edit' => [
            'title'   => '编辑维护计划',
-            'success' => '计划已更新！',
-            'failure' => '计划更新失败。',
+            'success' => '维护计划已更新！',
+            'failure' => '维护计划更新失败。',
        ],
        'delete' => [
            'success' => '维护计划已被删除，它将从您的状态页上消失。',
@ -183,7 +183,7 @@ return [
            'stylesheet' => '自定义样式',
        ],
        'theme' => [
-            'theme' => '主题',
+            'theme' => '主题设置',
        ],
        'edit' => [
            'success' => '设置已保存。',
--- a/resources/views/dashboard/components/add.blade.php
+++ b/resources/views/dashboard/components/add.blade.php
@ -6,7 +6,7 @@
            <i class="icon ion-navicon"></i>
        </div>
        <span class="uppercase">
-            <i class="icons ion-outlet"></i> {{ trans('dashboard.components.components') }}
+            <i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
        </span>
        &gt; <small>{{ trans('dashboard.components.add.title') }}</small>
    </div>
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@ -6,7 +6,7 @@
            <i class="icon ion-navicon"></i>
        </div>
        <span class="uppercase">
-            <i class="icons ion-outlet"></i> {{ trans('dashboard.components.components') }}
+            <i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
        </span>
        &gt; <small>{{ trans('dashboard.components.edit.title') }}</small>
    </div>
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@ -8,7 +8,7 @@
        <div class="content-wrapper">
            <div class="header sub-header">
                <span class="uppercase">
-                    <i class="icons ion-outlet"></i> {{ trans('dashboard.components.components') }}
+                    <i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
                </span>
                <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}">
                    {{ trans('dashboard.components.add.title') }}
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@ -6,7 +6,7 @@
            <i class="icon ion-navicon"></i>
        </div>
        <span class="uppercase">
-            <i class="icon ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
+            <i class="icon ion-ios-speedometer"></i> {{ trans('dashboard.dashboard') }}
        </span>
    </div>
    <div class="content-wrapper">
--- a/resources/views/dashboard/partials/sidebar.blade.php
+++ b/resources/views/dashboard/partials/sidebar.blade.php
@ -26,7 +26,7 @@
        <ul>
            <li {!! set_active('dashboard') !!}>
                <a href="{{ route('dashboard.index') }}">
-                    <i class="icon ion-speedometer"></i>
+                    <i class="icon ion-ios-speedometer"></i>
                    <span>{{ trans('dashboard.dashboard') }}</span>
                </a>
            </li>
@ -45,7 +45,7 @@
            </li>
            <li {!! set_active('dashboard/components*') !!}>
                <a href="{{ route('dashboard.components.index') }}">
-                    <i class="icons ion-outlet"></i>
+                    <i class="icons ion-ios-browsers"></i>
                    <span>{{ trans('dashboard.components.components') }}</span>
                    <span class="label label-info">{{ $component_count }}</span>
                </a>
--- a/resources/views/dashboard/partials/welcome-modal.blade.php
+++ b/resources/views/dashboard/partials/welcome-modal.blade.php
@ -18,7 +18,7 @@
                    <div class="row">
                        <div class="col-md-4 animated fadeInDown">
                            <a href="{{ route('dashboard.components.add') }}">
-                                <i class="icon ion-outlet"></i>
+                                <i class="icon ion-ios-browsers"></i>
                                {{ trans('dashboard.welcome.steps.component') }}
                            </a>
                        </div>