Module: nagvis Branch: master Commit: 48b482f1ac5650a826208a46cb4c45c7ef12ca9c URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=48b482f1ac5650a826208a46cb4c45c7ef12ca9c
Author: Lars Michelsen <[email protected]> Date: Thu Oct 22 19:16:47 2009 +0200 #11 some small improvements, comments --- share/server/core/classes/GlobalLanguage.php | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/share/server/core/classes/GlobalLanguage.php b/share/server/core/classes/GlobalLanguage.php index 74c9471..a4604e7 100644 --- a/share/server/core/classes/GlobalLanguage.php +++ b/share/server/core/classes/GlobalLanguage.php @@ -68,7 +68,7 @@ class GlobalLanguage { $this->checkGettextSupport(); // Check if choosen language is available - $this->checkLanguageAvailable($this->sCurrentLanguage); + $this->checkLanguageAvailable($this->sCurrentLanguage, true, true); // Set the language to use putenv('LANG='.$this->sCurrentLanguage); @@ -109,7 +109,7 @@ class GlobalLanguage { $sReturn = $this->getUserLanguage(); // Save language to session when user set one - if($sReturn != '') { + if($sReturn != '' && $sReturn != $this->SHANDLER->get('userLanguage')) { $this->SHANDLER->set('userLanguage', $sReturn); } break; @@ -216,16 +216,20 @@ class GlobalLanguage { /** * Checks if the choosen language is available * - * @return Boolean - * @author Lars Michelsen <[email protected]> + * @param String Language definition string + * @param Boolean Print error message or not + * @param Boolean Check language_available config or not + * @return Boolean + * @author Lars Michelsen <[email protected]> */ - private function checkLanguageAvailable($sLang, $printErr=1) { + private function checkLanguageAvailable($sLang, $printErr = 1, $ignoreConf = false) { $CORE = new GlobalCore($this->MAINCFG, $this); // Checks two things: // a) The language availabilty in the filesyste, // b) Listed language in global/language_available config option - if(in_array($sLang, $CORE->getAvailableLanguages()) && in_array($sLang, $this->MAINCFG->getValue('global', 'language_available'))) { + + if(in_array($sLang, $CORE->getAvailableLanguages())) { return TRUE; } else { if($printErr) { ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
