diff --git a/Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php b/Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php index a2ac0cb..342859a 100755 --- a/Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php +++ b/Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php @@ -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() diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3d9621a..51dc40b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -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); diff --git a/tests/Interfaces/OMS/Exporter.php b/tests/Interfaces/OMS/Exporter.php index dd83a58..061dcfb 100755 --- a/tests/Interfaces/OMS/Exporter.php +++ b/tests/Interfaces/OMS/Exporter.php @@ -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'); diff --git a/tests/Interfaces/OMS/Importer.php b/tests/Interfaces/OMS/Importer.php index b91108e..064a9f0 100755 --- a/tests/Interfaces/OMS/Importer.php +++ b/tests/Interfaces/OMS/Importer.php @@ -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');