Changeset 2873 in subversion

Timestamp:

Aug 27, 2009 2:18:54 AM (4 years ago)

Author:

thomasb

Message:

Reload settings page if language was changed

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (3 diffs)
• steps/settings/save_prefs.inc (modified) (2 diffs)

trunk/roundcubemail/program/js/app.js

@@ -698 +698 @@
           this.load_identity(props, 'edit-identity');
         else if (this.task=='mail' && (cid = this.get_single_uid())) {
-          var url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
+          var url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
           this.goto_url('compose', url+cid+'&_mbox='+urlencode(this.env.mailbox), true);
-        }
+        }
         break;
 
@@ -838 +838 @@
         if (props == 'invert')
           this.message_list.invert_selection();
-        else
+        else
           this.message_list.select_all(props);
         break;
@@ -1215 +1215 @@
     this.display_message('Request timed out!', 'error');
     };
+  
+  this.reload = function(delay)
+  {
+    if (this.env.framed && parent.rcmail)
+      parent.rcmail.reload(delay);
+    else if (delay)
+      window.setTimeout(function(){ rcmail.reload(); }, delay);
+    else if (window.location)
+      location.href = this.env.comm_path;
+  };
 
 

trunk/roundcubemail/program/steps/settings/save_prefs.inc

@@ -103 +103 @@
 
     // 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);
     }
 
@@ -133 +134 @@
     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];
-        }
+      }
     }