8000 n/a by fabpot · Pull Request #11830 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

n/a #11830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2014
Merged

n/a #11830

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
101a3b7
[FrameworkBundle][Translator] Validate locales.
aitboudad Jul 22, 2014
9e1bc22
Add tests and more assertions
Jul 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[FrameworkBundle][Translator] Validate locales.
  • Loading branch information
@aitboudad
aitboudad authored and Jérémy Derussé committed Sep 2, 2014
commit 101a3b7b501b65838faad49fe51076011f0b72a9
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
public function getLocale()
{
if (null === $this->locale && $this->container->isScopeActive('request') && $this->container->has('request')) {
$this->locale = $this->container->get('request')->getLocale();
$this->setLocale($this->container->get('request')->getLocale());
}

return $this->locale;
Expand Down
0