From: Pierre Habouzit (MadCoder <pierre.habouzit@m4x.org>
Date: Thu, 30 Dec 2004 07:09:34 +0000 (+0000)
Subject: make locale a conf, since fr_FR is not generated here (only fr_FR@euro).
X-Git-Tag: xorg/old~563
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=bbc6b86801a6f3da39835eb6b6323468ff20e09e;p=platal.git

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
--- 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