From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Sat, 16 Dec 2006 13:25:16 -0500 Subject: [PATCH] updated ja and fr translations --- program/steps/mail/func.inc | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index bfddb5a..9bda890 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -79,6 +79,7 @@ // add some labels to client rcube_add_label('purgefolderconfirm'); + rcube_add_label('deletemessagesconfirm'); // $mboxlist_start = rcube_timer(); @@ -495,6 +496,7 @@ $javascript .= sprintf("%s.set_env('messages', %s);", $JS_OBJECT_NAME, array2js($a_js_message_arr)); $OUTPUT->add_script($javascript); + $OUTPUT->include_script('list.js'); return $out; } @@ -511,8 +513,8 @@ $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)) - && !array_search('to', $a_show_cols)) + if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) + && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; $commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols)); @@ -555,6 +557,27 @@ return $commands; } + +// return an HTML iframe for loading mail content +function rcmail_messagecontent_frame($attrib) + { + global $OUTPUT, $JS_OBJECT_NAME; + + if (empty($attrib['id'])) + $attrib['id'] = 'rcmailcontentwindow'; + + // allow the following attributes to be added to the <iframe> tag + $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); + $framename = $attrib['id']; + + $out = sprintf('<iframe name="%s"%s></iframe>'."\n", + $framename, + $attrib_str); + + $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');"); + + return $out; + } // return code for search function function rcmail_search_form($attrib) @@ -1082,7 +1105,7 @@ else if ($part->type=='content') { if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset'])) - $$part->ctype_parameters['charset'] = $MESSAGE['headers']->charset; + $part->ctype_parameters['charset'] = $MESSAGE['headers']->charset; // fetch part if not available if (!isset($part->body)) -- Gitblit v1.9.1