Commit 59ffcd46f94ae788f3bd76123258e2673f3614b5

Authored by alex
2 parents 8b1b0efd d9c166d7

merge error

clinica @ 8b1b0efde22
  1 +Subproject commit 8b1b0efde228ff71e43eba90086e0c15392645cc
common/config/main.php
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
53 ], 53 ],
54 ], 54 ],
55 ], 55 ],
  56 +
56 'filedb' => [ 57 'filedb' => [
57 'class' => 'yii2tech\filedb\Connection', 58 'class' => 'yii2tech\filedb\Connection',
58 'path' => '@common/config', 59 'path' => '@common/config',
common/messages/ru/app.php 0 → 100644
  1 +<?php
  2 +/**
  3 + * Дополнительно все переводы расположены в РУССКОМ алфавитном порядке.
  4 + * Последние переводы --> то, что я не хочу привязывать к словарю, тк информация несуразна
  5 + */
  6 +
  7 +
  8 +return [
  9 +
  10 + 'Signup' =>'Авторизация',
  11 + 'Signup!' =>'Авторизироватся',
  12 +
  13 + 'Blog' =>'Блог',
  14 +
  15 +
  16 + 'Reset password' =>'Восстановление пароля',
  17 + 'reset it' =>'восстановить его',
  18 + 'Yours question' =>'Ваш вопрос',
  19 + 'Yours feedback' =>'Ваш отзыв',
  20 + 'Second thing' =>'Второе мнение',
  21 + 'Quest/Answer' =>'Вопрос-ответ',
  22 + 'Choosing department' =>'Выбор отделения',
  23 + 'All rights reserved' =>'Все права защищены',
  24 + 'All callbacks' =>'Все отзывы',
  25 + 'All questions' =>'Все вопросы',
  26 + 'All categories' =>'Все рубрики',
  27 +
  28 +
  29 +
  30 + 'Ua short valute' =>'грн',
  31 +
  32 +
  33 +
  34 + 'Add to contacts' =>'Добавить в контакты',
  35 + 'Sorry h3' =>'Данной страницы не существует',
  36 +
  37 +
  38 +
  39 + 'More by theme' =>'Ещё по теме',
  40 + 'If u forgot pass u can' =>'Если вы забыли пароль, вы можете',
  41 +
  42 +
  43 +
  44 + 'Make an appointment' =>'Записаться на прием',
  45 + 'Login' =>'Зарегистрироватся',
  46 + 'Asc question' =>'Задать вопрос',
  47 + 'Request password reset' =>'Запрос на восстановление пароля',
  48 +
  49 +
  50 + 'Buy' =>'Купить',
  51 + 'Contacts' =>'Контакты',
  52 +
  53 +
  54 +
  55 + 'ours clients' =>'наших клиентов',
  56 +
  57 +
  58 +
  59 + 'Send' =>'Отправить',
  60 + 'Send SMS' =>'Отправить SMS',
  61 + 'Send question' =>'Отправить вопрос',
  62 + 'Department' =>'отделение',
  63 + 'General issues' =>'Общие вопросы',
  64 + 'Give feedback' =>'Оставить отзыв',
  65 + 'Callbacks' =>'Отзывы',
  66 + 'Callback' =>'Обратная связь',
  67 + 'Callback phone' =>'Обратный звонок',
  68 + '404 short description' =>'Ошибка 404 - страница не найдена',
  69 +
  70 +
  71 +
  72 + 'Package offerings' =>'Пакетные предложения',
  73 + 'Login ==> fill all fields!'=>'Пожалуста, заполните все указанные поля для регистрации',
  74 + 'Please choose your new password:'=>'Пожалуйста, выберите себе новый пароль',
  75 + 'Please fill out the following fields to signup:'=>'Пожалуйста, заполните все указанные поля для авторизации',
  76 + 'RPRT short' =>'Пожалуйста, введите Ваш email.На него будет выслана ссылка для восстановления',
  77 + 'More info' =>'подробнее',
  78 + 'Follow to news on FB' =>' Подписывайтесь на наши новости на канале FACEBOOK',
  79 + 'Follow' =>'Подписаться',
  80 +
  81 +
  82 + 'Slide Up' =>'развернуть',
  83 +
  84 +
  85 +
  86 + 'Creating sites' =>'Создание сайтов',
  87 + 'Minimize a window' =>'Свернуть окно',
  88 + 'Thanks for request' =>'Спасибо за Ваш запрос!',
  89 + 'We`ll call you later' =>'Мы свяжемся с вами в ближайшее время',
  90 + 'Slide Down' =>'свернуть',
  91 + 'Save' =>'Сохранить',
  92 +
  93 + 'Services' =>'Услуги',
  94 +
  95 +
  96 + 'Price' =>'Цена',
  97 + 'Prices' =>'Цены',
  98 + 'Price list description' =>'Цены на услуги медицинской клиники ABClinik',
  99 +
  100 +
  101 +
  102 +
  103 +
  104 + 'FIO' =>'ФИО',
  105 + 'Email' =>'Email',
  106 + 'Office address' =>'Украина, Киев, ул. Кудрявская, 31/33',
  107 + 'Go to Homepage' =>'На главную',
  108 + 'ABC short' =>'ABClinic — медицинский центр',
  109 +];
0 \ No newline at end of file 110 \ No newline at end of file
frontend/views/blog/_article.php
@@ -26,7 +26,8 @@ @@ -26,7 +26,8 @@
26 <div class="blog-views-ico"><?=$model->views?></div> 26 <div class="blog-views-ico"><?=$model->views?></div>
27 </div> 27 </div>
28 </div> 28 </div>
29 - <div class="blog-list-link"><a href="<?=Url::to(['alias' => $model->language->alias])?>"><span><?=$model->body_preview?></span></a></div> 29 + <div class="blog-list-link"><a href="<?=Url::to(['alias' => $model->language->alias])?>">
  30 + <span><?=$model->body_preview?></span></a></div>
30 <?php if (!empty($model->tags)){?> 31 <?php if (!empty($model->tags)){?>
31 <div class="blog-list-tags"> 32 <div class="blog-list-tags">
32 <?php foreach ($model->tags as $tag){?> 33 <?php foreach ($model->tags as $tag){?>
frontend/views/blog/category.php
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 $seo = \Yii::$app->get('seo'); 19 $seo = \Yii::$app->get('seo');
20 20
21 $this->params[ 'breadcrumbs' ][] = [ 21 $this->params[ 'breadcrumbs' ][] = [
22 - 'label' => \Yii::t('app', 'Блог'), 22 + 'label' => \Yii::t('app','Blog'),
23 'url' => Url::to(['blog/index']) 23 'url' => Url::to(['blog/index'])
24 ]; 24 ];
25 $this->params['breadcrumbs'][] = $model->title; 25 $this->params['breadcrumbs'][] = $model->title;
@@ -30,21 +30,20 @@ @@ -30,21 +30,20 @@
30 <div class="container"> 30 <div class="container">
31 <div class="row"> 31 <div class="row">
32 <div class="col-xs-12 col-sm-12"> 32 <div class="col-xs-12 col-sm-12">
33 - <div class="blog-title title-pages">Блог</div> 33 + <div class="blog-title title-pages"><?=\Yii::t('app','Blog');?></div>
34 </div> 34 </div>
35 </div> 35 </div>
36 <div class="row"> 36 <div class="row">
37 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3"> 37 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3">
38 <div class="fb-subscribe"> 38 <div class="fb-subscribe">
39 - Подписывайтесь на наши новости  
40 - на канале FACEBOOK 39 + <?=\Yii::t('app','Follow to news on FB');?>
41 </div> 40 </div>
42 </div> 41 </div>
43 </div> 42 </div>
44 <div class="row"> 43 <div class="row">
45 <div class="col-xs-12 col-sm-12"> 44 <div class="col-xs-12 col-sm-12">
46 <div class="style fb-subscribe-btn"> 45 <div class="style fb-subscribe-btn">
47 - <a target="_blank" href="#" class="btn_">Подписаться</a> 46 + <a target="_blank" href="#" class="btn_"> <?=\Yii::t('app','Follow');?></a>
48 </div> 47 </div>
49 </div> 48 </div>
50 </div> 49 </div>
@@ -58,7 +57,8 @@ @@ -58,7 +57,8 @@
58 <div class="select-blog"> 57 <div class="select-blog">
59 <?php $form = ActiveForm::begin();?> 58 <?php $form = ActiveForm::begin();?>
60 <div class="input-wr"> 59 <div class="input-wr">
61 - <?=Html::dropDownList('categories', $model->language->alias->value, ['' => 'Все рубрики']+$categories, [ 60 + <?=Html::dropDownList('categories', $model->language->alias->value,
  61 + ['' => \Yii::t('app','All categories')]+$categories, [
62 'id' => 'blog-categories' 62 'id' => 'blog-categories'
63 ])?> 63 ])?>
64 </div> 64 </div>
frontend/views/blog/index.php
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 */ 16 */
17 $seo = \Yii::$app->get('seo'); 17 $seo = \Yii::$app->get('seo');
18 18
19 - $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Блог'); 19 + $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Blog');
20 20
21 ?> 21 ?>
22 22
@@ -24,21 +24,20 @@ @@ -24,21 +24,20 @@
24 <div class="container"> 24 <div class="container">
25 <div class="row"> 25 <div class="row">
26 <div class="col-xs-12 col-sm-12"> 26 <div class="col-xs-12 col-sm-12">
27 - <div class="blog-title title-pages">Блог</div> 27 + <div class="blog-title title-pages"><?=\Yii::t('app', 'Blog');?></div>
28 </div> 28 </div>
29 </div> 29 </div>
30 <div class="row"> 30 <div class="row">
31 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3"> 31 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3">
32 <div class="fb-subscribe"> 32 <div class="fb-subscribe">
33 - Подписывайтесь на наши новости  
34 - на канале FACEBOOK 33 + <?=\Yii::t('app','Follow to news on FB');?>
35 </div> 34 </div>
36 </div> 35 </div>
37 </div> 36 </div>
38 <div class="row"> 37 <div class="row">
39 <div class="col-xs-12 col-sm-12"> 38 <div class="col-xs-12 col-sm-12">
40 <div class="style fb-subscribe-btn"> 39 <div class="style fb-subscribe-btn">
41 - <a target="_blank" href="#" class="btn_">Подписаться</a> 40 + <a target="_blank" href="#" class="btn_"><?=\Yii::t('app','Follow');?></a>
42 </div> 41 </div>
43 </div> 42 </div>
44 </div> 43 </div>
@@ -52,7 +51,8 @@ @@ -52,7 +51,8 @@
52 <div class="select-blog"> 51 <div class="select-blog">
53 <?php $form = ActiveForm::begin();?> 52 <?php $form = ActiveForm::begin();?>
54 <div class="input-wr"> 53 <div class="input-wr">
55 - <?=Html::dropDownList('categories', null, ['' => 'Все рубрики']+$categories, [ 54 + <?=Html::dropDownList('categories', null,
  55 + ['' => \Yii::t('app','All categories')]+$categories, [
56 'id' => 'blog-categories' 56 'id' => 'blog-categories'
57 ])?> 57 ])?>
58 </div> 58 </div>
frontend/views/blog/tag.php
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 $seo = \Yii::$app->get('seo'); 19 $seo = \Yii::$app->get('seo');
20 20
21 $this->params[ 'breadcrumbs' ][] = [ 21 $this->params[ 'breadcrumbs' ][] = [
22 - 'label' => \Yii::t('app', 'Блог'), 22 + 'label' => \Yii::t('app', 'Blog'),
23 'url' => Url::to(['blog/index']) 23 'url' => Url::to(['blog/index'])
24 ]; 24 ];
25 $this->params['breadcrumbs'][] = $model->title; 25 $this->params['breadcrumbs'][] = $model->title;
@@ -30,21 +30,20 @@ @@ -30,21 +30,20 @@
30 <div class="container"> 30 <div class="container">
31 <div class="row"> 31 <div class="row">
32 <div class="col-xs-12 col-sm-12"> 32 <div class="col-xs-12 col-sm-12">
33 - <div class="blog-title title-pages">Блог</div> 33 + <div class="blog-title title-pages"><?=\Yii::t('app', 'Blog');?></div>
34 </div> 34 </div>
35 </div> 35 </div>
36 <div class="row"> 36 <div class="row">
37 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3"> 37 <div class="col-xs-12 col-sm-5 col-md-4 col-lg-3">
38 <div class="fb-subscribe"> 38 <div class="fb-subscribe">
39 - Подписывайтесь на наши новости  
40 - на канале FACEBOOK 39 + <?=\Yii::t('app','Follow to news on FB');?>
41 </div> 40 </div>
42 </div> 41 </div>
43 </div> 42 </div>
44 <div class="row"> 43 <div class="row">
45 <div class="col-xs-12 col-sm-12"> 44 <div class="col-xs-12 col-sm-12">
46 <div class="style fb-subscribe-btn"> 45 <div class="style fb-subscribe-btn">
47 - <a target="_blank" href="#" class="btn_">Подписаться</a> 46 + <a target="_blank" href="#" class="btn_"><?=\Yii::t('app','Follow');?></a>
48 </div> 47 </div>
49 </div> 48 </div>
50 </div> 49 </div>
@@ -58,7 +57,8 @@ @@ -58,7 +57,8 @@
58 <div class="select-blog"> 57 <div class="select-blog">
59 <?php $form = ActiveForm::begin();?> 58 <?php $form = ActiveForm::begin();?>
60 <div class="input-wr"> 59 <div class="input-wr">
61 - <?=Html::dropDownList('categories', null, ['' => 'Все рубрики']+$categories, [ 60 + <?=Html::dropDownList('categories', null,
  61 + ['' => \Yii::t('app','All categories')]+$categories, [
62 'id' => 'blog-categories' 62 'id' => 'blog-categories'
63 ])?> 63 ])?>
64 </div> 64 </div>
frontend/views/blog/view.php
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 */ 14 */
15 15
16 $this->params[ 'breadcrumbs' ][] = [ 16 $this->params[ 'breadcrumbs' ][] = [
17 - 'label' => \Yii::t('app', 'Блог'), 17 + 'label' => \Yii::t('app', 'Blog'),
18 'url' => [ 'blog/index' ], 18 'url' => [ 'blog/index' ],
19 ]; 19 ];
20 20
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 88
89 <div class="col-xs-12 col-sm-6"> 89 <div class="col-xs-12 col-sm-6">
90 90
91 - <div class="title-c-a">Отзывы</div> 91 + <div class="title-c-a"><?=\Yii::t('app','Callbacks');?></div>
92 <?php if(!empty($model->comments)){?> 92 <?php if(!empty($model->comments)){?>
93 <div class="service-comments-wr style"> 93 <div class="service-comments-wr style">
94 <?php foreach ($model->comments as $comment){?> 94 <?php foreach ($model->comments as $comment){?>
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <div class="col-xs-12 col-sm-6"> 107 <div class="col-xs-12 col-sm-6">
108 <div class="style blog-view-comments-form"> 108 <div class="style blog-view-comments-form">
109 <div class="style hidden-form-c-a"> 109 <div class="style hidden-form-c-a">
110 - <div class="title-forms-c-a style">Оставить отзыв</div> 110 + <div class="title-forms-c-a style"><?=\Yii::t('app','Give feedback');?></div>
111 <?=$moduleComment->renderForm($this)?> 111 <?=$moduleComment->renderForm($this)?>
112 </div> 112 </div>
113 </div> 113 </div>
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <div class="container"> 120 <div class="container">
121 <div class="row"> 121 <div class="row">
122 <div class="col-xs-12"> 122 <div class="col-xs-12">
123 - <div class="style title-view-mins-bl">Ещё по теме</div> 123 + <div class="style title-view-mins-bl"><?=\Yii::t('app','More by theme');?></div>
124 </div> 124 </div>
125 </div> 125 </div>
126 <div class="row"> 126 <div class="row">
@@ -139,7 +139,8 @@ @@ -139,7 +139,8 @@
139 <div class="blog-views-ico">317</div> 139 <div class="blog-views-ico">317</div>
140 </div> 140 </div>
141 </div> 141 </div>
142 - <div class="blog-list-link"><a href="#"><span>Желающие забеременеть женщины должны заниматься спортом не менее 4 часов в неделю – ученые</span></a></div> 142 + <div class="blog-list-link"><a href="#">
  143 + <span>Желающие забеременеть женщины должны заниматься спортом не менее 4 часов в неделю – ученые</span></a></div>
143 <div class="blog-list-tags"> 144 <div class="blog-list-tags">
144 <a href="#">гинекология</a> 145 <a href="#">гинекология</a>
145 <a href="#">роды</a> 146 <a href="#">роды</a>
frontend/views/layouts/main.php
@@ -132,20 +132,20 @@ @@ -132,20 +132,20 @@
132 </td> 132 </td>
133 </tr> 133 </tr>
134 <tr> 134 <tr>
135 - <td><span class="modal-link" data-form="callback"><?= \Yii::t('app', 'обратный звонок') ?></span> 135 + <td><span class="modal-link" data-form="callback"><?= \Yii::t('app', 'Callback') ?></span>
136 </td> 136 </td>
137 </tr> 137 </tr>
138 </table> 138 </table>
139 </div> 139 </div>
140 140
141 <div class="hidden-xs btn-header-wr"> 141 <div class="hidden-xs btn-header-wr">
142 - <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Записаться на прием') ?></span> 142 + <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span>
143 </div> 143 </div>
144 144
145 <ul class="hidden-xs hidden-sm"> 145 <ul class="hidden-xs hidden-sm">
146 - <li><a href="#" class="new"><span>Второе мнение</span></a></li>  
147 - <li><a href="<?=Url::to(['site/questions'])?>">Вопрос-ответ</a></li>  
148 - <li><a href="<?=Url::to(['site/comments'])?>">Отзывы</a></li> 146 + <li><a href="#" class="new"><span> <?=\Yii::t('app','Second thing')?> </span></a></li>
  147 + <li><a href="<?=Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer')?></a></li>
  148 + <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li>
149 </ul> 149 </ul>
150 <!-- --> 150 <!-- -->
151 <!-- <div class="lang-sep-wr hidden-xs hidden-sm">--> 151 <!-- <div class="lang-sep-wr hidden-xs hidden-sm">-->
@@ -176,14 +176,14 @@ @@ -176,14 +176,14 @@
176 ]; 176 ];
177 } 177 }
178 $items[] = [ 178 $items[] = [
179 - 'label' => \Yii::t('app', 'Цены'), 179 + 'label' => \Yii::t('app', 'Prices'),
180 'url' => Url::to(['site/prices']), 180 'url' => Url::to(['site/prices']),
181 'options' => [ 181 'options' => [
182 'class' => 'active' 182 'class' => 'active'
183 ] 183 ]
184 ]; 184 ];
185 $items[] = [ 185 $items[] = [
186 - 'label' => \Yii::t('app', 'Пакетные предложения'), 186 + 'label' => \Yii::t('app', 'Package offerings'),
187 'url' => Url::to(['package/index']), 187 'url' => Url::to(['package/index']),
188 ] 188 ]
189 ?> 189 ?>
@@ -220,14 +220,14 @@ @@ -220,14 +220,14 @@
220 ]; 220 ];
221 } 221 }
222 $itemsMobile[] = [ 222 $itemsMobile[] = [
223 - 'label' => \Yii::t('app', 'Цены'), 223 + 'label' => \Yii::t('app', 'Prices'),
224 'url' => Url::to(['site/prices']), 224 'url' => Url::to(['site/prices']),
225 'options' => [ 225 'options' => [
226 'class' => 'active' 226 'class' => 'active'
227 ] 227 ]
228 ]; 228 ];
229 $itemsMobile[] = [ 229 $itemsMobile[] = [
230 - 'label' => \Yii::t('app', 'Пакетные предложения'), 230 + 'label' => \Yii::t('app', 'Package offerings'),
231 'url' => Url::to(['package/index']), 231 'url' => Url::to(['package/index']),
232 ] 232 ]
233 ?> 233 ?>
@@ -242,20 +242,20 @@ @@ -242,20 +242,20 @@
242 </div> 242 </div>
243 <div class="menu-second-mob"> 243 <div class="menu-second-mob">
244 <ul class="footer-menu"> 244 <ul class="footer-menu">
245 - <li><a href="<?= Url::to([ 'site/contacts' ]) ?>"><?= \Yii::t('app', 'Контакты') ?></a></li>  
246 - <li><a href="#" class="new"><span><?= \Yii::t('app', 'Второе мнение') ?></span></a></li>  
247 - <li><a href="#"><?= \Yii::t('app', 'Вопрос-ответ') ?></a></li>  
248 - <li><a href="#"><?= \Yii::t('app', 'Отзывы') ?></a></li> 245 + <li><a href="<?= Url::to([ 'site/contacts' ]) ?>"><?= \Yii::t('app', 'Contacts') ?></a></li>
  246 + <li><a href="#" class="new"><span><?= \Yii::t('app', 'Second thing') ?></span></a></li>
  247 + <li><a href="#"><?= \Yii::t('app', 'Quest/Answer') ?></a></li>
  248 + <li><a href="#"><?= \Yii::t('app', 'Callbacks') ?></a></li>
249 </ul> 249 </ul>
250 </div> 250 </div>
251 251
252 <div class="mob-menu-btns"> 252 <div class="mob-menu-btns">
253 <div class="style mob-menu-write"> 253 <div class="style mob-menu-write">
254 - <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Записаться на прием') ?></span> 254 + <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span>
255 </div> 255 </div>
256 <div class="style mob-menu-callback"> 256 <div class="style mob-menu-callback">
257 <p><?= $settings->phone ?></p> 257 <p><?= $settings->phone ?></p>
258 - <span class="modal-link" data-form="callback">обратный звонок</span> 258 + <span class="modal-link" data-form="callback"><?=\Yii::t('app','Callback');?></span>
259 </div> 259 </div>
260 </div> 260 </div>
261 </div> 261 </div>
@@ -270,7 +270,7 @@ @@ -270,7 +270,7 @@
270 <div class="row"> 270 <div class="row">
271 <div class="col-xs-12 col-sm-12 breadcrumb-wrapp"> 271 <div class="col-xs-12 col-sm-12 breadcrumb-wrapp">
272 <?=SeoBreadcrumbs::widget([ 272 <?=SeoBreadcrumbs::widget([
273 - 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], 273 + 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [],
274 ])?> 274 ])?>
275 </div> 275 </div>
276 </div> 276 </div>
@@ -321,16 +321,16 @@ @@ -321,16 +321,16 @@
321 <div class="row"> 321 <div class="row">
322 <div class="col-xs-12 hidden-sm hidden-md hidden-lg" style="text-align: center; margin-bottom: 8px"> 322 <div class="col-xs-12 hidden-sm hidden-md hidden-lg" style="text-align: center; margin-bottom: 8px">
323 <div class="btn-footer-wr"> 323 <div class="btn-footer-wr">
324 - <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Записаться на прием') ?></span> 324 + <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span>
325 </div> 325 </div>
326 </div> 326 </div>
327 327
328 <div class="col-xs-9 col-sm-2"> 328 <div class="col-xs-9 col-sm-2">
329 <ul class="footer-menu"> 329 <ul class="footer-menu">
330 - <li><a href="<?=Url::to(['site/about'])?>">Контакты</a></li>  
331 - <li><a href="#" class="new"><span>Второе мнение</span></a></li>  
332 - <li><a href="<?=Url::to(['site/questions'])?>">Вопрос-ответ</a></li>  
333 - <li><a href="<?=Url::to(['site/comments'])?>">Отзывы</a></li> 330 + <li><a href="<?=Url::to(['site/about'])?>"><?=\Yii::t('app','Contacts')?></a></li>
  331 + <li><a href="#" class="new"><span><?=\Yii::t('app','Make an appointment');?></span></a></li>
  332 + <li><a href="<?=Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer');?></a></li>
  333 + <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks');?></a></li>
