From 20bd83232ea843659aa1fb2f64419e958dfe204f Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 11 Jan 2024 19:41:19 -0500 Subject: [PATCH] standardizing naming to use Template --- resources/lang/en/admin/reports/general.php | 4 ++-- resources/lang/en/admin/reports/message.php | 10 +++++----- resources/views/reports/custom.blade.php | 15 +++++++-------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/resources/lang/en/admin/reports/general.php b/resources/lang/en/admin/reports/general.php index 37b1ca7b16..938a191a28 100644 --- a/resources/lang/en/admin/reports/general.php +++ b/resources/lang/en/admin/reports/general.php @@ -7,10 +7,10 @@ return [ 'reminder_sent' => 'Reminder sent', 'acceptance_deleted' => 'Acceptance request deleted', 'acceptance_request' => 'Acceptance request', - 'saved_reports' => 'Saved Reports', + 'saved_templates' => 'Saved Templates', 'save_template' => 'Save Template', 'apply_template' => 'Apply Template', 'generate_template' => 'Generate Template', 'apply_and_generate' => 'Apply and Generate', - 'report_name' => 'Enter Report Name', + 'template_name' => 'Enter Template Name', ]; \ No newline at end of file diff --git a/resources/lang/en/admin/reports/message.php b/resources/lang/en/admin/reports/message.php index 5c5363ecee..42967dee96 100644 --- a/resources/lang/en/admin/reports/message.php +++ b/resources/lang/en/admin/reports/message.php @@ -3,13 +3,13 @@ return array( 'error' => 'You must select at least ONE option.', 'no_report_permission' => 'Template does not exist or you do not have permission to view it.', - 'about_reports' => 'About Saved Reports', - 'saving_reports_description' => 'Select your options, then enter the name of your report in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved report.', + 'about_templates' => 'About Saved Templates', + 'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.', 'create' => [ - 'success' => 'Report saved successfully', - 'needs_title' => 'Report title can not be blank.', - 'duplicate' => 'Report title already exists. Please choose a different one.', + 'success' => 'Template saved successfully', + 'needs_title' => 'Template title can not be blank.', + 'duplicate' => 'Template title already exists. Please choose a different one.', ], 'delete' => [ diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 9817c3aaf5..20624eb4c9 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -452,16 +452,16 @@ {{ Form::close() }} +
@if (! request()->routeIs('report-templates.edit'))
- +
- {{--this means that the name of a loaded report is in the input box. could lead to confusion with update--}} - + {!! $errors->first('name', '') !!}
@@ -490,10 +489,10 @@
-

{{ trans('admin/reports/message.about_reports') }}

+

{{ trans('admin/reports/message.about_templates') }}

-

{!! trans('admin/reports/message.saving_reports_description') !!}

+

{!! trans('admin/reports/message.saving_templates_description') !!}

@endif