From b569ac3475627da1afa6a14fa14220d5293bb4f9 Mon Sep 17 00:00:00 2001 From: Eugeny Galkovskiy Date: Thu, 13 Oct 2016 19:11:43 +0300 Subject: [PATCH] MESSAGES !!!! EVGEN! --- common/models/Articles.php | 2 +- common/models/ArticlesLang.php | 20 ++++++++++---------- common/models/BannerLang.php | 8 ++++---- common/models/Bg.php | 5 +++-- common/models/BgLang.php | 6 +++--- common/models/Customer.php | 34 +++++++++++++++++----------------- common/models/EventLang.php | 16 ++++++++-------- common/models/Feedback.php | 10 +++++----- common/models/Orders.php | 8 ++++---- common/models/OrdersDeliveryLang.php | 8 ++++---- common/models/OrdersProducts.php | 13 +++++++------ common/models/Page.php | 7 ++++--- common/models/PageLang.php | 20 ++++++++++---------- common/models/ProductSpec.php | 13 +++++++------ common/models/ProductSpecLang.php | 8 ++++---- common/models/ProductToProject.php | 9 +++++---- common/models/ProductToRating.php | 6 +++--- common/models/Project.php | 11 +++++++---- common/models/ProjectImage.php | 11 ++++++----- common/models/ProjectLang.php | 10 +++++----- common/models/SeoCategoryLang.php | 6 +++--- common/models/SeoDynamicLang.php | 18 +++++++++--------- common/models/SeoLang.php | 14 +++++++------- common/models/ServiceLang.php | 16 ++++++++-------- common/models/Share.php | 4 ++-- common/models/SliderImageLang.php | 8 ++++---- common/models/Subscribe.php | 4 +++- common/models/TemplateLocation.php | 16 ++++++++-------- common/translation/ru/app.php | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- common/translation/ua/app.php | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 30 files changed, 301 insertions(+), 152 deletions(-) diff --git a/common/models/Articles.php b/common/models/Articles.php index eb9c661..ae7d2e1 100755 --- a/common/models/Articles.php +++ b/common/models/Articles.php @@ -1,7 +1,7 @@ Yii::t('app', 'Articles ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'body' => Yii::t('app', 'Body'), - 'meta_title' => Yii::t('app', 'Meta Title'), - 'meta_keywords' => Yii::t('app', 'Meta Keywords'), - 'meta_description' => Yii::t('app', 'Meta Description'), - 'seo_text' => Yii::t('app', 'Seo Text'), - 'h1' => Yii::t('app', 'H1'), - 'body_preview' => Yii::t('app', 'Body Preview'), + 'articles_id' => Yii::t('app', 'lang-Articles ID'), + 'language_id' => Yii::t('app', 'lang-Language ID'), + 'title' => Yii::t('app', 'lang-Title'), + 'body' => Yii::t('app', 'lang-Body'), + 'meta_title' => Yii::t('app', 'lang-Meta Title'), + 'meta_keywords' => Yii::t('app', 'lang-Meta Keywords'), + 'meta_description' => Yii::t('app', 'lang-Meta Description'), + 'seo_text' => Yii::t('app', 'lang-Seo Text'), + 'h1' => Yii::t('app', 'lang-H1'), + 'body_preview' => Yii::t('app', 'lang-Body Preview'), ]; } diff --git a/common/models/BannerLang.php b/common/models/BannerLang.php index 660dad8..1c9e6f3 100755 --- a/common/models/BannerLang.php +++ b/common/models/BannerLang.php @@ -72,10 +72,10 @@ class BannerLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'banner_id' => Yii::t('app', 'Banner ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'alt' => Yii::t('app', 'Alt'), - 'title' => Yii::t('app', 'Title'), + 'banner_id' => Yii::t('app', 'banner_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'alt' => Yii::t('app', 'alt'), + 'title' => Yii::t('app', 'title'), ]; } diff --git a/common/models/Bg.php b/common/models/Bg.php index e95532f..248dab8 100755 --- a/common/models/Bg.php +++ b/common/models/Bg.php @@ -7,6 +7,7 @@ use yii\db\ActiveQuery; use yii\db\ActiveRecord; use yii\web\Request; + use Yii; /** * Class Bg @@ -72,8 +73,8 @@ public function attributeLabels() { return [ - 'image' => \Yii::t('app', 'Image'), - 'url' => \Yii::t('app', 'Url'), + 'image' => Yii::t('app', 'image'), + 'url' => Yii::t('app', 'url'), ]; } } diff --git a/common/models/BgLang.php b/common/models/BgLang.php index f054ebc..7ca6590 100755 --- a/common/models/BgLang.php +++ b/common/models/BgLang.php @@ -54,9 +54,9 @@ class BgLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'bg_id' => Yii::t('app', 'Bg ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), + 'bg_id' => Yii::t('app', 'bg_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), ]; } diff --git a/common/models/Customer.php b/common/models/Customer.php index a4e6597..1c95313 100755 --- a/common/models/Customer.php +++ b/common/models/Customer.php @@ -60,23 +60,23 @@ class Customer extends User implements \yii\web\IdentityInterface public function attributeLabels() { return [ - 'id' => 'ID', - 'username' => 'Username', - 'name' => 'Name', - 'surname' => 'Surname', - 'phone' => 'Phone', - 'gender' => 'Gender', - 'birth_day' => 'Birth Day', - 'birth_month' => 'Birth Month', - 'birth_year' => 'Birth Year', - 'body' => 'Body', - 'group_id' => 'Group ID', - 'email' => 'Email', - 'auth_key' => 'Auth Key', - 'password_reset_token' => 'Password Reset Token', - 'status' => 'Status', - 'created_at' => 'Created At', - 'updated_at' => 'Updated At', + 'id' => Yii::t('app', 'id'), + 'username' => Yii::t('app', 'username'), + 'name' => Yii::t('app', 'cname'), + 'surname' => Yii::t('app', 'surname'), + 'phone' => Yii::t('app', 'phone'), + 'gender' => Yii::t('app', 'gender'), + 'birth_day' => Yii::t('app', 'birth_day'), + 'birth_month' => Yii::t('app', 'birth_month'), + 'birth_year' => Yii::t('app', 'birth_year'), + 'body' => Yii::t('app', 'body'), + 'group_id' => Yii::t('app', 'group_id'), + 'email' => Yii::t('app', 'email'), + 'auth_key' => Yii::t('app', 'auth_key'), + 'password_reset_token' => Yii::t('app', 'password_reset_token'), + 'status' => Yii::t('app', 'status'), + 'created_at' => Yii::t('app', 'created_at'), + 'updated_at' => Yii::t('app', 'updated_at'), ]; } diff --git a/common/models/EventLang.php b/common/models/EventLang.php index 4c91758..799231c 100755 --- a/common/models/EventLang.php +++ b/common/models/EventLang.php @@ -116,14 +116,14 @@ public function attributeLabels() { return [ - 'event_id' => Yii::t('app', 'Event ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'name' => Yii::t('app', 'Name'), - 'body' => Yii::t('app', 'Body'), - 'meta_title' => Yii::t('app', 'Meta Title'), - 'description' => Yii::t('app', 'Description'), - 'seo_text' => Yii::t('app', 'Seo Text'), - 'h1' => Yii::t('app', 'H1'), + 'event_id' => Yii::t('app', 'event_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'name' => Yii::t('app', 'name'), + 'body' => Yii::t('app', 'body'), + 'meta_title' => Yii::t('app', 'meta_title'), + 'description' => Yii::t('app', 'description'), + 'seo_text' => Yii::t('app', 'seo_text'), + 'h1' => Yii::t('app', 'h1'), ]; } diff --git a/common/models/Feedback.php b/common/models/Feedback.php index 7b190d6..8292bce 100755 --- a/common/models/Feedback.php +++ b/common/models/Feedback.php @@ -84,11 +84,11 @@ class Feedback extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'feedback_id' => Yii::t('app', 'Feedback ID'), - 'name' => Yii::t('app', 'Имя'), - 'phone' => Yii::t('app', 'Телефон'), - 'date_add' => Yii::t('app', 'Date Add'), - 'ip' => Yii::t('app', 'Ip'), + 'feedback_id' => Yii::t('app', 'feedback_id'), + 'name' => Yii::t('app', 'name'), + 'phone' => Yii::t('app', 'phone'), + 'date_add' => Yii::t('app', 'date_add'), + 'ip' => Yii::t('app', 'ip'), ]; } } diff --git a/common/models/Orders.php b/common/models/Orders.php index ce08147..1a47b12 100755 --- a/common/models/Orders.php +++ b/common/models/Orders.php @@ -75,10 +75,10 @@ public function attributeLabels() { return [ - 'name' => 'Ф.И.О', - 'phone' => 'Контактный телефон', - 'email' => 'email', - 'comment' => 'Комментарии', + 'name' => Yii::t('app', 'order_name'), + 'phone' => Yii::t('app', 'order_phone'), + 'email' => Yii::t('app', 'order_email'), + 'comment' => Yii::t('app', 'order_comment'), ]; } diff --git a/common/models/OrdersDeliveryLang.php b/common/models/OrdersDeliveryLang.php index a879a5a..d7dacc3 100755 --- a/common/models/OrdersDeliveryLang.php +++ b/common/models/OrdersDeliveryLang.php @@ -56,10 +56,10 @@ class OrdersDeliveryLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'orders_delivery_id' => Yii::t('app', 'Orders Delivery ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'text' => Yii::t('app', 'Text'), + 'orders_delivery_id' => Yii::t('app', 'orders_delivery_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), + 'text' => Yii::t('app', 'text'), ]; } diff --git a/common/models/OrdersProducts.php b/common/models/OrdersProducts.php index dbc7b3e..d358f5e 100755 --- a/common/models/OrdersProducts.php +++ b/common/models/OrdersProducts.php @@ -3,6 +3,7 @@ namespace common\models; use common\modules\product\models\ProductVariant; +use Yii; class OrdersProducts extends \yii\db\ActiveRecord { @@ -24,12 +25,12 @@ class OrdersProducts extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'product_name'=>'Продукт', - 'name'=>'Вид', - 'art'=>'Артикул', - 'cost'=>'Цена за один', - 'count'=>'Кол.', - 'sum_cost'=>'Сумма', + 'product_name'=>Yii::t('app', 'product_name'), + 'name'=>Yii::t('app', 'op_name'), + 'art'=>Yii::t('app', 'art'), + 'cost'=>Yii::t('app', 'cost'), + 'count'=>Yii::t('app', 'count'), + 'sum_cost'=>Yii::t('app', 'sum_cost'), ]; } diff --git a/common/models/Page.php b/common/models/Page.php index 55925aa..1318441 100755 --- a/common/models/Page.php +++ b/common/models/Page.php @@ -6,7 +6,8 @@ use yii\db\ActiveQuery; use yii\db\ActiveRecord; use yii\web\Request; - + use Yii; + /** * This is the model class for table "page". * @property integer $id @@ -82,8 +83,8 @@ public function attributeLabels() { return [ - 'id' => 'ID', - 'in_menu' => 'Show in menu', + 'id' => Yii::t('app', 'id'), + 'in_menu' => Yii::t('app', 'in_menu'), ]; } } diff --git a/common/models/PageLang.php b/common/models/PageLang.php index 8790090..3b0d780 100755 --- a/common/models/PageLang.php +++ b/common/models/PageLang.php @@ -118,16 +118,16 @@ public function attributeLabels() { return [ - 'page_id' => Yii::t('app', 'Page ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'body' => Yii::t('app', 'Body'), - 'meta_title' => Yii::t('app', 'Meta Title'), - 'meta_keywords' => Yii::t('app', 'Meta Keywords'), - 'meta_description' => Yii::t('app', 'Meta Description'), - 'seo_text' => Yii::t('app', 'Seo Text'), - 'h1' => Yii::t('app', 'H1'), - 'alias' => Yii::t('app', 'Alias'), + 'page_id' => Yii::t('app', 'page_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), + 'body' => Yii::t('app', 'body'), + 'meta_title' => Yii::t('app', 'meta_title'), + 'meta_keywords' => Yii::t('app', 'meta_keywords'), + 'meta_description' => Yii::t('app', 'meta_description'), + 'seo_text' => Yii::t('app', 'seo_text'), + 'h1' => Yii::t('app', 'h1'), + 'alias' => Yii::t('app', 'alias'), ]; } diff --git a/common/models/ProductSpec.php b/common/models/ProductSpec.php index d0e4ec6..ce169ee 100755 --- a/common/models/ProductSpec.php +++ b/common/models/ProductSpec.php @@ -4,6 +4,7 @@ use common\modules\language\behaviors\LanguageBehavior; use common\modules\product\models\Product; + use Yii; use yii\db\ActiveQuery; use yii\db\ActiveRecord; use yii\web\Request; @@ -90,12 +91,12 @@ public function attributeLabels() { return [ - 'product_spec_id' => 'Product Spec ID', - 'product_id' => 'Product ID', - 'tech_spec_link' => 'Tech Spec Link', - 'tech_char_link' => 'Tech Char Link', - 'techSpecFile' => 'techSpecFile', - 'techCharFile' => 'techCharFile', + 'product_spec_id' => Yii::t('app', 'product_spec_id'), + 'product_id' => Yii::t('app', 'product_id'), + 'tech_spec_link' => Yii::t('app', 'tech_spec_link'), + 'tech_char_link' => Yii::t('app', 'tech_char_link'), + 'techSpecFile' => Yii::t('app', 'techSpecFile'), + 'techCharFile' => Yii::t('app', 'techCharFile'), ]; } diff --git a/common/models/ProductSpecLang.php b/common/models/ProductSpecLang.php index 32a53ec..91269f4 100755 --- a/common/models/ProductSpecLang.php +++ b/common/models/ProductSpecLang.php @@ -54,10 +54,10 @@ class ProductSpecLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'product_spec_id' => Yii::t('app', 'Product Spec ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'tech_spec_text' => Yii::t('app', 'Tech Spec Text'), - 'instruction' => Yii::t('app', 'Instruction'), + 'product_spec_id' => Yii::t('app', 'product_spec_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'tech_spec_text' => Yii::t('app', 'tech_spec_text'), + 'instruction' => Yii::t('app', 'instruction'), ]; } diff --git a/common/models/ProductToProject.php b/common/models/ProductToProject.php index 2628606..cbe257e 100755 --- a/common/models/ProductToProject.php +++ b/common/models/ProductToProject.php @@ -4,6 +4,7 @@ use common\modules\product\models\Product; use common\modules\product\models\ProductVariant; + use Yii; /** * This is the model class for table "product_to_project". @@ -76,10 +77,10 @@ public function attributeLabels() { return [ - 'product_to_project_id' => 'Product To Project ID', - 'product_variant_id' => 'Product Variant ID', - 'project_id' => 'Project ID', - 'product_id' => 'Product', + 'product_to_project_id' => Yii::t('app', 'product_to_project_id'), + 'product_variant_id' => Yii::t('app', 'product_variant_id'), + 'project_id' => Yii::t('app', 'project_id'), + 'product_id' => Yii::t('app', 'product_id'), ]; } diff --git a/common/models/ProductToRating.php b/common/models/ProductToRating.php index ad5755e..ddefded 100755 --- a/common/models/ProductToRating.php +++ b/common/models/ProductToRating.php @@ -43,9 +43,9 @@ class ProductToRating extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'product_to_rating_id' => 'Product To Rating ID', - 'product_id' => 'Product ID', - 'value' => 'Value', + 'product_to_rating_id' => Yii::t('app', 'product_to_rating_id'), + 'product_id' => Yii::t('app', 'product_id'), + 'value' => Yii::t('app', 'value'), ]; } diff --git a/common/models/Project.php b/common/models/Project.php index fc63891..60f62b9 100755 --- a/common/models/Project.php +++ b/common/models/Project.php @@ -4,6 +4,7 @@ use common\modules\language\behaviors\LanguageBehavior; use common\modules\product\models\ProductVariant; + use Yii; use yii\db\ActiveQuery; use yii\db\ActiveRecord; use yii\web\Request; @@ -102,10 +103,12 @@ public function attributeLabels() { return [ - 'project_id' => 'Project ID', - 'description' => 'Description', - 'date_add' => 'Date Add', - 'images' => 'Images', + 'project_id' => Yii::t('app', 'project_id'), + 'title' => Yii::t('app', 'title'), + 'link' => Yii::t('app', 'link'), + 'description' => Yii::t('app', 'description'), + 'date_add' => Yii::t('app', 'date_add'), + 'images' => Yii::t('app', 'images'), ]; } diff --git a/common/models/ProjectImage.php b/common/models/ProjectImage.php index a2a6814..60aa4cb 100755 --- a/common/models/ProjectImage.php +++ b/common/models/ProjectImage.php @@ -1,6 +1,7 @@ 'Project Image ID', - 'project_id' => 'Project ID', - 'image' => 'Image', - 'alt' => 'Alt', - 'title' => 'Title', + 'project_image_id' => Yii::t('app', 'project_image_id'), + 'project_id' => Yii::t('app', 'project_id'), + 'image' => Yii::t('app', 'image'), + 'alt' => Yii::t('app', 'alt'), + 'title' => Yii::t('app', 'title'), ]; } diff --git a/common/models/ProjectLang.php b/common/models/ProjectLang.php index 302551f..f674c10 100755 --- a/common/models/ProjectLang.php +++ b/common/models/ProjectLang.php @@ -103,11 +103,11 @@ public function attributeLabels() { return [ - 'project_id' => Yii::t('app', 'Project ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'description' => Yii::t('app', 'Description'), - 'alias' => Yii::t('app', 'Alias'), + 'project_id' => Yii::t('app', 'project_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), + 'description' => Yii::t('app', 'description'), + 'alias' => Yii::t('app', 'alias'), ]; } diff --git a/common/models/SeoCategoryLang.php b/common/models/SeoCategoryLang.php index 85aa6fb..7a0b46a 100755 --- a/common/models/SeoCategoryLang.php +++ b/common/models/SeoCategoryLang.php @@ -53,9 +53,9 @@ class SeoCategoryLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'seo_category_id' => Yii::t('app', 'Seo Category ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'name' => Yii::t('app', 'Name'), + 'seo_category_id' => Yii::t('app', 'seo_category_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'name' => Yii::t('app', 'name'), ]; } diff --git a/common/models/SeoDynamicLang.php b/common/models/SeoDynamicLang.php index d2dd954..b8fdc12 100755 --- a/common/models/SeoDynamicLang.php +++ b/common/models/SeoDynamicLang.php @@ -60,15 +60,15 @@ class SeoDynamicLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'seo_dynamic_id' => Yii::t('app', 'Seo Dynamic ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'name' => Yii::t('app', 'Name'), - 'title' => Yii::t('app', 'Title'), - 'h1' => Yii::t('app', 'H1'), - 'key' => Yii::t('app', 'Key'), - 'meta' => Yii::t('app', 'Meta'), - 'description' => Yii::t('app', 'Description'), - 'seo_text' => Yii::t('app', 'Seo Text'), + 'seo_dynamic_id' => Yii::t('app', 'seo_dynamic_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'name' => Yii::t('app', 'name'), + 'title' => Yii::t('app', 'title'), + 'h1' => Yii::t('app', 'h1'), + 'key' => Yii::t('app', 'key'), + 'meta' => Yii::t('app', 'meta'), + 'description' => Yii::t('app', 'description'), + 'seo_text' => Yii::t('app', 'seo_text'), ]; } diff --git a/common/models/SeoLang.php b/common/models/SeoLang.php index 3a838ed..db6cd44 100755 --- a/common/models/SeoLang.php +++ b/common/models/SeoLang.php @@ -58,13 +58,13 @@ class SeoLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'seo_id' => Yii::t('app', 'Seo ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'description' => Yii::t('app', 'Description'), - 'h1' => Yii::t('app', 'H1'), - 'meta' => Yii::t('app', 'Meta'), - 'seo_text' => Yii::t('app', 'Seo Text'), + 'seo_id' => Yii::t('app', 'seo_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), + 'description' => Yii::t('app', 'description'), + 'h1' => Yii::t('app', 'h1'), + 'meta' => Yii::t('app', 'meta'), + 'seo_text' => Yii::t('app', 'seo_text'), ]; } diff --git a/common/models/ServiceLang.php b/common/models/ServiceLang.php index 5821b30..1711bc6 100755 --- a/common/models/ServiceLang.php +++ b/common/models/ServiceLang.php @@ -114,14 +114,14 @@ public function attributeLabels() { return [ - 'service_id' => Yii::t('app', 'Service ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'name' => Yii::t('app', 'Name'), - 'body' => Yii::t('app', 'Body'), - 'seo_text' => Yii::t('app', 'Seo Text'), - 'meta_title' => Yii::t('app', 'Meta Title'), - 'description' => Yii::t('app', 'Description'), - 'h1' => Yii::t('app', 'H1'), + 'service_id' => Yii::t('app', 'service_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'name' => Yii::t('app', 'name'), + 'body' => Yii::t('app', 'body'), + 'seo_text' => Yii::t('app', 'seo_text'), + 'meta_title' => Yii::t('app', 'meta_title'), + 'description' => Yii::t('app', 'description'), + 'h1' => Yii::t('app', 'h1'), ]; } diff --git a/common/models/Share.php b/common/models/Share.php index f25dcaf..3d211b9 100755 --- a/common/models/Share.php +++ b/common/models/Share.php @@ -16,8 +16,8 @@ class Share extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'product_name' => 'Название', - 'date_time'=>'Дата', + 'product_name' => Yii::t('app', 'product_name'), + 'date_time'=> Yii::t('app', 'date_time'), ]; } diff --git a/common/models/SliderImageLang.php b/common/models/SliderImageLang.php index 8201767..9a6306f 100755 --- a/common/models/SliderImageLang.php +++ b/common/models/SliderImageLang.php @@ -54,10 +54,10 @@ class SliderImageLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'slider_image_id' => Yii::t('app', 'Slider Image ID'), - 'language_id' => Yii::t('app', 'Language ID'), - 'title' => Yii::t('app', 'Title'), - 'alt' => Yii::t('app', 'Alt'), + 'slider_image_id' => Yii::t('app', 'slider_image_id'), + 'language_id' => Yii::t('app', 'language_id'), + 'title' => Yii::t('app', 'title'), + 'alt' => Yii::t('app', 'alt'), ]; } diff --git a/common/models/Subscribe.php b/common/models/Subscribe.php index e3baba3..d0b026e 100755 --- a/common/models/Subscribe.php +++ b/common/models/Subscribe.php @@ -2,6 +2,8 @@ namespace common\models; +use Yii; + class Subscribe extends \yii\db\ActiveRecord { public static function tableName() @@ -22,7 +24,7 @@ class Subscribe extends \yii\db\ActiveRecord if(self::find() ->where('email = :email', [':email' => $this->email]) ->exists()) - $this->addError('email','Такой email уже есть.'); + $this->addError('email', Yii::t('app', 'emailis')); } } \ No newline at end of file diff --git a/common/models/TemplateLocation.php b/common/models/TemplateLocation.php index 22fa840..822d3a3 100755 --- a/common/models/TemplateLocation.php +++ b/common/models/TemplateLocation.php @@ -47,14 +47,14 @@ class TemplateLocation extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'template_location_id' => Yii::t('app', 'Template Location ID'), - 'template_location_name' => Yii::t('app', 'Template Location Name'), - 'template_location_title' => Yii::t('app', 'Template Location Title'), - 'width' => Yii::t('app', 'Width'), - 'height' => Yii::t('app', 'Height'), - 'sort' => Yii::t('app', 'Sort'), - 'is_slider' => Yii::t('app', 'Is Slider'), - 'is_banner' => Yii::t('app', 'Is Banner'), + 'template_location_id' => Yii::t('app', 'template_location_id'), + 'template_location_name' => Yii::t('app', 'template_location_name'), + 'template_location_title' => Yii::t('app', 'template_location_title'), + 'width' => Yii::t('app', 'width'), + 'height' => Yii::t('app', 'height'), + 'sort' => Yii::t('app', 'sort'), + 'is_slider' => Yii::t('app', 'is_slider'), + 'is_banner' => Yii::t('app', 'is_banner'), ]; } diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php index e85a258..e293b2f 100755 --- a/common/translation/ru/app.php +++ b/common/translation/ru/app.php @@ -1,7 +1,8 @@ 'ID', - 'username' => 'Имя', + 'username' => 'Логин', + 'cname' => 'Имя', 'surname' => 'Фамилия', 'auth_key' => 'Ключ аутентификации', 'password_hash' => 'Хэш пароля', @@ -9,6 +10,12 @@ return [ 'email' => 'Логин (e-mail)', 'phone' => 'Телефон', 'status' => 'Статус', + 'gender' => 'Пол', + 'birth_day' => 'Birth Day', + 'birth_month' => 'Birth Month', + 'birth_year' => 'Birth Year', + 'group_id' => 'Group ID', + 'created_at' => 'Created At', 'updated_at' => 'Updated At', 'verifyCode' => 'Код проверки', @@ -78,6 +85,68 @@ return [ 'slider_image_id' => 'Slider Image ID', 'sort' => 'Сортировка', + 'order_name' => 'Ф.И.О', + 'order_phone' => 'Контактный телефон', + 'order_email' => 'email', + 'order_comment' => 'Комментарии', + + 'articlesID' => 'ID', + 'articlesDate' => 'Дата', + 'articlesImage' => 'Изображение', + + 'lang-Articles ID' => '', + 'lang-Language ID' => '', + 'lang-Title' => '', + 'lang-Body' => '', + 'lang-Meta Title' => '', + 'lang-Meta Keywords' => '', + 'lang-Meta Description' => '', + 'lang-Seo Text' => '', + 'lang-H1' => '', + 'lang-Body Preview' => '', + 'language_id' => '', + 'bg_id' => '', + + 'feedback_id' => 'Feedback ID', + 'ip' => 'IP', + + 'product_name'=>'Продукт', + 'op_name'=>'Вид', + 'art'=>'Артикул', + 'cost'=>'Цена за один', + 'count'=>'Кол.', + 'sum_cost'=>'Сумма', + 'in_menu' => 'Show in menu', + 'page_id' => 'Page ID', + 'meta_keywords' => 'Meta Keywords', + 'meta_description' => 'Meta Description', + 'product_spec_id' => 'Product Spec ID', + 'product_id' => 'Product ID', + 'tech_spec_link' => 'Tech Spec Link', + 'tech_char_link' => 'Tech Char Link', + 'techSpecFile' => 'techSpecFile', + 'techCharFile' => 'techCharFile', + 'tech_spec_text' => 'Tech Spec Text', + 'instruction' => 'Instruction', + 'product_to_project_id' => 'Product To Project ID', + 'product_variant_id' => 'Product Variant ID', + 'project_id' => 'Project ID', + 'product_to_rating_id' => 'Product To Rating ID', + 'value' => 'Value', + 'images' => 'Images', + 'project_image_id' => 'Project Image ID', + 'meta' => 'Meta', + 'date_time'=>'Дата', + 'template_location_id' => 'Template Location ID', + 'template_location_name' => 'Template Location Name', + 'template_location_title' => 'Template Location Title', + 'is_slider' => 'Is Slider', + 'is_banner' => 'Is Banner', + 'orders_delivery_id' => 'Orders Delivery ID', + 'text' => 'Text', + 'emailis' => 'Такой email уже есть.', + + 'меню' => 'меню', 'контрактный отдел' => 'контрактный отдел', 'отдел по работе с дизайнерами и архитекторами' => 'отдел по работе с дизайнерами и архитекторами', diff --git a/common/translation/ua/app.php b/common/translation/ua/app.php index 069d457..a348839 100755 --- a/common/translation/ua/app.php +++ b/common/translation/ua/app.php @@ -1,7 +1,8 @@ 'ID', - 'username' => "Ім'я", + 'username' => "Логін", + 'cname' => 'Ім\'я', 'surname' => 'Фамилия', 'auth_key' => 'Ключ аутентифікації', 'password_hash' => 'Хеш паролю', @@ -9,6 +10,12 @@ return [ 'email' => 'Логін (e-mail)', 'phone' => 'Телефон', 'status' => 'Статус', + 'gender' => 'Пол', + 'birth_day' => 'Birth Day', + 'birth_month' => 'Birth Month', + 'birth_year' => 'Birth Year', + 'group_id' => 'Group ID', + 'created_at' => 'Створено', 'updated_at' => 'Оновлено', 'verifyCode' => 'Код перевірки', @@ -78,6 +85,68 @@ return [ 'slider_image_id' => 'Slider Image ID', 'sort' => 'Сортування', + 'order_name' => 'П.І.Б.', + 'order_phone' => 'Контактний телефон', + 'order_email' => 'email', + 'order_comment' => 'Коментар', + + 'articlesID' => 'ID', + 'articlesDate' => 'Дата', + 'articlesImage' => 'Зображення', + + 'lang-Articles ID' => '', + 'lang-Language ID' => '', + 'lang-Title' => '', + 'lang-Body' => '', + 'lang-Meta Title' => '', + 'lang-Meta Keywords' => '', + 'lang-Meta Description' => '', + 'lang-Seo Text' => '', + 'lang-H1' => '', + 'lang-Body Preview' => '', + 'language_id' => '', + 'bg_id' => '', + + 'feedback_id' => 'Feedback ID', + 'ip' => 'IP', + + 'product_name'=>'Продукт', + 'op_name'=>'Вид', + 'art'=>'Артикул', + 'cost'=>'Цена за один', + 'count'=>'Кол.', + 'sum_cost'=>'Сумма', + 'in_menu' => 'Show in menu', + 'page_id' => 'Page ID', + 'meta_keywords' => 'Meta Keywords', + 'meta_description' => 'Meta Description', + 'product_spec_id' => 'Product Spec ID', + 'product_id' => 'Product ID', + 'tech_spec_link' => 'Tech Spec Link', + 'tech_char_link' => 'Tech Char Link', + 'techSpecFile' => 'techSpecFile', + 'techCharFile' => 'techCharFile', + 'tech_spec_text' => 'Tech Spec Text', + 'instruction' => 'Instruction', + 'product_to_project_id' => 'Product To Project ID', + 'product_variant_id' => 'Product Variant ID', + 'project_id' => 'Project ID', + 'product_to_rating_id' => 'Product To Rating ID', + 'value' => 'Value', + 'images' => 'Images', + 'project_image_id' => 'Project Image ID', + 'meta' => 'Meta', + 'date_time'=>'Дата', + 'template_location_id' => 'Template Location ID', + 'template_location_name' => 'Template Location Name', + 'template_location_title' => 'Template Location Title', + 'is_slider' => 'Is Slider', + 'is_banner' => 'Is Banner', + 'orders_delivery_id' => 'Orders Delivery ID', + 'text' => 'Text', + 'emailis' => 'Такой email уже есть.', + + 'меню' => 'меню', 'контрактный отдел' => 'контрактне відділення', 'отдел по работе с дизайнерами и архитекторами' => 'відділення по роботі з дизайнерами та архітекторами', -- libgit2 0.21.4