lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the remaining use of the lang facade

Browse Source
This commit is contained in:
Graham Campbell
2015-01-01 22:03:33 +00:00
parent b2edda5ee2
commit 056e0c489e
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/app.php
View File

@@ -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',

3
app/models/Component.php
View File

@@ -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);
}
/**

2
app/models/Incident.php
View File

@@ -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];
}

2
app/start/global.php
View File

@@ -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);
}

10
app/view-composers.php
View File

@@ -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([