[jan] Fix translation of portal block names (Bug #13116).

horde · Apr 16, 2014 · 7863ae0 · 7863ae0
1 parent c089d7d
commit 7863ae0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/framework/Core/lib/Horde/Core/Block/Collection.php b/framework/Core/lib/Horde/Core/Block/Collection.php
@@ -486,17 +486,21 @@ public function _loadBlocks()
             return;
         }
 
+        $currentApp = $registry->getApp();
         $this->_blocks = array();
 
         foreach ($this->_apps as $app) {
             $drivers = $registry->getAppDrivers($app, 'Block');
+            $registry->setLanguageEnvironment(null, $app);
             foreach ($drivers as $val) {
                 $tmp = new $val($app);
                 if ($tmp->enabled) {
                     $this->_blocks[$app][$val]['name'] = $tmp->getName();
                 }
             }
         }
+
+        $registry->setLanguageEnvironment(null, $currentApp);
     }
 
     /* Serializable methods. */

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [jan] Fix translation of portal block names (Bug #13116).
 * [mms] Add Horde_Registry#getAuthInfo() and Horde_Registry#getAuthApps().
 * [mms] Add Horde_Core_Cache_Session.
 * [mms] Add abstracted web notifications interface to the Horde_Notification system.
@@ -3377,6 +3378,7 @@
    <date>2014-04-14</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [jan] Fix translation of portal block names (Bug #13116).
 * [mms] Add Horde_Registry#getAuthInfo() and Horde_Registry#getAuthApps().
 * [mms] Add Horde_Core_Cache_Session.
 * [mms] Add abstracted web notifications interface to the Horde_Notification system.