From f1ea4c0130e0ec30cf6f97f603c1e6078a24c50a Mon Sep 17 00:00:00 2001
From: andryeyev <volodymyr.andryeyev@gmail.com>
Date: Thu, 14 Jan 2016 10:00:09 +0200
Subject: [PATCH] lang_id => language_id

---
 backend/controllers/LanguageController.php         |  4 ++--
 backend/models/Import.php                          |  4 ++--
 backend/models/Menu.php                            |  4 ++--
 backend/models/MenuLocation.php                    |  2 +-
 backend/models/MenuLocationLang.php                | 10 +++++-----
 backend/models/NewOptionsLang.php                  |  6 +++---
 backend/models/NewOptionsLangSearch.php            |  4 ++--
 backend/models/Termin.php                          | 10 +++++-----
 backend/models/TerminLang.php                      | 10 +++++-----
 backend/views/admin-menu/view.php                  | 20 ++++++++++----------
 backend/views/blog/articles.php                    |  2 +-
 backend/views/language/_form_adress_edit.php       |  2 +-
 backend/views/language/view_adress.php             |  2 +-
 backend/views/new-options-lang/_form.php           |  2 +-
 backend/views/new-options-lang/_search.php         |  2 +-
 backend/views/new-options-lang/index.php           |  2 +-
 backend/views/new-options-lang/view.php            |  2 +-
 backend/views/option/_form_edit.php                |  2 +-
 backend/views/termin/_form.php                     |  4 ++--
 backend/web/js/option.js                           |  4 ++--
 common/components/LangUrlManager.php               |  6 +++---
 common/models/Catalog.php                          | 12 ++++++------
 common/modules/blog/controllers/AjaxController.php | 20 ++++++++++----------
 common/modules/blog/models/ArticleCategoryLang.php |  4 ++--
 common/modules/blog/models/ArticleLang.php         |  4 ++--
 common/modules/blog/views/article/_form.php        |  2 +-
 common/translation/ru/app.php                      |  2 +-
 common/translation/uk/app.php                      |  2 +-
 frontend/controllers/OptionValuesController.php    |  2 +-
 frontend/controllers/SiteController.php            |  6 +++---
 frontend/models/Language.php                       |  2 +-
 frontend/models/LanguageLang.php                   |  4 ++--
 frontend/models/Option.php                         | 20 ++++++++++----------
 frontend/models/OptionLang.php                     |  2 +-
 frontend/models/OptionLangSearch.php               |  4 ++--
 frontend/models/OptionValues.php                   |  8 ++++----
 frontend/models/OptionValuesSearch.php             |  4 ++--
 frontend/views/option-values/_form.php             |  6 +++---
 frontend/views/option-values/_search.php           |  2 +-
 frontend/views/option-values/index.php             |  2 +-
 frontend/views/option-values/view.php              |  2 +-
 frontend/views/option/_form_edit.php               |  2 +-
 frontend/web/js/option.js                          |  4 ++--
 43 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/backend/controllers/LanguageController.php b/backend/controllers/LanguageController.php
index 96f87e5..92d8e9f 100644
--- a/backend/controllers/LanguageController.php
+++ b/backend/controllers/LanguageController.php
@@ -156,14 +156,14 @@ class LanguageController extends Controller
         $langs = array();
         if(!empty($children)) {
             foreach($children as $child) {
-                $langs = OptionLang::findAll(['option_lang_id' => $child->option_id]);
+                $langs = OptionLang::findAll(['option_language_id' => $child->option_id]);
                 foreach($langs as $lang) {
                     $lang->delete();
                 }
                 $child->delete();
             }
         }
-        $langs = OptionLang::findAll(['option_lang_id' => $id]);
+        $langs = OptionLang::findAll(['option_language_id' => $id]);
         foreach($langs as $lang) {
             $lang->delete();
         }
diff --git a/backend/models/Import.php b/backend/models/Import.php
index b7feaf8..a159d06 100644
--- a/backend/models/Import.php
+++ b/backend/models/Import.php
@@ -42,7 +42,7 @@ class Import extends \yii\db\ActiveRecord
         $termin_pid = 8; 
         // $template_id шаблон каьегорий
         $template_id = 3; 
-        $lang_id = 2;
+        $language_id = 2;
         $type = 'H';
         
         // массив для импортп товаров
@@ -69,7 +69,7 @@ class Import extends \yii\db\ActiveRecord
             // массив для поиска/добавления термина
             $basic = [
                 'type' => $type, 
-                'lang_id' => $lang_id,
+                'language_id' => $language_id,
                 'template_id' => $template_id,
             ];
             
diff --git a/backend/models/Menu.php b/backend/models/Menu.php
index 8cdbddd..ba22c5f 100644
--- a/backend/models/Menu.php
+++ b/backend/models/Menu.php
@@ -80,7 +80,7 @@ class Menu extends \yii\db\ActiveRecord
                     AND menu_location.menu_location_name = \''.$location_name.'\'
                 INNER JOIN termin ON termin.termin_id = menu.termin_id
                 INNER JOIN termin_lang ON termin_lang.termin_id = menu.termin_id
-                    AND termin_lang.lang_id = '.Yii::$app->params['lang_id'].'
+                    AND termin_lang.language_id = '.Yii::$app->params['language_id'].'
             ORDER BY menu.level ASC, menu.sortorder ASC
         ')->queryAll();
 /*
@@ -90,7 +90,7 @@ class Menu extends \yii\db\ActiveRecord
              ->join(
                  'INNER JOIN',
                  'termin_lang.termin_id = menu.termin_id',
-                 ['lang_id' => yii::$app->params['lang_id']])
+                 ['language_id' => yii::$app->params['language_id']])
             ->all();
  */
     }    
diff --git a/backend/models/MenuLocation.php b/backend/models/MenuLocation.php
index 3c442c2..e554021 100644
--- a/backend/models/MenuLocation.php
+++ b/backend/models/MenuLocation.php
@@ -59,6 +59,6 @@ class MenuLocation extends \yii\db\ActiveRecord
      */
     public function getLangs()
     {
-        return $this->hasMany(Language::className(), ['language_id' => 'lang_id'])->viaTable('menu_location_lang', ['menu_location_id' => 'menu_location_id']);
+        return $this->hasMany(Language::className(), ['language_id' => 'language_id'])->viaTable('menu_location_lang', ['menu_location_id' => 'menu_location_id']);
     }
 }
diff --git a/backend/models/MenuLocationLang.php b/backend/models/MenuLocationLang.php
index 02e310d..273d4d1 100644
--- a/backend/models/MenuLocationLang.php
+++ b/backend/models/MenuLocationLang.php
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $menu_location_id
  * @property string $menu_location_title
- * @property integer $lang_id
+ * @property integer $language_id
  *
  * @property Language $lang
  * @property MenuLocation $menuLocation
@@ -30,8 +30,8 @@ class MenuLocationLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['menu_location_id', 'menu_location_title', 'lang_id'], 'required'],
-            [['menu_location_id', 'lang_id'], 'integer'],
+            [['menu_location_id', 'menu_location_title', 'language_id'], 'required'],
+            [['menu_location_id', 'language_id'], 'integer'],
             [['menu_location_title'], 'string', 'max' => 250]
         ];
     }
@@ -44,7 +44,7 @@ class MenuLocationLang extends \yii\db\ActiveRecord
         return [
             'menu_location_id' => Yii::t('app', 'Menu Location ID'),
             'menu_location_title' => Yii::t('app', 'Menu Location Title'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
         ];
     }
 
@@ -53,7 +53,7 @@ class MenuLocationLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
 
     /**
diff --git a/backend/models/NewOptionsLang.php b/backend/models/NewOptionsLang.php
index 64679be..d4b0826 100644
--- a/backend/models/NewOptionsLang.php
+++ b/backend/models/NewOptionsLang.php
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $primary
  * @property integer $id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $value
  */
 class NewOptionsLang extends \yii\db\ActiveRecord
@@ -32,7 +32,7 @@ class NewOptionsLang extends \yii\db\ActiveRecord
     {
         return [
             [['id', 'value'], 'required'],
-            [['id', 'lang_id'], 'integer'],
+            [['id', 'language_id'], 'integer'],
             [['value'], 'string']
         ];
     }
@@ -45,7 +45,7 @@ class NewOptionsLang extends \yii\db\ActiveRecord
         return [
             'primary' => Yii::t('app', 'Primary'),
             'id' => Yii::t('app', 'ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'value' => Yii::t('app', 'Value'),
         ];
     }
diff --git a/backend/models/NewOptionsLangSearch.php b/backend/models/NewOptionsLangSearch.php
index 5d68560..e91eca3 100644
--- a/backend/models/NewOptionsLangSearch.php
+++ b/backend/models/NewOptionsLangSearch.php
@@ -18,7 +18,7 @@ class NewOptionsLangSearch extends NewOptionsLang
     public function rules()
     {
         return [
-            [['primary', 'id', 'lang_id'], 'integer'],
+            [['primary', 'id', 'language_id'], 'integer'],
             [['value'], 'safe'],
         ];
     }
@@ -58,7 +58,7 @@ class NewOptionsLangSearch extends NewOptionsLang
         $query->andFilterWhere([
             'primary' => $this->primary,
             'id' => $this->id,
-            'lang_id' => $this->lang_id,
+            'language_id' => $this->language_id,
         ]);
 
         $query->andFilterWhere(['like', 'value', $this->value]);
diff --git a/backend/models/Termin.php b/backend/models/Termin.php
index e7064da..af65884 100644
--- a/backend/models/Termin.php
+++ b/backend/models/Termin.php
@@ -57,7 +57,7 @@ class Termin extends \yii\db\ActiveRecord
 
     /**
      * Выполняет поиск по параметрам
-     * @param array $param принимает [termin_id, lang_id, return_one, return_field, show_all]
+     * @param array $param принимает [termin_id, language_id, return_one, return_field, show_all]
      * @return array one | array all | string значение масива
      */
     public function finInfo (array $params = [])
@@ -65,7 +65,7 @@ class Termin extends \yii\db\ActiveRecord
         Tools::ifNotExist ($params, array (
             'termin_id' => false,
             'termin_pid' => false,
-            'lang_id' => Yii::$app->params['lang_id'],
+            'language_id' => Yii::$app->params['language_id'],
             'return_one' => false,
             'return_field' => false,
             'show_all' => false,
@@ -92,9 +92,9 @@ class Termin extends \yii\db\ActiveRecord
             'termin.termin_id = termin_lang.termin_id'
         );
 
-        if ($params['lang_id'])
+        if ($params['language_id'])
         {
-            $WHERE['termin_lang.lang_id'] = $params['lang_id'];
+            $WHERE['termin_lang.language_id'] = $params['language_id'];
         }
         
         // структура
@@ -169,7 +169,7 @@ class Termin extends \yii\db\ActiveRecord
      */
     public function getLangs()
     {
-        return $this->hasMany(Language::className(), ['language_id' => 'lang_id'])
+        return $this->hasMany(Language::className(), ['language_id' => 'language_id'])
             ->viaTable('termin_lang', ['termin_id' => 'termin_id']);
     }
 
diff --git a/backend/models/TerminLang.php b/backend/models/TerminLang.php
index 911a353..487701e 100644
--- a/backend/models/TerminLang.php
+++ b/backend/models/TerminLang.php
@@ -8,7 +8,7 @@ use Yii;
  * This is the model class for table "termin_lang".
  *
  * @property integer $termin_id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $termin_title
  * @property string $termin_alias
  *
@@ -31,8 +31,8 @@ class TerminLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['lang_id'], 'required'],
-            [['lang_id'], 'integer'],
+            [['language_id'], 'required'],
+            [['language_id'], 'integer'],
             [['termin_title', 'termin_alias'], 'string', 'max' => 250]
         ];
     }
@@ -44,7 +44,7 @@ class TerminLang extends \yii\db\ActiveRecord
     {
         return [
             'termin_id' => Yii::t('app', 'Termin ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'termin_title' => Yii::t('app', 'Termin Title'),
             'termin_alias' => Yii::t('app', 'Termin Alias'),
         ];
@@ -55,7 +55,7 @@ class TerminLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
 
     /**
diff --git a/backend/views/admin-menu/view.php b/backend/views/admin-menu/view.php
index 80c6e94..859ca41 100644
--- a/backend/views/admin-menu/view.php
+++ b/backend/views/admin-menu/view.php
@@ -10,26 +10,26 @@ $this->title = Yii::t('app', 'Admin Menus').': '.$model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="admin-menu-view box box-primary">
 
-    <?= DetailView::widget([
+<div class="admin-menu-view box box-primary">
+<?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id',
-            'parent_id',
-            'active',
+            'admin_menu_id',
+            'admin_menu_pid',
+            'status',
             'hide_min',
             'sort',
             'name',
             'path',
-            'params',
+            'param',
         ],
     ]) ?>
 
     <div class="box-footer with-border">
         <p>
-            <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary btn-flat']) ?>
-            <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
+            <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->admin_menu_id], ['class' => 'btn btn-primary btn-flat']) ?>
+            <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->admin_menu_id], [
                 'class' => 'btn btn-danger btn-flat',
                 'data' => [
                     'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
@@ -39,5 +39,5 @@ $this->params['breadcrumbs'][] = $this->title;
             <?= Html::a(Yii::t('app', 'Back'), ['index'], ['class' => 'btn btn-default btn-flat']) ?>
         </p>
     </div>
-
-</div>
+    
+</div>
\ No newline at end of file
diff --git a/backend/views/blog/articles.php b/backend/views/blog/articles.php
index f56a765..b4d1e07 100644
--- a/backend/views/blog/articles.php
+++ b/backend/views/blog/articles.php
@@ -21,7 +21,7 @@ echo GridView::widget([
             'class' => Column::className(),
             'header' => Yii::t('app', 'Name'),
             'content' => function($model, $key, $index, $column) {
-                return $model->getArticleLangs()->where(['lang_id' => Language::getDefaultLang()->language_id])->one()->name;
+                return $model->getArticleLangs()->where(['language_id' => Language::getDefaultLang()->language_id])->one()->name;
             }
         ],
         [
diff --git a/backend/views/language/_form_adress_edit.php b/backend/views/language/_form_adress_edit.php
index b57d0f3..6855c28 100644
--- a/backend/views/language/_form_adress_edit.php
+++ b/backend/views/language/_form_adress_edit.php
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>
diff --git a/backend/views/language/view_adress.php b/backend/views/language/view_adress.php
index 701ff4d..3a91122 100644
--- a/backend/views/language/view_adress.php
+++ b/backend/views/language/view_adress.php
@@ -24,7 +24,7 @@ echo $this->render('layout');
             [
                 'class' => 'yii\grid\Column',
                 'content' => function($model, $key, $index, $column) {
-                    return OptionLang::find()->select('value')->where(['lang_id' => 0, 'id' => $model->option_id])->scalar();
+                    return OptionLang::find()->select('value')->where(['language_id' => 0, 'id' => $model->option_id])->scalar();
                 },
                 'header' => Yii::t('app', 'adress_name')
             ],
diff --git a/backend/views/new-options-lang/_form.php b/backend/views/new-options-lang/_form.php
index 92be7ec..26fff33 100644
--- a/backend/views/new-options-lang/_form.php
+++ b/backend/views/new-options-lang/_form.php
@@ -14,7 +14,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'id')->textInput() ?>
 
-    <?= $form->field($model, 'lang_id')->textInput() ?>
+    <?= $form->field($model, 'language_id')->textInput() ?>
 
     <?= $form->field($model, 'value')->textarea(['rows' => 6]) ?>
 
diff --git a/backend/views/new-options-lang/_search.php b/backend/views/new-options-lang/_search.php
index 492705f..c146c4f 100644
--- a/backend/views/new-options-lang/_search.php
+++ b/backend/views/new-options-lang/_search.php
@@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'id') ?>
 
-    <?= $form->field($model, 'lang_id') ?>
+    <?= $form->field($model, 'language_id') ?>
 
     <?= $form->field($model, 'value') ?>
 
diff --git a/backend/views/new-options-lang/index.php b/backend/views/new-options-lang/index.php
index 728c3e3..907b488 100644
--- a/backend/views/new-options-lang/index.php
+++ b/backend/views/new-options-lang/index.php
@@ -27,7 +27,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
             'primary',
             'id',
-            'lang_id',
+            'language_id',
             'value:ntext',
 
             ['class' => 'yii\grid\ActionColumn'],
diff --git a/backend/views/new-options-lang/view.php b/backend/views/new-options-lang/view.php
index 4fa8864..29bb711 100644
--- a/backend/views/new-options-lang/view.php
+++ b/backend/views/new-options-lang/view.php
@@ -30,7 +30,7 @@ $this->params['breadcrumbs'][] = $this->title;
         'attributes' => [
             'primary',
             'id',
-            'lang_id',
+            'language_id',
             'value:ntext',
         ],
     ]) ?>
diff --git a/backend/views/option/_form_edit.php b/backend/views/option/_form_edit.php
index 4a3dd57..f5384ce 100644
--- a/backend/views/option/_form_edit.php
+++ b/backend/views/option/_form_edit.php
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>
diff --git a/backend/views/termin/_form.php b/backend/views/termin/_form.php
index cc088ef..7a5ad07 100644
--- a/backend/views/termin/_form.php
+++ b/backend/views/termin/_form.php
@@ -37,8 +37,8 @@ use yii\helpers\ArrayHelper;
  
 	<?= $form->field($model_lang, 'termin_alias')->textInput() ?>
  
- 	<?= Html::activeHiddenInput ($model_lang, 'lang_id', [
- 	    'value' => ($model_lang->lang_id != 0 ? $model_lang->lang_id : Yii::$app->params['lang_id']),
+ 	<?= Html::activeHiddenInput ($model_lang, 'language_id', [
+ 	    'value' => ($model_lang->language_id != 0 ? $model_lang->language_id : Yii::$app->params['language_id']),
  	]) ?>
 
     <div class="form-group">
diff --git a/backend/web/js/option.js b/backend/web/js/option.js
index a71b24d..f0e930a 100644
--- a/backend/web/js/option.js
+++ b/backend/web/js/option.js
@@ -71,7 +71,7 @@ $(function() {
         var path = form[id].handler;
         var view = form[id].view;
         var model = form[id].model;
-        $.get(path, { lang_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
+        $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
             $('#'+id+'-tabs li').removeClass('active');
             $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
             $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
@@ -92,7 +92,7 @@ $(function() {
         var flag = $(this).find('span').first().clone();
         var el = $(this);
         var id = $(this).attr('href').substr(1);
-        $.get(form[id], { lang_id: lang, widget_id: id }, function(data) {
+        $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
             $('#'+id+'-tabs li').removeClass('active');
             $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
             $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
diff --git a/common/components/LangUrlManager.php b/common/components/LangUrlManager.php
index f26dd22..2170b02 100644
--- a/common/components/LangUrlManager.php
+++ b/common/components/LangUrlManager.php
@@ -9,16 +9,16 @@ class LangUrlManager extends UrlManager
 {
     public function createUrl ($params)
     {
-        if (isset ($params['lang_id']))
+        if (isset ($params['language_id']))
         {
             //Если указан идентификатор языка, то делаем попытку найти язык в БД,
             //иначе работаем с языком по умолчанию 
-            if (($lang_code = Language::findOne($params['lang_id'])) === null)
+            if (($lang_code = Language::findOne($params['language_id'])) === null)
             {
                 $lang_code = Language::getDefaultLang();
             }
             
-            unset ($params['lang_id']);
+            unset ($params['language_id']);
 
         } 
         else 
diff --git a/common/models/Catalog.php b/common/models/Catalog.php
index 97eca29..6498fa8 100644
--- a/common/models/Catalog.php
+++ b/common/models/Catalog.php
@@ -23,21 +23,21 @@ class Catalog extends Model
                 termin_lang.termin_title 
             FROM termin_structure  
                 INNER JOIN termin_lang ON termin_lang.termin_id = termin_structure.termin_id
-                    AND termin_lang.lang_id = '.Yii::$app->params['lang_id'].' 
+                    AND termin_lang.language_id = '.Yii::$app->params['language_id'].' 
             ORDER BY termin_structure.termin_id ASC, termin_structure.termin_pid ASC
         ')->queryAll();
     }
     
     /**
      * Выполняет поиск по параметрам
-     * @param array $param принимает [catalog_id, lang_id, return_one, return_field, show_all]
+     * @param array $param принимает [catalog_id, language_id, return_one, return_field, show_all]
      * @return array one | array all | string значение масива
      */
     public function finInfo (array $params = [])
     {
         Tools::ifNotExist ($params, array (
             'catalog_id' => false,
-            'lang_id' => false,
+            'language_id' => false,
             'return_one' => false,
             'return_field' => false,
             'show_all' => false,
@@ -57,9 +57,9 @@ class Catalog extends Model
             $WHERE['catalog.catalog_id'] = $params['catalog_id'];
         }
     
-        if ($params['lang_id'])
+        if ($params['language_id'])
         {
-            $WHERE['catalog_i18n.lang_id'] = $params['lang_id'];
+            $WHERE['catalog_i18n.language_id'] = $params['language_id'];
         }
     
         if (! empty ($WHERE))
@@ -144,7 +144,7 @@ class Catalog extends Model
      */
     public function getRelationCatalogLangPlus()
     {
-        return $this->getRelationCatalogLang()->where(['lang_id' => yii::$app->params['lang_id']]);
+        return $this->getRelationCatalogLang()->where(['language_id' => yii::$app->params['language_id']]);
     }
     
     /**
diff --git a/common/modules/blog/controllers/AjaxController.php b/common/modules/blog/controllers/AjaxController.php
index 6ff8ba6..f7002b7 100644
--- a/common/modules/blog/controllers/AjaxController.php
+++ b/common/modules/blog/controllers/AjaxController.php
@@ -27,9 +27,9 @@ class AjaxController extends Controller
         return true;
     }
 
-    public function actionCategoryForm($lang_id, $widget_id)
+    public function actionCategoryForm($language_id, $widget_id)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -37,9 +37,9 @@ class AjaxController extends Controller
         return $this->renderAjax('_category_form', ['model' => $model, 'category_lang' => $category_lang, 'widget_id' => $widget_id]);
     }
 
-    public function actionArticleForm($lang_id, $widget_id)
+    public function actionArticleForm($language_id, $widget_id)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -47,9 +47,9 @@ class AjaxController extends Controller
         return $this->renderAjax('_article_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id]);
     }
 
-    public function actionArticleMediaForm($lang_id, $widget_id, $type)
+    public function actionArticleMediaForm($language_id, $widget_id, $type)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -60,9 +60,9 @@ class AjaxController extends Controller
         return $this->renderAjax('_article_media_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id, 'type' => $type]);
     }
 
-    public function actionArticleCategoryMediaForm($lang_id, $widget_id, $type)
+    public function actionArticleCategoryMediaForm($language_id, $widget_id, $type)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -124,9 +124,9 @@ class AjaxController extends Controller
         }
     }
 
-    public function actionMultilangForm($model, $ajaxView, $widget_id, $lang_id = NULL)
+    public function actionMultilangForm($model, $ajaxView, $widget_id, $language_id = NULL)
     {
-        $model = new $model(['language_id' => $lang_id]);
+        $model = new $model(['language_id' => $language_id]);
         return $this->renderAjax($ajaxView, ['model' => $model, 'widget_id' => $widget_id]);
     }
 }
diff --git a/common/modules/blog/models/ArticleCategoryLang.php b/common/modules/blog/models/ArticleCategoryLang.php
index e461116..1851437 100644
--- a/common/modules/blog/models/ArticleCategoryLang.php
+++ b/common/modules/blog/models/ArticleCategoryLang.php
@@ -8,7 +8,7 @@ use Yii;
 /**
  * This is the model class for table "article_category_lang".
  *
- * @property integer $article_category_lang_id
+ * @property integer $article_category_language_id
  * @property integer $language_id
  * @property integer $article_category_id
  * @property string $text
@@ -69,7 +69,7 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'article_category_lang_id' => Yii::t('app', 'ID'),
+            'article_category_language_id' => Yii::t('app', 'ID'),
             'language_id' => Yii::t('app', 'Lang ID'),
             'article_category_id' => Yii::t('app', 'Category ID'),
             'text' => Yii::t('app', 'Text'),
diff --git a/common/modules/blog/models/ArticleLang.php b/common/modules/blog/models/ArticleLang.php
index 75ef25c..378b266 100644
--- a/common/modules/blog/models/ArticleLang.php
+++ b/common/modules/blog/models/ArticleLang.php
@@ -8,7 +8,7 @@ use common\models\Language;
 /**
  * This is the model class for table "article_lang".
  *
- * @property integer $article_lang_id
+ * @property integer $article_language_id
  * @property integer $language_id
  * @property integer $article_id
  * @property string $text
@@ -52,7 +52,7 @@ class ArticleLang extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'article_lang_id' => Yii::t('app', 'ID'),
+            'article_language_id' => Yii::t('app', 'ID'),
             'language_id' => Yii::t('app', 'Lang ID'),
             'article_id' => Yii::t('app', 'Article ID'),
             'text' => Yii::t('app', 'Text'),
diff --git a/common/modules/blog/views/article/_form.php b/common/modules/blog/views/article/_form.php
index 981005e..30eb077 100644
--- a/common/modules/blog/views/article/_form.php
+++ b/common/modules/blog/views/article/_form.php
@@ -130,7 +130,7 @@ $uploaddir = \Yii::getAlias('@saveImageDir');
                 ?>
                 <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$multilang->id?>-<?=$index?>">
 
-                    <?= $form->field($article_langs[$index], "[$index]lang_id")->label(false)->hiddenInput(['value' => $index]) ?>
+                    <?= $form->field($article_langs[$index], "[$index]language_id")->label(false)->hiddenInput(['value' => $index]) ?>
 
                     <?= $form->field($article_langs[$index], "[$index]text")->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
 
diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php
index ff22385..b313076 100644
--- a/common/translation/ru/app.php
+++ b/common/translation/ru/app.php
@@ -86,7 +86,7 @@ return [
     'meta_description' => 'Meta Description',
     'text' => 'Текст',
     'page_alias' => 'alias',
-    'lang_id' => 'ID языка',
+    'language_id' => 'ID языка',
     'common' => 'Общее',
     'lang' => 'Языковые переменные',
     'termin' => 'Термин',
diff --git a/common/translation/uk/app.php b/common/translation/uk/app.php
index e69d796..9795107 100644
--- a/common/translation/uk/app.php
+++ b/common/translation/uk/app.php
@@ -14,7 +14,7 @@ return [
     'meta_description' => 'Meta Description',
     'text' => 'Текст',
     'page_alias' => 'alias',
-    'lang_id' => 'ID мови',
+    'language_id' => 'ID мови',
     'common' => 'Загальне',
     'lang' => 'Мовні змінні',
     'termin' => 'Термін',
diff --git a/frontend/controllers/OptionValuesController.php b/frontend/controllers/OptionValuesController.php
index e65492a..f552de1 100644
--- a/frontend/controllers/OptionValuesController.php
+++ b/frontend/controllers/OptionValuesController.php
@@ -68,7 +68,7 @@ class OptionValuesController extends Controller
             foreach($post['OptionValues']['option_value_text'] as $lang => $value) {
                 $models[$lang] = new OptionValues();
                 $models[$lang]->load(Yii::$app->request->post());
-                $models[$lang]->option_lang_id = $lang;
+                $models[$lang]->option_language_id = $lang;
                 $models[$lang]->option_value_text = $value;
                 if($first && $id) {
                     $models[$lang]->option_value_parent = $id;
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index d8f44cf..5146196 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -303,10 +303,10 @@ class SiteController extends Controller
                     $option_values[$key] = new OptionValues();
                     $option_values[$key]['option_value_id'] = $options_to_values[$key]->getAttribute('option_value_id');
                     $option_values[$key]['option_value_text'] = $val['option_value'];
-                    if($options_to_values[$key]->option->getAttribute('option_translatable') == 0 || empty($val['option_lang_id'])) {
-                        $option_values[$key]['option_lang_id'] = 0;
+                    if($options_to_values[$key]->option->getAttribute('option_translatable') == 0 || empty($val['option_language_id'])) {
+                        $option_values[$key]['option_language_id'] = 0;
                     } else {
-                        $option_values[$key]['option_lang_id'] = $val['option_lang_id'];
+                        $option_values[$key]['option_language_id'] = $val['option_language_id'];
                     }
                     if(!$option_values[$key]->save()) {  
                         $options_to_values[$key]->delete();
diff --git a/frontend/models/Language.php b/frontend/models/Language.php
index ed98291..91e6d34 100644
--- a/frontend/models/Language.php
+++ b/frontend/models/Language.php
@@ -61,6 +61,6 @@ class Language extends \yii\db\ActiveRecord
      */
     public function getOptionValues()
     {
-        return $this->hasMany(OptionValues::className(), ['option_lang_id' => 'language_id']);
+        return $this->hasMany(OptionValues::className(), ['option_language_id' => 'language_id']);
     }
 }
diff --git a/frontend/models/LanguageLang.php b/frontend/models/LanguageLang.php
index 2edf909..78ed820 100644
--- a/frontend/models/LanguageLang.php
+++ b/frontend/models/LanguageLang.php
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $language_id
  * @property string $lang_title
- * @property integer $lang_id
+ * @property integer $language_id
  *
  * @property Language $language
  */
@@ -43,7 +43,7 @@ class LanguageLang extends \yii\db\ActiveRecord
         return [
             'language_id' => Yii::t('app', 'Language ID'),
             'lang_title' => Yii::t('app', 'Lang Title'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
         ];
     }
 
diff --git a/frontend/models/Option.php b/frontend/models/Option.php
index bdddac0..cfa62bb 100644
--- a/frontend/models/Option.php
+++ b/frontend/models/Option.php
@@ -60,7 +60,7 @@ class Option extends \yii\db\ActiveRecord
     public static function change($id, $post, $modeldb, $model_id) {
         $models[$id] = Option::findOne($id);
         $modellang[$id] = array();
-        $langs = OptionLang::findAll(['option_lang_id' => $id]);
+        $langs = OptionLang::findAll(['option_language_id' => $id]);
         foreach($langs as $lang) {
             $modellang[$id][$lang->language_id] = $lang;
         }
@@ -78,7 +78,7 @@ class Option extends \yii\db\ActiveRecord
             foreach($post['Option'] as $key => $option) {
                 if(in_array($key, array('model', 'model_id'))) { continue; }
                 if(empty($option['value'][$models[$key]->name]) && !empty($option['lang'])) {
-                    foreach($option['lang'] as $lang_id => $lang) {
+                    foreach($option['lang'] as $language_id => $lang) {
                         if(!empty($lang)) {
                             $option['value'][$models[$key]->name] = $lang;
                             break;
@@ -92,16 +92,16 @@ class Option extends \yii\db\ActiveRecord
                     $modellang[$key][0]->addError('value', 'Value must be set');
                 }
                 if(!empty($option['lang'])) {
-                    foreach($option['lang'] as $lang_id => $lang) {
-                        if(empty($modellang[$key][$lang_id])) {
-                            $modellang[$key][$lang_id] = new OptionLang();
-                            $modellang[$key][$lang_id]->option_id = $models[$key]->option_id;
-                            $modellang[$key][$lang_id]->language_id = $lang_id;
-                            $modellang[$key][$lang_id]->value = $lang;
+                    foreach($option['lang'] as $language_id => $lang) {
+                        if(empty($modellang[$key][$language_id])) {
+                            $modellang[$key][$language_id] = new OptionLang();
+                            $modellang[$key][$language_id]->option_id = $models[$key]->option_id;
+                            $modellang[$key][$language_id]->language_id = $language_id;
+                            $modellang[$key][$language_id]->value = $lang;
                         } else {
-                            $modellang[$key][$lang_id]->value = $lang;
+                            $modellang[$key][$language_id]->value = $lang;
                         }
-                        if(!$modellang[$key][$lang_id]->save()) {
+                        if(!$modellang[$key][$language_id]->save()) {
                             $ok = 0;
                         }
                     }
diff --git a/frontend/models/OptionLang.php b/frontend/models/OptionLang.php
index 0db7283..5b98585 100644
--- a/frontend/models/OptionLang.php
+++ b/frontend/models/OptionLang.php
@@ -8,7 +8,7 @@ use Yii;
  * This is the model class for table "option_lang".
  *
  * @property integer $id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $value
  */
 class OptionLang extends \yii\db\ActiveRecord
diff --git a/frontend/models/OptionLangSearch.php b/frontend/models/OptionLangSearch.php
index 1f9c236..4ba6e1c 100644
--- a/frontend/models/OptionLangSearch.php
+++ b/frontend/models/OptionLangSearch.php
@@ -18,7 +18,7 @@ class OptionLangSearch extends OptionLang
     public function rules()
     {
         return [
-            [['option_lang_id', 'option_id', 'language_id'], 'integer'],
+            [['option_language_id', 'option_id', 'language_id'], 'integer'],
             [['value'], 'safe'],
         ];
     }
@@ -56,7 +56,7 @@ class OptionLangSearch extends OptionLang
         }
 
         $query->andFilterWhere([
-            'option_lang_id' => $this->option_lang_id,
+            'option_language_id' => $this->option_language_id,
             'option_id' => $this->option_id,
             'language_id' => $this->language_id,
         ]);
diff --git a/frontend/models/OptionValues.php b/frontend/models/OptionValues.php
index 0317cc1..7ab4e2b 100644
--- a/frontend/models/OptionValues.php
+++ b/frontend/models/OptionValues.php
@@ -10,7 +10,7 @@ use Yii;
  * @property integer $option_value_id
  * @property string $option_key
  * @property string $option_value_text
- * @property integer $option_lang_id
+ * @property integer $option_language_id
  * @property integer $option_value_parent
  * @property integer $option_user
  *
@@ -33,7 +33,7 @@ class OptionValues extends \yii\db\ActiveRecord
     {
         return [
             [['option_key', 'option_value_text'], 'required'],
-            [['option_lang_id', 'option_value_parent', 'option_user'], 'integer'],
+            [['option_language_id', 'option_value_parent', 'option_user'], 'integer'],
             [['option_key'], 'string', 'max' => 200]
         ];
     }
@@ -47,7 +47,7 @@ class OptionValues extends \yii\db\ActiveRecord
             'option_value_id' => Yii::t('app', 'Option Value ID'),
             'option_key' => Yii::t('app', 'Option Key'),
             'option_value_text' => Yii::t('app', 'Option Value Text'),
-            'option_lang_id' => Yii::t('app', 'Option Lang ID'),
+            'option_language_id' => Yii::t('app', 'Option Lang ID'),
             'option_value_parent' => Yii::t('app', 'Option Value Parent'),
             'option_user' => Yii::t('app', 'Option User'),
         ];
@@ -58,7 +58,7 @@ class OptionValues extends \yii\db\ActiveRecord
      */
     public function getOptionLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'option_lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'option_language_id']);
     }
     public function getLanguages() {
         return (new LanguageLang())->find()->orderBy('language_id ASC')->asArray()->all();
diff --git a/frontend/models/OptionValuesSearch.php b/frontend/models/OptionValuesSearch.php
index 50bc0d9..e8dafed 100644
--- a/frontend/models/OptionValuesSearch.php
+++ b/frontend/models/OptionValuesSearch.php
@@ -18,7 +18,7 @@ class OptionValuesSearch extends OptionValues
     public function rules()
     {
         return [
-            [['option_value_id', 'option_lang_id', 'option_value_parent', 'option_user'], 'integer'],
+            [['option_value_id', 'option_language_id', 'option_value_parent', 'option_user'], 'integer'],
             [['option_key', 'option_value_text'], 'safe'],
         ];
     }
@@ -57,7 +57,7 @@ class OptionValuesSearch extends OptionValues
 
         $query->andFilterWhere([
             'option_value_id' => $this->option_value_id,
-            'option_lang_id' => $this->option_lang_id,
+            'option_language_id' => $this->option_language_id,
             'option_value_parent' => $this->option_value_parent,
             'option_user' => $this->option_user,
         ]);
diff --git a/frontend/views/option-values/_form.php b/frontend/views/option-values/_form.php
index f6f9e61..3d9f0d6 100644
--- a/frontend/views/option-values/_form.php
+++ b/frontend/views/option-values/_form.php
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
 	<div class="optionvalues-option_value_text-active">
 	<?= $form->field($model, 'option_value_text', ['enableClientValidation' => false])->label($model->getAttributeLabel('option_key').' | <span class="glyphicon glyphicon-globe add-langs"></span>')->textInput() ?>
 
-    <?= $form->field($model, 'option_lang_id')->dropDownList($model->getDropDownArray()) ?>
+    <?= $form->field($model, 'option_language_id')->dropDownList($model->getDropDownArray()) ?>
     </div>
 
     <?= $form->field($model, 'option_value_parent')->dropDownList($model->getUserOptionsArray()) ?>
@@ -46,7 +46,7 @@ use yii\widgets\ActiveForm;
 		$(document).on('click', '.add-langs', function() {
 			var group = $(this).parent().attr('for');
 			$(this).parent().parent().appendTo('.reserved_inputs');
-			$('.field-optionvalues-option_lang_id').appendTo('.reserved_inputs');
+			$('.field-optionvalues-option_language_id').appendTo('.reserved_inputs');
 			$('.'+group+'-lang').appendTo('.'+group+'-active');
 		});
 		$(document).on('click', '.remove-langs', function() {
@@ -54,7 +54,7 @@ use yii\widgets\ActiveForm;
 			$(this).parent().parent().appendTo('.reserved_inputs');
 			console.log('field-'+group);
 			$('.reserved_inputs .field-'+group).appendTo('.'+group+'-active');
-			$('.field-optionvalues-option_lang_id').appendTo('.'+group+'-active');
+			$('.field-optionvalues-option_language_id').appendTo('.'+group+'-active');
 		});
 	});
 </script>
\ No newline at end of file
diff --git a/frontend/views/option-values/_search.php b/frontend/views/option-values/_search.php
index 8ac15cd..6269471 100644
--- a/frontend/views/option-values/_search.php
+++ b/frontend/views/option-values/_search.php
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'option_value_text') ?>
 
-    <?= $form->field($model, 'option_lang_id') ?>
+    <?= $form->field($model, 'option_language_id') ?>
 
     <?= $form->field($model, 'option_value_parent') ?>
 
diff --git a/frontend/views/option-values/index.php b/frontend/views/option-values/index.php
index 79cd35c..98160c2 100644
--- a/frontend/views/option-values/index.php
+++ b/frontend/views/option-values/index.php
@@ -28,7 +28,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'option_value_id',
             'option_key',
             'option_value_text:ntext',
-            'option_lang_id',
+            'option_language_id',
             'option_value_parent',
             // 'option_user',
 
diff --git a/frontend/views/option-values/view.php b/frontend/views/option-values/view.php
index a6504d1..93b6f5f 100644
--- a/frontend/views/option-values/view.php
+++ b/frontend/views/option-values/view.php
@@ -31,7 +31,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'option_value_id',
             'option_key',
             'option_value_text:ntext',
-            'option_lang_id',
+            'option_language_id',
             'option_value_parent',
             'option_user',
         ],
diff --git a/frontend/views/option/_form_edit.php b/frontend/views/option/_form_edit.php
index 4a3dd57..f5384ce 100644
--- a/frontend/views/option/_form_edit.php
+++ b/frontend/views/option/_form_edit.php
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>
diff --git a/frontend/web/js/option.js b/frontend/web/js/option.js
index 0b374ed..1520807 100644
--- a/frontend/web/js/option.js
+++ b/frontend/web/js/option.js
@@ -72,7 +72,7 @@ $(function() {
         var path = form[id].handler;
         var view = form[id].view;
         var model = form[id].model;
-        $.get(path, { lang_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
+        $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
             $('#'+id+'-tabs li').removeClass('active');
             $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
             $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
@@ -92,7 +92,7 @@ $(function() {
         var flag = $(this).find('span').first().clone();
         var el = $(this);
         var id = $(this).attr('href').substr(1);
-        $.get(form[id], { lang_id: lang, widget_id: id }, function(data) {
+        $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
             $('#'+id+'-tabs li').removeClass('active');
             $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
             $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
--
libgit2 0.21.4