From 95ce2259b5e38187b88df0034553cf3c4aaad5ee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 30 Mar 2011 15:52:27 +0000 Subject: [PATCH] Fix: Fix autodetect language for greek. --- htdocs/core/class/translate.class.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index cba2520761e..431fee414b4 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -96,26 +96,22 @@ class Translate { $codetouse=$langlist[0]; } else $codetouse=$srclang; - // We redefine $srclang $langpart=explode("_",$codetouse); //print "Short before _ : ".$langpart[0].'/ Short after _ : '.$langpart[1].'
'; - if (isset($langpart[1])) // If its a long code xx_YY + // Array to convert short lang code into other long code. + $longforshort=array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'nb'=>'nb_NO', 'no'=>'nb_NO'); + if (isset($langpart[1])) // If it's for a codetouse that is a long code xx_YY { - // Array to convert short lang code into other long code. - $longforshort=array('ar'=>'ar_SA'); if (isset($longforshort[strtolower($langpart[0])])) $srclang=$longforshort[strtolower($langpart[0])]; else { $srclang=strtolower($langpart[0])."_".strtoupper($langpart[1]); - // Array to convert long lang code into other long code. $longforlong=array('no_nb'=>'nb_NO'); if (isset($longforlong[strtolower($srclang)])) $srclang=$longforlong[strtolower($srclang)]; } } - else { // If its a short code xx - // Array to convert short lang code into long code. - $longforshort=array('en'=>'en_US', 'ca'=>'ca_ES', 'nb'=>'nb_NO', 'no'=>'nb_NO'); + else { // If it's for a codetouse that is a short code xx if (isset($longforshort[strtolower($langpart[0])])) $srclang=$longforshort[strtolower($langpart[0])]; else $srclang=strtolower($langpart[0])."_".strtoupper($langpart[0]); }