Commit 4df5348f962ab9c388593d7b01e2126b4fa73855
1 parent
e37bf1d4
Поредактировал формы, сообщения при корректном/некорректном заполнении , вывод дат formatter-а
Showing
4 changed files
with
36 additions
and
28 deletions
Show diff stats
common/messages/en/app.php
@@ -14,22 +14,23 @@ return [ | @@ -14,22 +14,23 @@ return [ | ||
14 | 'Gallery' =>'Gallery', | 14 | 'Gallery' =>'Gallery', |
15 | 'Go to contact page' => 'Go to contact page', | 15 | 'Go to contact page' => 'Go to contact page', |
16 | 'Our clients' =>'Our clients', | 16 | 'Our clients' =>'Our clients', |
17 | - 'No results found' =>'No results found', | ||
18 | - 'Home' =>'Home', | ||
19 | - 'Search' =>'Search', | ||
20 | - 'Search by tag' => 'Search by tag', | ||
21 | - "Search by article" => 'Search by article', | ||
22 | - 'Send' => 'Send', | ||
23 | - 'Send message' => 'Send message', | ||
24 | - 'Events' => 'Events', | ||
25 | - 'You question' => 'You question', | ||
26 | - 'News' => 'News', | ||
27 | - 'Media' => 'Media', | ||
28 | - 'More' => 'More', | ||
29 | - 'Form sends success' => 'Form sends success', | ||
30 | - 'Message' => 'Message', | ||
31 | - 'Name' => 'Name', | ||
32 | - 'Phone' => 'Phone', | 17 | + 'No results found' =>'No results found', |
18 | + 'Home' =>'Home', | ||
19 | + 'Search' =>'Search', | ||
20 | + 'Search by tag' => 'Search by tag', | ||
21 | + "Search by article" => 'Search by article', | ||
22 | + 'Send' => 'Send', | ||
23 | + 'Send message' => 'Send message', | ||
24 | + 'Events' => 'Events', | ||
25 | + 'You question' => 'You question', | ||
26 | + 'News' => 'News', | ||
27 | + 'Media' => 'Media', | ||
28 | + 'More' => 'More', | ||
29 | + 'Form sends success' => 'Form sends success', | ||
30 | + #'Message' => 'Message', | ||
31 | + 'Message' => 'Messag as dflkasd;fk asp dok', | ||
32 | + 'Name' => 'Name', | ||
33 | + 'Phone' => 'Phone', | ||
33 | 'Form sends success Header' => 'Success', | 34 | 'Form sends success Header' => 'Success', |
34 | 'Empty field' => 'This field is required.Please fill it', | 35 | 'Empty field' => 'This field is required.Please fill it', |
35 | 'Wrong email' => 'Field Email is not valid', | 36 | 'Wrong email' => 'Field Email is not valid', |
@@ -37,6 +38,6 @@ return [ | @@ -37,6 +38,6 @@ return [ | ||
37 | 'Without category' =>'Without category', | 38 | 'Without category' =>'Without category', |
38 | 'Our advantages' => 'Our advantages', | 39 | 'Our advantages' => 'Our advantages', |
39 | 'Читать далее' => 'Read more', | 40 | 'Читать далее' => 'Read more', |
40 | - | 41 | + 'Send Message' => 'tes st s', |
41 | 42 | ||
42 | ]; | 43 | ]; |
43 | \ No newline at end of file | 44 | \ No newline at end of file |
common/messages/en/core.php
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | return [ | 3 | return [ |
4 | - 'name'=>'Name', | ||
5 | - 'email'=>'Email', | ||
6 | - 'phone'=>'Phone', | ||
7 | - 'message'=>'Message', | ||
8 | - | 4 | + 'name' =>'Name', |
5 | + 'email' =>'Email', | ||
6 | + 'phone' =>'Phone', | ||
7 | + 'message' =>'Message', | ||
8 | + 'Message' => 'forntrend message', | ||
9 | ]; | 9 | ]; |
10 | \ No newline at end of file | 10 | \ No newline at end of file |
common/messages/ru/app.php
@@ -14,7 +14,7 @@ return [ | @@ -14,7 +14,7 @@ return [ | ||
14 | 'Media' => 'Медиа', | 14 | 'Media' => 'Медиа', |
15 | 'More' => 'Подробнее', | 15 | 'More' => 'Подробнее', |
16 | 'Company Blog' => 'Блог компании', | 16 | 'Company Blog' => 'Блог компании', |
17 | - 'Message' => 'Сообщения', | 17 | + |
18 | 'Name' => 'Имя', | 18 | 'Name' => 'Имя', |
19 | 'Phone' => 'Телефон', | 19 | 'Phone' => 'Телефон', |
20 | 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', | 20 | 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', |
@@ -35,6 +35,7 @@ return [ | @@ -35,6 +35,7 @@ return [ | ||
35 | 'Search by tag' => 'Поиск по тегам', | 35 | 'Search by tag' => 'Поиск по тегам', |
36 | "Search by article" => 'Поиск по статьям', | 36 | "Search by article" => 'Поиск по статьям', |
37 | 'Wrong email' => 'Поле Email не валидное', | 37 | 'Wrong email' => 'Поле Email не валидное', |
38 | + 'Message' => 'Сообщение', | ||
38 | 39 | ||
39 | 40 | ||
40 | ]; | 41 | ]; |
41 | \ No newline at end of file | 42 | \ No newline at end of file |
frontend/config/main.php
@@ -2,6 +2,8 @@ | @@ -2,6 +2,8 @@ | ||
2 | use artbox\core\components\SeoComponent; | 2 | use artbox\core\components\SeoComponent; |
3 | use frontend\components\UrlManager; | 3 | use frontend\components\UrlManager; |
4 | 4 | ||
5 | + $a = \Yii::t('app', 'Message'); | ||
6 | + | ||
5 | $params = array_merge( | 7 | $params = array_merge( |
6 | require( __DIR__ . '/../../common/config/params.php' ), | 8 | require( __DIR__ . '/../../common/config/params.php' ), |
7 | require( __DIR__ . '/../../common/config/params-local.php' ), | 9 | require( __DIR__ . '/../../common/config/params-local.php' ), |
@@ -12,14 +14,18 @@ | @@ -12,14 +14,18 @@ | ||
12 | 'id' => 'app-frontend', | 14 | 'id' => 'app-frontend', |
13 | 'homeUrl' => '/', | 15 | 'homeUrl' => '/', |
14 | 'basePath' => dirname(__DIR__), | 16 | 'basePath' => dirname(__DIR__), |
15 | - 'bootstrap' => [ 'log' ], | 17 | + 'bootstrap' => [ |
18 | + 'log', | ||
19 | + 'i18n', | ||
20 | + 'contact', | ||
21 | + ], | ||
16 | 'controllerNamespace' => 'frontend\controllers', | 22 | 'controllerNamespace' => 'frontend\controllers', |
17 | - 'container' => [ | 23 | + 'container' => [ |
18 | 'singletons' => [ | 24 | 'singletons' => [ |
19 | 'artbox\core\services\Languages' =>'artbox\core\services\Languages', | 25 | 'artbox\core\services\Languages' =>'artbox\core\services\Languages', |
20 | ] | 26 | ] |
21 | ], | 27 | ], |
22 | - | 28 | + |
23 | 'components' => [ | 29 | 'components' => [ |
24 | 'request' => [ | 30 | 'request' => [ |
25 | 'csrfParam' => '_csrf-frontend', | 31 | 'csrfParam' => '_csrf-frontend', |
@@ -111,7 +117,7 @@ | @@ -111,7 +117,7 @@ | ||
111 | 'options' => [], | 117 | 'options' => [], |
112 | ], | 118 | ], |
113 | ], | 119 | ], |
114 | - 'buttonContent' => \Yii::t('app','Send'), | 120 | + 'buttonContent' => \Yii::t('app', 'Send'), |
115 | 'scenario' => 'feedback', | 121 | 'scenario' => 'feedback', |
116 | 'sendEmail' => false, | 122 | 'sendEmail' => false, |
117 | 'formId' => 'feedback-form', | 123 | 'formId' => 'feedback-form', |
@@ -177,7 +183,7 @@ | @@ -177,7 +183,7 @@ | ||
177 | 'buttonOptions' => [ | 183 | 'buttonOptions' => [ |
178 | 'class' => 'btn btn-template-main', | 184 | 'class' => 'btn btn-template-main', |
179 | ], | 185 | ], |
180 | - 'buttonContent' => '<i class="fa fa-envelope-o"></i>' . \Yii::t('app', 'Message'), | 186 | + 'buttonContent' => '<i class="fa fa-envelope-o"></i>' . \Yii::t('app', 'Send Message'), |
181 | 'sendEmail' => false, | 187 | 'sendEmail' => false, |
182 | 'ajax' => true, | 188 | 'ajax' => true, |
183 | 'formId' => 'contact-form', | 189 | 'formId' => 'contact-form', |