334 </ul> 334 </ul>
335 </div> 335 </div>
336 336
@@ -348,7 +348,8 @@ @@ -348,7 +348,8 @@
348 348
349 <div class="hidden-xs col-xs-12 col-sm-3 col-md-3"> 349 <div class="hidden-xs col-xs-12 col-sm-3 col-md-3">
350 <div class="btn-footer-wr"> 350 <div class="btn-footer-wr">
351 - <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Записаться на прием') ?></span> 351 + <span class="btn_ modal-link" data-form="write-to">
  352 + <?= \Yii::t('app', 'Make an appointment') ?></span>
352 </div> 353 </div>
353 </div> 354 </div>
354 355
@@ -368,9 +369,9 @@ @@ -368,9 +369,9 @@
368 </div> 369 </div>
369 <div class="row"> 370 <div class="row">
370 <div class="col-xs-12 col-sm-12 studio-wrapp"> 371 <div class="col-xs-12 col-sm-12 studio-wrapp">
371 - <div class="all-rights-txt">© Все права защищены, 2018. ABClinic</div> 372 + <div class="all-rights-txt">©<?=\Yii::t('app','All rights reserved');?> , 2018. ABClinic</div>
372 <div class="link-studio"> 373 <div class="link-studio">
373 - <a href="http://artweb.ua">Создание сайтов</a> 374 + <a href="http://artweb.ua"><?=\Yii::t('app','Creating sites');?></a>
374 </div> 375 </div>
375 </div> 376 </div>
376 </div> 377 </div>
@@ -395,10 +396,11 @@ @@ -395,10 +396,11 @@
395 </div> 396 </div>
396 <?php } ?> 397 <?php } ?>
397 398
398 - <div class="button-call-mob"><a class="call-sms" href="sms:<?= $settings->phone ?>">Отправить SMS</a> 399 + <div class="button-call-mob">
  400 + <a class="call-sms" href="sms:<?= $settings->phone ?>"><?=\Yii::t('app','Send SMS')?></a>
