diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.php index 2bc118db3..26ccb5035 100644 --- a/app/Http/Controllers/Api/PredefinedKitsController.php +++ b/app/Http/Controllers/Api/PredefinedKitsController.php @@ -246,7 +246,7 @@ class PredefinedKitsController extends Controller $relation = $kit->models(); if ($relation->find($model_id)) { - return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => 'Model already attached to kit'])); + return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => trans('admin/kits/general.model_already_attached')])); } $relation->attach($model_id, ['quantity' => $quantity]); diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php index c75e4ea8f..bf4f64a8d 100644 --- a/app/Http/Controllers/Kits/CheckoutKitController.php +++ b/app/Http/Controllers/Kits/CheckoutKitController.php @@ -62,10 +62,10 @@ class CheckoutKitController extends Controller $checkout_result = $this->kitService->checkout($request, $kit, $user); if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0) { - return redirect()->back()->with('error', trans('general.checkout_error'))->with('error_messages', $checkout_result['errors']); + return redirect()->back()->with('error', trans('admin/kits/general.checkout_error'))->with('error_messages', $checkout_result['errors']); } - return redirect()->back()->with('success', trans('general.checkout_success')) + return redirect()->back()->with('success', trans('admin/kits/general.checkout_success')) ->with('assets', Arr::get($checkout_result, 'assets', null)) ->with('accessories', Arr::get($checkout_result, 'accessories', null)) ->with('consumables', Arr::get($checkout_result, 'consumables', null)); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 73358454d..79027547b 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -48,6 +48,7 @@ class Kernel extends HttpKernel 'api' => [ 'auth:api', + \App\Http\Middleware\CheckLocale::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index d3a19929e..17693fccf 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -86,7 +86,7 @@ class AssetsTransformer 'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'), 'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'), 'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'), - 'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '', + 'age' => $asset->purchase_date ? $asset->purchase_date->locale(app()->getLocale())->diffForHumans() : '', 'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'), 'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'), 'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'), diff --git a/resources/lang/en-US/admin/kits/general.php b/resources/lang/en-US/admin/kits/general.php index f57fb645c..2b5c2d9cd 100644 --- a/resources/lang/en-US/admin/kits/general.php +++ b/resources/lang/en-US/admin/kits/general.php @@ -47,4 +47,5 @@ return [ 'kit_deleted' => 'Kit was successfully deleted', 'kit_model_updated' => 'Model was successfully updated', 'kit_model_detached' => 'Model was successfully detached', + 'model_already_attached' => 'Model already attached to kit', ]; diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 42ca4cb96..92091f9d2 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -426,7 +426,7 @@ return [ 'assets_by_status_type' => 'Assets by Status Type', 'pie_chart_type' => 'Dashboard Pie Chart Type', 'hello_name' => 'Hello, :name!', - 'unaccepted_profile_warning' => 'You have :count items requiring acceptance. Click here to accept or decline them', + 'unaccepted_profile_warning' => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them', 'start_date' => 'Start Date', 'end_date' => 'End Date', 'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail', @@ -559,5 +559,6 @@ return [ 'expires' => 'Expires', 'map_fields'=> 'Map :item_type Field', 'remaining_var' => ':count Remaining', + 'assets_in_var' => 'Assets in :name :type', ]; diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 6fee34652..a4ffa16ec 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -17,7 +17,7 @@ - {{ trans('general.unaccepted_profile_warning', array('count' => $acceptances)) }} + {{ trans_choice('general.unaccepted_profile_warning', $acceptances, ['count' => $acceptances]) }} diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index 9b361c46c..72a02bf92 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -3,8 +3,7 @@ {{-- Page title --}} @section('title') - {{ $category->name }} - {{ ucwords($category_type_route) }} +{{ trans('general.assets_in_var', ['name'=> $category->name, 'type' => trans('general.category')]) }} @parent @stop diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index efd050266..12a0627ae 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -132,7 +132,7 @@ :button_label="trans('general.checkin')" :disabled_select="!$asset->model" :options="[ - 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']), + 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]), 'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]), ]" /> diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index f91e06036..17b971a5b 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -180,7 +180,7 @@ :button_label="trans('general.checkout')" :disabled_select="!$asset->model" :options="[ - 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']), + 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]), 'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]), 'target' => trans('admin/hardware/form.redirect_to_checked_out_to'), diff --git a/resources/views/settings/logins.blade.php b/resources/views/settings/logins.blade.php index aedef4f84..959392b63 100644 --- a/resources/views/settings/logins.blade.php +++ b/resources/views/settings/logins.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Attempted Logins + {{ trans('admin/settings/general.login') }} @parent @stop diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index a9f977a3a..26ed2e812 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -373,7 +373,7 @@ - +
- - + + @@ -407,8 +407,8 @@ - - + + @@ -419,6 +419,10 @@ + + + +
EULA @@ -395,8 +395,8 @@
NameSignature{{ trans('general.name') }}{{ trans('general.signature') }} {{ trans('general.date') }}
NameSignature{{ trans('general.name') }}{{ trans('general.signature') }} {{ trans('general.date') }}