diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] added the current locale as the default value for _locale when generating routes

Browse Source
This commit is contained in:
Fabien Potencier 2011-04-20 23:01:31 +02:00
parent c6dcf0f8f3
commit 7266b41ade
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Bundle/FrameworkBundle/RequestListener.php
View File

@ -77,14 +77,20 @@ class RequestListener
if ($master) {
// set the context even if the parsing does not need to be done
// to have correct link generation
$this->router->setContext(new RequestContext(
$context = new RequestContext(
$request->getBaseUrl(),
$request->getMethod(),
$request->getHost(),
$request->getScheme(),
$this->httpPort,
$this->httpsPort
));
);
if ($session = $request->getSession()) {
$context->setParameter('_locale', $session->getLocale());
}
$this->router->setContext($context);
}
if ($request->attributes->has('_controller')) {
@ -101,10 +107,6 @@ class RequestListener
}
$request->attributes->add($parameters);
if ($locale = $request->attributes->get('_locale')) {
$request->getSession()->setLocale($locale);
}
} catch (NotFoundException $e) {
$message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getPathInfo());
if (null !== $this->logger) {
@ -118,6 +120,11 @@ class RequestListener
}
throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e);
}
if ($master && $locale = $request->attributes->get('_locale')) {
$request->getSession()->setLocale($locale);
$context->setParameter('_locale', $locale);
}
}
private function parametersToString(array $parameters)