composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Trac #209 (default_language setting not used properly)

Browse Source 
SVN:trunk[655]
This commit is contained in:
Denis Flaven
2010-08-04 19:55:11 +00:00
parent b0b3330c13
commit 2df7884289
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/dict.class.inc.php
View File

@@ -59,7 +59,7 @@ class Dict
{ {
protected static $m_iErrorMode = DICT_ERR_STRING; protected static $m_iErrorMode = DICT_ERR_STRING;
protected static $m_sDefaultLanguage = 'EN US'; protected static $m_sDefaultLanguage = 'EN US';
protected static $m_sCurrentLanguage = 'EN US'; protected static $m_sCurrentLanguage = null; // No language selected by default
protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...) protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
protected static $m_aData = array(); protected static $m_aData = array();
@@ -84,6 +84,16 @@ class Dict
} }
public static function GetCurrentLanguage()
{
if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
{
// In which case let's use the default language
return self::$m_sDefaultLanguage;
}
return self::$m_sCurrentLanguage;
}
//returns a hash array( code => array( 'description' => '...', 'localized_description' => '...') ...) //returns a hash array( code => array( 'description' => '...', 'localized_description' => '...') ...)
public static function GetLanguages() public static function GetLanguages()
{ {
@@ -101,12 +111,12 @@ class Dict
{ {
// Attempt to find the string in the user language // Attempt to find the string in the user language
// //
if (!array_key_exists(self::$m_sCurrentLanguage, self::$m_aData)) if (!array_key_exists(self::GetCurrentLanguage(), self::$m_aData))
{ {
// It may happen, when something happens before the dictionnaries get loaded // It may happen, when something happens before the dictionnaries get loaded
return $sStringCode; return $sStringCode;
} }
$aCurrentDictionary = self::$m_aData[self::$m_sCurrentLanguage]; $aCurrentDictionary = self::$m_aData[self::GetCurrentLanguage()];
if (array_key_exists($sStringCode, $aCurrentDictionary)) if (array_key_exists($sStringCode, $aCurrentDictionary))
{ {
return $aCurrentDictionary[$sStringCode]; return $aCurrentDictionary[$sStringCode];
@@ -215,11 +225,4 @@ class Dict
MyHelpers::var_dump_html(self::$m_aData); MyHelpers::var_dump_html(self::$m_aData);
} }
} }
/*
Dans les templates, les chaines localizables seront remplacées par un tag <itopstring>code_de_la_chaine</itopstring>
Modifier les profils utilisateurs pour stocker le langage de l'utilisateur.
*/
?> ?>