From: x2000habouzit Date: Fri, 1 Oct 2004 13:33:18 +0000 (+0000) Subject: we don't want a i10n site, it's only a cool way to allow other schools to have anony... X-Git-Tag: xorg/old~1463 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a48d03ed10c6949ebb22f47f0cc06398cea2575e;p=platal.git we don't want a i10n site, it's only a cool way to allow other schools to have anony,ised sites ... --- diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php index 9113236..78fa25f 100644 --- a/include/xorg.page.inc.php +++ b/include/xorg.page.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: xorg.page.inc.php,v 1.43 2004-09-24 14:47:43 x2000habouzit Exp $ + $Id: xorg.page.inc.php,v 1.44 2004-10-01 13:33:18 x2000habouzit Exp $ ***************************************************************************/ require("diogenes.core.page.inc.php"); @@ -114,20 +114,7 @@ class XorgPage extends DiogenesCorePage { } function setLang($lang=null) { - global $globals; - if(empty($lang)) { - if(!empty($_COOKIE['lang'])) { - $locale = $_COOKIE['lang']; - } else { - list($locale,) = explode(',', $_SERVER["HTTP_ACCEPT_LANGUAGE"]); - $locale = strtolower(trim($locale)); - $locale = strtr($locale,'-','_'); - $locale = preg_replace('!_(.*)!e', "'_'.strtoupper('\\1')",$locale); - setcookie('lang',$locale,(time()+25920000),'/','',0); - } - } else { - $locale = $lang; - } + $locale = empty($lang) ? 'fr_FR' : '$lang'; setlocale(LC_MESSAGES, $locale); setlocale(LC_TIME, $locale); $this->compile_id = $locale;