diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 942947e6c1..bd59be9506 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -6,6 +6,7 @@ 'accessory' => 'Accessory', 'accessory_report' => 'Accessory Report', 'action' => 'Action', + 'actions' => 'Actions', 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', @@ -62,6 +63,7 @@ 'updated_at' => 'Updated at', 'currency' => '$', // this is deprecated 'current' => 'Current', + 'current_password' => 'Current Password', 'custom_report' => 'Custom Asset Report', 'dashboard' => 'Dashboard', 'days' => 'days', @@ -104,9 +106,10 @@ 'file_type' => 'File Type', 'file_uploads' => 'File Uploads', 'generate' => 'Generate', - 'github_markdown' => 'This field accepts Github flavored markdown.', + 'github_markdown' => 'This field accepts Github flavored markdown.', 'groups' => 'Groups', 'gravatar_email' => 'Gravatar Email Address', + 'gravatar_url' => 'Change your avatar at Gravatar.com.', 'history' => 'History', 'history_for' => 'History for', 'id' => 'ID', @@ -122,6 +125,7 @@ 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', 'item' => 'Item', + 'item_name' => 'Item Name', 'insufficient_permissions' => 'Insufficient permissions!', 'kits' => 'Predefined Kits', 'language' => 'Language', @@ -151,6 +155,7 @@ 'months' => 'months', 'moreinfo' => 'More Info', 'name' => 'Name', + 'new_password' => 'New Password', 'next' => 'Next', 'next_audit_date' => 'Next Audit Date', 'last_audit' => 'Last Audit', @@ -178,7 +183,10 @@ 'reports' => 'Reports', 'restored' => 'restored', 'restore' => 'Restore', + 'requestable_models' => 'Requestable Models', 'requested' => 'Requested', + 'requested_date' => 'Requested Date', + 'requested_assets' => 'Requested Assets', 'request_canceled' => 'Request Canceled', 'save' => 'Save', 'select' => 'Select', @@ -231,6 +239,7 @@ 'users' => 'Users', 'viewall' => 'View All', 'viewassets' => 'View Assigned Assets', + 'viewassetsfor' => 'View Assets for :name', 'website' => 'Website', 'welcome' => 'Welcome, :name', 'years' => 'years', diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php index cb4956a95f..e9034c7100 100644 --- a/resources/views/account/accept-asset.blade.php +++ b/resources/views/account/accept-asset.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - {{trans('general.accept', ['asset' => $item->present()->name()])}} + {{ trans('general.accept', ['asset' => $item->present()->name()]) }} @parent @stop diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php index 816c0cb2bd..defba995b0 100644 --- a/resources/views/account/accept/create.blade.php +++ b/resources/views/account/accept/create.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Accept {{ $acceptance->checkoutable->present()->name() }} + {{ trans('general.accept', array('asset' => $acceptance->checkoutable->present()->name())) }} @parent @stop @@ -47,14 +47,14 @@
@@ -69,7 +69,7 @@ @if ($snipeSettings->require_accept_signature=='1')
-

Sign below to indicate that you agree to the terms of service:

+

{{ trans('general.sign_tos') }}

@@ -77,7 +77,7 @@
- +
diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index aeab72a299..273feab95a 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -2,6 +2,7 @@ {{-- Page title --}} @section('title') +//TODO: Debug page as it is not viewable in browser due to crash Accept assets {{ $user->present()->fullName() }} @parent @stop @@ -34,8 +35,8 @@ Accept assets {{ $user->present()->fullName() }} }'> - Name - Actions + {{ trans('general.name')}} + {{ trans('general.actions')}} diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index a91eb94cba..d54b1cc9fd 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Personal API Keys + {{ trans('account/api.personal_api_keys') }} @parent @stop @@ -24,18 +24,17 @@
- When generating an API token, be sure to copy it down immediately as they - will not be visible to you again.
+ {{ trans('account/api.api_key_warning') }} +
-

Your API base url is located at:
- {{ url('/api/v1') }}/<endpoint>

+

{{ trans('account/api.api_base_url') }}
+ {{ url('/api/v1') }}{{!! trans('account/api.api_base_url_endpoint') !!}}

-

API tokens are set to expire in: - {{ config('passport.expiration_years') }} years.

+

{{ trans('account/api.api_token_expiration_time') }} + {{ config('passport.expiration_years') }} {{ trans('general.years') }} .

-

Please check the API reference to - find specific API endpoints and additional API documentation.

+

{{!! trans('account/api.api_reference') !!}}

diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php index 0a4ef26831..9899a9734e 100755 --- a/resources/views/account/change-password.blade.php +++ b/resources/views/account/change-password.blade.php @@ -20,7 +20,7 @@
-
@@ -32,7 +32,7 @@
- +
{!! $errors->first('password', '') !!} @@ -44,7 +44,7 @@
- +
{!! $errors->first('password_confirmation', '') !!} diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 4650340628..7efb62681a 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -97,7 +97,7 @@ {!! $errors->first('gravatar', '') !!}

{{ $user->present()->fullName() }} avatar image - Change your avatar at Gravatar.com. + {{!! trans('general.gravatar_url') !!}}

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index b0b8a0f4f6..039d0fb3bd 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -72,7 +72,7 @@
@if ($models->count() > 0) -

Requestable Models

+

{{ trans('general.requestable_models') }}

- - - + + + - +
ImageItem NameType{{ trans('general.image') }}{{ trans('general.item_name') }}{{ trans('general.type') }} {{ trans('general.qty') }} {{ trans('admin/hardware/table.location') }} {{ trans('admin/hardware/form.expected_checkin') }}Requested Date {{ trans('general.requested_date') }}
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index e50986470b..dfbc19b960 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') -View Assets for {{ $user->present()->fullName() }} +{{ trans('general.viewassetsfor', array('name' => $user->fullName)) }} @parent @stop @@ -294,7 +294,7 @@ View Assets for {{ $user->present()->fullName() }} @if ($user->id)
-

History

+

{{ trans('general.history') }}

@endif