From 141c9e732df32afb0ff6892b165bd72f1aac2287 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 27 Aug 2009 06:18:54 +0000
Subject: Reload settings page if language was changed

---
 program/steps/settings/save_prefs.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'program/steps/settings')

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index d0bfdf099..48f6ef7ef 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -102,8 +102,9 @@ switch ($CURR_SECTION)
   case 'general':
 
     // switch UI language
-    if (isset($_POST['_language'])) {
+    if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
       $RCMAIL->load_language($a_user_prefs['language']);
+      $OUTPUT->command('reload', 500);
     }
 
     // switch skin
@@ -132,13 +133,13 @@ switch ($CURR_SECTION)
     // special handling for 'default_imap_folders'
     if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) {
       foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
-	$a_user_prefs[$p] = $CONFIG[$p];
+        $a_user_prefs[$p] = $CONFIG[$p];
     } else {
       $a_user_prefs['default_imap_folders'] = array('INBOX');
       foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
-	if ($a_user_prefs[$p])
+        if ($a_user_prefs[$p])
           $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p];
-	}
+      }
     }
   
   break;
-- 
cgit v1.2.3