diff --git a/app/lang/en/admin/hardware/general.php b/app/lang/en/admin/hardware/general.php index 6756ba2c9e..6fead1a212 100644 --- a/app/lang/en/admin/hardware/general.php +++ b/app/lang/en/admin/hardware/general.php @@ -6,5 +6,6 @@ return array( 'clone' => 'Clone Asset', 'view' => 'View Asset', 'edit' => 'Edit Asset', - 'created_asset' => 'created asset', + 'asset' => 'Asset', + 'pending' => 'Pending Asset', ); diff --git a/app/lang/en/admin/hardware/message.php b/app/lang/en/admin/hardware/message.php index e4edeb6bc5..8e3ec10410 100755 --- a/app/lang/en/admin/hardware/message.php +++ b/app/lang/en/admin/hardware/message.php @@ -2,34 +2,36 @@ return array( - 'does_not_exist' => 'Asset does not exist.', - 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', + 'undeployable' => 'Warning: This asset has been marked as currently undeployable. + If this status has changed, please update the asset status.', + 'does_not_exist' => 'Asset does not exist.', + 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', 'create' => array( - 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' + 'error' => 'Asset was not created, please try again. :(', + 'success' => 'Asset created successfully. :)' ), 'update' => array( - 'error' => 'Asset was not updated, please try again', - 'success' => 'Asset updated successfully.' + 'error' => 'Asset was not updated, please try again', + 'success' => 'Asset updated successfully.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this asset?', - 'error' => 'There was an issue deleting the asset. Please try again.', - 'success' => 'The asset was deleted successfully.' + 'confirm' => 'Are you sure you wish to delete this asset?', + 'error' => 'There was an issue deleting the asset. Please try again.', + 'success' => 'The asset was deleted successfully.' ), 'checkout' => array( - 'error' => 'Asset was not checked out, please try again', - 'success' => 'Asset checked out successfully.', + 'error' => 'Asset was not checked out, please try again', + 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.' ), 'checkin' => array( - 'error' => 'Asset was not checked in, please try again', - 'success' => 'Asset checked in successfully.', + 'error' => 'Asset was not checked in, please try again', + 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.' ) diff --git a/app/lang/en/admin/licenses/form.php b/app/lang/en/admin/licenses/form.php index 3b2bd650d4..3c7bc88431 100644 --- a/app/lang/en/admin/licenses/form.php +++ b/app/lang/en/admin/licenses/form.php @@ -16,6 +16,9 @@ return array( 'no_depreciation' => 'Do Not Depreciate', 'notes' => 'Notes', 'checkin' => 'Checkin', + 'checkin' => 'Checkin', + 'date' => 'Purchase Date', + 'cost' => 'Purchase Cost', ) ; \ No newline at end of file diff --git a/app/lang/en/admin/licenses/general.php b/app/lang/en/admin/licenses/general.php index 4209fe124d..5c492bd76c 100644 --- a/app/lang/en/admin/licenses/general.php +++ b/app/lang/en/admin/licenses/general.php @@ -5,8 +5,13 @@ return array( 'checkout' => 'Checkout License Seat to User', 'view' => 'View License', 'edit' => 'Edit License', - 'created_asset' => 'created asset', 'software_licenses' => 'Software Licenses', + 'license_seats' => 'License Seats', 'in_out' => 'In/Out', 'history_for' => 'History for ', + 'seat' => 'Seat', + 'seats' => 'Seats', + 'user' => 'User', + 'checkout_history' => 'Checkout History', + 'info' => 'License Info', ); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index a53e932efa..e99a83594f 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -46,5 +46,8 @@ return array( 'asset_models' => 'Asset Models', 'currency_symbol' => '$', 'no_results' => 'No Results.', + 'date' => 'Date', 'unknown_admin' => 'Unknown Admin', + 'created_asset' => 'created asset', + 'moreinfo' => 'More Info', ); diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index d8b2c08361..232235b0bc 100644 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -91,8 +91,8 @@ {{ $asset->months_until_depreciated()->m }} @lang('admin/hardware/form.months') @if ($asset->months_until_depreciated()->y > 0) - , {{ $asset->months_until_depreciated()->y }} - @lang('admin/hardware/form.years') + , {{ $asset->months_until_depreciated()->y }} + @lang('admin/hardware/form.years') @endif @endif @@ -174,7 +174,7 @@ @lang('general.unknown_admin') @endif - @lang('admin/hardware/general.created_asset') + @lang('general.created_asset') @@ -228,24 +228,24 @@ @elseif (($asset->status_id ) && ($asset->status_id > 1)) @if ($asset->assetstatus) -

{{ $asset->assetstatus->name }} Asset
+

{{ $asset->assetstatus->name }} + @lang('admin/hardware/general.asset')
- Warning: This asset has been marked {{ $asset->assetstatus->name }} and is currently undeployable. - If this status has changed, please update the asset status by editing the asset. + @lang('admin/hardware/message.undeployable') +
@endif @elseif ($asset->status_id == NULL) -

Pending Asset
+

@lang('admin/hardware/general.pending')
- Warning: This asset has been marked as pending and is currently undeployable. - If this status has changed, please update the asset status. + @lang('admin/hardware/message.undeployable')
diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index b087c87aa0..9a32cfd2f6 100644 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -11,7 +11,7 @@
- Edit License + @lang('admin/licenses/form.update')

@lang('admin/licenses/general.history_for') {{ $license->name }}

@@ -20,7 +20,7 @@
-
License Info
+
@lang('admin/licenses/general.info')
@if ($license->serial) @@ -47,12 +47,12 @@ -
{{ $license->seats }} License Seats
+
{{ $license->seats }} @lang('admin/licenses/general.license_seats')
- - + + @@ -72,9 +72,9 @@ @@ -87,17 +87,17 @@
SeatUser@lang('admin/licenses/general.seat')@lang('admin/licenses/general.user')
@if ($licensedto->assigned_to) - Checkin + @lang('general.checkin') @else - Checkout + @lang('general.checkout') @endif

-
Checkout History
+
@lang('admin/licenses/general.checkout_history')
- - - - - + + + + + @@ -140,10 +140,10 @@ @if ($license->adminuser) {{ $license->adminuser->fullName() }} @else - Unknown Admin + @lang('general.unknown_admin') @endif - + @@ -153,23 +153,28 @@
-

More Info:
+

@lang('general.moreinfo'):
    @if ($license->purchase_date > 0) -
  • Purchase Date: {{ $license->purchase_date }}
    • +
  • @lang('admin/licenses/form.date'): {{ $license->purchase_date }}
    • @endif @if ($license->purchase_cost > 0) -
  • Purchase Cost: ${{ number_format($license->purchase_cost,2) }}
    • +
  • @lang('admin/licenses/form.cost'): + @lang('general.currency') + {{ number_format($license->purchase_cost,2) }}
    • @endif @if ($license->order_number) -
  • Order #: {{ $license->order_number }}
    • +
  • @lang('admin/licenses/form.order'): + {{ $license->order_number }}
    • @endif @if (($license->seats) && ($license->seats) > 0) -
  • Seats: {{ $license->seats }}
    • +
  • @lang('admin/licenses/form.seats'): + {{ $license->seats }}
    • @endif @if ($license->depreciation) -
  • Depreciation: {{ $license->depreciation->name }} ({{ $license->depreciation->months }} months)
    • +
  • @lang('admin/licenses/form.depreciation'): + {{ $license->depreciation->name }} ({{ $license->depreciation->months }} months)
    • @endif
DateAdminActionUserNote@lang('general.date')@lang('general.admin')@lang('button.actions')@lang('admin/licenses/general.user')@lang('admin/licenses/form.notes')
created asset@lang('general.created_asset')