Fix code standards, update language files.

2015-06-16 09:07:49 +01:00
parent 49411d8568
commit 9d879b162e
84 changed files with 613 additions and 613 deletions
--- a/app/Console/Commands/FixPermissionsCommand.php
+++ b/app/Console/Commands/FixPermissionsCommand.php
@@ -65,8 +65,6 @@ class FixPermissionsCommand extends Command
     * @param string $databaseDirectory
     * @param string $databasePath
     * @param string $databaseDefault
-     *
-     * @return void
     */
    public function __construct($storageDirectory, $databaseDirectory, $databasePath, $databaseDefault)
    {
--- a/app/Events/CustomerHasSubscribedEvent.php
+++ b/app/Events/CustomerHasSubscribedEvent.php
@@ -24,8 +24,6 @@ class CustomerHasSubscribedEvent

    /**
     * Create a new customer has subscribed event instance.
-     *
-     * @return void
     */
    public function __construct(Subscriber $subscriber)
    {
--- a/app/Events/IncidentHasReportedEvent.php
+++ b/app/Events/IncidentHasReportedEvent.php
@@ -24,8 +24,6 @@ class IncidentHasReportedEvent

    /**
     * Create a new incident has reported event instance.
-     *
-     * @return void
     */
    public function __construct(Incident $incident)
    {
--- a/app/Events/MaintenanceHasScheduledEvent.php
+++ b/app/Events/MaintenanceHasScheduledEvent.php
@@ -24,8 +24,6 @@ class MaintenanceHasScheduledEvent

    /**
     * Create a new maintenance has scheduled event instance.
-     *
-     * @return void
     */
    public function __construct(Incident $incident)
    {
--- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
+++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
@@ -46,8 +46,6 @@ class SendIncidentEmailNotificationHandler
     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
-     *
-     * @return void
     */
    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
    {
@@ -60,8 +58,6 @@ class SendIncidentEmailNotificationHandler
     * Handle the event.
     *
     * @param \CachetHQ\Cachet\Events\IncidentHasReportedEvent $event
-     *
-     * @return void
     */
    public function handle(IncidentHasReportedEvent $event)
    {
--- a/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
+++ b/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
@@ -46,8 +46,6 @@ class SendMaintenanceEmailNotificationHandler
     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
-     *
-     * @return void
     */
    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
    {
@@ -60,8 +58,6 @@ class SendMaintenanceEmailNotificationHandler
     * Handle the event.
     *
     * @param \CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent $event
-     *
-     * @return void
     */
    public function handle(MaintenanceHasScheduledEvent $event)
    {
--- a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
+++ b/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
@@ -28,8 +28,6 @@ class SendSubscriberVerificationEmailHandler
     * Create a new send subscriber verification email handler.
     *
     * @param \Illuminate\Contracts\Mail\Mailer $mailer
-     *
-     * @return void
     */
    public function __construct(MailQueue $mailer)
    {
@@ -40,8 +38,6 @@ class SendSubscriberVerificationEmailHandler
     * Handle the event.
     *
     * @param \CachetHQ\Cachet\Events\CustomerHasSubscribedEvent $event
-     *
-     * @return void
     */
    public function handle(CustomerHasSubscribedEvent $event)
    {
--- a/app/Http/Controllers/AtomController.php
+++ b/app/Http/Controllers/AtomController.php
@@ -56,8 +56,6 @@ class AtomController extends AbstractController
     *
     * @param \Roumen\Feed\Facades\Feed        $feed
     * @param \CachetHQ\Cachet\Models\Incident $incident
-     *
-     * @return void
     */
    private function feedAddItem(&$feed, $incident)
    {
--- a/app/Http/Controllers/RssController.php
+++ b/app/Http/Controllers/RssController.php
@@ -56,8 +56,6 @@ class RssController extends AbstractController
     *
     * @param \Roumen\Feed\Facades\Feed        $feed
     * @param \CachetHQ\Cachet\Models\Incident $incident
-     *
-     * @return void
     */
    private function feedAddItem(&$feed, $incident)
    {
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -219,8 +219,6 @@ class SetupController extends AbstractController
     *
     * @param string $key
     * @param mixed  $value
-     *
-     * @return void
     */
    protected function writeEnv($key, $value)
    {
@@ -236,8 +234,6 @@ class SetupController extends AbstractController

    /**
     * Generate the app.key value.
-     *
-     * @return void
     */
    protected function keyGenerate()
    {
--- a/app/Http/Middleware/Admin.php
+++ b/app/Http/Middleware/Admin.php
@@ -28,8 +28,6 @@ class Admin
     * Create a new admin middleware instance.
     *
     * @param \Illuminate\Contracts\Auth\Guard $auth
-     *
-     * @return void
     */
    public function __construct(Guard $auth)
    {
--- a/app/Http/Middleware/ApiAuthenticate.php
+++ b/app/Http/Middleware/ApiAuthenticate.php
@@ -29,8 +29,6 @@ class ApiAuthenticate
     * Create a new api authenticate middleware instance.
     *
     * @param \Illuminate\Contracts\Auth\Guard $auth
-     *
-     * @return void
     */
    public function __construct(Guard $auth)
    {
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -27,8 +27,6 @@ class Authenticate
     * Create a new authenticate middleware instance.
     *
     * @param \Illuminate\Contracts\Auth\Guard $auth
-     *
-     * @return void
     */
    public function __construct(Guard $auth)
    {
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -28,8 +28,6 @@ class RedirectIfAuthenticated
     * Create a new redirect if authenticated middleware instance.
     *
     * @param \Illuminate\Contracts\Auth\Guard $auth
-     *
-     * @return void
     */
    public function __construct(Guard $auth)
    {
--- a/app/Models/Subscriber.php
+++ b/app/Models/Subscriber.php
@@ -44,8 +44,6 @@ class Subscriber extends Model

    /**
     * Overrides the models boot method.
-     *
-     * @return void
     */
    public static function boot()
    {
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -21,8 +21,6 @@ class AppServiceProvider extends ServiceProvider
     * Boot the service provider.
     *
     * @param \Illuminate\Bus\Dispatcher $dispatcher
-     *
-     * @return void
     */
    public function boot(Dispatcher $dispatcher)
    {
@@ -37,8 +35,6 @@ class AppServiceProvider extends ServiceProvider

    /**
     * Register the service provider.
-     *
-     * @return void
     */
    public function register()
    {
--- a/app/Providers/ComposerServiceProvider.php
+++ b/app/Providers/ComposerServiceProvider.php
@@ -26,8 +26,6 @@ class ComposerServiceProvider extends ServiceProvider
     * Boot the service provider.
     *
     * @param \Illuminate\Contracts\View\Factory $factory
-     *
-     * @return void
     */
    public function boot(Factory $factory)
    {
@@ -41,8 +39,6 @@ class ComposerServiceProvider extends ServiceProvider

    /**
     * Register the service provider.
-     *
-     * @return void
     */
    public function register()
    {
--- a/app/Providers/ConfigServiceProvider.php
+++ b/app/Providers/ConfigServiceProvider.php
@@ -21,8 +21,6 @@ class ConfigServiceProvider extends ServiceProvider
 {
    /**
     * Boot the service provider.
-     *
-     * @return void
     */
    public function boot()
    {
@@ -68,8 +66,6 @@ class ConfigServiceProvider extends ServiceProvider

    /**
     * Register the service provider.
-     *
-     * @return void
     */
    public function register()
    {
--- a/app/Providers/ConsoleServiceProvider.php
+++ b/app/Providers/ConsoleServiceProvider.php
@@ -18,8 +18,6 @@ class ConsoleServiceProvider extends ServiceProvider
 {
    /**
     * Register the service provider.
-     *
-     * @return void
     */
    public function register()
    {
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -29,8 +29,6 @@ class RouteServiceProvider extends ServiceProvider
     * Define the route model bindings, pattern filters, etc.
     *
     * @param \Illuminate\Routing\Router $router
-     *
-     * @return void
     */
    public function boot(Router $router)
    {
@@ -41,8 +39,6 @@ class RouteServiceProvider extends ServiceProvider

    /**
     * Register model bindings.
-     *
-     * @return void
     */
    protected function registerBindings()
    {
@@ -60,8 +56,6 @@ class RouteServiceProvider extends ServiceProvider
     * Define the routes for the application.
     *
     * @param \Illuminate\Routing\Router $router
-     *
-     * @return void
     */
    public function map(Router $router)
    {
--- a/app/Providers/SegmentServiceProvider.php
+++ b/app/Providers/SegmentServiceProvider.php
@@ -20,8 +20,6 @@ class SegmentServiceProvider extends ServiceProvider
 {
    /**
     * Register the service provider.
-     *
-     * @return void
     */
    public function register()
    {
--- a/app/Segment/CacheRepository.php
+++ b/app/Segment/CacheRepository.php
@@ -29,8 +29,6 @@ class CacheRepository implements RepositoryInterface
     * Create a new segment cache repository instance.
     *
     * @param \CachetHQ\Cachet\Segment\RepositoryInterface $repository
-     *
-     * @return void
     */
    public function __construct(RepositoryInterface $repository)
    {
--- a/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php
+++ b/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php
@@ -17,8 +17,6 @@ class AlterTableComponentGroupsAddOrder extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -30,8 +28,6 @@ class AlterTableComponentGroupsAddOrder extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php
+++ b/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php
@@ -3,9 +3,7 @@
 /*
 * This file is part of Cachet.
 *
- * (c) James Brooks <james@cachethq.io>
- * (c) Joseph Cohen <joseph.cohen@dinkbit.com>
- * (c) Graham Campbell <graham@mineuk.com>
+ * (c) Cachet HQ <support@cachethq.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -19,8 +17,6 @@ class AlterTableIncidentsAddVisibileColumn extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -33,8 +29,6 @@ class AlterTableIncidentsAddVisibileColumn extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/database/migrations/2015_05_24_210939_create_jobs_table.php
+++ b/database/migrations/2015_05_24_210939_create_jobs_table.php
@@ -16,8 +16,6 @@ class CreateJobsTable extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -35,8 +33,6 @@ class CreateJobsTable extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php
+++ b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php
@@ -16,8 +16,6 @@ class CreateFailedJobsTable extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -32,8 +30,6 @@ class CreateFailedJobsTable extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php
+++ b/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php
@@ -17,8 +17,6 @@ class AlterTableComponentsDropUserIdColumn extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -29,8 +27,6 @@ class AlterTableComponentsDropUserIdColumn extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php
+++ b/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php
@@ -17,8 +17,6 @@ class AlterTableIncidentsDropUserIdColumn extends Migration
 {
    /**
     * Run the migrations.
-     *
-     * @return void
     */
    public function up()
    {
@@ -29,8 +27,6 @@ class AlterTableIncidentsDropUserIdColumn extends Migration

    /**
     * Reverse the migrations.
-     *
-     * @return void
     */
    public function down()
    {
--- a/resources/lang/en-UD/cachet.php
+++ b/resources/lang/en-UD/cachet.php
@@ -58,11 +58,40 @@ return [
        ],
    ],

+    // Subscriber
+    'subscriber' => [
+        'subscribe' => 'crwdns489:0crwdne489:0',
+        'button'    => 'crwdns490:0crwdne490:0',
+        'email'     => [
+            'subscribe'    => 'crwdns491:0crwdne491:0',
+            'subscribed'   => 'crwdns492:0crwdne492:0',
+            'verified'     => 'crwdns493:0crwdne493:0',
+            'unsubscribe'  => 'crwdns494:0crwdne494:0',
+            'unsubscribed' => 'crwdns495:0crwdne495:0',
+            'failure'      => 'crwdns496:0crwdne496:0',
+            'verify'       => [
+                'text'           => 'crwdns497:0crwdne497:0',
+                'html-preheader' => 'crwdns498:0crwdne498:0',
+                'html'           => 'crwdns499:0crwdne499:0',
+            ],
+            'maintenance' => [
+                'text'           => 'crwdns500:0crwdne500:0',
+                'html-preheader' => 'crwdns501:0crwdne501:0',
+                'html'           => 'crwdns502:0crwdne502:0',
+            ],
+            'incident' => [
+                'text'           => 'crwdns503:0crwdne503:0',
+                'html-preheader' => 'crwdns504:0crwdne504:0',
+                'html'           => 'crwdns505:0crwdne505:0',
+            ],
+        ],
+    ],
+
    // Other
    'powered_by'      => 'crwdns11:0crwdne11:0',
    'about_this_site' => 'crwdns150:0crwdne150:0',
-    'rss-feed'        => 'crwdns273:0crwdne273:0',
-    'atom-feed'       => 'crwdns274:0crwdne274:0',
+    'rss-feed'        => 'crwdns506:0crwdne506:0',
+    'atom-feed'       => 'crwdns507:0crwdne507:0',
    'feed'            => 'crwdns275:0crwdne275:0',

 ];
--- a/resources/lang/en-UD/errors.php
+++ b/resources/lang/en-UD/errors.php
@@ -1,5 +1,14 @@
 <?php

+/*
+ * This file is part of Cachet.
+ *
+ * (c) Cachet HQ <support@cachethq.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return [
    'not-found' => [
        'code'    => 'crwdns208:0crwdne208:0',
--- a/resources/lang/en-UD/forms.php
+++ b/resources/lang/en-UD/forms.php
@@ -21,6 +21,8 @@ return [
        'site_timezone'    => 'crwdns378:0crwdne378:0',
        'site_locale'      => 'crwdns379:0crwdne379:0',
        'enable_google2fa' => 'crwdns380:0crwdne380:0',
+        'cache_driver'     => 'crwdns508:0crwdne508:0',
+        'session_driver'   => 'crwdns509:0crwdne509:0',
    ],

    // Login form fields
@@ -42,6 +44,7 @@ return [
        'message-help'       => 'crwdns388:0crwdne388:0',
        'scheduled_at'       => 'crwdns464:0crwdne464:0',
        'incident_time'      => 'crwdns481:0crwdne481:0',
+        'notify_subscribers' => 'crwdns510:0crwdne510:0',
        'visibility'         => 'crwdns482:0crwdne482:0',
        'public'             => 'crwdns483:0crwdne483:0',
        'logged_in_only'     => 'crwdns484:0crwdne484:0',
@@ -100,6 +103,9 @@ return [
            'banner-help'            => 'crwdns405:0crwdne405:0',
            'analytics_google'       => 'crwdns486:0crwdne486:0',
            'analytics_gosquared'    => 'crwdns487:0crwdne487:0',
+            'analytics_piwik_url'    => 'crwdns511:0crwdne511:0',
+            'analytics_piwik_siteid' => 'crwdns512:0crwdne512:0',
+            'subscribers'            => 'crwdns513:0crwdne513:0',
        ],
        'security' => [
            'allowed-domains'      => 'crwdns407:0crwdne407:0',
--- a/resources/lang/en-UD/pagination.php
+++ b/resources/lang/en-UD/pagination.php
@@ -1,5 +1,14 @@
 <?php

+/*
+ * This file is part of Cachet.
+ *
+ * (c) Cachet HQ <support@cachethq.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return [

    /*
--- a/resources/lang/en-UD/reminders.php
+++ b/resources/lang/en-UD/reminders.php
@@ -1,5 +1,14 @@
 <?php

+/*
+ * This file is part of Cachet.
+ *
+ * (c) Cachet HQ <support@cachethq.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return [

    /*
--- a/resources/lang/en-UD/setup.php
+++ b/resources/lang/en-UD/setup.php
@@ -13,6 +13,7 @@ return [
    'setup'             => 'crwdns258:0crwdne258:0',
    'title'             => 'crwdns259:0crwdne259:0',
    'service_details'   => 'crwdns260:0crwdne260:0',
+    'env_setup'         => 'crwdns514:0crwdne514:0',
    'status_page_setup' => 'crwdns261:0crwdne261:0',
    'show_support'      => 'crwdns488:0crwdne488:0',
    'admin_account'     => 'crwdns263:0crwdne263:0',
--- a/resources/lang/en-UD/validation.php
+++ b/resources/lang/en-UD/validation.php
@@ -1,5 +1,14 @@
 <?php

+/*
+ * This file is part of Cachet.
+ *
+ * (c) Cachet HQ <support@cachethq.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return [

    /*
@@ -69,7 +78,7 @@ return [
        'string'  => 'crwdns428:0crwdne428:0',
        'array'   => 'crwdns429:0crwdne429:0',
    ],
-    'string'               => 'The :attribute must be a string.',
+    'string'   => 'crwdns515:0crwdne515:0',
    'unique'   => 'crwdns144:0crwdne144:0',
    'url'      => 'crwdns145:0crwdne145:0',
    'timezone' => 'crwdns146:0crwdne146:0',
--- a/resources/lang/zh-CN/cachet.php
+++ b/resources/lang/zh-CN/cachet.php
@@ -60,29 +60,29 @@ return [

    // Subscriber
    'subscriber' => [
-        'subscribe' => 'Subscribe to get the most recent updates.',
-        'button'    => 'Subscribe',
+        'subscribe' => '',
+        'button'    => '',
        'email'     => [
-            'subscribe'    => 'Subscribe to email updates.',
-            'subscribed'   => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
-            'verified'     => 'Your email subscription has been confirmed. Thank you!',
-            'unsubscribe'  => 'Unsuscribe from email updates.',
-            'unsubscribed' => 'Your email subscription has been cancelled.',
-            'failure'      => 'Something went wrong with the subscription.',
+            'subscribe'    => '',
+            'subscribed'   => '',
+            'verified'     => '',
+            'unsubscribe'  => '',
+            'unsubscribed' => '',
+            'failure'      => '',
            'verify'       => [
-                'text'           => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name",
-                'html-preheader' => 'Please confirm your email subscription to :app_name status updates.',
-                'html'           => '<p>Please confirm your email subscription to :app_name status updates.</p><p>:link</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
            'maintenance' => [
-                'text'           => "New maintenance has been scheduled on :app_name.\nThank you, :app_name",
-                'html-preheader' => 'New maintenance has been scheduled on :app_name.',
-                'html'           => '<p>New maintenance has been scheduled on :app_name.</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
            'incident' => [
-                'text'           => "New incident has been reported on :app_name.\nThank you, :app_name",
-                'html-preheader' => 'New incident has been reported on :app_name.',
-                'html'           => '<p>New incident has been reported on :app_name.</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
        ],
    ],
@@ -90,8 +90,8 @@ return [
    // Other
    'powered_by'      => ':app 应用状态页面由 <a href="https://cachethq.io">Cachet</a>提供支持。',
    'about_this_site' => '关于此站点',
-    'rss-feed'        => 'RSS 源',
-    'atom-feed'       => 'Atom 源',
+    'rss-feed'        => '',
+    'atom-feed'       => '',
    'feed'            => '状态源',

 ];
--- a/resources/lang/zh-CN/dashboard.php
+++ b/resources/lang/zh-CN/dashboard.php
@@ -87,7 +87,7 @@ return [
        // Component groups
        'groups' => [
            'groups'        => '部件分组|部件分组',
-            'no_components' => 'You should add a component group.',
+            'no_components' => '您应添加一个组件分组。',
            'add'           => [
                'title'   => '添加一个分组。',
                'success' => '部件分组已添加。',
@@ -189,7 +189,7 @@ return [
            'customize'  => '自定义',
            'team'       => '添加用户',
            'api'        => '生成 API 令牌。',
-            'two-factor' => '双因素认证',
+            'two-factor' => '双因素身份验证',
        ],
    ],

--- a/resources/lang/zh-CN/errors.php
+++ b/resources/lang/zh-CN/errors.php
--- a/resources/lang/zh-CN/forms.php
+++ b/resources/lang/zh-CN/forms.php
@@ -21,6 +21,8 @@ return [
        'site_timezone'    => '选择您的时区',
        'site_locale'      => '选择您的语言',
        'enable_google2fa' => '启用谷歌双因素身份验证',
+        'cache_driver'     => '',
+        'session_driver'   => '',
    ],

    // Login form fields
@@ -30,7 +32,7 @@ return [
        '2fauth'        => '双因素验证代码',
        'invalid'       => '无效的电子邮件或密码。',
        'invalid-token' => '无效的令牌。',
-        'cookies'       => 'You must enable cookies to login.',
+        'cookies'       => '您必须启用 cookies 来进行登录。',
    ],

    // Incidents form fields
@@ -41,7 +43,11 @@ return [
        'message'            => '消息',
        'message-help'       => '您可以使用Markdown语言。',
        'scheduled_at'       => '什么时间安排维护？',
-
+        'incident_time'      => '这次事件是什么时候发生的？',
+        'notify_subscribers' => '',
+        'visibility'         => '事件的可见性',
+        'public'             => '公共可见',
+        'logged_in_only'     => '仅登录用户可见',
        'templates'          => [
            'name'     => '事件名',
            'template' => '模板',
@@ -89,15 +95,17 @@ return [
            'site-timezone'          => '站点时区',
            'site-locale'            => '站点语言',
            'date-format'            => '日期格式',
+            'incident-date-format'   => '事件的时间戳格式',
            'display-graphs'         => '是否在状态页上显示图表',
            'about-this-page'        => '关于这个页面',
            'days-of-incidents'      => '显示多少天的事件？',
            'banner'                 => '横幅图像',
            'banner-help'            => '建议上传文件宽度不大于930像素。',
-            'analytics_google'       => 'Google Analytics code',
-            'analytics_gosquared'    => 'GoSquared Analytics code',
-            'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
-            'analytics_piwik_siteid' => 'Piwik\'s site id',
+            'analytics_google'       => 'Google Analytics 代码',
+            'analytics_gosquared'    => 'GoSquared Analytics 代码',
+            'analytics_piwik_url'    => '',
+            'analytics_piwik_siteid' => '',
+            'subscribers'            => '',
        ],
        'security' => [
            'allowed-domains'      => '允许的域',
--- a/resources/lang/zh-CN/pagination.php
+++ b/resources/lang/zh-CN/pagination.php
--- a/resources/lang/zh-CN/reminders.php
+++ b/resources/lang/zh-CN/reminders.php
--- a/resources/lang/zh-CN/setup.php
+++ b/resources/lang/zh-CN/setup.php
@@ -13,8 +13,9 @@ return [
    'setup'             => '设置',
    'title'             => '安装 Cachet',
    'service_details'   => '服务细节',
+    'env_setup'         => '',
    'status_page_setup' => '状态页面设置',
-    'show_support'      => '想支持Cachet？',
+    'show_support'      => '您想支持Cachet么?',
    'admin_account'     => '管理员帐户',
    'complete_setup'    => '设置完成',
    'completed'         => 'Cachet已成功配置！',
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -78,7 +78,7 @@ return [
        'string'  => ':attribute 必须是 :size 个字符',
        'array'   => ':attribute 必须包含 :size 个',
    ],
-    'string'               => 'The :attribute must be a string.',
+    'string'   => '',
    'unique'   => ':attribute 已经被占用',
    'url'      => ':attribute 的格式无效',
    'timezone' => ':attribute 必须是个有效的区域。',
--- a/resources/lang/zh-TW/cachet.php
+++ b/resources/lang/zh-TW/cachet.php
@@ -13,7 +13,7 @@ return [
    // Components
    'components' => [
        'status' => [
-            1 => '正常運行',
+            1 => '正常',
            2 => '效能問題',
            3 => '部分停止運作',
            4 => '停止運作',
@@ -22,7 +22,7 @@ return [

    // Incidents
    'incidents' => [
-        'none'          => '沒有任何事件。',
+        'none'          => '沒有任何報告',
        'past'          => '以前的事件',
        'previous_week' => '上星期',
        'next_week'     => '下星期',
@@ -40,12 +40,12 @@ return [

    // Service Status
    'service' => [
-        'good' => '全部系統運作正常。',
+        'good' => '所有系統正常運轉',
        'bad'  => '部分系統出現異常。',
    ],

    'api' => [
-        'regenerate' => '重新生成 API 密鑰',
+        'regenerate' => '重新產生 API 金鑰',
        'revoke'     => '撤銷 API 密鑰',
    ],

@@ -60,38 +60,38 @@ return [

    // Subscriber
    'subscriber' => [
-        'subscribe' => 'Subscribe to get the most recent updates.',
-        'button'    => 'Subscribe',
+        'subscribe' => '',
+        'button'    => '',
        'email'     => [
-            'subscribe'    => 'Subscribe to email updates.',
-            'subscribed'   => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
-            'verified'     => 'Your email subscription has been confirmed. Thank you!',
-            'unsubscribe'  => 'Unsuscribe from email updates.',
-            'unsubscribed' => 'Your email subscription has been cancelled.',
-            'failure'      => 'Something went wrong with the subscription.',
+            'subscribe'    => '',
+            'subscribed'   => '',
+            'verified'     => '',
+            'unsubscribe'  => '',
+            'unsubscribed' => '',
+            'failure'      => '',
            'verify'       => [
-                'text'           => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name",
-                'html-preheader' => 'Please confirm your email subscription to :app_name status updates.',
-                'html'           => '<p>Please confirm your email subscription to :app_name status updates.</p><p>:link</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
            'maintenance' => [
-                'text'           => "New maintenance has been scheduled on :app_name.\nThank you, :app_name",
-                'html-preheader' => 'New maintenance has been scheduled on :app_name.',
-                'html'           => '<p>New maintenance has been scheduled on :app_name.</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
            'incident' => [
-                'text'           => "New incident has been reported on :app_name.\nThank you, :app_name",
-                'html-preheader' => 'New incident has been reported on :app_name.',
-                'html'           => '<p>New incident has been reported on :app_name.</p><p>Thank you, :app_name</p>',
+                'text'           => '',
+                'html-preheader' => '',
+                'html'           => '',
            ],
        ],
    ],

    // Other
    'powered_by'      => ':app 狀態頁是由 <a href="https://cachethq.io">Cachet</a> 提供。',
-    'about_this_site' => '關於本站',
-    'rss-feed'        => 'RSS 訂閱',
-    'atom-feed'       => 'Atom 訂閱',
+    'about_this_site' => '關於此網站',
+    'rss-feed'        => '',
+    'atom-feed'       => '',
    'feed'            => 'Status 訂閱',

 ];
--- a/resources/lang/zh-TW/dashboard.php
+++ b/resources/lang/zh-TW/dashboard.php
@@ -87,7 +87,7 @@ return [
        // Component groups
        'groups' => [
            'groups'        => '組件組|組件組',
-            'no_components' => 'You should add a component group.',
+            'no_components' => '',
            'add'           => [
                'title'   => '新增組件組',
                'success' => '組件組新增成功。',
@@ -103,7 +103,7 @@ return [

    // Metrics
    'metrics' => [
-        'metrics' => '指標',
+        'metrics' => '效能度量',
        'add'     => [
            'title'   => '新增指標',
            'success' => '指標新增成功。',
@@ -160,7 +160,7 @@ return [

    // Login
    'login' => [
-        'login'      => '登錄',
+        'login'      => '登入',
        'logged_in'  => '你已經登錄。',
        'welcome'    => '歡迎回來！',
        'two-factor' => '請輸入驗證碼。',
@@ -189,7 +189,7 @@ return [
            'customize'  => '定制化',
            'team'       => '新增用戶',
            'api'        => '生成 API 密鑰',
-            'two-factor' => '兩步驗證',
+            'two-factor' => '',
        ],
    ],

--- a/resources/lang/zh-TW/errors.php
+++ b/resources/lang/zh-TW/errors.php
--- a/resources/lang/zh-TW/forms.php
+++ b/resources/lang/zh-TW/forms.php
@@ -21,6 +21,8 @@ return [
        'site_timezone'    => '選擇你的時區',
        'site_locale'      => '選擇你的語言',
        'enable_google2fa' => '啟用 Google 兩步驗證',
+        'cache_driver'     => '',
+        'session_driver'   => '',
    ],

    // Login form fields
@@ -30,7 +32,7 @@ return [
        '2fauth'        => '驗證碼',
        'invalid'       => '錯誤的電郵地址或密碼',
        'invalid-token' => '錯誤的驗證碼',
-        'cookies'       => 'You must enable cookies to login.',
+        'cookies'       => '',
    ],

    // Incidents form fields
@@ -38,13 +40,17 @@ return [
        'name'               => '名稱',
        'status'             => '狀態',
        'component'          => '組件',
-        'message'      => '信息',
+        'message'            => '訊息',
        'message-help'       => '你可以使用 Markdown 。',
        'scheduled_at'       => '排期在什麼時候進行維護？',
-
+        'incident_time'      => '',
+        'notify_subscribers' => '',
+        'visibility'         => '',
+        'public'             => '',
+        'logged_in_only'     => '',
        'templates'          => [
            'name'     => '名稱',
-            'template' => '模板',
+            'template' => '範本',
        ],
    ],

@@ -68,7 +74,7 @@ return [
        'name'             => '名稱',
        'suffix'           => '後綴',
        'description'      => '描述',
-        'description-help' => '你可以使用 Markdown 。',
+        'description-help' => '你也可以使用 Markdown',
        'display-chart'    => '在狀態頁上顯示圖表？',
        'default-value'    => '默認值',
        'calc_type'        => '指標的計算方法',
@@ -89,15 +95,17 @@ return [
            'site-timezone'          => '網站時區',
            'site-locale'            => '網站語言',
            'date-format'            => '日期格式',
+            'incident-date-format'   => '',
            'display-graphs'         => '在狀態頁上顯示圖片？',
            'about-this-page'        => '關於本站',
            'days-of-incidents'      => '顯示多少天前的事件？',
            'banner'                 => '圖片橫幅',
            'banner-help'            => '橫幅寬度建議少於 930px 。',
-            'analytics_google'       => 'Google Analytics code',
-            'analytics_gosquared'    => 'GoSquared Analytics code',
-            'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
-            'analytics_piwik_siteid' => 'Piwik\'s site id',
+            'analytics_google'       => '',
+            'analytics_gosquared'    => '',
+            'analytics_piwik_url'    => '',
+            'analytics_piwik_siteid' => '',
+            'subscribers'            => '',
        ],
        'security' => [
            'allowed-domains'      => '容許訪問的域名',
@@ -127,12 +135,12 @@ return [
    'add'    => '增加',
    'save'   => '儲存',
    'update' => '更新',
-    'create' => '新增',
-    'edit'   => '修改',
+    'create' => '建立',
+    'edit'   => '編輯',
    'delete' => '刪除',
-    'submit' => '提交',
+    'submit' => '送出',
    'cancel' => '取消',
-    'remove' => '刪除',
+    'remove' => '移除',

    // Other
    'optional' => '* 可選項目',
--- a/resources/lang/zh-TW/pagination.php
+++ b/resources/lang/zh-TW/pagination.php
@@ -22,7 +22,7 @@ return [
    |
    */

-    'previous' => '&laquo; 前一頁',
-    'next'     => '後一頁 &raquo;',
+    'previous' => '&laquo; 上一頁',
+    'next'     => '下一頁 &raquo;',

 ];
--- a/resources/lang/zh-TW/reminders.php
+++ b/resources/lang/zh-TW/reminders.php
@@ -22,10 +22,10 @@ return [
    |
    */

-    'password' => '密碼必須至少有六個字符，而兩次輸入的密碼也必須匹配。',
-    'user'     => '無法找到擁有該電郵地址的用戶。',
-    'token'    => '無效的密碼重置令牌。',
-    'sent'     => '已發送密碼重置郵件。',
-    'reset'    => '成功重置密碼。',
+    'password' => '密碼至少需六個字元，並且和確認欄相同',
+    'user'     => '我們無法找到具有該電子郵件地址的使用者。',
+    'token'    => '此密碼重設 token 無效',
+    'sent'     => '已發送密碼提醒 ！',
+    'reset'    => '已重設密碼 ！',

 ];
--- a/resources/lang/zh-TW/setup.php
+++ b/resources/lang/zh-TW/setup.php
@@ -13,8 +13,9 @@ return [
    'setup'             => '安裝',
    'title'             => '安裝 Cachet',
    'service_details'   => '服務詳細信息',
+    'env_setup'         => '',
    'status_page_setup' => '設置狀態頁面',
-    'show_support'      => '希望支持 Cachet 嗎？',
+    'show_support'      => '',
    'admin_account'     => '管理員帳戶',
    'complete_setup'    => '完成安裝',
    'completed'         => '成功安裝 Cachet ！',
--- a/resources/lang/zh-TW/validation.php
+++ b/resources/lang/zh-TW/validation.php
@@ -22,66 +22,66 @@ return [
    |
    */

-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
+    'accepted'   => '這個 :attribute 必須被接受',
+    'active_url' => '這個 :attribute 不是一個有效的網址',
+    'after'      => ':attribute 必須在 :date 之後',
+    'alpha'      => ':attribute 只能包含字母',
+    'alpha_dash' => ':attribute 只能包含字母、數字、破折號',
+    'alpha_num'  => ':attribute 只能包含字母及數字',
+    'array'      => ':attribute 必須是一個陣列',
+    'before'     => ':attribute 必須在 :date 之前',
    'between'    => [
-        'numeric' => 'The :attribute must be between :min and :max.',
+        'numeric' => ':attribute 必須介於 :min 到 :max 之間',
        'file'    => 'The :attribute must be between :min and :max kilobytes.',
        'string'  => 'The :attribute must be between :min and :max characters.',
        'array'   => 'The :attribute must have between :min and :max items.',
    ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
+    'boolean'        => ':attribute 欄位必須是 true 或 false',
+    'confirmed'      => ':attribute 確認不符合',
+    'date'           => ':attribute 不是一個有效的日期',
+    'date_format'    => ':attribute 不符合 :format 的格式',
+    'different'      => ':attribute 與 :other 必須不同',
+    'digits'         => ':attribute 必須是 :digits 位數',
+    'digits_between' => ':attribute 必須介於 :min 到 :max 位數之間',
+    'email'          => ':attribute 必須是一個有效的電子郵件地址',
+    'exists'         => '選擇的 :attribute 是無效的',
+    'image'          => ':attribute 必須是圖片',
+    'in'             => '選擇的 :attribute 是無效的',
+    'integer'        => ':attribute 必須是整數',
+    'ip'             => ':attribute 必須是有效的 IP 位址',
    'max'            => [
-        'numeric' => 'The :attribute may not be greater than :max.',
+        'numeric' => ':attribute 不能大於 :max',
        'file'    => 'The :attribute may not be greater than :max kilobytes.',
        'string'  => 'The :attribute may not be greater than :max characters.',
        'array'   => 'The :attribute may not have more than :max items.',
    ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimes' => ':attribute 檔案類型必須是 :values ',
    'min'   => [
-        'numeric' => 'The :attribute must be at least :min.',
+        'numeric' => ':attribute 至少要 :min',
        'file'    => 'The :attribute must be at least :min kilobytes.',
        'string'  => 'The :attribute must be at least :min characters.',
        'array'   => 'The :attribute must have at least :min items.',
    ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
+    'not_in'               => '選擇的 :attribute 是無效的',
+    'numeric'              => ':attribute 必須是數字',
+    'regex'                => ':attribute 格式無效',
+    'required'             => ':attribute 欄位是必須的',
+    'required_if'          => ':attribute 欄位在 :other 為 :value 時，是必填的',
+    'required_with'        => ':attribute 欄位在 :values 存在時，是必填的',
+    'required_with_all'    => ':attribute 欄位在 :values 存在時，是必填的',
+    'required_without'     => ':attribute 欄位在 :values 不存在時，是必填的',
+    'required_without_all' => ':attribute 欄位在沒有 :values 存在時，是必填的',
+    'same'                 => ':attribute 及 :other 必須相符',
    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
+        'numeric' => ':attribute 必須為 :size',
        'file'    => 'The :attribute must be :size kilobytes.',
        'string'  => 'The :attribute must be :size characters.',
        'array'   => 'The :attribute must contain :size items.',
    ],
-    'string'               => 'The :attribute must be a string.',
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
-    'timezone'             => 'The :attribute must be a valid zone.',
+    'string'   => '',
+    'unique'   => ':attribute 已經被佔用',
+    'url'      => ':attribute 格式無效',
+    'timezone' => ':attribute 必須是有效的區域',

    /*
    |--------------------------------------------------------------------------
@@ -96,7 +96,7 @@ return [

    'custom' => [
        'attribute-name' => [
-            'rule-name' => 'custom-message',
+            'rule-name' => '自訂訊息',
        ],
    ],

--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -38,8 +38,6 @@ abstract class AbstractTestCase extends TestCase

    /**
     * Becomes a user.
-     *
-     * @return void
     */
    protected function beUser()
    {