fix

parent 9f8f0f13
......@@ -22,7 +22,8 @@ class LangRequest extends Request
Languages::setCurrent($lang_url);
if( $lang_url !== null && $lang_url === Languages::getCurrent()->url &&
strpos($this->_lang_url, Languages::getCurrent()->url) === 1 )
strpos($this->_lang_url, Languages::getCurrent()->url) === 1 &&
!Languages::getCurrent()->default)
{
$this->_lang_url = substr($this->_lang_url, strlen(Languages::getCurrent()->url) + 1);
}
......
......@@ -47,7 +47,7 @@ class UrlManager extends \yii\web\UrlManager {
//Добавляем к URL префикс - буквенный идентификатор языка
if($url == '/')
{
return '/' . $lang->url;
return '/' . (!$lang->default?$lang->url:'');
}
// Делаем универсальный URL без языка для Eauth авторизации
elseif (strpos($url, '/eauth') !== false) {
......@@ -55,7 +55,7 @@ class UrlManager extends \yii\web\UrlManager {
}
else
{
return '/' . $lang->url . $url;
return (!$lang->default?'/'.$lang->url:'') . $url;
}
}
}
......@@ -6,14 +6,14 @@ use yii\helpers\Html;
<div class="lang_check">
<?= Html::a('<i class="icon-arrowDown"></i>' . $current->name, '#', ['class' => 'd_menu']) ?>
<?php foreach ($langs as $i => $lang): ?>
<?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl(), ['class' => 'd_menu_hide']) ?>
<?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, (!$lang->default?'/'.$lang->url:'') . Yii::$app->getRequest()->getLangUrl(), ['class' => 'd_menu_hide']) ?>
<?php endforeach;?>
</div>
<?php else : ?>
<nav class="top_nav clearfix">
<ul>
<?php foreach ($langs as $lang):?>
<li><?= Html::a($lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl()) ?></li>
<li><?= Html::a($lang->name, (!$lang->default?'/'.$lang->url:'') . Yii::$app->getRequest()->getLangUrl()) ?></li>
<?php endforeach;?>
</ul>
</nav>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment