6
6
use bl \locale \receiver \ParamsLanguageReceive ;
7
7
use bl \locale \receiver \ReceiveContainer ;
8
8
use bl \locale \receiver \SessionLanguageReceive ;
9
- use bl \locale \receiver \UrlLanguageReceive ;
10
9
use bl \locale \saver \CookieLanguageSave ;
11
10
use bl \locale \saver \SaveConteiner ;
12
11
use bl \locale \saver \SessionLanguageSave ;
13
12
use yii \base \InvalidConfigException ;
14
13
use yii \base \InvalidValueException ;
15
14
use yii \di \Container ;
16
15
use yii \helpers \ArrayHelper ;
17
- use yii \web \Cookie ;
18
16
use yii \web \NotFoundHttpException ;
19
- use yii \web \UrlRule ;
20
17
use \yii \web \UrlManager as BaseUrlManager ;
21
18
22
19
/**
@@ -217,9 +214,11 @@ public function createUrl($params)
217
214
$ language = $ this ->lowerCase ? strtolower ($ language ) : $ language ;
218
215
$ language = $ this ->useShortSyntax ? preg_replace ('~(\w{2})-\w{2}~i ' , '$1 ' , $ language , 1 ) : $ language ;
219
216
217
+
218
+ $ url = substr_replace (parent ::createUrl ($ params ), !empty ($ language ) ? "/ $ language " : '' , strlen ($ this ->baseUrl ), 0 );
219
+ $ url = rtrim ($ url , '/ ' );
220
+
220
221
return $ this ->showDefault || strcasecmp ($ language , $ this ->defaultLanguage ) != 0
221
- ? substr_replace (parent ::createUrl ($ params ), !empty ($ language ) ? "/ $ language " : '' , strlen ($ this ->baseUrl ), 0 )
222
- : parent ::createUrl ($ params );
222
+ ? $ url : parent ::createUrl ($ params );
223
223
}
224
-
225
224
}
0 commit comments