diff --git a/app/Http/Controllers/CsvController.php b/app/Http/Controllers/CsvController.php index 6bc6a9b2e3..b54ef7314a 100644 --- a/app/Http/Controllers/CsvController.php +++ b/app/Http/Controllers/CsvController.php @@ -81,7 +81,7 @@ class CsvController extends Controller } $keys = array_keys(Config::get('csv.roles')); foreach ($keys as $name) { - $availableRoles[$name] = trans('firefly.csv_column_' . $name);//$role['name']; + $availableRoles[$name] = trans('firefly.csv_column_' . $name); } ksort($availableRoles); @@ -162,7 +162,7 @@ class CsvController extends Controller Session::forget('csv-roles'); Session::forget('csv-mapped'); Session::forget('csv-specifix'); - SessioN::forget('csv-delimiter'); + Session::forget('csv-delimiter'); // get list of supported specifix $specifix = []; diff --git a/resources/views/csv/index.twig b/resources/views/csv/index.twig index deff9ec3ae..9749ac83a1 100644 --- a/resources/views/csv/index.twig +++ b/resources/views/csv/index.twig @@ -55,7 +55,7 @@ {{ ExpandedForm.checkbox('has_headers',1,null,{helpText: 'csv_header_help'|_}) }} - {{ ExpandedForm.text('date_format','Ymd',{helpText: 'csv_date_help'|_}) }} + {{ ExpandedForm.text('date_format','Ymd',{helpText: trans('firefly.csv_date_help', {dateExample: phpdate('Ymd')}) }) }} {{ ExpandedForm.file('csv',{helpText: 'csv_csv_file_help'|_}) }} @@ -65,7 +65,6 @@ {{ ExpandedForm.select('csv_import_account', accounts, 0, {helpText: 'csv_import_account_help'|_} ) }} - {{ ExpandedForm.multiCheckbox('specifix', specifix) }}