From: Jan Schneider <jan@horde.org>
Date: Wed, 3 Feb 2010 10:05:12 +0000 (+0100)
Subject: Horde_Nls::setLang() => setLanguage()/setLanguageEnvironment()
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ff0192a38c9d88e0484aae9fbba8138ebe441389;p=horde.git

Horde_Nls::setLang() => setLanguage()/setLanguageEnvironment()
---

diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php
index 0ee043fd0..9bccffec2 100644
--- a/framework/Auth/lib/Horde/Auth.php
+++ b/framework/Auth/lib/Horde/Auth.php
@@ -746,7 +746,7 @@ class Horde_Auth
 
         /* Reload preferences for the new user. */
         $GLOBALS['registry']->loadPrefs();
-        Horde_Nls::setLang($GLOBALS['prefs']->getValue('language'));
+        Horde_Nls::setLanguageEnvironment($GLOBALS['prefs']->getValue('language'));
 
         if (!empty($options['nologin'])) {
             return true;
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index ffe50128e..91238c82a 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -281,7 +281,7 @@ class Horde_Registry
         /* Initialize the localization routines and variables. We can't use
          * Horde_Nls::setLanguageEnvironment() here because that depends on the
          * registry to be already initialized. */
-        Horde_Nls::setLang();
+        Horde_Nls::setLanguage();
         Horde_Nls::setTextdomain('horde', HORDE_BASE . '/locale', Horde_Nls::getCharset());
         Horde_String::setDefaultCharset(Horde_Nls::getCharset());
 
diff --git a/framework/Nls/lib/Horde/Nls.php b/framework/Nls/lib/Horde/Nls.php
index e0d0325ac..1fcf75dd7 100644
--- a/framework/Nls/lib/Horde/Nls.php
+++ b/framework/Nls/lib/Horde/Nls.php
@@ -102,7 +102,7 @@ class Horde_Nls
      *
      * @throws Horde_Exception
      */
-    static public function setLang($lang = null)
+    static public function setLanguage($lang = null)
     {
         Horde::loadConfiguration('nls.php', null, 'horde');
 
@@ -181,7 +181,7 @@ class Horde_Nls
         if (empty($app)) {
             $app = $GLOBALS['registry']->getApp();
         }
-        self::setLang($language);
+        self::setLanguage($language);
         self::setTextdomain(
             $app,
             $GLOBALS['registry']->get('fileroot', $app) . '/locale',
diff --git a/horde/login.php b/horde/login.php
index 17d5e1fe6..e0b59ed70 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -173,7 +173,7 @@ if ($error_reason) {
     $registry->setupSessionHandler();
     @session_start();
 
-    Horde_Nls::setLang($language);
+    Horde_Nls::setLanguageEnvironment($language);
 
     /* Hook to preselect the correct language in the widget. */
     $_GET['new_lang'] = $language;
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 469b51d48..0752e7c1a 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1907,7 +1907,7 @@ class Kronolith
         }
 
         foreach ($addresses as $lang => $twentyFour) {
-            Horde_Nls::setLang($lang);
+            Horde_Nls::setLanguageEnvironment($lang);
 
             switch ($action) {
             case 'add':