Commit d8993476ef1044353384578afd1cee08e8fd8af5
Merge remote-tracking branch 'origin/master'
Showing
11 changed files
with
165 additions
and
62 deletions
Show diff stats
backend/models/Orders.php
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | namespace backend\models; |
| 4 | 4 | |
| 5 | 5 | use common\models\Customer; |
| 6 | + use Yii; | |
| 6 | 7 | |
| 7 | 8 | class Orders extends \yii\db\ActiveRecord |
| 8 | 9 | { |
| ... | ... | @@ -56,30 +57,31 @@ |
| 56 | 57 | public function attributeLabels() |
| 57 | 58 | { |
| 58 | 59 | return [ |
| 59 | - 'id' => '№ заказа', | |
| 60 | - 'name' => 'ФИО', | |
| 61 | - 'phone' => 'Телефон', | |
| 62 | - 'phone2' => 'Телефон 2', | |
| 63 | - 'adress' => 'Адрес', | |
| 64 | - 'body' => 'Сообщение', | |
| 65 | - 'reserve' => 'Резерв', | |
| 66 | - 'status' => 'Статус', | |
| 67 | - 'email' => 'E-mail', | |
| 68 | - 'total' => 'Сумма', | |
| 69 | - 'labels' => 'Метки', | |
| 70 | - 'label' => 'Метка', | |
| 71 | - 'comment' => 'Комментарий менеджера', | |
| 72 | - 'date_dedline' => 'Дедлайн', | |
| 73 | - 'numbercard' => '№ карточки', | |
| 74 | - 'delivery' => 'Доставка', | |
| 75 | - 'declaration' => 'Декларация №', | |
| 76 | - 'stock' => '№ склада', | |
| 77 | - 'consignment' => '№ накладной', | |
| 78 | - 'payment' => 'Способ оплаты', | |
| 79 | - 'insurance' => 'Страховка', | |
| 80 | - 'amount_imposed' => 'Сумма наложенного', | |
| 81 | - 'shipping_by' => 'Отправка за счет', | |
| 82 | - 'city' => 'Город', | |
| 60 | + 'id' => Yii::t('app', 'orders_id'), | |
| 61 | + 'name' => Yii::t('app', 'orders_name'), | |
| 62 | + 'phone' => Yii::t('app', 'orders_phone'), | |
| 63 | + 'phone2' => Yii::t('app', 'orders_phone2'), | |
| 64 | + 'adress' => Yii::t('app', 'orders_adress'), | |
| 65 | + 'body' => Yii::t('app', 'orders_body'), | |
| 66 | + 'reserve' => Yii::t('app', 'orders_reserve'), | |
| 67 | + 'status' => Yii::t('app', 'orders_status'), | |
| 68 | + 'email' => Yii::t('app', 'orders_email'), | |
| 69 | + 'total' => Yii::t('app', 'orders_total'), | |
| 70 | + 'labels' => Yii::t('app', 'orders_labels'), | |
| 71 | + 'label' => Yii::t('app', 'orders_label'), | |
| 72 | + 'comment' => Yii::t('app', 'orders_comment'), | |
| 73 | + 'date_dedline' => Yii::t('app', 'orders_date_dedline'), | |
| 74 | + 'numbercard' => Yii::t('app', 'orders_numbercard'), | |
| 75 | + 'delivery' => Yii::t('app', 'orders_delivery'), | |
| 76 | + 'declaration' => Yii::t('app', 'orders_declaration'), | |
| 77 | + 'stock' => Yii::t('app', 'orders_stock'), | |
| 78 | + 'consignment' => Yii::t('app', 'orders_consignment'), | |
| 79 | + 'payment' => Yii::t('app', 'orders_payment'), | |
| 80 | + 'insurance' => Yii::t('app', 'orders_insurance'), | |
| 81 | + 'amount_imposed' => Yii::t('app', 'orders_amount_imposed'), | |
| 82 | + 'shipping_by' => Yii::t('app', 'orders_shipping_by'), | |
| 83 | + 'city' => Yii::t('app', 'orders_city'), | |
| 84 | + 'date_time' => Yii::t('app', 'orders_datetime'), | |
| 83 | 85 | ]; |
| 84 | 86 | } |
| 85 | 87 | ... | ... |
backend/views/delivery/index.php
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | * @var DeliverySearch $searchModel |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | - $this->title = 'Deliveries'; | |
| 15 | + $this->title = Yii::t('app', 'Deliveries'); | |
| 16 | 16 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 17 | 17 | ?> |
| 18 | 18 | <div class="delivery-index"> |
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | <h1><?= Html::encode($this->title) ?></h1> |
| 21 | 21 | |
| 22 | 22 | <p> |
| 23 | - <?= Html::a('Create Delivery', [ 'create' ], [ 'class' => 'btn btn-success' ]) ?> | |
| 23 | + <?= Html::a(Yii::t('app', 'Create Delivery'), [ 'create' ], [ 'class' => 'btn btn-success' ]) ?> | |
| 24 | 24 | </p> |
| 25 | 25 | <?= GridView::widget([ |
| 26 | 26 | 'dataProvider' => $dataProvider, | ... | ... |
backend/views/orders/index.php
| ... | ... | @@ -12,7 +12,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> |
| 13 | 13 | <h1>Заказы</h1> |
| 14 | 14 | <p> |
| 15 | - <?= Html::a('Add Orders', ['create'], ['class' => 'btn btn-success']) ?> | |
| 15 | + <?= Html::a(Yii::t('app', 'Add Orders'), ['create'], ['class' => 'btn btn-success']) ?> | |
| 16 | 16 | </p> |
| 17 | 17 | <?php \yii\widgets\Pjax::begin( [ |
| 18 | 18 | ... | ... |
backend/views/seo/update.php
backend/views/site/error.php
common/models/Certificate.php
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | namespace common\models; |
| 4 | 4 | |
| 5 | 5 | use yii\web\UploadedFile; |
| 6 | + use Yii; | |
| 6 | 7 | |
| 7 | 8 | /** |
| 8 | 9 | * This is the model class for table "certificate". |
| ... | ... | @@ -23,7 +24,7 @@ |
| 23 | 24 | */ |
| 24 | 25 | public static function tableName() |
| 25 | 26 | { |
| 26 | - return 'certificate'; | |
| 27 | + return Yii::t('app', 'certcreate'); | |
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | /** |
| ... | ... | @@ -57,10 +58,10 @@ |
| 57 | 58 | public function attributeLabels() |
| 58 | 59 | { |
| 59 | 60 | return [ |
| 60 | - 'certificate_id' => 'Certificate ID', | |
| 61 | - 'name' => 'Name', | |
| 62 | - 'link' => 'Link', | |
| 63 | - 'file' => 'Certificate File', | |
| 61 | + 'certificate_id' => Yii::t('app', 'certificate_id'), | |
| 62 | + 'name' => Yii::t('app', 'certname'), | |
| 63 | + 'link' => Yii::t('app', 'certlink'), | |
| 64 | + 'file' => Yii::t('app', 'certfile'), | |
| 64 | 65 | ]; |
| 65 | 66 | } |
| 66 | 67 | ... | ... |
common/models/Orders.php
| ... | ... | @@ -79,6 +79,27 @@ |
| 79 | 79 | 'phone' => Yii::t('app', 'order_phone'), |
| 80 | 80 | 'email' => Yii::t('app', 'order_email'), |
| 81 | 81 | 'comment' => Yii::t('app', 'order_comment'), |
| 82 | + 'id' => Yii::t('app', 'orders_id'), | |
| 83 | + 'phone2' => Yii::t('app', 'orders_phone2'), | |
| 84 | + 'adress' => Yii::t('app', 'orders_adress'), | |
| 85 | + 'body' => Yii::t('app', 'orders_body'), | |
| 86 | + 'reserve' => Yii::t('app', 'orders_reserve'), | |
| 87 | + 'status' => Yii::t('app', 'orders_status'), | |
| 88 | + 'total' => Yii::t('app', 'orders_total'), | |
| 89 | + 'labels' => Yii::t('app', 'orders_labels'), | |
| 90 | + 'label' => Yii::t('app', 'orders_label'), | |
| 91 | + 'date_dedline' => Yii::t('app', 'orders_date_dedline'), | |
| 92 | + 'numbercard' => Yii::t('app', 'orders_numbercard'), | |
| 93 | + 'delivery' => Yii::t('app', 'orders_delivery'), | |
| 94 | + 'declaration' => Yii::t('app', 'orders_declaration'), | |
| 95 | + 'stock' => Yii::t('app', 'orders_stock'), | |
| 96 | + 'consignment' => Yii::t('app', 'orders_consignment'), | |
| 97 | + 'payment' => Yii::t('app', 'orders_payment'), | |
| 98 | + 'insurance' => Yii::t('app', 'orders_insurance'), | |
| 99 | + 'amount_imposed' => Yii::t('app', 'orders_amount_imposed'), | |
| 100 | + 'shipping_by' => Yii::t('app', 'orders_shipping_by'), | |
| 101 | + 'city' => Yii::t('app', 'orders_city'), | |
| 102 | + 'date_time' => Yii::t('app', 'orders_datetime'), | |
| 82 | 103 | ]; |
| 83 | 104 | } |
| 84 | 105 | ... | ... |
common/modules/product/models/ProductSearch.php
| ... | ... | @@ -65,10 +65,10 @@ |
| 65 | 65 | { |
| 66 | 66 | $labels = parent::attributeLabels(); |
| 67 | 67 | $new_labels = [ |
| 68 | - 'category_id' => 'Category ID', | |
| 69 | - 'brand_id' => 'Brand ID', | |
| 70 | - 'product_name' => 'Product name', | |
| 71 | - 'variant_count' => 'Variant count', | |
| 68 | + 'category_id' => Yii::t('app', 'pr_category_id'), | |
| 69 | + 'brand_id' => Yii::t('app', 'pr_brand_id'), | |
| 70 | + 'product_name' => Yii::t('app', 'pr_product_name'), | |
| 71 | + 'variant_count' => Yii::t('app', 'pr_variant_count'), | |
| 72 | 72 | ]; |
| 73 | 73 | return array_merge($labels, $new_labels); |
| 74 | 74 | } | ... | ... |
common/translation/ru/app.php
| ... | ... | @@ -182,6 +182,47 @@ return [ |
| 182 | 182 | 'Поиск' => 'Поиск', |
| 183 | 183 | 'Результаты поиска для' => 'Результаты поиска для', |
| 184 | 184 | 'certs' => 'Сертификаты', |
| 185 | + | |
| 186 | + 'orders_id' => '№ заказа', | |
| 187 | + 'orders_name' => 'Ф.И.О.', | |
| 188 | + 'orders_phone' => 'Телефон', | |
| 189 | + 'orders_phone2' => 'Телефон 2', | |
| 190 | + 'orders_adress' => 'Адрес', | |
| 191 | + 'orders_body' => 'Сообщение', | |
| 192 | + 'orders_reserve' => 'Резерв', | |
| 193 | + 'orders_status' => 'Статус', | |
| 194 | + 'orders_email' => 'E-mail', | |
| 195 | + 'orders_total' => 'Сумма', | |
| 196 | + 'orders_labels' => 'Метки', | |
| 197 | + 'orders_label' => 'Метка', | |
| 198 | + 'orders_comment' => 'Комментарий менеджера', | |
| 199 | + 'orders_date_dedline' => 'Дедлайн', | |
| 200 | + 'orders_numbercard' => '№ карточки', | |
| 201 | + 'orders_delivery' => 'Доставка', | |
| 202 | + 'orders_declaration' => 'Декларация №', | |
| 203 | + 'orders_stock' => '№ склада', | |
| 204 | + 'orders_consignment' => '№ накладной', | |
| 205 | + 'orders_payment' => 'Способ оплаты', | |
| 206 | + 'orders_insurance' => 'Страховка', | |
| 207 | + 'orders_amount_imposed' => 'Сумма наложенного', | |
| 208 | + 'orders_shipping_by' => 'Отправка за счет', | |
| 209 | + 'orders_city' => 'Город', | |
| 210 | + 'orders_datetime' => 'Дата и время заказа', | |
| 211 | + 'Add Orders' => 'Добавить заказ', | |
| 212 | + | |
| 213 | + 'pr_category_id' => 'ID категории', | |
| 214 | + 'pr_brand_id' => 'ID бренда', | |
| 215 | + 'pr_product_name' => 'Название товара', | |
| 216 | + 'pr_variant_count' => 'Вариант подсчёта', | |
| 217 | + 'Create Delivery' => 'Создать доставку', | |
| 218 | + 'Deliveries' => 'Доставка', | |
| 219 | + | |
| 220 | + 'Create Seo' => 'Create Seo', | |
| 221 | + 'certificate_id' => 'ID сертификата', | |
| 222 | + 'certname' => 'Название', | |
| 223 | + 'certlink' => 'Ссылка', | |
| 224 | + 'certfile' => 'Файл сертификата', | |
| 225 | + 'certcreate' => 'Создать сертификат', | |
| 185 | 226 | 'All-list ' => 'Весь ', |
| 186 | 227 | 'Return back' => 'Вернуться назад', |
| 187 | 228 | ]; |
| 188 | 229 | \ No newline at end of file | ... | ... |
common/translation/ua/app.php
| ... | ... | @@ -23,7 +23,7 @@ return [ |
| 23 | 23 | 'password_repeat' => 'Повторити пароль', |
| 24 | 24 | 'registration' => 'Реєстрація', |
| 25 | 25 | 'message' => 'Цей {field} вже зайнято', |
| 26 | - 'message_match_password' => 'Пароли не совпадают', | |
| 26 | + 'message_match_password' => 'Паролі не співпадають', | |
| 27 | 27 | 'exit' => 'Вихід', |
| 28 | 28 | 'enter' => 'Війти', |
| 29 | 29 | 'your_personal_area' => 'Вхід в особистий кабінет', |
| ... | ... | @@ -46,8 +46,8 @@ return [ |
| 46 | 46 | 'url' => 'Посилання', |
| 47 | 47 | 'width' => 'Ширина', |
| 48 | 48 | 'height' => 'Висота', |
| 49 | - 'blog_id' => 'Blog ID', | |
| 50 | - 'user_id' => 'User ID', | |
| 49 | + 'blog_id' => 'ID Блогу', | |
| 50 | + 'user_id' => 'ID Користувача', | |
| 51 | 51 | 'name' => 'Назва', |
| 52 | 52 | 'link' => 'Посилання', |
| 53 | 53 | 'date_add' => 'Дата додавання', |
| ... | ... | @@ -55,7 +55,7 @@ return [ |
| 55 | 55 | 'view_count' => 'Кількість переглядів', |
| 56 | 56 | 'description' => 'Опис', |
| 57 | 57 | 'cover' => 'Фото головне', |
| 58 | - 'event_id' => 'Event ID', | |
| 58 | + 'event_id' => 'ID Події', | |
| 59 | 59 | 'alias' => 'Посилання', |
| 60 | 60 | 'body' => 'Тіло', |
| 61 | 61 | 'meta_title' => 'Мета заголовок', |
| ... | ... | @@ -94,18 +94,18 @@ return [ |
| 94 | 94 | 'articlesDate' => 'Дата', |
| 95 | 95 | 'articlesImage' => 'Зображення', |
| 96 | 96 | |
| 97 | - 'lang-Articles ID' => '', | |
| 98 | - 'lang-Language ID' => '', | |
| 99 | - 'lang-Title' => '', | |
| 100 | - 'lang-Body' => '', | |
| 101 | - 'lang-Meta Title' => '', | |
| 102 | - 'lang-Meta Keywords' => '', | |
| 103 | - 'lang-Meta Description' => '', | |
| 104 | - 'lang-Seo Text' => '', | |
| 105 | - 'lang-H1' => '', | |
| 106 | - 'lang-Body Preview' => '', | |
| 107 | - 'language_id' => '', | |
| 108 | - 'bg_id' => '', | |
| 97 | + 'lang-Articles ID' => 'Articles ID', | |
| 98 | + 'lang-Language ID' => 'Language ID', | |
| 99 | + 'lang-Title' => 'Title', | |
| 100 | + 'lang-Body' => 'Body', | |
| 101 | + 'lang-Meta Title' => 'Meta Title', | |
| 102 | + 'lang-Meta Keywords' => 'Meta Keywords', | |
| 103 | + 'lang-Meta Description' => 'Meta Description', | |
| 104 | + 'lang-Seo Text' => 'Seo Text', | |
| 105 | + 'lang-H1' => 'H1', | |
| 106 | + 'lang-Body Preview' => 'Body Preview', | |
| 107 | + 'language_id' => 'ID Мови', | |
| 108 | + 'bg_id' => 'Bg ID', | |
| 109 | 109 | |
| 110 | 110 | 'feedback_id' => 'Feedback ID', |
| 111 | 111 | 'ip' => 'IP', |
| ... | ... | @@ -116,23 +116,23 @@ return [ |
| 116 | 116 | 'cost'=>'Цена за один', |
| 117 | 117 | 'count'=>'Кол.', |
| 118 | 118 | 'sum_cost'=>'Сумма', |
| 119 | - 'in_menu' => 'Show in menu', | |
| 120 | - 'page_id' => 'Page ID', | |
| 121 | - 'meta_keywords' => 'Meta Keywords', | |
| 122 | - 'meta_description' => 'Meta Description', | |
| 119 | + 'in_menu' => 'Показати в меню', | |
| 120 | + 'page_id' => 'ID сторінки', | |
| 121 | + 'meta_keywords' => 'Meta ключові слова', | |
| 122 | + 'meta_description' => 'Meta опис', | |
| 123 | 123 | 'product_spec_id' => 'Product Spec ID', |
| 124 | - 'product_id' => 'Product ID', | |
| 124 | + 'product_id' => 'ID продукта', | |
| 125 | 125 | 'tech_spec_link' => 'Tech Spec Link', |
| 126 | 126 | 'tech_char_link' => 'Tech Char Link', |
| 127 | 127 | 'techSpecFile' => 'techSpecFile', |
| 128 | 128 | 'techCharFile' => 'techCharFile', |
| 129 | 129 | 'tech_spec_text' => 'Tech Spec Text', |
| 130 | - 'instruction' => 'Instruction', | |
| 130 | + 'instruction' => 'Інструкція', | |
| 131 | 131 | 'product_to_project_id' => 'Product To Project ID', |
| 132 | 132 | 'product_variant_id' => 'Product Variant ID', |
| 133 | 133 | 'project_id' => 'Project ID', |
| 134 | 134 | 'product_to_rating_id' => 'Product To Rating ID', |
| 135 | - 'value' => 'Value', | |
| 135 | + 'value' => 'Значення', | |
| 136 | 136 | 'images' => 'Images', |
| 137 | 137 | 'project_image_id' => 'Project Image ID', |
| 138 | 138 | 'meta' => 'Meta', |
| ... | ... | @@ -143,8 +143,8 @@ return [ |
| 143 | 143 | 'is_slider' => 'Is Slider', |
| 144 | 144 | 'is_banner' => 'Is Banner', |
| 145 | 145 | 'orders_delivery_id' => 'Orders Delivery ID', |
| 146 | - 'text' => 'Text', | |
| 147 | - 'emailis' => 'Такой email уже есть.', | |
| 146 | + 'text' => 'Текст', | |
| 147 | + 'emailis' => 'Такий email вже є.', | |
| 148 | 148 | |
| 149 | 149 | |
| 150 | 150 | 'меню' => 'меню', |
| ... | ... | @@ -182,6 +182,39 @@ return [ |
| 182 | 182 | 'Поиск' => 'Пошук', |
| 183 | 183 | 'Результаты поиска для' => 'Результати пошуку для', |
| 184 | 184 | 'certs' => 'Сертифікати', |
| 185 | + | |
| 186 | + | |
| 187 | + 'orders_id' => '№ замовлення', | |
| 188 | + 'orders_name' => 'П.І.Б.', | |
| 189 | + 'orders_phone' => 'Телефон', | |
| 190 | + 'orders_phone2' => 'Телефон 2', | |
| 191 | + 'orders_adress' => 'Адреса', | |
| 192 | + 'orders_body' => 'Повідомлення', | |
| 193 | + 'orders_reserve' => 'Резерв', | |
| 194 | + 'orders_status' => 'Статус', | |
| 195 | + 'orders_email' => 'E-mail', | |
| 196 | + 'orders_total' => 'Сума', | |
| 197 | + 'orders_labels' => 'Мітки', | |
| 198 | + 'orders_label' => 'Мітка', | |
| 199 | + 'orders_comment' => 'Коментар менеджера', | |
| 200 | + 'orders_date_dedline' => 'Дедлайн', | |
| 201 | + 'orders_numbercard' => '№ картки', | |
| 202 | + 'orders_delivery' => 'Доставка', | |
| 203 | + 'orders_declaration' => 'Декларація №', | |
| 204 | + 'orders_stock' => '№ складу', | |
| 205 | + 'orders_consignment' => '№ накладної', | |
| 206 | + 'orders_payment' => 'Спосіб оплати', | |
| 207 | + 'orders_insurance' => 'Страховка', | |
| 208 | + 'orders_amount_imposed' => 'Сума накладеного', | |
| 209 | + 'orders_shipping_by' => 'Відправка за рахунок', | |
| 210 | + 'orders_city' => 'Місто', | |
| 211 | + 'Add Orders' => 'Додати замовлення', | |
| 212 | + 'pr_category_id' => 'ID категорії', | |
| 213 | + 'pr_brand_id' => 'ID бренду', | |
| 214 | + 'pr_product_name' => 'Назва товару', | |
| 215 | + 'pr_variant_count' => 'Variant count', | |
| 216 | + 'Create Delivery' => 'Создать доставку', | |
| 217 | + 'Deliveries' => 'Доставка', | |
| 185 | 218 | 'All-list ' => 'Весь ', |
| 186 | 219 | 'Return back' => 'Повернутись назад', |
| 187 | 220 | ]; |
| 188 | 221 | \ No newline at end of file | ... | ... |