Browse Source

Cosmetic on the API of the dictionnary (internal)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1687 a333f486-631f-4898-b8df-5754b55c2be0
romainq 13 years ago
parent
commit
78bf54adca
1 changed files with 3 additions and 3 deletions
  1. 3 3
      core/dict.class.inc.php

+ 3 - 3
core/dict.class.inc.php

@@ -97,7 +97,7 @@ class Dict
 	}
 	}
 
 
 
 
-	public static function GetCurrentLanguage()
+	public static function GetUserLanguage()
 	{
 	{
 		if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
 		if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
 		{
 		{
@@ -124,12 +124,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::GetCurrentLanguage(), self::$m_aData))
+		if (!array_key_exists(self::GetUserLanguage(), 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::GetCurrentLanguage()];
+		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
 		if (array_key_exists($sStringCode, $aCurrentDictionary))
 		if (array_key_exists($sStringCode, $aCurrentDictionary))
 		{
 		{
 			return $aCurrentDictionary[$sStringCode];
 			return $aCurrentDictionary[$sStringCode];