Revert "Bug #9539: Correct translations for application names"
authorMichael M Slusarz <slusarz@curecanti.org>
Tue, 25 Jan 2011 21:51:45 +0000 (14:51 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Tue, 25 Jan 2011 21:51:45 +0000 (14:51 -0700)
This reverts commit 9514d8c72c0ccda884094e3bdecfa2a6911d0264.

framework/Core/lib/Horde/Registry.php

index f0ae1e1..fb18ef8 100644 (file)
@@ -1458,17 +1458,9 @@ class Horde_Registry
                 : (isset($this->applications['horde'][$parameter]) ? $this->applications['horde'][$parameter] : null);
         }
 
-        if ($parameter != 'name') {
-            return $pval;
-        }
-
-        $pushed = $this->pushApp('horde');
-        $pval = _($pval);
-        if ($pushed) {
-            $this->popApp();
-        }
-
-        return $pval;
+        return ($parameter == 'name')
+            ? _($pval)
+            : $pval;
     }
 
     /**