DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13823 from spencerrlongg/chore/sc-23922

Browse source 
New Translation Strings for Custom Asset Export
This commit is contained in:
snipe 2023-11-08 08:57:20 +00:00 committed by GitHub
parent cf42eca198 8f75bb8706
commit bc9545ca96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ReportsController.php
View file

@ -539,23 +539,23 @@ class ReportsController extends Controller
} }
if ($request->filled('user_address')) { if ($request->filled('user_address')) {
$header[] = trans('general.user') .' '. trans('general.address'); $header[] = trans('admin/reports/general.custom_export.user_address');
} }
if ($request->filled('user_city')) { if ($request->filled('user_city')) {
$header[] = trans('general.user') .' '. trans('general.city'); $header[] = trans('admin/reports/general.custom_export.user_city');
} }
if ($request->filled('user_state')) { if ($request->filled('user_state')) {
$header[] = trans('general.user') .' '. trans('general.state'); $header[] = trans('admin/reports/general.custom_export.user_state');
} }
if ($request->filled('user_country')) { if ($request->filled('user_country')) {
$header[] = trans('general.user') .' '. trans('general.country'); $header[] = trans('admin/reports/general.custom_export.user_country');
} }
if ($request->filled('user_zip')) { if ($request->filled('user_zip')) {
$header[] = trans('general.user') .' '. trans('general.zip'); $header[] = trans('admin/reports/general.custom_export.user_zip');
} }
if ($request->filled('status')) { if ($request->filled('status')) {

9
resources/lang/en/admin/reports/general.php
View file

@ -6,5 +6,12 @@ return [
'send_reminder' => 'Send reminder', 'send_reminder' => 'Send reminder',
'reminder_sent' => 'Reminder sent', 'reminder_sent' => 'Reminder sent',
'acceptance_deleted' => 'Acceptance request deleted', 'acceptance_deleted' => 'Acceptance request deleted',
'acceptance_request' => 'Acceptance request' 'acceptance_request' => 'Acceptance request',
'custom_export' => [
'user_address' => 'User Address',
'user_city' => 'User City',
'user_state' => 'User State',
'user_country' => 'User Country',
'user_zip' => 'User Zip'
]
]; ];