Merge pull request #41 from Kunstmaan/fix_translation_import

by default, import the translations from all your own bundles

Author: jverdeyen

DependencyInjection/Configuration.php

@@ -31,7 +31,7 @@ public function getConfigTreeBuilder()
 
                 ->scalarNode('default_bundle')
                     ->cannotBeEmpty()
-                    ->defaultValue('kunstmaantranslatorbundle')
+                    ->defaultValue('own')
                 ->end()
 
                 ->scalarNode('cache_dir')

Service/Command/Importer/ImportCommandHandler.php

@@ -3,13 +3,14 @@
 namespace Kunstmaan\TranslatorBundle\Service\Command\Importer;
 
 use Kunstmaan\TranslatorBundle\Model\Import\ImportCommand;
-use Symfony\Component\Finder\Finder;
+use Kunstmaan\TranslatorBundle\Service\Command\AbstractCommandHandler;
 use Kunstmaan\TranslatorBundle\Service\Exception\TranslationsNotFoundException;
+use Symfony\Component\Finder\Finder;
 
 /**
  * Parses an ImportCommand
  */
-class ImportCommandHandler extends \Kunstmaan\TranslatorBundle\Service\Command\AbstractCommandHandler
+class ImportCommandHandler extends AbstractCommandHandler
 {
 
     /**
@@ -58,8 +59,12 @@ public function importGlobalTranslationFiles(ImportCommand $importCommand)
      */
     public function importBundleTranslationFiles(ImportCommand $importCommand)
     {
-        if (strtolower($importCommand->getBundle()) == 'all') {
+        $importBundle = strtolower($importCommand->getBundle());
+
+        if ($importBundle == 'all') {
             return $this->importAllBundlesTranslationFiles($importCommand);
+        } elseif ($importBundle == 'own') {
+            return $this->importOwnBundlesTranslationFiles($importCommand);
         }
 
         return $this->importSingleBundleTranslationFiles($importCommand);
@@ -88,6 +93,31 @@ public function importAllBundlesTranslationFiles(ImportCommand $importCommand)
         return $imported;
     }
 
+    /**
+     * Import all translation files from your own registered bundles (in src/ directory)
+     * @param  ImportCommand $importCommand
+     * @return int           The total number of imported files
+     */
+    public function importOwnBundlesTranslationFiles(ImportCommand $importCommand)
+    {
+        $imported = 0;
+        $srcDir = dirname($this->kernel->getRootDir()) . '/src';
+
+        foreach($this->kernel->getBundles() as $name => $bundle) {
+            if (strpos($bundle->getPath(), $srcDir) !== false) {
+                $importCommand->setBundle(strtolower($name));
+
+                try {
+                    $imported += $this->importSingleBundleTranslationFiles($importCommand);
+                } catch (TranslationsNotFoundException $e) {
+                    continue;
+                }
+            }
+        }
+
+        return $imported;
+    }
+
     /**
      * Import all translation files from a single bundle
      * @param  ImportCommand $importCommand