From a0be1c647e7b71ef41e486f2ec419cff54eade11 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 10 Jan 2013 14:01:03 -0500
Subject: [PATCH] CC-4786: Refresh page when language setting changes

-configure localization and reinitiliaze edit user form after the user locale is set
---
 airtime_mvc/application/controllers/UserController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index bb7a9b263..f0fd5b4ee 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -153,13 +153,14 @@ class UserController extends Zend_Controller_Action
                 $user->setJabber($formData['cu_jabber']);
                 $user->save();
 
+                Application_Model_Preference::SetUserLocale($user->getId(), $formData['cu_locale']);
+                Application_Model_Preference::SetUserTimezone($user->getId(), $formData['cu_timezone']);
+
                 //configure localization with new locale setting
                 Application_Model_Locale::configureLocalization($formData['cu_locale']);
                 //reinitialize form so language gets translated
                 $form = new Application_Form_EditUser();
 
-                Application_Model_Preference::SetUserLocale($user->getId(), $formData['cu_locale']);
-                Application_Model_Preference::SetUserTimezone($user->getId(), $formData['cu_timezone']);
                 $this->view->successMessage = "<div class='success'>"._("Settings updated successfully!")."</div>";
             }
             $this->view->form = $form;