Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
don
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
25
Issues
25
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
LQDN Adminsys
don
Commits
4862f1be
Commit
4862f1be
authored
Dec 17, 2018
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Translatiosn are now fixed
parent
b7071163
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
16 deletions
+28
-16
app/config.ini
app/config.ini
+0
-4
app/config.php
app/config.php
+2
-0
app/controller/controller.php
app/controller/controller.php
+24
-10
app/view/toolbar.html
app/view/toolbar.html
+2
-2
No files found.
app/config.ini
View file @
4862f1be
...
...
@@ -19,7 +19,3 @@ DEBUG=0
; Langue par défaut
LANGUAGE
=
'fr'
; Variables globales du site
languages
=
["fr-FR", "en-US"]
app/config.php
View file @
4862f1be
...
...
@@ -28,6 +28,8 @@ define("CTX_MODE", getenv('CTX_MODE'));
//define("CERTIFICATE","XXXXXXXXXXXXXXXXXXXXXXXXx");
//define("CTX_MODE","PRODUCTION");
define
(
"LANGUAGES"
,
[
"fr_FR"
,
"en_US"
]);
define
(
"PIPLOME_PATH"
,
getenv
(
'PIPLOME_PATH'
));
define
(
"PIPLOME_URL"
,
getenv
(
'PIPLOME_URL'
));
...
...
app/controller/controller.php
View file @
4862f1be
...
...
@@ -23,32 +23,46 @@ class Controller
define
(
"ROOTURL"
,
"https://"
.
$HTTP_HOST
.
'/'
);
// Sélection de la langue par header
$lang
=
'fr
-
FR'
;
$lang
=
'fr
_
FR'
;
$lang_short
=
'fr'
;
var_dump
(
$f3
->
get
(
'HEADERS'
));
/*$accept_languages = $f3->exists('HEADERS.Accept-Language') ? $f3->get('HEADERS.Accept-Language').split[','] : [];
//$accept_languages[] = $f3->exists('GET.lang') ? $f3->get('GET.lang') : 'C' ;
foreach ($f3->get('languages') as $language) {
if
(
$f3
->
exists
(
'GET.lang'
))
{
// On force la langue passée dans l'URL GET
$accept_languages
=
[
$f3
->
get
(
'GET.lang'
)];
$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
(
LANGUAGES
as
$language
)
{
foreach
(
$accept_languages
as
$accept_language
)
{
if (s
ubstr($language, $accept_language) >
0) {
if
(
s
trpos
(
$language
,
$accept_language
)
>=
0
)
{
$lang
=
$language
;
$lang_short
=
explode
(
$language
,
'-'
)[
0
];
}
}
}
*/
if
(
!
bindtextdomain
(
"messages"
,
dirname
(
__FILE__
)
.
"/../locales"
))
{
var_dump
(
$lang
);
if
(
!
bindtextdomain
(
"messages"
,
"../locales/"
))
{
var_dump
(
bindtextdomain
(
"messages"
,
"../locales/"
));
echo
"<!-- bondtextdomain failed -->"
;
}
// Language ok, set the locale environment
putenv
(
"LC_MESSAGES="
.
$lang
);
putenv
(
"LANG="
.
$lang
);
putenv
(
"LANGUAGE="
.
$lang
);
// this locale MUST be selected in "dpkg-reconfigure locales"
if
(
!
setlocale
(
LC_ALL
,
$lang
))
{
echo
"<!-- setlocale failed -->"
;
echo
"<!-- setlocale
$lang
failed -->"
;
}
if
(
!
textdomain
(
"messages"
))
{
echo
"<!-- textdomain failed -->"
;
}
...
...
app/view/toolbar.html
View file @
4862f1be
...
...
@@ -90,8 +90,8 @@
<div
class=
"hidden-xs hidden-sm"
>
<nav
id=
"up-bar"
class=
"navbar navbar-default dark-blue"
>
<ul
class=
"nav navbar-nav navbar-right blue"
>
<li><a
href=
"?lang=fr"
>
{{ _("[FR]")}}
</a></li>
<li><a
href=
"?lang=en"
>
{{ _("[EN]")}}
</a></li>
<li><a
href=
"?lang=fr
_FR
"
>
{{ _("[FR]")}}
</a></li>
<li><a
href=
"?lang=en
_US
"
>
{{ _("[EN]")}}
</a></li>
</ul>
<ul
class=
"nav navbar-nav navbar-right"
>
<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