From fa16b324aaee6cf77f3e10f7186da0c1cd88ab4e Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 3 Nov 2010 15:34:27 +0100 Subject: [PATCH] Use application name translations from horde, not Horde_Core. --- framework/Core/lib/Horde/Core/Sidebar.php | 9 +++++---- framework/Core/lib/Horde/Registry.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/framework/Core/lib/Horde/Core/Sidebar.php b/framework/Core/lib/Horde/Core/Sidebar.php index 6071ee0f9..d6244455b 100644 --- a/framework/Core/lib/Horde/Core/Sidebar.php +++ b/framework/Core/lib/Horde/Core/Sidebar.php @@ -136,10 +136,11 @@ class Horde_Core_Sidebar break; default: - // Need to run the name through gettext since the user's - // locale may not have been loaded when registry.php was - // parsed. - $name = Horde_Core_Translation::t($params['name']); + // Need to run the name through Horde's gettext since the + // user's locale may not have been loaded when registry.php was + // parsed, and the translations of the application names are + // not in the Core package. + $name = _($params['name']); // Headings have no webroot; they're just containers for other // menu items. diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 067c8946a..d84341039 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -1368,7 +1368,7 @@ class Horde_Registry } return ($parameter == 'name') - ? Horde_Core_Translation::t($pval) + ? _($pval) : $pval; } -- 2.11.0