Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

#567 Use namespaces in gettext module

  • Loading branch information...
commit d85613f80f6170fd63dd5c2fa301297880691b82 1 parent 13475fd
@daris daris authored
Showing with 6 additions and 6 deletions.
  1. +5 −5 include/classes/lang.php
  2. +1 −1  modules/gettext
View
10 include/classes/lang.php
@@ -47,7 +47,7 @@ class Flux_Lang
public static function getLanguageList()
{
static $list;
-
+
if (!isset($list))
{
$list = array();
@@ -56,11 +56,11 @@ public static function getLanguageList()
$dirs = explode('/', $dir);
$list[] = end($dirs);
}
-
+
// TODO: Do we need sorting here?
natcasesort($list);
}
-
+
return $list;
}
@@ -143,7 +143,7 @@ public function load($resource)
$trans_cache = $cache->get($this->lang.'_'.$resource);
if ($trans_cache === \fluxbb\cache\Cache::NOT_FOUND)
{
- $trans_cache = Flux_Gettext::parse($filename);
+ $trans_cache = \fluxbb\gettext\Gettext::parse($filename);
// If this is not the default language, load that, too
if ($this->defaultLang != $this->lang)
@@ -151,7 +151,7 @@ public function load($resource)
$def_trans_cache = $cache->get($this->defaultLang.'_'.$resource);
if ($def_trans_cache === \fluxbb\cache\Cache::NOT_FOUND)
{
- $def_trans_cache = Flux_Gettext::parse($default_filename);
+ $def_trans_cache = \fluxbb\gettext\Gettext::parse($default_filename);
$cache->set($this->defaultLang.'_'.$resource, $def_trans_cache);
}
2  modules/gettext
@@ -1 +1 @@
-Subproject commit 1a9e25add8fc77fbbb9b50fa97d35b59db385d75
+Subproject commit d3ef91dbe4d91ec3db3b8eb653507d7c4780252f
Please sign in to comment.
Something went wrong with that request. Please try again.