Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
fa5cab1e
Commit
fa5cab1e
authored
Feb 11, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
9f8f0f13
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
common/components/LangRequest.php
common/components/LangRequest.php
+2
-1
common/components/UrlManager.php
common/components/UrlManager.php
+2
-2
common/modules/languages/widgets/views/languages.php
common/modules/languages/widgets/views/languages.php
+2
-2
No files found.
common/components/LangRequest.php
View file @
fa5cab1e
...
@@ -22,7 +22,8 @@ class LangRequest extends Request
...
@@ -22,7 +22,8 @@ class LangRequest extends Request
Languages
::
setCurrent
(
$lang_url
);
Languages
::
setCurrent
(
$lang_url
);
if
(
$lang_url
!==
null
&&
$lang_url
===
Languages
::
getCurrent
()
->
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
);
$this
->
_lang_url
=
substr
(
$this
->
_lang_url
,
strlen
(
Languages
::
getCurrent
()
->
url
)
+
1
);
}
}
...
...
common/components/UrlManager.php
View file @
fa5cab1e
...
@@ -47,7 +47,7 @@ class UrlManager extends \yii\web\UrlManager {
...
@@ -47,7 +47,7 @@ class UrlManager extends \yii\web\UrlManager {
//Добавляем к URL префикс - буквенный идентификатор языка
//Добавляем к URL префикс - буквенный идентификатор языка
if
(
$url
==
'/'
)
if
(
$url
==
'/'
)
{
{
return
'/'
.
$lang
->
url
;
return
'/'
.
(
!
$lang
->
default
?
$lang
->
url
:
''
)
;
}
}
// Делаем универсальный URL без языка для Eauth авторизации
// Делаем универсальный URL без языка для Eauth авторизации
elseif
(
strpos
(
$url
,
'/eauth'
)
!==
false
)
{
elseif
(
strpos
(
$url
,
'/eauth'
)
!==
false
)
{
...
@@ -55,7 +55,7 @@ class UrlManager extends \yii\web\UrlManager {
...
@@ -55,7 +55,7 @@ class UrlManager extends \yii\web\UrlManager {
}
}
else
else
{
{
return
'/'
.
$lang
->
url
.
$url
;
return
(
!
$lang
->
default
?
'/'
.
$lang
->
url
:
''
)
.
$url
;
}
}
}
}
}
}
common/modules/languages/widgets/views/languages.php
View file @
fa5cab1e
...
@@ -6,14 +6,14 @@ use yii\helpers\Html;
...
@@ -6,14 +6,14 @@ use yii\helpers\Html;
<div
class=
"lang_check"
>
<div
class=
"lang_check"
>
<?=
Html
::
a
(
'<i class="icon-arrowDown"></i>'
.
$current
->
name
,
'#'
,
[
'class'
=>
'd_menu'
])
?>
<?=
Html
::
a
(
'<i class="icon-arrowDown"></i>'
.
$current
->
name
,
'#'
,
[
'class'
=>
'd_menu'
])
?>
<?php
foreach
(
$langs
as
$i
=>
$lang
)
:
?>
<?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
;
?>
<?php
endforeach
;
?>
</div>
</div>
<?php
else
:
?>
<?php
else
:
?>
<nav
class=
"top_nav clearfix"
>
<nav
class=
"top_nav clearfix"
>
<ul>
<ul>
<?php
foreach
(
$langs
as
$lang
)
:
?>
<?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
;
?>
<?php
endforeach
;
?>
</ul>
</ul>
</nav>
</nav>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment