A free open source IT asset/license management system
More translations
Marcus Moore40f2907f86ab
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.phpindex 9b2c0c8900..5b94f42627 100644--- a/app/Http/Controllers/Reports/CustomComponentReportController.php+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php@@ -157,7 +157,7 @@ class CustomComponentReportController extends Controllertrans('admin/reports/general.custom_export.asset_company'),trans('admin/reports/general.custom_export.asset_serial'),trans('admin/hardware/form.checkout_date'),- 'Assigned Qty', // todo: translate+ trans('general.assigned_quantity'),],'values' => fn ($component, $i) => isset($component->assets[$i]) ? [$component->assets[$i]->name ?? '',diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex dea3e81a54..c1acdc612d 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -49,6 +49,7 @@ return ['asset_deleted_warning' => 'This asset has been deleted. You must restore it before you can assign it to someone.','assigned_date' => 'Date Assigned','assigned_to' => 'Assigned to :name',+ 'assigned_quantity' => 'Assigned Quantity','assignee' => 'Assigned to','avatar_delete' => 'Delete Avatar','avatar_upload' => 'Upload Avatar',@@ -167,6 +168,7 @@ return ['id' => 'ID','image' => 'Image','image_delete' => 'Delete Image',+ 'include_assignments' => 'Include Assignments','include_deleted' => 'Include Deleted Assets','image_upload' => 'Upload Image','filetypes_accepted_help' => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',diff --git a/resources/views/reports/custom/component.blade.php b/resources/views/reports/custom/component.blade.phpindex a3786d6084..c5263f13b6 100644--- a/resources/views/reports/custom/component.blade.php+++ b/resources/views/reports/custom/component.blade.php@@ -199,7 +199,7 @@<h2>{{ trans('general.assigned') }}: </h2><label class="form-control"><input type="checkbox" name="include_assignments" value="1" @checked($template->checkmarkValue('include_assignments', '0')) />- Include Assignments+ {{ trans('general.include_assignments') }}</label></div> <!-- /.col-md-4-->diff --git a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php b/tests/Feature/Reporting/Custom/CustomComponentReportTest.phpindex 1fe0e65271..f375e3a90e 100644--- a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php+++ b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php@@ -131,13 +131,6 @@ class CustomComponentReportTest extends TestCase]);}- public function test_custom_component_report_contents()- {- $this->markTestIncomplete();-- // todo: ensure only the items checked are included in the output- }-public function test_limiting_by_company(){[$companyA, $companyB] = Company::factory()@@ -576,8 +569,7 @@ class CustomComponentReportTest extends TestCasetrans('admin/reports/general.custom_export.asset_company'),trans('admin/reports/general.custom_export.asset_serial'),trans('admin/hardware/table.checkout_date'),- // todo: translate- 'Assigned Qty',+ trans('general.assigned_quantity'),])->assertSeeTextInStreamedResponse('Component A')->assertSeeTextInStreamedResponse('Component B')@@ -613,8 +605,7 @@ class CustomComponentReportTest extends TestCasetrans('admin/reports/general.custom_export.asset_company'),trans('admin/reports/general.custom_export.asset_serial'),trans('admin/hardware/table.checkout_date'),- // todo: translate- 'Assigned Qty',+ trans('general.assigned_quantity'),])->assertSeeTextInStreamedResponse(['Component A',