IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-30 10:47:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1652

Browse Source
This commit is contained in:
James Cole 2019-07-20 16:48:35 +02:00
parent 889b7e9a18
commit 3b8e95fcca
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Import/Storage/ImportArrayStorage.php
View File

@ -31,6 +31,7 @@ use FireflyIII\Events\RequestedReportOnJournals;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\ImportJob; use FireflyIII\Models\ImportJob;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
@ -68,6 +69,9 @@ class ImportArrayStorage
/** @var TransactionGroupRepositoryInterface */ /** @var TransactionGroupRepositoryInterface */
private $groupRepos; private $groupRepos;
/** @var string */
private $language = 'en_US';
/** /**
* Set job, count transfers in the array and create the repository. * Set job, count transfers in the array and create the repository.
* *
@ -87,6 +91,11 @@ class ImportArrayStorage
$this->groupRepos = app(TransactionGroupRepositoryInterface::class); $this->groupRepos = app(TransactionGroupRepositoryInterface::class);
$this->groupRepos->setUser($importJob->user); $this->groupRepos->setUser($importJob->user);
// get language of user.
/** @var Preference $pref */
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
$this->language = $pref->data;
Log::debug('Constructed ImportArrayStorage()'); Log::debug('Constructed ImportArrayStorage()');
} }
@ -276,7 +285,7 @@ class ImportArrayStorage
$hash = $this->getHash($transaction); $hash = $this->getHash($transaction);
$existingId = $this->hashExists($hash); $existingId = $this->hashExists($hash);
if (null !== $existingId) { if (null !== $existingId) {
$message = sprintf('Row #%d ("%s") could not be imported. It already exists.', $index, $transaction['description']); $message = (string)trans('import.duplicate_row', ['row' => $index, 'description' => $transaction['description']]);
$this->logDuplicateObject($transaction, $existingId); $this->logDuplicateObject($transaction, $existingId);
$this->repository->addErrorMessage($this->importJob, $message); $this->repository->addErrorMessage($this->importJob, $message);
@ -285,7 +294,7 @@ class ImportArrayStorage
// do transfer detection: // do transfer detection:
if ($this->checkForTransfers && $this->transferExists($transaction)) { if ($this->checkForTransfers && $this->transferExists($transaction)) {
$message = sprintf('Row #%d ("%s") could not be imported. Such a transfer already exists.', $index, $transaction['description']); $message = (string)trans('import.duplicate_row', ['row' => $index, 'description' => $transaction['description']]);
$this->logDuplicateTransfer($transaction); $this->logDuplicateTransfer($transaction);
$this->repository->addErrorMessage($this->importJob, $message); $this->repository->addErrorMessage($this->importJob, $message);

3
resources/lang/en_US/import.php
View File

@ -310,4 +310,7 @@ return [
'column_note' => 'Note(s)', 'column_note' => 'Note(s)',
'column_internal-reference' => 'Internal reference', 'column_internal-reference' => 'Internal reference',
// error message
'duplicate_row' => 'Row #:row (":description") could not be imported. It already exists.',
]; ];