backport fix #316

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.6--patch-33
   fix #316

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

diff --git a/ChangeLog b/ChangeLog
index 4ba3c53..548a31e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@ Bug/Wish :
                
 Fixes (from 0.9.6 branch) :
 
+       * Core :
+               - #316: locale was not set correctly.  dates are in french again.       -MC
+
        * Search :
                - #307: fix bad escaping in advanced search.                                            -MC
 

diff --git a/include/platal.inc.php b/include/platal.inc.php
index 59f50a5..769261a 100644 (file)
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -40,14 +40,9 @@ define("PERMS_ADMIN", "admin");
 define('SKINNED', 0);
 define('NO_SKIN', 1);
 
-// }}}
-// {{{ globals
-
 require_once('platal/env.inc.php');
-setlocale(LC_MESSAGES, $globals->core->locale);
-setlocale(LC_TIME,     $globals->core->locale);
-setlocale(LC_CTYPE,    $globals->core->locale);
 
 // }}}
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index fb298c9..9854407 100644 (file)
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -23,6 +23,7 @@ require_once('platal.inc.php');
 require_once('xnet/globals.inc.php');
 require_once('xnet/session.inc.php');
 XnetGlobals::init();
+XnetGlobals::setlocale();
 XnetSession::init();
 
 // {{{ function new_skinned_page()

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index c4a1d36..95a7bb9 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -23,6 +23,7 @@ require_once('platal.inc.php');
 require_once('xorg/globals.inc.php');
 require_once('xorg/session.inc.php');
 XorgGlobals::init();
+XorgGlobals::setlocale();
 XorgSession::init();
 
 // {{{ function _new_page()