diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-10-06 14:31:36 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-10-06 16:23:56 +0200 |
| commit | 212bbf1f7e6d8e14b4017c1683655ed0e823db3f (patch) | |
| tree | 5314da7785c71f6fe0d7a5cd28dfa7ad4dd9cc46 /addons/mail/static/src/xml/thread.xml | |
| parent | 581c38cdca72fa0414fbeadd1861c96abc44fbe3 (diff) | |
[FIX] mail: thread: messages' date displayed in browser's timezone
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 28717bc70a3..da318464b71 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -21,7 +21,7 @@ <t t-foreach="messages" t-as="message"> <div t-if="current_day != message.date.split(' ')[0]" class="o_thread_date_separator"> <span class="o_thread_date"> - <t t-raw="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LL')"/> + <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LL')"/> </span> <t t-set="current_day" t-value="message.date.split(' ')[0]"/> </div> @@ -52,7 +52,7 @@ </t> <small t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')"> - - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm')"/> + - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm A')"/> </small> <t t-if="message.model && (message.model != 'mail.channel') && options.display_document_link"> on <a class="o_mail_redirect" href="#" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a> @@ -100,7 +100,7 @@ <t t-name="mail.Attachment"> <div t-attf-class="o_attachment #{attachment.upload ? 'o_attachment_uploading' : ''}" t-att-title="attachment.name"> <a class="o_image" t-att-href='attachment.url' target="_blank" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80"> - <span class='o_attachment_name'><t t-raw='attachment.name'/></span> + <span class='o_attachment_name'><t t-esc='attachment.name'/></span> </a> <t t-if="editable"> <div class="o_attachment_delete"> |