From: Jan Schneider <jan@horde.org>
Date: Mon, 26 Jan 2009 15:44:59 +0000 (+0100)
Subject: Use NLS::setLanguageEnvironment().
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=91d7a18aaecbc5e5083c4b3bc63d29a1fa282c9c;p=horde.git

Use NLS::setLanguageEnvironment().
---

diff --git a/imp/attachment.php b/imp/attachment.php
index 4b3846c64..aae08c65c 100644
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -86,8 +86,6 @@ if ($conf['compose']['link_attachments_notify']) {
                 $mail_address_full = $mail_identity->getDefaultFromAddress(true);
                 NLS::setTimeZone();
                 NLS::setLanguageEnvironment();
-                NLS::setTextdomain('imp', dirname(__FILE__) . '/locale', NLS::getCharset());
-                String::setDefaultCharset(NLS::getCharset());
 
                 /* Set up the mail headers and read the log file. */
                 $msg_headers = new Horde_Mime_Headers();
diff --git a/kronolith/lib/api.php b/kronolith/lib/api.php
index fd5dc7d43..aa34b3cb8 100644
--- a/kronolith/lib/api.php
+++ b/kronolith/lib/api.php
@@ -1340,10 +1340,7 @@ function _kronolith_listAlarms($time, $user = null)
                 if (($reminder == 'owner' && $alarm_user == $owner) ||
                     ($reminder == 'show' && in_array($calendar, $shown_calendars)) ||
                     $reminder == 'read') {
-                    /* @todo: replace with NLS::setLanguageEnvironement(). */
-                    NLS::setLang($prefs->getValue('language'));
-                    NLS::setTextdomain('kronolith', KRONOLITH_BASE . '/locale', NLS::getCharset());
-                    String::setDefaultCharset(NLS::getCharset());
+                    NLS::setLanguageEnvironment($prefs->getValue('language'));
                     $alarm = $event->toAlarm($time, $alarm_user, $prefs);
                     if ($alarm) {
                         $alarm_list[] = $alarm;