kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +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

2
app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php
View File

@@ -296,7 +296,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface
{
$roles = [];
foreach (array_keys(config('csv.import_roles')) as $role) {
$roles[$role] = trans('import.column_' . $role);
$roles[$role] = (string)trans('import.column_' . $role);
}
asort($roles);

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';

4
app/Support/Import/JobConfiguration/File/NewFileJobHandler.php
View File

@@ -91,7 +91,7 @@ class NewFileJobHandler implements FileConfigurationInterface
$importFileTypes = [];
$defaultImportType = config('import.options.file.default_import_format');
foreach ($allowedTypes as $type) {
$importFileTypes[$type] = trans('import.import_file_type_' . $type);
$importFileTypes[$type] = (string)trans('import.import_file_type_' . $type);
}
return [
@@ -145,7 +145,7 @@ class NewFileJobHandler implements FileConfigurationInterface
// check if content is UTF8:
if (!$this->isUTF8($attachment)) {
$message = trans('import.file_not_utf8');
$message = (string)trans('import.file_not_utf8');
Log::error($message);
$messages->add('import_file', $message);
// delete attachment: