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('
');
$('#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('
');
$('#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');
?>
- field($article_langs[$index], "[$index]lang_id")->label(false)->hiddenInput(['value' => $index]) ?>
+ field($article_langs[$index], "[$index]language_id")->label(false)->hiddenInput(['value' => $index]) ?>
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;
field($model, 'option_value_text', ['enableClientValidation' => false])->label($model->getAttributeLabel('option_key').' | ')->textInput() ?>
- field($model, 'option_lang_id')->dropDownList($model->getDropDownArray()) ?>
+ field($model, 'option_language_id')->dropDownList($model->getDropDownArray()) ?>
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');
});
});
\ 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;
field($model, 'option_value_text') ?>
- field($model, 'option_lang_id') ?>
+ field($model, 'option_language_id') ?>
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;
hasErrors()) { ?>
getFirstError('value');?>
translate) {
- foreach($row->getLangs() as $lang_id => $lang) {
+ foreach($row->getLangs() as $language_id => $lang) {
?>