Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 13:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we translate

Browse Source
This commit is contained in:
David Bomba 2021-09-24 08:50:50 +10:00
parent 19d4895a64
commit 9e0bcffd6e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/SubdomainController.php
View File

@ -29,6 +29,7 @@ class SubdomainController extends BaseController
'preview', 'preview',
'invoiceninja', 'invoiceninja',
'cname', 'cname',
'sandbox',
]; ];
public function __construct() public function __construct()

6
app/Jobs/Import/CSVImport.php
View File

@ -38,6 +38,7 @@ use App\Repositories\BaseRepository;
use App\Repositories\ClientRepository; use App\Repositories\ClientRepository;
use App\Repositories\InvoiceRepository; use App\Repositories\InvoiceRepository;
use App\Repositories\PaymentRepository; use App\Repositories\PaymentRepository;
use App\Utils\Ninja;
use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\CleanLineItems;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
@ -52,6 +53,7 @@ use League\Csv\Reader;
use League\Csv\Statement; use League\Csv\Statement;
use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\ParameterBag;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Illuminate\Support\Facades\App;
class CSVImport implements ShouldQueue { class CSVImport implements ShouldQueue {
@ -132,6 +134,10 @@ class CSVImport implements ShouldQueue {
'company' => $this->company, 'company' => $this->company,
]; ];
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($this->company->settings));
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new ImportCompleted($this->company, $data); $nmo->mailable = new ImportCompleted($this->company, $data);
$nmo->company = $this->company; $nmo->company = $this->company;