From 75233860a281e49f43ec691b5da9bbd92790d3b3 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 17 Sep 2015 10:40:10 +0200
Subject: [PATCH] [FIX] event: confirmation_event and confirmation_registration

-The lang of the partner linked to the "event_registration" record
must be used to send the registration/confirmation email.

-strftime cannot be used on a string.

opw:649510
---
 addons/event/email_template.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 5bc0e484764..ca367cee140 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -6,10 +6,11 @@
         <field name="model_id" ref="event.model_event_registration"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
+        <field name="lang">${object.partner_id.lang}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
         <field name="body_html"><![CDATA[
         <p>Hello ${object.name},</p>
-        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')} to ${object.event_id.date_end_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')}.
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located} to ${object.event_id.date_end_located}.
         For any further information please contact our event department.</p>
         <p>Thank you for your participation!</p>
         <p>Best regards</p>]]></field>
@@ -20,6 +21,7 @@
         <field name="model_id" ref="event.model_event_registration"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
+        <field name="lang">${object.partner_id.lang}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
         <field name="body_html"><![CDATA[
         <p>Hello ${object.name},</p>