Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

#567 Use namespaces in gettext module

  • Loading branch information...
commit d85613f80f6170fd63dd5c2fa301297880691b82 1 parent 13475fd
daris authored January 23, 2012
10  include/classes/lang.php
@@ -47,7 +47,7 @@ class Flux_Lang
47 47
 	public static function getLanguageList()
48 48
 	{
49 49
 		static $list;
50  
-		
  50
+
51 51
 		if (!isset($list))
52 52
 		{
53 53
 			$list = array();
@@ -56,11 +56,11 @@ public static function getLanguageList()
56 56
 				$dirs = explode('/', $dir);
57 57
 				$list[] = end($dirs);
58 58
 			}
59  
-	
  59
+
60 60
 			// TODO: Do we need sorting here?
61 61
 			natcasesort($list);
62 62
 		}
63  
-		
  63
+
64 64
 		return $list;
65 65
 	}
66 66
 
@@ -143,7 +143,7 @@ public function load($resource)
143 143
 		$trans_cache = $cache->get($this->lang.'_'.$resource);
144 144
 		if ($trans_cache === \fluxbb\cache\Cache::NOT_FOUND)
145 145
 		{
146  
-			$trans_cache = Flux_Gettext::parse($filename);
  146
+			$trans_cache = \fluxbb\gettext\Gettext::parse($filename);
147 147
 
148 148
 			// If this is not the default language, load that, too
149 149
 			if ($this->defaultLang != $this->lang)
@@ -151,7 +151,7 @@ public function load($resource)
151 151
 				$def_trans_cache = $cache->get($this->defaultLang.'_'.$resource);
152 152
 				if ($def_trans_cache === \fluxbb\cache\Cache::NOT_FOUND)
153 153
 				{
154  
-					$def_trans_cache = Flux_Gettext::parse($default_filename);
  154
+					$def_trans_cache = \fluxbb\gettext\Gettext::parse($default_filename);
155 155
 
156 156
 					$cache->set($this->defaultLang.'_'.$resource, $def_trans_cache);
157 157
 				}
2  modules/gettext
... ...
@@ -1 +1 @@
1  
-Subproject commit 1a9e25add8fc77fbbb9b50fa97d35b59db385d75
  1
+Subproject commit d3ef91dbe4d91ec3db3b8eb653507d7c4780252f

0 notes on commit d85613f

Please sign in to comment.
Something went wrong with that request. Please try again.