diff --git a/app/config/app.php b/app/config/app.php index 660623ab..67b69d85 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -163,7 +163,6 @@ return [ 'Form' => 'Illuminate\Support\Facades\Form', 'HTML' => 'Illuminate\Support\Facades\HTML', 'Input' => 'Illuminate\Support\Facades\Input', - 'Lang' => 'Illuminate\Support\Facades\Lang', 'Log' => 'Illuminate\Support\Facades\Log', 'Redirect' => 'Illuminate\Support\Facades\Redirect', 'Request' => 'Illuminate\Support\Facades\Request', diff --git a/app/models/Component.php b/app/models/Component.php index a6b5dfe7..26c9212b 100644 --- a/app/models/Component.php +++ b/app/models/Component.php @@ -5,7 +5,6 @@ use Dingo\Api\Transformer\TransformableInterface; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletingTrait; -use Illuminate\Support\Facades\Lang; use Watson\Validating\ValidatingTrait; class Component extends Model implements TransformableInterface @@ -74,7 +73,7 @@ class Component extends Model implements TransformableInterface */ public function getHumanStatusAttribute() { - return Lang::get('cachet.component.status.'.$this->status); + return trans('cachet.component.status.'.$this->status); } /** diff --git a/app/models/Incident.php b/app/models/Incident.php index ccd5646f..8753f723 100644 --- a/app/models/Incident.php +++ b/app/models/Incident.php @@ -55,7 +55,7 @@ class Incident extends Model implements TransformableInterface */ public function getHumanStatusAttribute() { - $statuses = Lang::get('cachet.incident.status'); + $statuses = trans('cachet.incident.status'); return $statuses[$this->status]; } diff --git a/app/start/global.php b/app/start/global.php index ebf02914..80eb04a8 100644 --- a/app/start/global.php +++ b/app/start/global.php @@ -37,7 +37,7 @@ API::error(function (\Illuminate\Database\Eloquent\ModelNotFoundException $excep App::missing(function ($exception) { if (Request::is('dashboard*') or Request::is('api*')) { return Response::view('errors.404', [ - 'pageTitle' => Lang::get('cachet.dashboard.not_found_title'), + 'pageTitle' => trans('cachet.dashboard.not_found_title'), ], 404); } diff --git a/app/view-composers.php b/app/view-composers.php index 233f1c09..ead11ffc 100644 --- a/app/view-composers.php +++ b/app/view-composers.php @@ -13,15 +13,15 @@ View::composer('index', function ($view) { $incidentCount = $incidents->count(); if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) { - $status = 'success'; - $message = Lang::get('cachet.service.good'); + $status = 'success'; + $message = trans('cachet.service.good'); } else { - $status = 'danger'; - $message = Lang::get('cachet.service.bad'); + $status = 'danger'; + $message = trans('cachet.service.bad'); } } else { $status = 'danger'; - $message = Lang::get('cachet.service.bad'); + $message = trans('cachet.service.bad'); } $view->with([