From a65e72941f9c9ee440524e96d2ea157f165775fb Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 7 Jan 2013 18:18:40 -0500
Subject: [PATCH] CC-4805: Localization -> Changing default language changes
 datatables and add media language setting

-fixed
---
 airtime_mvc/application/Bootstrap.php          |  8 +-------
 .../controllers/PreferenceController.php       |  2 +-
 .../application/forms/GeneralPreferences.php   |  2 +-
 airtime_mvc/application/models/Preference.php  | 18 ++++++++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index ee3bb7096..62679c8b0 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -34,13 +34,7 @@ $front->registerPlugin(new RabbitMqPlugin());
 
 //localization configuration
 $codeset = 'UTF-8';
-$auth = Zend_Auth::getInstance();
-if ($auth->hasIdentity()) {
-    $id = $auth->getIdentity()->id;
-    $lang = Application_Model_Preference::GetCurrentUserLocale($id).'.'.$codeset;
-} else {
-    $lang = Application_Model_Preference::GetLocale().'.'.$codeset;
-}
+$lang = Application_Model_Preference::GetLocale().'.'.$codeset;
 
 putenv("LC_ALL=$lang");
 putenv("LANG=$lang");
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 7ac5b8c1b..267e8e851 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -44,7 +44,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
                 Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);
                 Application_Model_Preference::SetAllow3rdPartyApi($values["thirdPartyApi"]);
-                Application_Model_Preference::SetLocale($values["locale"]);
+                Application_Model_Preference::SetDefaultLocale($values["locale"]);
                 Application_Model_Preference::SetTimezone($values["timezone"]);
                 Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]);
 
diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 018745a90..ef9761396 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -55,7 +55,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         $locale = new Zend_Form_Element_Select("locale");
         $locale->setLabel(_("Default Interface Language"));
         $locale->setMultiOptions(Application_Model_Locale::getLocales());
-        $locale->setValue(Application_Model_Preference::GetLocale());
+        $locale->setValue(Application_Model_Preference::GetDefaultLocale());
         $locale->setDecorators(array('ViewHelper'));
         $this->addElement($locale);
 
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 79732d12b..98d64e378 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -446,17 +446,17 @@ class Application_Model_Preference
     }
 
     // This is the language setting on preferences page
-    public static function SetLocale($locale)
+    public static function SetDefaultLocale($locale)
     {
         self::setValue("locale", $locale);
     }
 
-    public static function GetLocale()
+    public static function GetDefaultLocale()
     {
         return self::getValue("locale");
     }
 
-    public static function GetCurrentUserLocale($id)
+    public static function GetUserLocale($id)
     {
         return self::getValue("user_".$id."_locale", true);
     }
@@ -466,14 +466,20 @@ class Application_Model_Preference
         // When a new user is created they will get the default locale
         // setting which the admin sets on preferences page
         if (is_null($locale)) {
-            $locale = self::GetLocale();
+            $locale = self::GetDefaultLocale();
         }
         self::setValue("user_".$userId."_locale", $locale, true, $userId);
     }
 
-    public static function GetUserLocale($userId)
+    public static function GetLocale()
     {
-        return self::getValue("user_".$userId."_locale");
+        $auth = Zend_Auth::getInstance();
+        if ($auth->hasIdentity()) {
+            $id = $auth->getIdentity()->id;
+            return self::GetUserLocale($id);
+        } else {
+            return self::GetDefaultLocale();
+        }
     }
 
     public static function SetStationLogo($imagePath)