Fix Multilingual widget and extend ILanguageManager

Author: lijkbezorger

src/components/LanguageManager.php

@@ -104,6 +104,26 @@ public function getLanguage()
         return $this->_language;
     }
 
+    public function getSlugMap()
+    {
+        $map = [];
+        foreach ($this->languages as $language) {
+            $map[$language->getId()] = $language->getSlug();
+        }
+
+        return $map;
+    }
+
+    public function getMap()
+    {
+        $map = [];
+        foreach ($this->languages as $language) {
+            $map[$language->getId()] = $language->getTitle();
+        }
+
+        return $map;
+    }
+
     /**
      * @param ILanguage $language
      */
@@ -130,4 +150,4 @@ public function setLanguage(ILanguage $language)
             Yii::$app->getResponse()->getCookies()->add($cookie);
         }
     }
-}
+}

src/interfaces/ILanguageManager.php

@@ -28,4 +28,14 @@ public function getLanguage();
      * @param ILanguage $language
      */
     public function setLanguage(ILanguage $language);
-}
+
+    /**
+     * @return array
+     */
+    public function getSlugMap();
+
+    /**
+     * @return array
+     */
+    public function getMap();
+}

src/widgets/Multilingual.php

@@ -7,27 +7,25 @@
 
 use nullref\core\interfaces\ILanguageManager;
 use Yii;
+use yii\base\Model;
 use yii\base\Widget;
 
 class Multilingual extends Widget
 {
+    /** @var \Closure */
     public $tab;
+    /** @var Model */
     public $model;
-    public $languages = null;
-
-    /**
-     * @var MultilingualForm
-     */
+    /** @var MultilingualForm */
     public $form;
 
+    /** @var ILanguageManager */
+    private $languageManager;
+
     public function init()
     {
         parent::init();
-        if (!count($this->languages)) {
-            /** @var ILanguageManager $languageManager */
-            $languageManager = Yii::$app->get('languageManager');
-            $this->languages = $languageManager->getLanguages();
-        }
+        $this->languageManager = Yii::$app->get('languageManager');
     }
 
 
@@ -50,7 +48,7 @@ public function run()
             'form' => $form,
             'tab' => $this->tab,
             'model' => $this->model,
-            'languages' => $this->languages,
+            'languageManager' => $this->languageManager,
         ]);
     }
-}
+}

src/widgets/views/multilingual.php

@@ -4,8 +4,8 @@
  * @var $form \nullref\core\widgets\MultilingualForm
  * @var $model \yii\base\Model
  * @var $tab Closure
+ * @var $languageManager \nullref\core\interfaces\ILanguageManager
  */
-use app\helpers\Languages;
 
 ?>
 <style>
@@ -22,21 +22,21 @@
 <div class="multilingual">
     <ul class="nav nav-tabs">
         <?php $first = true;
-        foreach (Languages::getSlugMap() as $key => $lang): ?>
+        foreach ($languageManager->getSlugMap() as $key => $lang): ?>
             <li class="<?= ($first) ? 'active' : '' ?>">
                 <a data-toggle="tab" href="#<?= $lang ?>">
-                    <?= Yii::t('translation', Languages::getMap()[$key]) ?>
+                    <?= Yii::t('translation', $languageManager->getMap()[$key]) ?>
                 </a>
             </li>
             <?php $first = false; endforeach ?>
     </ul>
     <div class="tab-content multilingual-tab-content" style="padding: 10px 5px">
         <?php $first = true;
-        foreach (Languages::getSlugMap() as $key => $lang): ?>
+        foreach ($languageManager->getSlugMap() as $key => $lang): ?>
             <div id="<?= $lang ?>" class="tab-pane <?= ($first) ? 'active' : '' ?>">
                 <?php $form->language = $lang ?>
                 <?= call_user_func($tab, $form, $model) ?>
             </div>
             <?php $first = false; endforeach ?>
     </div>
-</div>
+</div>