From abcc01f5e051dfcfa4348890e633aaaba0b10e50 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Nov 2016 12:48:00 -0800 Subject: [PATCH] More language string corrections --- app/Http/Controllers/ReportsController.php | 2 +- resources/views/asset_maintenances/view.blade.php | 2 +- resources/views/hardware/view.blade.php | 2 +- resources/views/reports/asset_maintenances.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 86d65cdd67..2d920accfb 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -787,7 +787,7 @@ class ReportsController extends Controller $header = [ trans('admin/hardware/table.asset_tag'), trans('admin/asset_maintenances/table.asset_name'), - trans('admin/asset_maintenances/table.supplier_name'), + trans('general.supplier'), trans('admin/asset_maintenances/form.asset_maintenance_type'), trans('admin/asset_maintenances/form.title'), trans('admin/asset_maintenances/form.start_date'), diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php index 014a0daaa5..33b5419947 100644 --- a/resources/views/asset_maintenances/view.blade.php +++ b/resources/views/asset_maintenances/view.blade.php @@ -52,7 +52,7 @@ use Carbon\Carbon;
- {{ trans('admin/asset_maintenances/table.supplier_name') }}: + {{ trans('general.supplier') }}: {{ $assetMaintenance->supplier->name }} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 27a4195740..875a7c5817 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -505,7 +505,7 @@ - + diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php index 2d91772aab..39bb6a5444 100644 --- a/resources/views/reports/asset_maintenances.blade.php +++ b/resources/views/reports/asset_maintenances.blade.php @@ -27,7 +27,7 @@ - +
{{ trans('admin/asset_maintenances/table.supplier_name') }}{{ trans('general.supplier') }} {{ trans('admin/asset_maintenances/form.title') }} {{ trans('admin/asset_maintenances/form.asset_maintenance_type') }} {{ trans('admin/asset_maintenances/form.start_date') }}{{ trans('admin/companies/table.title') }} {{ trans('admin/hardware/table.asset_tag') }} {{ trans('admin/asset_maintenances/table.asset_name') }}{{ trans('admin/asset_maintenances/table.supplier_name') }}{{ trans('general.supplier') }} {{ trans('admin/asset_maintenances/form.asset_maintenance_type') }} {{ trans('admin/asset_maintenances/form.title') }} {{ trans('admin/asset_maintenances/form.start_date') }}