diff --git a/resources/lang/en/admin/kits/general.php b/resources/lang/en/admin/kits/general.php index 0dfad82469..8d73d8baf5 100644 --- a/resources/lang/en/admin/kits/general.php +++ b/resources/lang/en/admin/kits/general.php @@ -13,5 +13,12 @@ return [ 'none_licenses' => 'There are not enough available seats for :license to checkout. :qty are required. ', 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', - + 'append_accessory' => 'Append Accessory', + 'update_appended_accessory' => 'Update appended Accessory', + 'append_consumable' => 'Append Consumable', + 'update_appended_consumable' => 'Update appended Consumable', + 'append_license' => 'Append license', + 'update_appended_license' => 'Update appended license', + 'append_model' => 'Append model', + 'update_appended_model' => 'Update appended model' ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index b39d0c0545..fe659171f0 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -19,4 +19,5 @@ return [ 'go' => 'Go', 'bulk_actions' => 'Bulk Actions', 'add_maintenance' => 'Add Maintenance', + 'append' => 'Append', ]; diff --git a/resources/views/kits/accessory-edit.blade.php b/resources/views/kits/accessory-edit.blade.php index a6f916731a..6270ae2f6e 100644 --- a/resources/views/kits/accessory-edit.blade.php +++ b/resources/views/kits/accessory-edit.blade.php @@ -1,12 +1,12 @@ @extends('layouts/edit-form', [ - 'createText' => 'Append accessory', // TODO: trans - 'updateText' => 'Update appended accessory', // TODO: trans + 'createText' => {{ trans('admin/kits/general.append_accessory') }}, + 'updateText' => {{ trans('admin/kits/general.update_appended_accessory') }}, 'formAction' => (isset($item->id)) ? route('kits.accessories.update', ['kit_id' => $kit->id, 'accessory_id' => $item->accessory_id]) : route('kits.accessories.store', ['kit_id' => $kit->id]), ]) {{-- Page content --}} @section('inputFields') -@include ('partials.forms.edit.accessory-select', ['translated_name' => 'Accessory', 'fieldname' => 'accessory_id', 'required' => 'true']){{-- TODO: trans --}} +@include ('partials.forms.edit.accessory-select', ['translated_name' => {{ trans('general.accessory')}}, 'fieldname' => 'accessory_id', 'required' => 'true'])
diff --git a/resources/views/kits/consumable-edit.blade.php b/resources/views/kits/consumable-edit.blade.php index 7834d2ad4f..fdac02023b 100644 --- a/resources/views/kits/consumable-edit.blade.php +++ b/resources/views/kits/consumable-edit.blade.php @@ -1,12 +1,12 @@ @extends('layouts/edit-form', [ - 'createText' => 'Append consumable', // TODO: trans - 'updateText' => 'Update appended consumable', // TODO: trans + 'createText' => {{ trans('admin/kits/general.append_consumable') }}, + 'updateText' => {{ trans('admin/kits/general.update_appended_consumable') }}, 'formAction' => (isset($item->id)) ? route('kits.consumables.update', ['kit_id' => $kit->id, 'consumable_id' => $item->consumable_id]) : route('kits.consumables.store', ['kit_id' => $kit->id]), ]) {{-- Page content --}} @section('inputFields') -@include ('partials.forms.edit.consumable-select', ['translated_name' => 'Consumable', 'fieldname' => 'consumable_id', 'required' => 'true']){{-- TODO: trans --}} +@include ('partials.forms.edit.consumable-select', ['translated_name' => {{ trans('general.consumable')}}, 'fieldname' => 'consumable_id', 'required' => 'true'])
diff --git a/resources/views/kits/edit.blade.php b/resources/views/kits/edit.blade.php index feea7e6eb1..1961005f43 100644 --- a/resources/views/kits/edit.blade.php +++ b/resources/views/kits/edit.blade.php @@ -41,7 +41,7 @@ "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }'> - Append + {{ trans('button.append')}}
diff --git a/resources/views/kits/index.blade.php b/resources/views/kits/index.blade.php index 87f6d816b5..3c25c7b22c 100644 --- a/resources/views/kits/index.blade.php +++ b/resources/views/kits/index.blade.php @@ -20,7 +20,6 @@
-
-
diff --git a/resources/views/kits/license-edit.blade.php b/resources/views/kits/license-edit.blade.php index 34727d8531..43463ab434 100644 --- a/resources/views/kits/license-edit.blade.php +++ b/resources/views/kits/license-edit.blade.php @@ -1,6 +1,6 @@ @extends('layouts/edit-form', [ - 'createText' => 'Append license', // TODO: trans - 'updateText' => 'Update appended license', // TODO: trans + 'createText' => {{ trans('admin/kits/general.append_license') }}, + 'updateText' => {{ trans('admin/kits/general.update_appended_license') }}, 'formAction' => (isset($item->id)) ? route('kits.licenses.update', ['kit_id' => $kit->id, 'license_id' => $item->license_id]) : route('kits.licenses.store', ['kit_id' => $kit->id]), ]) diff --git a/resources/views/kits/model-edit.blade.php b/resources/views/kits/model-edit.blade.php index d2a4a06e64..23d5855497 100644 --- a/resources/views/kits/model-edit.blade.php +++ b/resources/views/kits/model-edit.blade.php @@ -1,6 +1,6 @@ @extends('layouts/edit-form', [ - 'createText' => 'Append model', // TODO: trans - 'updateText' => 'Update appended model', // TODO: trans + 'createText' => {{ trans(admin/kits/general.append_model) }}, + 'updateText' => {{ trans(admin/kits/general.update_appended_model) }}, 'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]), ])