T7764 (#32)

* T7764 * Update src/I18n/TranslationUpdater.php Co-authored-by: Brooke Bryan <brooke@bajb.net> * Update src/Context/Context.php Co-authored-by: Brooke Bryan <brooke@bajb.net> * Update src/Context/Context.php Co-authored-by: Brooke Bryan <brooke@bajb.net>
cubex · Feb 26, 2021 · afa5f5a · afa5f5a
1 parent 730ac31
commit afa5f5a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/Context/Context.php b/src/Context/Context.php
@@ -104,7 +104,8 @@ public function prepareTranslator($path = '/translations/', $withUpdater = false
     if($withUpdater)
     {
       //Push all translations via a translation logger
-      $cubex->share(Translator::class, new TranslationLogger(new CatalogTranslator($catalog)));
+      $translationLogger = new TranslationLogger(new CatalogTranslator($catalog));
+      $cubex->share(Translator::class, $translationLogger);
 
       //Keep track of all new translations within _tpl.php
       $catFile = $transDir . '_tpl.php';
@@ -119,7 +120,7 @@ public function prepareTranslator($path = '/translations/', $withUpdater = false
       }
 
       //Setup the translation logger to listen @ shutdown
-      $cubex->retrieve(TranslationUpdater::class, [$this->getCubex(), $tplCatalog, $catFile, static::DEFAULT_LANGUAGE]);
+      $cubex->retrieve(TranslationUpdater::class, [$cubex, $tplCatalog, $catFile, static::DEFAULT_LANGUAGE, $translationLogger]);
     }
     else
     {

diff --git a/src/I18n/TranslationUpdater.php b/src/I18n/TranslationUpdater.php
@@ -22,20 +22,28 @@ class TranslationUpdater implements CubexAware
   protected $_file;
   protected $_lang;
 
-  public function __construct(Cubex $cubex, MessageCatalog $catalog, $file, $lang)
+  public function __construct(Cubex $cubex, MessageCatalog $catalog, $file, $lang, TranslationLogger $translationLogger = null)
   {
     $this->_catalog = $catalog;
     $this->_file = $file;
     $this->_lang = $lang;
     $this->setCubex($cubex);
     $cubex->listen(
       ShutdownEvent::class,
-      function () {
-        $translator = $this->getCubex()->retrieve(Translator::class);
-        if($translator instanceof TranslationLogger)
+      function () use ($translationLogger) {
+        if ($translationLogger !== null)
         {
-          $this->storeTranslations($translator);
+          $this->storeTranslations($translationLogger);
         }
+        else
+        {
+          $translator = $this->getCubex()->retrieve(Translator::class);
+          if($translator instanceof TranslationLogger)
+          {
+            $this->storeTranslations($translator);
+          }
+        }
+
       }
     );
   }