#2: Fixes multi-language support

yiimaker · Aug 15, 2017 · e848001 · e848001
1 parent 6ca68cc
commit e848001
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,16 @@
 Email Templates Module Change Log
 ---------------------------------
 
+1.1.1 August 15, 2017
+---------------------
+* Fix: multi-language support
+
 1.1.0 August 1, 2017
-------------------
+--------------------
 * Enh: adds Gii generator for email templates
 
 1.0.2 July 27, 2017
-----------------
+-------------------
 * Fix: bug with updating
 
 1.0.1 June 22, 2017

diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
@@ -68,9 +68,10 @@ public function actionIndex()
     /**
      * Create email template model
      *
+     * @param null|string $lang
      * @return string|\yii\web\Response
      */
-    public function actionCreate()
+    public function actionCreate($lang = null)
     {
         $request = Yii::$app->getRequest();
         if ($request->getIsPost()) {
@@ -82,7 +83,7 @@ public function actionCreate()
             }
         }
         $template = $this->_service->getModel();
-        $translation = $this->_service->getTranslationModel();
+        $translation = $this->_service->getTranslationModel(null, $lang);
 
         return $this->render('create', compact([
             'errros',

diff --git a/src/services/DbService.php b/src/services/DbService.php
@@ -75,7 +75,9 @@ public function getTranslationModel($modelId = null, $language = null)
             return $model ?: new EmailTemplateTranslation($params);
         }
 
-        return new EmailTemplateTranslation();
+        return new EmailTemplateTranslation([
+            'language' => $language ?: Yii::$app->language,
+        ]);
     }
 
     /**
@@ -99,7 +101,6 @@ protected function processData(array $data)
         if ($this->_template->load($data) && $this->_translation->load($data)) {
             if ($this->_template->getIsNewRecord()) {
                 $this->_translation->templateId = 0;
-                $this->_translation->language = Yii::$app->language;
             }
             $validationErrors = [];
             if (!$this->_template->validate()) {

diff --git a/src/views/default/create.php b/src/views/default/create.php
@@ -10,6 +10,7 @@
 use yii\widgets\ActiveForm;
 use ymaker\email\templates\Module as TemplatesModule;
 use vova07\imperavi\Widget as ImperaviRedactor;
+use ymaker\email\templates\widgets\LanguagesList;
 
 /**
  * View file for CRUD backend controller
@@ -40,12 +41,18 @@
                 <?php endforeach; ?>
             <?php endif; ?>
         </div>
+        <div class="col-md-12">
+            <div class="pull-right">
+                <?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
+            </div>
+        </div>
         <div class="col-md-12">
             <?php $form = ActiveForm::begin() ?>
             <?= $form->field($template, 'key') ?>
             <?= $form->field($translation, 'subject') ?>
             <?= $form->field($translation, 'body')->widget(ImperaviRedactor::class) ?>
             <?= $form->field($translation, 'hint') ?>
+            <?= $form->field($translation, 'language')->hiddenInput()->label(false) ?>
             <?= Html::submitButton(
                 TemplatesModule::t('Create'),
                 ['class' => 'btn btn-success']

diff --git a/src/views/default/update.php b/src/views/default/update.php
@@ -9,6 +9,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use ymaker\email\templates\Module as TemplatesModule;
+use ymaker\email\templates\widgets\LanguagesList;
 use vova07\imperavi\Widget as ImperaviRedactor;
 
 /**
@@ -40,6 +41,11 @@
                 <?php endforeach; ?>
             <?php endif; ?>
         </div>
+        <div class="col-md-12">
+            <div class="pull-right">
+                <?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
+            </div>
+        </div>
         <div class="col-md-12">
             <?php $form = ActiveForm::begin() ?>
             <?= $form->field($template, 'key')

diff --git a/src/views/default/view.php b/src/views/default/view.php
@@ -8,6 +8,7 @@
 use yii\helpers\Html;
 use yii\helpers\Url;
 use ymaker\email\templates\Module as TemplatesModule;
+use ymaker\email\templates\widgets\LanguagesList;
 
 /**
  * View file for CRUD backend controller
@@ -36,6 +37,9 @@
                         Url::toRoute(['delete', 'id' => $template->id]),
                         ['class' => 'btn btn-danger']
                     ) ?>
+                    <div class="pull-right">
+                        <?= LanguagesList::widget(['currentLanguage' => $translation->language]) ?>
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/src/widgets/LanguagesList.php b/src/widgets/LanguagesList.php
@@ -5,7 +5,7 @@
  * @license BSD 3-Clause License
  */
 
-namespace yii2deman\shop\common\widgets;
+namespace ymaker\email\templates\widgets;
 
 use Yii;
 use yii\base\Widget;
@@ -19,6 +19,11 @@
  */
 class LanguagesList extends Widget
 {
+    /**
+     * @var string
+     */
+    public $currentLanguage;
+
     /**
      * @var array
      */
@@ -33,6 +38,16 @@ public function init()
         /** @var LanguageProviderInterface $provider */
         $provider = Yii::$container->get(LanguageProviderInterface::class);
         $this->_languages = $provider->getLanguages();
+
+        if (!empty($this->currentLanguage)) {
+            foreach ($this->_languages as $key => $language) {
+                if ($language['locale'] == $this->currentLanguage) {
+                    $this->currentLanguage = $language;
+                    unset($this->_languages[$key]);
+                    break;
+                }
+            }
+        }
     }
 
     /**
@@ -41,7 +56,7 @@ public function init()
     public function run()
     {
         return $this->render('languages', [
-            'languages' => $this->_languages
+            'languages' => $this->_languages,
         ]);
     }
 }
diff --git a/src/widgets/views/languages.php b/src/widgets/views/languages.php
@@ -19,12 +19,18 @@
 \yii\bootstrap\BootstrapPluginAsset::register($this);
 ?>
 <div class="dropdown">
-    <button class="btn btn-default dropdown-toggle" type="button"
-            id="languages" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        <?= Yii::t('email-templates', 'Language') ?>
+    <button class="btn btn-default dropdown-toggle" type="button" id="email-template-languages"
+            data-toggle="dropdown"
+            aria-haspopup="true"
+            aria-expanded="true">
+        <?php if (!empty($this->context->currentLanguage)): ?>
+            <?= $this->context->currentLanguage['label'] ?>
+        <?php else: ?>
+            <?= Yii::t('email-templates', 'Language') ?>
+        <?php endif; ?>
         <span class="caret"></span>
     </button>
-    <ul class="dropdown-menu" aria-labelledby="languages">
+    <ul class="dropdown-menu" aria-labelledby="email-template-languages">
         <?php foreach ($languages as $language): ?>
             <li>
                 <?= Html::a($language['label'], Url::current(['lang' => $language['locale']])) ?>