simplify getLanguage call in request

This commit is contained in:
Dennis Eichhorn 2020-11-10 22:11:23 +01:00
parent cd3ed06387
commit bdb81a5b1b
3 changed files with 12 additions and 12 deletions

View File

@ -192,14 +192,14 @@ final class Application
);
}
UriFactory::setQuery('/lang', $response->getHeader()->getL11n()->getLanguage());
UriFactory::setQuery('/lang', $response->getLanguage());
$this->loadLanguageFromPath(
$response->getHeader()->getL11n()->getLanguage(),
__DIR__ . '/lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php'
$response->getLanguage(),
__DIR__ . '/lang/' . $response->getLanguage() . '.lang.php'
);
$response->getHeader()->set('content-language', $response->getHeader()->getL11n()->getLanguage(), true);
$response->getHeader()->set('content-language', $response->getLanguage(), true);
/* Create html head */
$this->initResponseHead($head, $request, $response);
@ -273,8 +273,8 @@ final class Application
$response->getHeader()->setStatusCode(RequestStatusCode::R_406);
$pageView->setTemplate('/Web/Timerecording/Error/406');
$this->loadLanguageFromPath(
$response->getHeader()->getL11n()->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php'
$response->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
);
}
@ -293,8 +293,8 @@ final class Application
$response->getHeader()->setStatusCode(RequestStatusCode::R_503);
$pageView->setTemplate('/Web/Timerecording/Error/503');
$this->loadLanguageFromPath(
$response->getHeader()->getL11n()->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php'
$response->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
);
}
@ -352,8 +352,8 @@ final class Application
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$pageView->setTemplate('/Web/Timerecording/Error/403');
$this->loadLanguageFromPath(
$response->getHeader()->getL11n()->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php'
$response->getLanguage(),
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
);
}

View File

@ -24,7 +24,7 @@ $head = $this->getData('head');
$dispatch = $this->getData('dispatch') ?? [];
?>
<!DOCTYPE HTML>
<html lang="<?= $this->printHtml($this->response->getHeader()->getL11n()->getLanguage()); ?>">
<html lang="<?= $this->printHtml($this->response->getLanguage()); ?>">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

View File

@ -13,7 +13,7 @@
$head = $this->getData('head');
?>
<!DOCTYPE HTML>
<html lang="<?= $this->printHtml($this->response->getHeader()->getL11n()->getLanguage()); ?>">
<html lang="<?= $this->printHtml($this->response->getLanguage()); ?>">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">