Lang attribute for HTML tags and inputs

wdmg · Feb 13, 2021 · a3cd30c · a3cd30c
1 parent 73095bc
commit a3cd30c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+## 1.2.*
+ * Lang attribute for HTML tags and inputs
+
 ## 1.2.5 (2020-12-29)
  * RBAC implementation
 

diff --git a/Module.php b/Module.php
@@ -128,7 +128,7 @@ public function normalizePagesRoute($routes)
     /**
      * {@inheritdoc}
      */
-    public function dashboardNavItems($createLink = false)
+    public function dashboardNavItems($options = false)
     {
         $items = [
             'label' => $this->name,

diff --git a/migrations/m190725_005152_pages.php b/migrations/m190725_005152_pages.php
@@ -31,9 +31,9 @@ public function safeUp()
             'route' => $this->string(255)->null(),
             'layout' => $this->string(64)->null(),
             'created_at' => $this->dateTime()->defaultExpression('CURRENT_TIMESTAMP'),
-            'created_by' => $this->integer(11)->notNull()->defaultValue(0),
+            'created_by' => $this->integer(11)->null(),
             'updated_at' => $this->datetime()->defaultExpression('CURRENT_TIMESTAMP'),
-            'updated_by' => $this->integer(11)->notNull()->defaultValue(0),
+            'updated_by' => $this->integer(11)->null(),
         ], $tableOptions);
 
         $this->createIndex('{{%idx-pages-alias}}', '{{%pages}}', ['name', 'alias']);

diff --git a/views/pages/_form.php b/views/pages/_form.php
@@ -35,7 +35,7 @@
         'id' => "addPageForm",
         'enableAjaxValidation' => true
     ]); ?>
-    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true, 'lang' => ($model->locale ?? Yii::$app->language)]) ?>
 
     <?= $form->field($model, 'alias')->widget(AliasInput::class, [
         'labels' => [
@@ -60,7 +60,9 @@
     ?>
 
     <?= $form->field($model, 'content')->widget(Editor::class, [
-        'options' => [],
+        'options' => [
+            'lang' => ($model->locale ?? Yii::$app->language)
+        ],
         'pluginOptions' => []
     ]) ?>
 
@@ -99,9 +101,9 @@
         </div>
         <div id="pageMetaTags" class="panel-collapse collapse">
             <div class="panel-body">
-                <?= $form->field($model, 'title')->textInput() ?>
-                <?= $form->field($model, 'description')->textarea(['rows' => 3]) ?>
-                <?= $form->field($model, 'keywords')->textarea(['rows' => 3]) ?>
+                <?= $form->field($model, 'title')->textInput(['lang' => ($model->locale ?? Yii::$app->language)]) ?>
+                <?= $form->field($model, 'description')->textarea(['rows' => 3, 'lang' => ($model->locale ?? Yii::$app->language)]) ?>
+                <?= $form->field($model, 'keywords')->textarea(['rows' => 3, 'lang' => ($model->locale ?? Yii::$app->language)]) ?>
             </div>
         </div>
     </div>

diff --git a/views/pages/view.php b/views/pages/view.php
@@ -30,6 +30,9 @@
             [
                 'attribute' => 'name',
                 'format' => 'raw',
+                'contentOptions' => [
+                    'lang' => ($model->locale ?? Yii::$app->language)
+                ],
                 'value' => function($model) {
                     $output = Html::tag('strong', $model->name);
                     if (($pageURL = $model->getPageUrl(true, true)) && $model->id) {
@@ -56,16 +59,35 @@
                     return $output;
                 }
             ],
-            'title:ntext',
+            [
+                'attribute' => 'title',
+                'format' => 'ntext',
+                'contentOptions' => [
+                    'lang' => ($model->locale ?? Yii::$app->language)
+                ]
+            ],
             [
                 'attribute' => 'content',
                 'format' => 'html',
                 'contentOptions' => [
+                    'lang' => ($model->locale ?? Yii::$app->language),
                     'style' => 'display:inline-block;max-height:360px;overflow-x:auto;'
                 ]
             ],
-            'description:ntext',
-            'keywords:ntext',
+            [
+                'attribute' => 'description',
+                'format' => 'ntext',
+                'contentOptions' => [
+                    'lang' => ($model->locale ?? Yii::$app->language)
+                ]
+            ],
+            [
+                'attribute' => 'keywords',
+                'format' => 'ntext',
+                'contentOptions' => [
+                    'lang' => ($model->locale ?? Yii::$app->language)
+                ]
+            ],
             [
                 'attribute' => 'common',
                 'label' => Yii::t('app/modules/pages','Common'),