diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index bd59be9506..9b6c4d4dfd 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -20,7 +20,8 @@ 'asset' => 'Asset', 'asset_report' => 'Asset Report', 'asset_tag' => 'Asset Tag', - 'assets_available' => 'assets available', + 'assets_available' => 'Assets available', + 'accept_assets' => 'Accept Assets :name', 'audit' => 'Audit', 'audit_report' => 'Audit Log', 'assets' => 'Assets', @@ -253,6 +254,7 @@ 'accept' => 'Accept :asset', 'i_accept' => 'I accept', 'i_decline' => 'I decline', + 'accept_decline' => 'Accept/Decline', 'sign_tos' => 'Sign below to indicate that you agree to the terms of service:', 'clear_signature' => 'Clear Signature', 'show_help' => 'Show help', diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 273feab95a..17997be6e5 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -2,8 +2,7 @@ {{-- Page title --}} @section('title') -//TODO: Debug page as it is not viewable in browser due to crash -Accept assets {{ $user->present()->fullName() }} +{{ trans('general.accept_assets', array('name' => $user->present()->fullName())) }} @parent @stop @@ -43,7 +42,7 @@ Accept assets {{ $user->present()->fullName() }} @foreach ($acceptances as $acceptance) {{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }} - Accept/Decline + {{ trans('general.accept_decline') }} @endforeach diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index dfbc19b960..f5dc07eb84 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -{{ trans('general.viewassetsfor', array('name' => $user->fullName)) }} +{{ trans('general.viewassetsfor', array('name' => $user->present()->fullName())) }} @parent @stop