Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-01-11 16:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

continue with getter/setter removal

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 04:15:35 +02:00
parent a51ddbe70c
commit 0893c42846
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php
View File

@ -49,9 +49,9 @@ trait ExchangeTrait
$settingData = $setting->getData();
$lang = [];
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->getLanguage() . '.lang.php';
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->header->l11n->language . '.lang.php';
$this->l11n->loadLanguage($request->header->l11n->getLanguage(), 'Exchange', $lang);
$this->l11n->loadLanguage($request->header->l11n->language, 'Exchange', $lang);
$importConnection = ($settingData['import']['db']['self'] ?? true)
? $this->local ?? new NullConnection()

4
Controller/BackendController.php
View File

@ -187,7 +187,7 @@ final class BackendController extends Controller
$lang = include $interface->source->getAbsolutePath()
. $interface->source->name
. '/Lang/' . $response->getLanguage() . '.lang.php';
. '/Lang/' . $response->header->l11n->language . '.lang.php';
$view->addData('lang', $lang);
@ -224,7 +224,7 @@ final class BackendController extends Controller
$lang = include $interface->source->getAbsolutePath()
. $interface->source->name
. '/Lang/' . $response->getLanguage() . '.lang.php';
. '/Lang/' . $response->header->l11n->language . '.lang.php';
$view->addData('lang', $lang);

6
tests/Interfaces/OMS/Exporter.php
View File

@ -70,9 +70,9 @@ final class Exporter extends ExporterAbstract
$this->account = $request->header->account;
$lang = [];
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->getLanguage() . '.lang.php';
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->header->l11n->language . '.lang.php';
$this->l11n->loadLanguage($request->header->l11n->getLanguage(), 'Exchange', $lang);
$this->l11n->loadLanguage($request->header->l11n->language, 'Exchange', $lang);
$result = [];
@ -82,7 +82,7 @@ final class Exporter extends ExporterAbstract
$log = new ExchangeLog();
$log->createdBy = $this->account;
$log->setType(ExchangeType::EXPORT);
$log->message = $this->l11n->getText($request->header->l11n->getLanguage(), 'Exchange', '', 'LangFileExported');
$log->message = $this->l11n->getText($request->header->l11n->language, 'Exchange', '', 'LangFileExported');
$log->subtype = 'language';
$log->exchange = (int) $request->getData('id');

6
tests/Interfaces/OMS/Importer.php
View File

@ -71,9 +71,9 @@ final class Importer extends ImporterAbstract
$end = new \DateTime($request->getData('end') ?? 'now');
$lang = [];
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->getLanguage() . '.lang.php';
$lang['Exchange'] = include __DIR__ . '/Lang/' . $request->header->l11n->language . '.lang.php';
$this->l11n->loadLanguage($request->header->l11n->getLanguage(), 'Exchange', $lang);
$this->l11n->loadLanguage($request->header->l11n->language, 'Exchange', $lang);
if ($request->hasData('db')) {
$this->remote = ConnectionFactory::create([
@ -102,7 +102,7 @@ final class Importer extends ImporterAbstract
$log = new ExchangeLog();
$log->createdBy = $this->account;
$log->setType(ExchangeType::IMPORT);
$log->message = $this->l11n->getText($request->header->l11n->getLanguage(), 'Exchange', '', 'LangFileImported');
$log->message = $this->l11n->getText($request->header->l11n->language, 'Exchange', '', 'LangFileImported');
$log->subtype = 'language';
$log->exchange = (int) $request->getData('id');