diff --git a/app/config.ini b/app/config.ini index 9bb1850433a52bdeba30e3330712dc31f5cfd3e6..a263fb700a024ebfc5d46b1a3d3c9057f292d87f 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 289b4e176cbf8991c73b48a3e3177376ebf35a7f..73cdbad6976b78bec798f41ed32eef70632807c9 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 ba179bde14704ec55de3d78ee38b9b142cac4839..875bfdf1c1d4dede92aec377348ae96592045ada 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>