kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

Cast all translations to strings.

Browse Source
This commit is contained in:
James Cole
2018-07-15 09:38:49 +02:00
parent 369839e012
commit 7b41c5b301
99 changed files with 335 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php
View File

@@ -80,7 +80,7 @@ class ConfigureUploadHandler implements FileConfigurationInterface
}
if (!$complete) {
$messages = new MessageBag;
$messages->add('account', trans('import.invalid_import_account'));
$messages->add('account', (string)trans('import.invalid_import_account'));
return $messages;
}
@@ -96,9 +96,9 @@ class ConfigureUploadHandler implements FileConfigurationInterface
public function getNextData(): array
{
$delimiters = [
',' => trans('form.csv_comma'),
';' => trans('form.csv_semicolon'),
'tab' => trans('form.csv_tab'),
',' => (string)trans('form.csv_comma'),
';' => (string)trans('form.csv_semicolon'),
'tab' => (string)trans('form.csv_tab'),
];
$config = $this->importJob->configuration;
$config['date-format'] = $config['date-format'] ?? 'Ymd';