399 </div> 401 </div>
400 <div class="button-call-mob"> 402 <div class="button-call-mob">
401 - <a class="call-contact" href="/contacts/abclinic.vcf">Добавить в контакты</a></div> 403 + <a class="call-contact" href="/contacts/abclinic.vcf"><?=\Yii::t('app','Add to contacts')?></a></div>
402 </div> 404 </div>
403 </div> 405 </div>
404 </div> 406 </div>
@@ -414,7 +416,7 @@ @@ -414,7 +416,7 @@
414 'titleTagOptions' => [ 416 'titleTagOptions' => [
415 'class' => 'style form-title' 417 'class' => 'style form-title'
416 ], 418 ],
417 - 'headerText' => \Yii::t('app', 'Обратный звонок'), 419 + 'headerText' => \Yii::t('app', 'Callback'),
418 'closeTagButton' => 'span', 420 'closeTagButton' => 'span',
419 'closeTagContent' => '', 421 'closeTagContent' => '',
420 'closeButtonOptions' => [ 422 'closeButtonOptions' => [
@@ -448,7 +450,7 @@ @@ -448,7 +450,7 @@
448 'titleTagOptions' => [ 450 'titleTagOptions' => [
449 'class' => 'style form-title' 451 'class' => 'style form-title'
450 ], 452 ],
451 - 'headerText' => \Yii::t('app', 'Записаться на прием'), 453 + 'headerText' => \Yii::t('app', 'Make an appointment'),
452 'closeTagButton' => 'span', 454 'closeTagButton' => 'span',
453 'closeTagContent' => '', 455 'closeTagContent' => '',
454 'closeButtonOptions' => [ 456 'closeButtonOptions' => [
@@ -463,8 +465,8 @@ @@ -463,8 +465,8 @@
463 465
464 <div id="success_form" style="display: none;"> 466 <div id="success_form" style="display: none;">
465 <span id="modal_close"></span> 467 <span id="modal_close"></span>
466 - <div class="txt-success"><span>Спасибо за Ваш запрос!</span>  
467 - <p>Мы свяжемся с вами в ближайшее время.</p></div> 468 + <div class="txt-success"><span><?=\Yii::t('app','Thanks for request')?></span>
  469 + <p><?=Yii::t('app','We`ll call you later')?>.</p></div>
468 </div> 470 </div>
469 471
470 <!-- выводить если главная страница --> 472 <!-- выводить если главная страница -->
frontend/views/package/index.php
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
7 use artbox\core\helpers\ImageHelper; 7 use artbox\core\helpers\ImageHelper;
8 use artbox\core\helpers\Url; 8 use artbox\core\helpers\Url;
9 9
10 - $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Пакетные предложения'); 10 + $this->params[ 'breadcrumbs'][] = \Yii::t('app','Package offerings');
11 ?> 11 ?>
12 12
13 <section class="section-packages-page"> 13 <section class="section-packages-page">
14 <div class="container"> 14 <div class="container">
15 <div class="row"> 15 <div class="row">
16 <div class="col-xs-12"> 16 <div class="col-xs-12">
17 - <h1 class="title-pages">Пакетные предолжения</h1> 17 + <h1 class="title-pages"><?=\Yii::t('app','Package offerings');?></h1>
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="row"> 20 <div class="row">
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </tr> 38 </tr>
39 <tr> 39 <tr>
40 <td> 40 <td>
41 - <span class="btn_ packages-btn">подробнее</span> 41 + <span class="btn_ packages-btn"><?=\Yii::t('app','More info');?></span>
42 </td> 42 </td>
43 </tr> 43 </tr>
44 </table> 44 </table>
frontend/views/package/view.php
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 <?=$package->body?> 25 <?=$package->body?>
26 26
27 <div class="style"> 27 <div class="style">
28 - <span class="btn_ modal-link" data-form="write-to">Записаться на прием</span> 28 + <span class="btn_ modal-link" data-form="write-to">
  29 + <?=\Yii::t('app','Make an appointment');?></span>
29 </div> 30 </div>
30 </div> 31 </div>
31 </div> 32 </div>
frontend/views/service/_prices.php
@@ -7,20 +7,21 @@ @@ -7,20 +7,21 @@
7 <table> 7 <table>
8 <thead> 8 <thead>
9 <tr> 9 <tr>
10 - <th>Услуги</th>  
11 - <th>Цена</th> 10 + <th><?=\Yii::t('app','Services');?></th>
  11 + <th><?=\Yii::t('app','Price');?></th>
12 </tr> 12 </tr>
13 </thead> 13 </thead>
14 <tbody> 14 <tbody>
15 <?php foreach ($prices as $price){?> 15 <?php foreach ($prices as $price){?>
16 <tr> 16 <tr>
17 <td><?=$price->title?></td> 17 <td><?=$price->title?></td>
18 - <td><b><?=$price->price?> <span>грн.</span></b></td> 18 + <td><b><?=$price->price?> <span><?=\Yii::t('app','Ua short valute');?>.</span></b></td>
19 </tr> 19 </tr>
20 <?php }?> 20 <?php }?>
21 </tbody> 21 </tbody>
22 </table> 22 </table>
23 <div class="style"> 23 <div class="style">
24 - <span class="btn_ modal-link" data-form="write-to">Записаться на прием</span> 24 + <span class="btn_ modal-link" data-form="write-to">
  25 + <?=\Yii::t('app','Make an appointment');?></span>
25 </div> 26 </div>
26 <?php } ?> 27 <?php } ?>
frontend/views/service/view.php
@@ -55,7 +55,10 @@ @@ -55,7 +55,10 @@
55 <div class="style service-list-wr"> 55 <div class="style service-list-wr">
56 <ul> 56 <ul>
57 <?php foreach ($others as $service){?> 57 <?php foreach ($others as $service){?>
58 - <li class="<?=(($model->id == $service->id and $model->level != 2) ? 'active' : '')?> <?=(($model->parent_id == $service->id and $model->level == 2) ? 'active2' : '')?> <?=(!empty($service->services) ? 'has-list' : '')?>"><a href="<?=Url::to(['alias' => $service->language->alias])?>"><?=$service->title?></a> 58 + <li class="<?=(($model->id == $service->id and $model->level != 2) ? 'active' : '')?>
  59 + <?=(($model->parent_id == $service->id and $model->level == 2) ? 'active2' : '')?>
  60 + <?=(!empty($service->services) ? 'has-list' : '')?>">
  61 + <a href="<?=Url::to(['alias' => $service->language->alias])?>"><?=$service->title?></a>
59 <?php 62 <?php
60 if (($model->id == $service->id or $model->parent_id == $service->id) and !empty($service->services)) {?> 63 if (($model->id == $service->id or $model->parent_id == $service->id) and !empty($service->services)) {?>
61 <ul> 64 <ul>
@@ -88,7 +91,7 @@ @@ -88,7 +91,7 @@
88 <div class="container"> 91 <div class="container">
89 <div class="row"> 92 <div class="row">
90 <div class="col-xs-12 col-sm-4 col-md-4 fix-form-c-a-wr"> 93 <div class="col-xs-12 col-sm-4 col-md-4 fix-form-c-a-wr">
91 - <div class="title-c-a">Отзывы</div> 94 + <div class="title-c-a"><?=\Yii::t('app','Callbacks');?></div>
92 <div class="service-comments-wr style"> 95 <div class="service-comments-wr style">
93 <?php foreach ($model->comments as $comment){?> 96 <?php foreach ($model->comments as $comment){?>
94 <div class="service-comments style"> 97 <div class="service-comments style">
@@ -99,20 +102,21 @@ @@ -99,20 +102,21 @@
99 <?php }?> 102 <?php }?>
100 </div> 103 </div>
101 104
102 - <div class="style service-links-c-a"><a href="<?=Url::to(['site/comments'])?>">Все отзывы</a></div> 105 + <div class="style service-links-c-a"><a href="<?=Url::to(['site/comments'])?>">
  106 + <?=\Yii::t('app','All callbacks');?></a></div>
103 <div class="style service-c-a-btns"> 107 <div class="style service-c-a-btns">
104 - <span class="btn_">Оставить отзыв</span> 108 + <span class="btn_"><?=\Yii::t('app','Give feedback');?></span>
105 </div> 109 </div>
106 <div class="style hidden-form-c-a-wr hidden"> 110 <div class="style hidden-form-c-a-wr hidden">
107 <div class="style hidden-form-c-a"> 111 <div class="style hidden-form-c-a">
108 - <div class="title-forms-c-a style">Оставить отзыв</div> 112 + <div class="title-forms-c-a style"><?=\Yii::t('app','Give feedback');?></div>
109 <?php $moduleComment->renderForm($this)?> 113 <?php $moduleComment->renderForm($this)?>
110 </div> 114 </div>
111 </div> 115 </div>
112 </div> 116 </div>
113 <div class="hidden-xs hidden-sm col-sm-1"></div> 117 <div class="hidden-xs hidden-sm col-sm-1"></div>
114 <div class="col-xs-12 col-sm-8 col-md-7 service-ansver-mob-line"> 118 <div class="col-xs-12 col-sm-8 col-md-7 service-ansver-mob-line">
115 - <div class="title-c-a">Вопрос-ответ</div> 119 + <div class="title-c-a"><?=\Yii::t('app','Quest/Answer');?></div>
116 <?php foreach ($model->questions as $question){?> 120 <?php foreach ($model->questions as $question){?>
117 <div class="service-comments-wr style"> 121 <div class="service-comments-wr style">
118 <div class="service-comments style service-ansvers"> 122 <div class="service-comments style service-ansvers">
@@ -131,14 +135,15 @@ @@ -131,14 +135,15 @@
131 135
132 </div> 136 </div>
133 <?php } ?> 137 <?php } ?>
134 - <div class="style service-links-c-a service-links-a"><a href="<?=Url::to(['site/questions'])?>">Все вопросы</a></div> 138 + <div class="style service-links-c-a service-links-a">
  139 + <a href="<?=Url::to(['site/questions'])?>"><?=\Yii::t('app','All questions');?></a></div>
135 <div class="style service-c-a-btns"> 140 <div class="style service-c-a-btns">
136 - <span class="btn_">Задать вопрос</span> 141 + <span class="btn_"><?=\Yii::t('app','Asc question');?></span>
137 </div> 142 </div>
138 143
139 <div class="style hidden-form-c-a-wr hidden"> 144 <div class="style hidden-form-c-a-wr hidden">
140 <div class="style hidden-form-c-a"> 145 <div class="style hidden-form-c-a">
141 - <div class="title-forms-c-a style">Задать вопрос </div> 146 + <div class="title-forms-c-a style"><?=\Yii::t('app','Asc question');?></div>
142 <?php $moduleQuestion->renderForm($this)?> 147 <?php $moduleQuestion->renderForm($this)?>
143 </div> 148 </div>
144 </div> 149 </div>
frontend/views/site/_question.php
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <div class="style comments-h-autor"><?=$model->name?></div> 8 <div class="style comments-h-autor"><?=$model->name?></div>
9 <div class="style comments-h-text"><?=$model->question?> </div> 9 <div class="style comments-h-text"><?=$model->question?> </div>
10 <div class="style answers-date-wr"> 10 <div class="style answers-date-wr">
11 - <span><?=date('d.m.Y', $model->created_at)?></span><p> отделение: 11 + <span><?=date('d.m.Y', $model->created_at)?></span><p> <?=\Yii::t('app','Department');?>:
12 <?php if ($model->service_id != null) {?> 12 <?php if ($model->service_id != null) {?>
13 <a href="<?=Url::to(['alias' => $model->service->alias])?>"><?=$model->service->title?></a></p> 13 <a href="<?=Url::to(['alias' => $model->service->alias])?>"><?=$model->service->title?></a></p>
14 <?php }?> 14 <?php }?>
frontend/views/site/comments.php
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 use yii\widgets\ActiveForm; 14 use yii\widgets\ActiveForm;
15 use yii\widgets\ListView; 15 use yii\widgets\ListView;
16 16
17 - $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Вопрос-ответ'); 17 + $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Quest/Answer');
18 18
19 $model = new Comment(['entity_id' => $service_id, 'entity' => Service::className()]); 19 $model = new Comment(['entity_id' => $service_id, 'entity' => Service::className()]);
20 20
21 - $data = ['' => 'Общие вопросы'] + ArrayHelper::map($services, 'id', 'title'); 21 + $data = ['' => \Yii::t('app','General issues')] + ArrayHelper::map($services, 'id', 'title');
22 ?> 22 ?>
23 23
24 24
@@ -26,32 +26,36 @@ @@ -26,32 +26,36 @@
26 <div class="container"> 26 <div class="container">
27 <div class="row"> 27 <div class="row">
28 <div class="col-xs-12 col-sm-12"> 28 <div class="col-xs-12 col-sm-12">
29 - <h1 class="title-pages">Отзывы</h1> 29 + <h1 class="title-pages"><?=\Yii::t('app','Callbacks')?></h1>
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="row"> 32 <div class="row">
33 <div class="col-xs-12 col-sm-12"> 33 <div class="col-xs-12 col-sm-12">
34 <div class="style add-answer-forms"> 34 <div class="style add-answer-forms">
35 - <span class="btn_">Оставить отзыв</span> 35 + <span class="btn_"><?=\Yii::t('app','Give feedback')?></span>
36 </div> 36 </div>
37 <div class="style hidden-answer-comment-form hidden"> 37 <div class="style hidden-answer-comment-form hidden">
38 - <div class="hidden-answer-comment-form-title">Оставить отзыв</div> 38 + <div class="hidden-answer-comment-form-title"><?=\Yii::t('app','Give feedback')?></div>
39 <?php $form = ActiveForm::begin(['id' => 'total_comment_form'])?> 39 <?php $form = ActiveForm::begin(['id' => 'total_comment_form'])?>
40 <div class="col-xs-12 col-sm-6"> 40 <div class="col-xs-12 col-sm-6">
41 <div class="input-wr"> 41 <div class="input-wr">
42 - <?=$form->field($model, 'entity_id')->dropDownList($data)->label('Выбор отделения')?> 42 + <?=$form->field($model, 'entity_id')->
  43 + dropDownList($data)->label(Yii::t('app','Choosing department'))?>
43 </div> 44 </div>
44 45
45 <div class="input-wr required"> 46 <div class="input-wr required">
46 - <?=$form->field($model, 'name')->label('ФИО')?> 47 + <?=$form->field($model, 'name')
  48 + ->label(Yii::t('app','FIO'))?>
47 </div> 49 </div>
48 <div class="input-wr required"> 50 <div class="input-wr required">
49 - <?=$form->field($model, 'email')->label('Email')?> 51 + <?=$form->field($model, 'email')
  52 + ->label(Yii::t('app','Email'))?>
50 </div> 53 </div>
51 </div> 54 </div>
52 <div class="col-xs-12 col-sm-6"> 55 <div class="col-xs-12 col-sm-6">
53 <div class="input-wr"> 56 <div class="input-wr">
54 - <?=$form->field($model, 'comment')->textarea(['cols' => 30, 'rows' => 10])->label('Ваш отзыв')?> 57 + <?=$form->field($model, 'comment')->textarea(['cols' => 30, 'rows' => 10])
  58 + ->label(Yii::t('app','Yours feedback'))?>
55 <!-- <label class="control-label" for="feedback-name">Ваш вопрос</label>--> 59 <!-- <label class="control-label" for="feedback-name">Ваш вопрос</label>-->
56 <!-- <textarea name="" id="" cols="30" rows="10"></textarea>--> 60 <!-- <textarea name="" id="" cols="30" rows="10"></textarea>-->
57 </div> 61 </div>
@@ -60,7 +64,8 @@ @@ -60,7 +64,8 @@
60 <div class="button-wr submit-close-wr-c-a"> 64 <div class="button-wr submit-close-wr-c-a">
61 <?=Html::submitButton('Отправить отзыв')?> 65 <?=Html::submitButton('Отправить отзыв')?>
62 <!-- <button type="submit">Отправить вопрос</button>--> 66 <!-- <button type="submit">Отправить вопрос</button>-->
63 - <div class="submit-close-c-a submit-close-c-a-page"><span>Свернуть окно</span></div> 67 + <div class="submit-close-c-a submit-close-c-a-page">
  68 + <span><?=\Yii::t('app','Minimize a window');?></span></div>
64 </div> 69 </div>
65 </div> 70 </div>
66 <?php $form::end();?> 71 <?php $form::end();?>
@@ -68,9 +73,12 @@ @@ -68,9 +73,12 @@
68 </div> 73 </div>
69 <div class="col-xs-12 col-sm-12"> 74 <div class="col-xs-12 col-sm-12">
70 <ul class="answers-category-list"> 75 <ul class="answers-category-list">
71 - <li <?=($service_id == null ? 'class="active"' : '')?>><a href="<?=Url::current(['service_id' => null])?>"><span>Общие вопросы</span></a></li> 76 + <li <?=($service_id == null ? 'class="active"' : '')?>>
  77 + <a href="<?=Url::current(['service_id' => null])?>">
  78 + <span><?=\Yii::t('app','General issues');?></span></a></li>
72 <?php foreach ($services as $service){?> 79 <?php foreach ($services as $service){?>
73 - <li <?=($service_id == $service->id ? 'class="active"' : '')?>><a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li> 80 + <li <?=($service_id == $service->id ? 'class="active"' : '')?>>
  81 + <a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li>
74 <?php } ?> 82 <?php } ?>
75 </ul> 83 </ul>
76 </div> 84 </div>
frontend/views/site/contact.php
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 13
14 14
15 15
16 - $this->title = \Yii::t('app', 'Contact'); 16 + $this->title = \Yii::t('app', 'Contacts');
17 $this->params[ 'breadcrumbs' ][] = $this->title; 17 $this->params[ 'breadcrumbs' ][] = $this->title;
18 18
19 19
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="container"> 26 <div class="container">
27 <div class="row"> 27 <div class="row">
28 <div class="col-xs-12"> 28 <div class="col-xs-12">
29 - <h1 class="title-pages">Контакты</h1> 29 + <h1 class="title-pages"><?=\Yii::t('app', 'Contacts');?></h1>
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="row"> 32 <div class="row">
@@ -35,11 +35,16 @@ @@ -35,11 +35,16 @@
35 <div class="map-info-wrapp"> 35 <div class="map-info-wrapp">
36 <?php if (!empty($settings->address)){?> 36 <?php if (!empty($settings->address)){?>
37 <div class="marker-img"><img src="/images/map/marker-1-grey.svg" width="12" height="18" alt=""></div> 37 <div class="marker-img"><img src="/images/map/marker-1-grey.svg" width="12" height="18" alt=""></div>
  38 +<<<<<<< HEAD
38 <div class="map-adress"><?=$settings->address?></div> 39 <div class="map-adress"><?=$settings->address?></div>
39 <?php } ?> 40 <?php } ?>
40 <?php if (!empty($settings->phone) or !empty($settings->phone2)){ 41 <?php if (!empty($settings->phone) or !empty($settings->phone2)){
41 $phones = array_merge(explode(';', $settings->phone2) , [$settings->phone]); 42 $phones = array_merge(explode(';', $settings->phone2) , [$settings->phone]);
42 ?> 43 ?>
  44 +=======
  45 + <div class="map-adress">
  46 + <?=\Yii::t('app','Office address')?></div>
  47 +>>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
43 <div class="ico-map"><img src="/images/map/phone-map-1-grey.svg" alt=""></div> 48 <div class="ico-map"><img src="/images/map/phone-map-1-grey.svg" alt=""></div>
44 <div class="map-phone"> 49 <div class="map-phone">
45 <?php foreach ($phones as $phone){?> 50 <?php foreach ($phones as $phone){?>
@@ -60,8 +65,40 @@ @@ -60,8 +65,40 @@
60 <div class="col-xs-12 col-sm-6 col-md-5 col-lg-5"> 65 <div class="col-xs-12 col-sm-6 col-md-5 col-lg-5">
61 <div class="style blog-view-comments-form"> 66 <div class="style blog-view-comments-form">
62 <div class="style hidden-form-c-a"> 67 <div class="style hidden-form-c-a">
  68 +<<<<<<< HEAD
63 <div class="title-forms-c-a style">Обратный звонок</div> 69 <div class="title-forms-c-a style">Обратный звонок</div>
64 <?=$module->renderForm($this)?> 70 <?=$module->renderForm($this)?>
  71 +=======
  72 + <div class="title-forms-c-a style">
  73 + <?=\Yii::t('app','Callback phone')?></div>
  74 + <form action="">
  75 + <div class="input-wr required">
  76 + <label class="control-label" for="feedback-name">
  77 + <?=\Yii::t('app','FIO')?></label>
  78 + <input type="text">
  79 + </div>
  80 +
  81 + <div class="input-wr required">
  82 + <label class="control-label" for="feedback-name">
  83 + <?=\Yii::t('app','Email')?>
  84 + </label>
  85 + <input type="text">
  86 + </div>
  87 +
  88 + <div class="input-wr">
  89 + <label class="control-label" for="feedback-name">
  90 + <?=\Yii::t('app','Yours question')?>
  91 + </label>
  92 + <textarea name="" id="" cols="30" rows="10"></textarea>
  93 + </div>
  94 +
  95 + <div class="button-wr submit-close-wr-c-a">
  96 + <button type="submit">
  97 + <?=\Yii::t('app','Send');?>
  98 + </button>
  99 + </div>
  100 + </form>
  101 +>>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
65 </div> 102 </div>
66 </div> 103 </div>
67 </div> 104 </div>
frontend/views/site/error.php
@@ -23,10 +23,19 @@ $this-&gt;title = $name; @@ -23,10 +23,19 @@ $this-&gt;title = $name;
23 </a> 23 </a>
24 </p> 24 </p>
25 25
26 - <h3>We are sorry - this page is not here anymore</h3>  
27 - <h4 class="text-muted">Error 404 - Page not found</h4> 26 + <h3>
  27 +<!-- Тут я не знал как правильно устроить перевод, поэтому оставляю оригиналы на всякий пожарный
  28 + We are sorry - this page is not here anymore
  29 +-->
  30 + <?=\Yii::t('app','Sorry h3');?></h3>
  31 + <h4 class="text-muted">
  32 +<!-- Error 404 - Page not found-->
  33 + <?=\Yii::t('app','404 short description');?>
  34 + </h4>
28 35
29 - <p class="buttons"><a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> Go to Homepage</a> 36 + <p class="buttons"><a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i>
  37 + <?=\Yii::t('app',' Go to Homepage');?>
  38 + </a>
30 </p> 39 </p>
31 </div> 40 </div>
32 41
frontend/views/site/index.php
@@ -97,7 +97,8 @@ JS; @@ -97,7 +97,8 @@ JS;
97 <div class="style categories-home-links-wr"> 97 <div class="style categories-home-links-wr">
98 <div class="style categories-home-links-title"> 98 <div class="style categories-home-links-title">
99 <!--если есть вложенность добавить класс для а "arrow"--> 99 <!--если есть вложенность добавить класс для а "arrow"-->
100 - <a <?=(count($service->services) > 0 ? 'class="arrow"' : '')?> href="<?=Url::to(['alias' => $service->language->alias])?>"><span><?=$service->title?></span></a> 100 + <a <?=(count($service->services) > 0 ? 'class="arrow"' : '')?>
  101 + href="<?=Url::to(['alias' => $service->language->alias])?>"><span><?=$service->title?></span></a>
101 </div> 102 </div>
102 <?php if (count($service->services) > 0){?> 103 <?php if (count($service->services) > 0){?>
103 <!--если есть вложенность--> 104 <!--если есть вложенность-->
@@ -125,14 +126,20 @@ JS; @@ -125,14 +126,20 @@ JS;
125 <div class="hidden-xs col-sm-5 col-md-5 col-lg-5"></div> 126 <div class="hidden-xs col-sm-5 col-md-5 col-lg-5"></div>
126 <div class="col-sm-7 col-md-7 col-lg-7"> 127 <div class="col-sm-7 col-md-7 col-lg-7">
127 <div class="style box3-text-wr"> 128 <div class="style box3-text-wr">
  129 +<<<<<<< HEAD
128 <h1 class="box3-text-title"><?=$seo->h1?></h1> 130 <h1 class="box3-text-title"><?=$seo->h1?></h1>
  131 +=======
  132 + <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div>
  133 +>>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
129 <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp"> 134 <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp">
130 <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt=""> 135 <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt="">
131 </div> 136 </div>
132 <div class="for-hidden-mob style status-hide"> 137 <div class="for-hidden-mob style status-hide">
133 <?=$seo->text?> 138 <?=$seo->text?>
134 </div> 139 </div>
135 - <div class="show-txt-mo hide-status" data-langshow="развернуть" data-langhide="свернуть"><span><b>развернуть</b></span></div> 140 + <div class="show-txt-mo hide-status" data-langshow="развернуть" data-langhide="свернуть"><span>
  141 + <b><?=\Yii::t('app','Slide Up')?></b>
  142 + </span></div>
136 </div> 143 </div>
137 </div> 144 </div>
138 </div> 145 </div>
@@ -145,7 +152,7 @@ JS; @@ -145,7 +152,7 @@ JS;
145 <div class="container"> 152 <div class="container">
146 <div class="row"> 153 <div class="row">
147 <div class="col-xs-12"> 154 <div class="col-xs-12">
148 - <div class="title-bx4">Пакетные предолжения</div> 155 + <div class="title-bx4"><?=\Yii::t('app','Package offerings')?></div>
149 </div> 156 </div>
150 </div> 157 </div>
151 <div class="row"> 158 <div class="row">
@@ -161,7 +168,7 @@ JS; @@ -161,7 +168,7 @@ JS;
161 ->quality(84) 168 ->quality(84)
162 ->renderImage()?></div> 169 ->renderImage()?></div>
163 <p><?=$item->title?></p> 170 <p><?=$item->title?></p>
164 - <span class="btn_">Купить</span> 171 + <span class="btn_"><?=\Yii::t('app','Buy')?></span>
165 </a> 172 </a>
166 </div> 173 </div>
167 <?php }?> 174 <?php }?>
@@ -174,7 +181,8 @@ JS; @@ -174,7 +181,8 @@ JS;
174 <div class="container"> 181 <div class="container">
175 <div class="row"> 182 <div class="row">
176 <div class="col-xs-12"> 183 <div class="col-xs-12">
177 - <div class="title-bx4">Отзывы <br />наших клиентов</div> 184 + <div class="title-bx4"><?=\Yii::t('app','Callbacks')?> <br />
  185 + <?=\Yii::t('app','ours clients')?></div>
178 </div> 186 </div>
179 </div> 187 </div>
180 <div class="row slider-home sliders"> 188 <div class="row slider-home sliders">
@@ -186,7 +194,7 @@ JS; @@ -186,7 +194,7 @@ JS;
186 <?php }?> 194 <?php }?>
187 <div class="row add-comment-h-wr"> 195 <div class="row add-comment-h-wr">
188 <div class="col-xs-12 add-comment-h"> 196 <div class="col-xs-12 add-comment-h">
189 - <span class="btn_">Оставить отзыв</span> 197 + <span class="btn_"><?=\Yii::t('app','Give feedback')?></span>
190 </div> 198 </div>
191 </div> 199 </div>
192 </div> 200 </div>
frontend/views/site/login.php
@@ -13,7 +13,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -13,7 +13,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
13 <div class="site-login"> 13 <div class="site-login">
14 <h1><?= Html::encode($this->title) ?></h1> 14 <h1><?= Html::encode($this->title) ?></h1>
15 15
16 - <p>Please fill out the following fields to login:</p> 16 + <p>
  17 +<!-- Please fill out the following fields to login:-->
  18 + <?=\Yii::t('app','Login ==> fill all fields!')?></p>
17 19
18 <div class="row"> 20 <div class="row">
19 <div class="col-lg-5"> 21 <div class="col-lg-5">
@@ -26,11 +28,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -26,11 +28,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
26 <?= $form->field($model, 'rememberMe')->checkbox() ?> 28 <?= $form->field($model, 'rememberMe')->checkbox() ?>
27 29
28 <div style="color:#999;margin:1em 0"> 30 <div style="color:#999;margin:1em 0">
29 - If you forgot your password you can <?= Html::a('reset it', ['site/request-password-reset']) ?>. 31 +<!-- If you forgot your password you can-->
  32 + <?=\Yii::t('app','If u forgot pass u can')?>
  33 + <?= Html::a(\Yii::t('app','reset it'), ['site/request-password-reset']) ?>.
30 </div> 34 </div>
31 35
32 <div class="form-group"> 36 <div class="form-group">
33 - <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?> 37 + <?= Html::submitButton(\Yii::t('app','Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
34 </div> 38 </div>
35 39
36 <?php ActiveForm::end(); ?> 40 <?php ActiveForm::end(); ?>
frontend/views/site/prices.php
@@ -12,7 +12,8 @@ @@ -12,7 +12,8 @@
12 <div class="row"> 12 <div class="row">
13 <div class="col-xs-12"> 13 <div class="col-xs-12">
14 <!-- <h1 class="title-pages">Цены на услуги медицинской клиники ABClinik</h1>--> 14 <!-- <h1 class="title-pages">Цены на услуги медицинской клиники ABClinik</h1>-->
15 - <div class="title-pages">Цены на услуги медицинской клиники ABClinik</div> 15 + <div class="title-pages">
  16 + <?=\Yii::t('app','Price list description');?></div>
16 </div> 17 </div>
17 </div> 18 </div>
18 <div class="row"> 19 <div class="row">
@@ -31,7 +32,7 @@ @@ -31,7 +32,7 @@
31 <?php foreach ($service->prices as $price){?> 32 <?php foreach ($service->prices as $price){?>
32 <tr> 33 <tr>
33 <td><?=$price->title?></td> 34 <td><?=$price->title?></td>
34 - <td><?=$price->price?> <span>грн.</span></td> 35 + <td><?=$price->price?> <span><?=\Yii::t('app','Ua short valute')?>.</span></td>
35 </tr> 36 </tr>
36 <?php } ?> 37 <?php } ?>
37 </table> 38 </table>
frontend/views/site/questions.php
@@ -13,12 +13,12 @@ @@ -13,12 +13,12 @@
13 use yii\widgets\ActiveForm; 13 use yii\widgets\ActiveForm;
14 use yii\widgets\ListView; 14 use yii\widgets\ListView;
15 15
16 - $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Вопрос-ответ'); 16 + $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Quest/Answer');
17 17
18 $model = new Question(['service_id' => $service_id]); 18 $model = new Question(['service_id' => $service_id]);
19 $model->scenario = Question::SCENARIO_QUESTION; 19 $model->scenario = Question::SCENARIO_QUESTION;
20 20
21 - $data = ['' => 'Общие вопросы'] + ArrayHelper::map($services, 'id', 'title'); 21 + $data = ['' =>\Yii::t('app','General issues')] + ArrayHelper::map($services, 'id', 'title');
22 ?> 22 ?>
23 23
24 24
@@ -26,41 +26,46 @@ @@ -26,41 +26,46 @@
26 <div class="container"> 26 <div class="container">
27 <div class="row"> 27 <div class="row">
28 <div class="col-xs-12 col-sm-12"> 28 <div class="col-xs-12 col-sm-12">
29 - <h1 class="title-pages">Вопрос-Ответ</h1> 29 + <h1 class="title-pages"><?=\Yii::t('app','Quest/Answer')?></h1>
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="row"> 32 <div class="row">
33 <div class="col-xs-12 col-sm-12"> 33 <div class="col-xs-12 col-sm-12">
34 <div class="style add-answer-forms"> 34 <div class="style add-answer-forms">
35 - <span class="btn_">Задать вопрос</span> 35 + <span class="btn_"><?=\Yii::t('app','Asc question');?></span>
36 </div> 36 </div>
37 <div class="style hidden-answer-comment-form hidden"> 37 <div class="style hidden-answer-comment-form hidden">
38 - <div class="hidden-answer-comment-form-title">Задать вопрос</div> 38 + <div class="hidden-answer-comment-form-title"><?=\Yii::t('app','Asc question');?></div>
39 <?php $form = ActiveForm::begin(['id' => 'total_question_form'])?> 39 <?php $form = ActiveForm::begin(['id' => 'total_question_form'])?>
40 <div class="col-xs-12 col-sm-6"> 40 <div class="col-xs-12 col-sm-6">
41 <div class="input-wr"> 41 <div class="input-wr">
42 - <?=$form->field($model, 'service_id')->dropDownList($data)->label('Выбор отделения')?> 42 + <?=$form->field($model, 'service_id')->dropDownList($data)
  43 + ->label(\Yii::t('app','Choosing department'))?>
43 </div> 44 </div>
44 45
45 <div class="input-wr required"> 46 <div class="input-wr required">
46 - <?=$form->field($model, 'name')->label('ФИО')?> 47 + <?=$form->field($model, 'name')
  48 + ->label(\Yii::t('app','FIO'))?>
47 </div> 49 </div>
48 <div class="input-wr required"> 50 <div class="input-wr required">
49 - <?=$form->field($model, 'email')->label('Email')?> 51 + <?=$form->field($model, 'email')
  52 + ->label(\Yii::t('app','Email'))?>
50 </div> 53 </div>
51 </div> 54 </div>
52 <div class="col-xs-12 col-sm-6"> 55 <div class="col-xs-12 col-sm-6">
53 <div class="input-wr"> 56 <div class="input-wr">
54 - <?=$form->field($model, 'question')->textarea(['cols' => 30, 'rows' => 10])->label('Ваш вопрос')?> 57 + <?=$form->field($model, 'question')->textarea(['cols' => 30, 'rows' => 10])
  58 + ->label(\Yii::t('app','Yours question'))?>
55 <!-- <label class="control-label" for="feedback-name">Ваш вопрос</label>--> 59 <!-- <label class="control-label" for="feedback-name">Ваш вопрос</label>-->
56 <!-- <textarea name="" id="" cols="30" rows="10"></textarea>--> 60 <!-- <textarea name="" id="" cols="30" rows="10"></textarea>-->
57 </div> 61 </div>
58 </div> 62 </div>
59 <div class="col-xs-12 col-sm-12"> 63 <div class="col-xs-12 col-sm-12">
60 <div class="button-wr submit-close-wr-c-a"> 64 <div class="button-wr submit-close-wr-c-a">
61 - <?=Html::submitButton('Отправить вопрос')?> 65 + <?=Html::submitButton(\Yii::t('app','Send question'))?>
62 <!-- <button type="submit">Отправить вопрос</button>--> 66 <!-- <button type="submit">Отправить вопрос</button>-->
63 - <div class="submit-close-c-a submit-close-c-a-page"><span>Свернуть окно</span></div> 67 + <div class="submit-close-c-a submit-close-c-a-page">
  68 + <span><?=\Yii::t('app','Minimize a window');?></span></div>
64 </div> 69 </div>
65 </div> 70 </div>
66 <?php $form::end();?> 71 <?php $form::end();?>
@@ -68,9 +73,12 @@ @@ -68,9 +73,12 @@
68 </div> 73 </div>
69 <div class="col-xs-12 col-sm-12"> 74 <div class="col-xs-12 col-sm-12">
70 <ul class="answers-category-list"> 75 <ul class="answers-category-list">
71 - <li <?=($service_id == null ? 'class="active"' : '')?>><a href="<?=Url::current(['service_id' => null])?>"><span>Общие вопросы</span></a></li> 76 + <li <?=($service_id == null ? 'class="active"' : '')?>>
  77 + <a href="<?=Url::current(['service_id' => null])?>">
  78 + <span><?=\Yii::t('app','General issues');?></span></a></li>
72 <?php foreach ($services as $service){?> 79 <?php foreach ($services as $service){?>
73 - <li <?=($service_id == $service->id ? 'class="active"' : '')?>><a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li> 80 + <li <?=($service_id == $service->id ? 'class="active"' : '')?>>
  81 + <a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li>
74 <?php } ?> 82 <?php } ?>
75 </ul> 83 </ul>
76 </div> 84 </div>
frontend/views/site/requestPasswordResetToken.php
@@ -7,13 +7,15 @@ @@ -7,13 +7,15 @@
7 use yii\helpers\Html; 7 use yii\helpers\Html;
8 use yii\bootstrap\ActiveForm; 8 use yii\bootstrap\ActiveForm;
9 9
10 -$this->title = 'Request password reset'; 10 +$this->title = \Yii::t('app','Request password reset');
11 $this->params['breadcrumbs'][] = $this->title; 11 $this->params['breadcrumbs'][] = $this->title;
12 ?> 12 ?>
13 <div class="site-request-password-reset"> 13 <div class="site-request-password-reset">
14 <h1><?= Html::encode($this->title) ?></h1> 14 <h1><?= Html::encode($this->title) ?></h1>
15 15
16 - <p>Please fill out your email. A link to reset password will be sent there.</p> 16 + <p>
  17 +<!-- Please fill out your email. A link to reset password will be sent there.-->
  18 + <?=\Yii::t('app','RPRT short');?></p>
17 19
18 <div class="row"> 20 <div class="row">
19 <div class="col-lg-5"> 21 <div class="col-lg-5">
@@ -22,7 +24,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -22,7 +24,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
22 <?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?> 24 <?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?>
23 25
24 <div class="form-group"> 26 <div class="form-group">
25 - <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?> 27 + <?= Html::submitButton(\Yii::t('app','Send'), ['class' => 'btn btn-primary']) ?>
26 </div> 28 </div>
27 29
28 <?php ActiveForm::end(); ?> 30 <?php ActiveForm::end(); ?>
frontend/views/site/resetPassword.php
@@ -7,13 +7,13 @@ @@ -7,13 +7,13 @@
7 use yii\helpers\Html; 7 use yii\helpers\Html;
8 use yii\bootstrap\ActiveForm; 8 use yii\bootstrap\ActiveForm;
9 9
10 -$this->title = 'Reset password'; 10 +$this->title = \Yii::t('app','Reset password');
11 $this->params['breadcrumbs'][] = $this->title; 11 $this->params['breadcrumbs'][] = $this->title;
12 ?> 12 ?>
13 <div class="site-reset-password"> 13 <div class="site-reset-password">
14 <h1><?= Html::encode($this->title) ?></h1> 14 <h1><?= Html::encode($this->title) ?></h1>
15 15
16 - <p>Please choose your new password:</p> 16 + <p><?=\Yii::t('app','Please choose your new password:');?></p>
17 17
18 <div class="row"> 18 <div class="row">
19 <div class="col-lg-5"> 19 <div class="col-lg-5">
@@ -22,7 +22,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -22,7 +22,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
22 <?= $form->field($model, 'password')->passwordInput(['autofocus' => true]) ?> 22 <?= $form->field($model, 'password')->passwordInput(['autofocus' => true]) ?>
23 23
24 <div class="form-group"> 24 <div class="form-group">
25 - <?= Html::submitButton('Save', ['class' => 'btn btn-primary']) ?> 25 + <?= Html::submitButton(\Yii::t('app','Save'), ['class' => 'btn btn-primary']) ?>
26 </div> 26 </div>
27 27
28 <?php ActiveForm::end(); ?> 28 <?php ActiveForm::end(); ?>
frontend/views/site/signup.php
@@ -7,13 +7,16 @@ @@ -7,13 +7,16 @@
7 use yii\helpers\Html; 7 use yii\helpers\Html;
8 use yii\bootstrap\ActiveForm; 8 use yii\bootstrap\ActiveForm;
9 9
10 -$this->title = 'Signup'; 10 +$this->title = \Yii::t('app','Signup');
11 $this->params['breadcrumbs'][] = $this->title; 11 $this->params['breadcrumbs'][] = $this->title;
12 ?> 12 ?>
13 <div class="site-signup"> 13 <div class="site-signup">
14 <h1><?= Html::encode($this->title) ?></h1> 14 <h1><?= Html::encode($this->title) ?></h1>
15 15
16 - <p>Please fill out the following fields to signup:</p> 16 + <p>
  17 +<!-- Please fill out the following fields to signup:-->
  18 + <?=\Yii::t('app','Please fill out the following fields to signup:')?>
  19 + </p>
17 20
18 <div class="row"> 21 <div class="row">
19 <div class="col-lg-5"> 22 <div class="col-lg-5">
@@ -26,7 +29,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -26,7 +29,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
26 <?= $form->field($model, 'password')->passwordInput() ?> 29 <?= $form->field($model, 'password')->passwordInput() ?>
27 30
28 <div class="form-group"> 31 <div class="form-group">
29 - <?= Html::submitButton('Signup', ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?> 32 + <?= Html::submitButton(\Yii::t('app','Signup!'), ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
30 </div> 33 </div>
31 34
32 <?php ActiveForm::end(); ?> 35 <?php ActiveForm::end(); ?>