From 8073c1749e7133ee4889e2492000e59c887d06ab Mon Sep 17 00:00:00 2001
From: Okhin <okhin@okhin.fr>
Date: Mon, 26 Nov 2018 19:15:31 +0100
Subject: [PATCH] =?UTF-8?q?Bricolage=20=20de=20la=20d=C3=A9tection=20de=20?=
=?UTF-8?q?langue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/config.ini | 6 +-----
app/controller/controller.php | 22 ++++++++++++++--------
app/view/toolbar.html | 4 ++--
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/app/config.ini b/app/config.ini
index 9bb1850..a263fb7 100644
--- a/app/config.ini
+++ b/app/config.ini
@@ -21,9 +21,5 @@ DEBUG=0
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"
+languages=["fr-FR", "en-US"]
diff --git a/app/controller/controller.php b/app/controller/controller.php
index 289b4e1..73cdbad 100644
--- a/app/controller/controller.php
+++ b/app/controller/controller.php
@@ -22,16 +22,22 @@ class Controller
}
define("ROOTURL", "https://".$HTTP_HOST.'/');
- // Sélection de la langue par l'url
- $main = explode('.', $HTTP_HOST)[0];
- $lang = "fr_FR";
- $lang_short = "fr";
- foreach ($f3->get('languages') as $key => $language) {
- if ($main==$language[0]) {
- $lang = $language[1];
- $lang_short = $language[2];
+ // Sélection de la langue par header
+ $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) {
+ foreach ($accept_languages as $accept_language) {
+ if (substr($language, $accept_language) > 0) {
+ $lang = $language;
+ $lang_short = explode($language, '-')[0];
+ }
}
}
+ */
if (!bindtextdomain("messages", dirname(__FILE__)."/../locales")) {
echo "<!-- bondtextdomain failed -->";
}
diff --git a/app/view/toolbar.html b/app/view/toolbar.html
index ba179bd..875bfdf 100644
--- a/app/view/toolbar.html
+++ b/app/view/toolbar.html
@@ -154,7 +154,7 @@
</nav>
</div>
<section id="messages">
- <message messages="@SESSION.message" class="alert alert-default">
- <message messages="@SESSION.error" class="alert alert-danger">
+ <message messages="{{ @SESSION.message }}" class="alert alert-default">
+ <message messages="{{ @SESSION.error }}" class="alert alert-danger">
</section>
--
GitLab