[bugfix] added translation manager service defintion, fixed object ac…

…cess in database loader
maschmann · Jan 12, 2014 · 785fd09 · 785fd09
1 parent 91c3ed2
commit 785fd09
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,18 +1,27 @@
 parameters:
+    asm_translation_loader.translation_loader_class:  'Asm\TranslationLoaderBundle\Translation\DatabaseLoader'
+    asm_translation_loader.translation_model:         'Asm\TranslationLoaderBundle\Translation'
+    asm_translation_loader.history.subscriber_class:  'Asm\TranslationLoaderBundle\EventListener\TranslationHistorySubscriber'
+    asm_translation_loader.translation_manager_model: 'Asm\TranslationLoaderBundle\Model\TranslationManager'
 
 services:
     # database loader
     translation.loader.db:
-        class:     Asm\TranslationLoaderBundle\Translation\DatabaseLoader
-        arguments: [ 'asm_translation_loader.translation_manager' ]
+        class:     '%asm_translation_loader.translation_loader_class%'
+        arguments: [ '@asm_translation_loader.translation_manager' ]
         tags:
             - { name: translation.loader, alias: db}
 
     # history writer
     asm_translation_loader.history.subscriber:
-        class: Asm\TranslationLoaderBundle\EventListener\TranslationHistorySubscriber
+        class: '%asm_translation_loader.history.subscriber_class%'
         calls:
             - [ setEnabled, [ "%asm_translation_loader.history.enabled%" ] ]
             - [ setSecurityContext, [ "@security.context" ] ]
         tags:
             - { name: doctrine.event_subscriber }
+
+    # translation manager
+    asm_translation_loader.translation_manager:
+        class: '%asm_translation_loader.translation_manager_model%'
+        arguments: [ '%asm_translation_loader.translation_model%' ]
diff --git a/Translation/DatabaseLoader.php b/Translation/DatabaseLoader.php
@@ -51,7 +51,7 @@ public function load($resource, $locale, $messageDomain = 'messages')
         $catalogue = new MessageCatalogue($locale);
 
         foreach ($translations as $translation) {
-            $catalogue->set($translation['transKey'], $translation['translation'], $messageDomain);
+            $catalogue->set($translation->getTransKey(), $translation->getTranslation(), $messageDomain);
         }
 
         return $catalogue;