Permalink
Browse files

BUG Added _config as valid module folder in TextCollector

  • Loading branch information...
1 parent 541436f commit 537ee24bd3c95d83c1eed61958f135a740bdb9c3 @ARNHOE ARNHOE committed Aug 15, 2013
Showing with 7 additions and 4 deletions.
  1. +7 −4 i18n/i18nTextCollector.php
@@ -8,7 +8,7 @@
*
* Collects all found entities (and their natural language text for the default locale)
* into language-files for each module in an array notation. Creates or overwrites these files,
- * e.g. framework/lang/en_US.php.
+ * e.g. framework/lang/en.yml.
*
* The collector needs to be run whenever you make new translatable
* entities available. Please don't alter the arrays in language tables manually.
@@ -117,12 +117,15 @@ public function collect($restrictToModules = null, $mergeWithExisting = false) {
$modules = array_merge($modules, $themeFolders);
foreach($modules as $module) {
- // Only search for calls in folder with a _config.php file (which means they are modules, including
- // themes folder)
+ // Only search for calls in folder with a _config.php file or _config folder
+ // (which means they are modules, including themes folder)
$isValidModuleFolder = (
is_dir("$this->basePath/$module")
- && is_file("$this->basePath/$module/_config.php")
&& substr($module,0,1) != '.'
+ && (
+ is_file("$this->basePath/$module/_config.php")
+ || is_dir("$this->basePath/$module/_config")
+ )
) || (
substr($module,0,7) == 'themes/'
&& is_dir("$this->basePath/$module")

0 comments on commit 537ee24

Please sign in to comment.