Merge remote-tracking branch 'origin/master'

Anastasia
2 parents 4aa38690 e38df1a5
Showing 9 changed files with 38 additions and 36 deletions Show diff stats
common/messages/en/app.php
common/messages/ru/app.php
common/messages/ua/app.php
frontend/views/blog/_article.php
frontend/views/blog/index.php
frontend/views/event/_event.php
frontend/views/event/index.php
frontend/views/site/contact.php
frontend/views/site/index.php
 <?php
 return [
-    'Читать далее' => 'Read more'
+    'Читать далее' => 'Read more',
+    'blog-txt' => 'We collect useful materials on household appliances and electronics',
+
+
+
+
+
 ];
 \ No newline at end of file
@@ -16,5 +16,13 @@ return [
     'Contact form' => "Форма для связи",
     'News' => 'Новости',
     'Media' => 'Медиа',
-    'More' => 'Подробнее'
+    'More' => 'Подробнее',
+    'Company Blog' => 'Блог компании',
+    'Categories' => 'Категории',
+    'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники',
+    'Search by tag' => 'Поиск по тегам',
+    'Continue reading' => 'Продолжить чтение',
+    'Address' => 'Адрес',
+    'phone' => 'Телефон',
+    'Our advantages' => 'Наши преимущества',
 ];
 \ No newline at end of file
@@ -17,6 +17,14 @@ return [
     "Contact form" => 'Форма для зв\'язку',
     'News' => 'Новини',
     'Media' => 'Медіа',
-    'More' => 'Докладніше'
-    
+    'More' => 'Докладніше',
+    'Company Blog' => 'Блог компанії',
+    'Categories' => 'Категорії',
+    'blog-txt' => 'Ми збираємо корисні матеріали з тематики побутової техніки та електроніки',
+    'Search by tag' => 'Пошук по тегам',
+    'Continue reading' => 'Продовжити читання',
+    'Address' => 'Адреса',
+    'phone' => 'телефон',
+    'Our advantages' => 'Наші переваги',
+
 ];
 \ No newline at end of file
@@ -65,7 +65,7 @@
       <p class="intro"><?= $model->body_preview; ?></p>
       <p class="read-more">
           <?= Html::a(
-              'Продолжить чтение',
+              \Yii::t('app', 'Continue reading'),
               [
                   '', 'alias' => $model->alias
               ],
@@ -61,12 +61,12 @@ _________________________________________________________ --&gt;
         <div class="panel panel-default sidebar-menu">
  
           <div class="panel-heading">
-            <h3 class="panel-title">Блог компании</h3>
+            <h3 class="panel-title"><?=\Yii::t('app', 'Company Blog')?></h3>
           </div>
  
           <div class="panel-body text-widget">
             <p>
-              Мы собираем полезные материалы по тематике бытовой техники и электроники
+                <?=\Yii::t('app', 'blog-txt')?>
             </p>
  
           </div>
@@ -77,7 +77,7 @@ _________________________________________________________ --&gt;
               <div class="panel panel-default sidebar-menu">
  
                   <div class="panel-heading">
-                      <h3 class="panel-title">Категории</h3>
+                      <h3 class="panel-title"><?=\Yii::t('app', 'Categories')?></h3>
                   </div>
  
                   <div class="panel-body text-widget">
@@ -103,7 +103,7 @@ _________________________________________________________ --&gt;
                 ?>
                 <div class="panel sidebar-menu">
                     <div class="panel-heading">
-                        <h3 class="panel-title">Поиск по тегам</h3>
+                        <h3 class="panel-title"><?=\Yii::t('app', 'Search by tag')?></h3>
                     </div>
  
                     <div class="panel-body">
@@ -65,7 +65,7 @@
       <p class="intro"><?= $model->body_preview; ?></p>
       <p class="read-more">
           <?= Html::a(
-              'Продолжить чтение',
+              \Yii::t('app', 'Continue reading'),
               [
                   '', 'alias' => $model->alias
               ],
@@ -53,7 +53,7 @@ _________________________________________________________ --&gt;
                 ?>
                 <div class="panel sidebar-menu">
                     <div class="panel-heading">
-                        <h3 class="panel-title"><?=\Yii::t('app', 'Поиск по тегам')?></h3>
+                        <h3 class="panel-title"><?=\Yii::t('app', 'Search by tag')?></h3>
                     </div>
  
                     <div class="panel-body">
@@ -29,24 +29,6 @@ JS;
  
 <div id="content">
     <div class="container" id="contact">
-        
-        <section>
-            
-            <div class="row">
-                <div class="col-md-12">
-                    <section>
-                        <div class="heading">
-                            <h2>We are here to help you</h2>
-                        </div>
-                        
-                        <p class="lead">Are you curious about something? Do you have some kind of problem with our products? As am hastily invited settled at limited civilly fortune me. Really spring in extent an by. Judge but built gay party world. Of so am
-                            he remember although required. Bachelor unpacked be advanced at. Confined in declared marianne is vicinity.</p>
-                        <p>Please feel free to contact us, our customer service center is working for you 24/7.</p>
-                    </section>
-                </div>
-            </div>
-        
-        </section>
         <section>
  
             <div class="row">
@@ -55,7 +37,7 @@ JS;
                         <div class="icon">
                             <i class="fa fa-map-marker"></i>
                         </div>
-                        <h3>Address</h3>
+                        <h3><?=\Yii::t('app', 'Address')?></h3>
                         <p>
                             <?php
                                 if (!empty( $settings->address )) {
@@ -76,9 +58,8 @@ JS;
                                 <div class="icon">
                                     <i class="fa fa-phone"></i>
                                 </div>
-                                <h3> Call center </h3>
-                                <p class="text-muted"> This number is toll free if calling from Great Britain otherwise we advise you to use the electronic form of communication .</p>
-                                <p>
+                                <h3><?=\Yii::t('app', 'phone')?></h3>
+                               <p>
                                     <?php
                                         echo Html::a(Html::tag('strong', $settings->phone), 'tel:' . $settings->phone);
                                     ?>
@@ -99,8 +80,7 @@ JS;
                                 <div class="icon">
                                     <i class="fa fa-envelope"></i>
                                 </div>
-                                <h3> Electronic support </h3>
-                                <p class="text-muted"> Please feel free to write an email to us or to use our electronic ticketing system .</p>
+                                <h3>e-mail</h3>
                                 <ul class="list-style-none">
                                     <li>
                                         <?php
@@ -60,7 +60,7 @@ _________________________________________________________ --&gt;
   <div class="container">
     <div class="col-md-12">
       <div class="heading text-center">
-        <h2>Our main focus</h2>
+        <h2><?=\Yii::t('app', 'Our advantages')?></h2>
       </div>
  
       <div class="row">