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
LQDN Adminsys
don
Commits
bec07fcd
Commit
bec07fcd
authored
Dec 20, 2018
by
okhin
🚴
Browse files
Merge branch 'preprod' into 'master'
Preprod See merge request
lqdn-interne/don!95
parents
bd7ad30b
96bb4568
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/config.ini
View file @
bec07fcd
...
@@ -19,11 +19,3 @@ DEBUG=0
...
@@ -19,11 +19,3 @@ DEBUG=0
; Langue par défaut
; Langue par défaut
LANGUAGE
=
'fr'
LANGUAGE
=
'fr'
; Variables globales du site
;languages['DE']="support","de_DE","de"
;languages['IT']="sostegno","it_IT","it"
languages
['ES']
="apoyar","es_ES","es"
languages
['FR']
="soutien","fr_FR","fr"
languages
['EN']
="support","en_US","en"
app/config.php
View file @
bec07fcd
...
@@ -28,6 +28,8 @@ define("CTX_MODE", getenv('CTX_MODE'));
...
@@ -28,6 +28,8 @@ define("CTX_MODE", getenv('CTX_MODE'));
//define("CERTIFICATE","XXXXXXXXXXXXXXXXXXXXXXXXx");
//define("CERTIFICATE","XXXXXXXXXXXXXXXXXXXXXXXXx");
//define("CTX_MODE","PRODUCTION");
//define("CTX_MODE","PRODUCTION");
define
(
"LANGUAGES"
,
"fr_FR,en_US"
);
define
(
"PIPLOME_PATH"
,
getenv
(
'PIPLOME_PATH'
));
define
(
"PIPLOME_PATH"
,
getenv
(
'PIPLOME_PATH'
));
define
(
"PIPLOME_URL"
,
getenv
(
'PIPLOME_URL'
));
define
(
"PIPLOME_URL"
,
getenv
(
'PIPLOME_URL'
));
...
...
app/controller/controller.php
View file @
bec07fcd
...
@@ -22,27 +22,45 @@ class Controller
...
@@ -22,27 +22,45 @@ class Controller
}
}
define
(
"ROOTURL"
,
"https://"
.
$HTTP_HOST
.
'/'
);
define
(
"ROOTURL"
,
"https://"
.
$HTTP_HOST
.
'/'
);
// Sélection de la langue par l'url
// Sélection de la langue par header
$main
=
explode
(
'.'
,
$HTTP_HOST
)[
0
];
$lang
=
'fr_FR'
;
$lang
=
"fr_FR"
;
$lang_short
=
'fr'
;
$lang_short
=
"fr"
;
foreach
(
$f3
->
get
(
'languages'
)
as
$key
=>
$language
)
{
if
(
$f3
->
exists
(
'GET.lang'
))
{
if
(
$main
==
$language
[
0
])
{
// On force la langue passée dans l'URL GET
$lang
=
$language
[
1
];
$accept_languages
=
[
$f3
->
get
(
'GET.lang'
)];
$lang_short
=
$language
[
2
];
$f3
->
set
(
'SESSION.lang'
,
$f3
->
get
(
'GET.lang'
));
}
else
{
if
(
$f3
->
exists
(
'SESSION.lang'
))
{
// On a déjà défini une langue précédemment
$accept_languages
=
[
$f3
->
get
(
'SESSION.lang'
)];
}
else
{
// On récupère la langue du navigateur
$accept_languages
=
$f3
->
exists
(
'HEADERS.Accept-Language'
)
?
explode
(
','
,
$f3
->
get
(
'HEADERS.Accept-Language'
))
:
[];
}
}
foreach
(
explode
(
','
,
LANGUAGES
)
as
$language
)
{
foreach
(
$accept_languages
as
$accept_language
)
{
if
(
strpos
(
$language
,
$accept_language
)
>=
0
)
{
$lang
=
$language
;
$lang_short
=
explode
(
$language
,
'-'
)[
0
];
}
}
}
}
}
if
(
!
bindtextdomain
(
"messages"
,
dirname
(
__FILE__
)
.
"/../locales"
))
{
if
(
!
bindtextdomain
(
"messages"
,
"../locales/"
))
{
echo
"<!-- bondtextdomain failed -->"
;
echo
"<!-- bondtextdomain failed -->"
;
}
}
// Language ok, set the locale environment
// Language ok, set the locale environment
putenv
(
"LC_MESSAGES="
.
$lang
);
putenv
(
"LC_MESSAGES="
.
$lang
);
putenv
(
"LANG="
.
$lang
);
putenv
(
"LANG="
.
$lang
);
putenv
(
"LANGUAGE="
.
$lang
);
putenv
(
"LANGUAGE="
.
$lang
);
// this locale MUST be selected in "dpkg-reconfigure locales"
if
(
!
setlocale
(
LC_ALL
,
$lang
))
{
if
(
!
setlocale
(
LC_ALL
,
$lang
))
{
echo
"<!-- setlocale failed -->"
;
echo
"<!-- setlocale
$lang
failed -->"
;
}
}
if
(
!
textdomain
(
"messages"
))
{
if
(
!
textdomain
(
"messages"
))
{
echo
"<!-- textdomain failed -->"
;
echo
"<!-- textdomain failed -->"
;
}
}
...
...
app/view/toolbar.html
View file @
bec07fcd
...
@@ -90,8 +90,8 @@
...
@@ -90,8 +90,8 @@
<div
class=
"hidden-xs hidden-sm"
>
<div
class=
"hidden-xs hidden-sm"
>
<nav
id=
"up-bar"
class=
"navbar navbar-default dark-blue"
>
<nav
id=
"up-bar"
class=
"navbar navbar-default dark-blue"
>
<ul
class=
"nav navbar-nav navbar-right blue"
>
<ul
class=
"nav navbar-nav navbar-right blue"
>
<li><a
href=
"?lang=fr"
>
{{ _("[FR]")}}
</a></li>
<li><a
href=
"?lang=fr
_FR
"
>
{{ _("[FR]")}}
</a></li>
<li><a
href=
"?lang=en"
>
{{ _("[EN]")}}
</a></li>
<li><a
href=
"?lang=en
_US
"
>
{{ _("[EN]")}}
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right"
>
<ul
class=
"nav navbar-nav navbar-right"
>
<check
if=
"{{ array_key_exists('user', @SESSION) }}"
>
<check
if=
"{{ array_key_exists('user', @SESSION) }}"
>
...
...
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