lib/kolab_recipient_policy.php

[Aleksander Machniak]

 lib/kolab_recipient_policy.php |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 16e345dbc51aa18874a8a080623381235bf44b29
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Apr 9 15:02:38 2013 +0200

    Small improvement in locale setting (prefer utf8 locales)

diff --git a/lib/kolab_recipient_policy.php b/lib/kolab_recipient_policy.php
index a59903f..fc950be 100644
--- a/lib/kolab_recipient_policy.php
+++ b/lib/kolab_recipient_policy.php
@@ -42,15 +42,15 @@ class kolab_recipient_policy {
     {
         //console("IN", $groupdata);
         foreach ($groupdata as $key => $value) {
-            if (isset($groupdata['preferredlanguage'])) {
+            if (!empty($groupdata['preferredlanguage'])) {
                 $locale = $groupdata['preferredlanguage'];
-                setlocale(LC_ALL, $groupdata['preferredlanguage']);
             } else {
                 $conf = Conf::get_instance();
                 $locale = $conf->get('default_locale');
-                if (!empty($locale)) {
-                    setlocale(LC_ALL, $locale);
-                }
+            }
+
+            if (!empty($locale)) {
+                setlocale(LC_ALL, $locale.'utf8', $locale.'UTF-8', $locale);
             }
 
             if (!is_array($groupdata[$key])) {
@@ -89,15 +89,15 @@ class kolab_recipient_policy {
                 $_key = $key;
             }
 
-            if (isset($userdata['preferredlanguage'])) {
+            if (!empty($userdata['preferredlanguage'])) {
                 $locale = $userdata['preferredlanguage'];
-                setlocale(LC_ALL, $userdata['preferredlanguage']);
             } else {
                 $conf = Conf::get_instance();
                 $locale = $conf->get('default_locale');
-                if (!empty($locale)) {
-                    setlocale(LC_ALL, $locale);
-                }
+            }
+
+            if (!empty($locale)) {
+                setlocale(LC_ALL, $locale.'utf8', $locale.'UTF-8', $locale);
             }
 
             if (!is_array($userdata[$_key])) {