Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Comptoir
Comptoir-srv
Commits
9093b16f
Commit
9093b16f
authored
Jun 03, 2020
by
Fabrice Gangler
🎨
Committed by
Matthieu FAURE
Jun 03, 2020
Browse files
FIX: improve for HTTP Accept-Language header not supported
Refs:
#910
parent
6e511a9e
Pipeline
#9892
failed with stage
in 4 minutes and 17 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/Controller/Api/V1/UsersController.php
View file @
9093b16f
...
...
@@ -974,7 +974,7 @@ class UsersController extends AppController
$reviewsNumber
=
count
(
$user
->
reviews
);
if
(
$reviewsNumber
===
0
)
{
$lang
=
I18n
::
locale
()
;
$lang
=
$this
->
selectedLanguage
;
$this
->
redirect
(
"
$lang
/users/
$id
"
,
301
);
}
else
{
$this
->
set
(
compact
(
'user'
));
...
...
src/Controller/AppController.php
View file @
9093b16f
...
...
@@ -183,7 +183,7 @@ class AppController extends Controller
$data
[
'title'
]
=
trim
(
filter_var
(
$linkData
[
'title'
],
FILTER_SANITIZE_STRING
));
}
if
(
isset
(
$linkData
[
'url'
]))
{
$lang
=
I18n
::
locale
()
;
$lang
=
$this
->
selectedLanguage
;
$urlPart
=
$linkData
[
'url'
];
$data
[
'url'
]
=
"/
$lang
/
$urlPart
"
;
}
...
...
@@ -195,7 +195,6 @@ class AppController extends Controller
public
function
beforeFilter
(
Event
$event
)
{
$this
->
Auth
->
allow
([
'index'
,
'logout'
,
'view'
,
'request'
,
'search'
]);
$this
->
setLocale
();
$this
->
setOpenGraph
();
parent
::
beforeFilter
(
$event
);
...
...
@@ -208,17 +207,20 @@ class AppController extends Controller
*/
protected
function
setLocale
()
{
$selectedLanguage
=
I18n
::
locale
();
if
(
$this
->
request
->
param
(
'language'
))
{
$lang
=
$this
->
request
->
param
(
'language'
);
}
else
{
$lang
=
preg_replace
(
'/_\w*/'
,
""
,
I18n
::
locale
());
}
if
(
$lang
&&
isset
(
$this
->
availableLanguages
[
$lang
]))
{
if
(
isset
(
$this
->
availableLanguages
[
$lang
]))
{
I18n
::
locale
(
$lang
);
$selectedLanguage
=
$this
->
availableLanguages
[
$lang
];
}
else
{
I18n
::
locale
(
'en'
);
$selectedLanguage
=
I18n
::
locale
();
}
$this
->
selectedLanguage
=
$selectedLanguage
;
$this
->
set
(
'selectedLanguage'
,
$selectedLanguage
);
$this
->
set
(
'availableLanguages'
,
$this
->
availableLanguages
);
...
...
src/View/Helper/ReviewHelper.php
View file @
9093b16f
...
...
@@ -129,7 +129,7 @@ class ReviewHelper extends ListItemHelper
'created'
=>
$this
->
Time
->
format
(
$review
->
created
->
toUnixString
(),
[
IntlDateFormatter
::
SHORT
,
-
1
],
I18n
::
locale
()
$selectedLanguage
),
'stars'
=>
$this
->
Rating
->
display
(
$review
->
evaluation
),
]
...
...
@@ -155,7 +155,7 @@ class ReviewHelper extends ListItemHelper
'created'
=>
$this
->
Time
->
format
(
$review
->
created
->
toUnixString
(),
[
IntlDateFormatter
::
SHORT
,
-
1
],
I18n
::
locale
()
$selectedLanguage
),
'stars'
=>
$this
->
Rating
->
display
(
$review
->
evaluation
),
]
...
...
Write
Preview
Supports
Markdown
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