fix languages urls

common/components/LangRequest.php

@@ -22,8 +22,7 @@ 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 &&
-                !Languages::getCurrent()->default)
+                strpos($this->_lang_url, Languages::getCurrent()->url) === 1)
             {
                 $this->_lang_url = substr($this->_lang_url, strlen(Languages::getCurrent()->url) + 1);
             }

common/modules/languages/widgets/views/languages.php

@@ -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->default?'/'.$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()==''?'/':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->default?'/'.$lang->url:'') . Yii::$app->getRequest()->getLangUrl()) ?></li>
+                <li><?= Html::a($lang->name, (!$lang->default?'/'.$lang->url:'') . (Yii::$app->getRequest()->getLangUrl()==''?'/':Yii::$app->getRequest()->getLangUrl())) ?></li>
             <?php endforeach;?>
         </ul>
     </nav>