[RTM] Improve the locale handling #1064
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aschempp
reviewed
Sep 12, 2017
|
|
||
| $finder = Finder::create()->directories()->depth(0)->in($dirs); | ||
|
|
||
| $languages = array_values( |
There was a problem hiding this comment.
$languages = [$this->defaultLocale];
foreach ($finder as $file) {
if (preg_match('/^[a-z]{2}(_[A-Z]{2})?$/', $file->getFilename())) {
$languages[] = $file->getFilename();
}
}
return array_values(array_unique($languages));
ausi
approved these changes
Sep 12, 2017
Toflar
reviewed
Sep 12, 2017
| $finder = Finder::create()->directories()->depth(0)->in($dirs); | ||
|
|
||
| foreach ($finder as $file) { | ||
| if (preg_match('/^[a-z]{2}(_[A-Z]{2})?$/', $file->getFilename())) { |
There was a problem hiding this comment.
Can't the $finder do that already? Like so:
$finder = Finder::create()->directories()->depth(0)->in($dirs)->name('/^[a-z]{2}(_[A-Z]{2})?$/');
aschempp
reviewed
Sep 12, 2017
| @@ -51,7 +51,8 @@ public function getConfiguration(array $config, ContainerBuilder $container) | |||
|
|
|||
| return new Configuration( | |||
| $container->getParameter('kernel.debug'), | |||
| $container->getParameter('kernel.project_dir') | |||
| $container->getParameter('kernel.project_dir'), | |||
There was a problem hiding this comment.
This should be kernel.root_dir
leofeyer
changed the title
leofeyer
added a commit
that referenced
this pull request
Sep 18, 2017
|
Merged in b40a935. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR caches the installed languages in the DI container, so we do not need to iterate over the file system upon every request. Also, it no longer stores the locale in the session by default, which is now done in the
setUserFromDb()method.