From b949de7153e667342f7c281d0b64fb93d4e1f1d9 Mon Sep 17 00:00:00 2001 From: dozer111 Date: Tue, 11 Dec 2018 16:49:15 +0200 Subject: [PATCH] add eng translates --- frontend/views/layouts/main.php | 9 +++++---- frontend/views/site/contact.php | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------- 2 files changed, 168 insertions(+), 165 deletions(-) diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index eb3a4e5..b378f66 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -762,8 +762,8 @@ _________________________________________________________ --> if (!empty($settings->street)) { - echo ($notEng)?$settings->street - :'m. Poznyaki, st. Sribnokilskaya'; + echo (($notEng)?$settings->street + :'m. Poznyaki, st. Sribnokilskaya'); if (!empty($settings->house)) { echo " " . $settings->house @@ -773,11 +773,12 @@ _________________________________________________________ --> echo Html::tag('br'); } if (!empty($settings->city)) { - echo ($notEng)?$settings->city:"Kyiv"; + echo (($notEng)?$settings->city:"Kyiv"); echo Html::tag('br'); } if (!empty($settings->country)) { - echo Html::tag('strong', ($notEng)?$settings->country:"Ukraine"); + echo Html::tag('strong', + (($notEng)?$settings->country:"Ukraine")); } ?>

diff --git a/frontend/views/site/contact.php b/frontend/views/site/contact.php index e1afb65..87d772d 100755 --- a/frontend/views/site/contact.php +++ b/frontend/views/site/contact.php @@ -1,230 +1,232 @@ title = \Yii::t('app', 'Контакты'); - $this->params[ 'breadcrumbs' ][] = $this->title; - - $js = <<< JS + +/** + * @var View $this + * @var Feedback $contact + */ + +use artbox\core\models\Feedback; +use common\models\Settings; +use frontend\assets\MapAsset; +use yii\helpers\Html; +use yii\bootstrap\ActiveForm; +use yii\web\View; + +MapAsset::register($this); +$settings = Settings::getInstance(); + +$this->title = \Yii::t('app', 'Контакты'); +$this->params[ 'breadcrumbs' ][] = $this->title; + +$js = <<< JS window.lat = {$settings->lat}; window.lon = {$settings->lon}; JS; - - $this->registerJs($js, View::POS_END); + +$this->registerJs($js, View::POS_END); ?>
- +
- +
- 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.

-//

Please feel free to contact us, our customer service center is working for you 24/7.

'; - ?> + 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.

+ //

Please feel free to contact us, our customer service center is working for you 24/7.

'; + ?>
- +
- +

- street )) { - $notEn = (\artbox\core\models\Language::getCurrent()->url !== 'en')?true:false; - echo "". - $notEn? - $settings->street - :'m. Poznyaki, st. Sribnokilskaya' - ; - if (!empty( $settings->house )) { - echo " " . $settings->house; - } - echo ""; - echo Html::tag('br'); - } - if (!empty( $settings->city )) { - echo "". - - $notEn?$settings->city - :'Kyiv' - .""; - if (!empty( $settings->country )) { - echo Html::tag('strong', ", " . - $notEn? + url !== 'en')?true:false; + + if (!empty( $settings->street )) { + + echo ""; + echo ($notEn)? + $settings->street + :'m. Poznyaki, st. Sribnokilskaya' + ; + if (!empty( $settings->house )) { + echo " " . $settings->house; + } + echo ""; + echo Html::tag('br'); + } + if (!empty( $settings->city )) { + echo ""; + echo + ($notEn)?$settings->city + :'Kyiv' + .""; + if (!empty( $settings->country )) { + echo Html::tag('strong', ", " . + (($notEn)? $settings->country - :'Ukraine' - .""); - } - } - ?> + :'Ukraine') + .""); + } + } + ?>

- - + +
- phone )) { - ?> -
-
- -
-

- This number is toll free if calling from Great Britain otherwise we advise you to use the electronic form of communication .

'; - ?> -

- ".$settings->phone.""), 'tel:' . $settings->phone); - echo Html::tag('div', "".$settings->phone2.""); - ?> -

+ phone )) { + ?> +
+
+
- - +

+ This number is toll free if calling from Great Britain otherwise we advise you to use the electronic form of communication .

'; + ?> +

+ ".$settings->phone.""), 'tel:' . $settings->phone); + echo Html::tag('div', "".$settings->phone2.""); + ?> +

+
+ +
- - email )) { - ?> -
- -
-
- -
-

E-mail

- Please feel free to write an email to us or to use our electronic ticketing system .

'; - ?> -
    -
  • - ".$settings->email.""), - 'mailto:' . $settings->email - ); - ?> -
    • -
+ + email )) { + ?> +
+ +
+
+
- +

E-mail

+ Please feel free to write an email to us or to use our electronic ticketing system .

'; + ?> +
    +
  • + ".$settings->email.""), + 'mailto:' . $settings->email + ); + ?> +
    • +
- + +
+
- +
- +
- +
- +

- +
- 'contact-form', - 'method' => 'POST', - 'action' => '/site/feedback', - ] - ); ?> + 'contact-form', + 'method' => 'POST', + 'action' => '/site/feedback', + ] + ); ?>
- - - + + +
- field($contact, 'name') - ->textInput() - ->label(\Yii::t('app', 'Имя')); ?> + field($contact, 'name') + ->textInput() + ->label(\Yii::t('app', 'Имя')); ?>
- +
- field($contact, 'email') - ->textInput() - ->label(\Yii::t('app','Email')); ?> + field($contact, 'email') + ->textInput() + ->label(\Yii::t('app','Email')); ?>
- field($contact, 'phone') - ->textInput() - ->label(\Yii::t('app','Телефон')); ?> + field($contact, 'phone') + ->textInput() + ->label(\Yii::t('app','Телефон')); ?>
- field($contact, 'message') - ->textarea( - [ - 'rows' => 3, - ] - ) - ->label(\Yii::t('app', 'Сообщение')); ?> + field($contact, 'message') + ->textarea( + [ + 'rows' => 3, + ] + ) + ->label(\Yii::t('app', 'Сообщение')); ?>
- +
- '.\Yii::t('app', 'Сообщение'), - [ - 'class' => 'btn btn-template-main', - ] - ) ?> - + '.\Yii::t('app', 'Сообщение'), + [ + 'class' => 'btn btn-template-main', + ] + ) ?> +
- +
- +
- - + +
-- libgit2 0.21.4