make locale a conf, since fr_FR is not generated here (only fr_FR@euro).

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-185

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index b13acf0..0d78f58 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -40,9 +40,6 @@ define("PERMS_ADMIN", "admin");
 define('SKINNED', 0);
 define('NO_SKIN', 1);
 
-setlocale(LC_MESSAGES, 'fr_FR');
-setlocale(LC_TIME, 'fr_FR');
-
 // }}}
 // {{{ globals + session init
 
@@ -52,6 +49,9 @@ require_once('xorg/session.inc.php');
 XorgGlobals::init();
 XorgSession::init();
 
+setlocale(LC_MESSAGES, $globals->core->locale);
+setlocale(LC_TIME,     $globals->core->locale);
+
 // }}}
 // {{{ fix magic quotes