From 43e6b6079967ebb82d708b6bdb12aea08c4dd75a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 30 Oct 2013 17:29:09 +0100
Subject: [PATCH] [FIX] Multilingual support (events etc.)

bzr revid: ddm@openerp.com-20131030162909-7bcq16gq154mv1lw
---
 addons/website_blog/controllers/main.py       |  2 +-
 .../views/website_blog_templates.xml          | 22 +++++++++----------
 addons/website_event/controllers/main.py      |  5 ++++-
 addons/website_event/views/website_event.xml  | 10 ++++-----
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 34a117505a5..61a248da1a8 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -41,7 +41,7 @@ class WebsiteBlog(http.Controller):
         '/blog/cat/<int:category_id>/page/<int:page>/',
         '/blog/tag/',
         '/blog/tag/<int:tag_id>/',
-    ], type='http', auth="public")
+    ], type='http', auth="public", multilang=True)
     def blog(self, category_id=None, blog_post_id=None, tag_id=None, page=1, **post):
         """ Prepare all values to display the blog.
 
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index efbf22814d0..b77214f020f 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -4,10 +4,10 @@
     <!-- Layout add nav and footer -->
     <template id="header_footer_custom" inherit_id="website.layout">
         <xpath expr="//header//ul[@id='top_menu']/li[@name='contactus']" position="before">
-            <li><a t-attf-href="/blog/cat/%(website_blog.blog_category_1)d/">News</a></li>
+            <li><a t-href="/blog/cat/%(website_blog.blog_category_1)d/">News</a></li>
         </xpath>
         <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a t-attf-href="/blog/cat/%(website_blog.blog_category_1)d/">News</a></li>
+            <li><a t-href="/blog/cat/%(website_blog.blog_category_1)d/">News</a></li>
         </xpath>
     </template>
 
@@ -24,17 +24,17 @@
                 <t t-call="website.publish_management">
                     <t t-set="object" t-value="blog_post"/>
                     <t t-set="publish_edit" t-value="True"/>
-                    <t t-set="publish_duplicate" t-value="'/blog/%s/duplicate' % (blog_post.id)"/>
+                    <t t-set="publish_duplicate" t-value="'/blog/#{blog_post.id}/duplicate'"/>
                 </t>
             </div>
             <h2 class="text-center">
-                <a t-attf-href="/blog/#{blog_post.id}" t-field="blog_post.name"></a>
+                <a t-href="/blog/#{blog_post.id}" t-field="blog_post.name"></a>
             </h2>
             <p class="post-meta text-muted text-center" name='blog_post_data'>
                 <span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
                 <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
                 <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment">
-                    <a t-attf-href="/blog/#{blog_post.id}/#comment">
+                    <a t-href="/blog/#{blog_post.id}/#comment">
                         <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
                         <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
                     </a>
@@ -69,7 +69,7 @@
             <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
                 <span class="icon-tags"/>
                 <t t-foreach="blog_post.tag_ids" t-as="tag">
-                    <a t-attf-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
+                    <a t-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
                 </t>
             </p>
         </xpath>
@@ -90,7 +90,7 @@
         <p class="post-meta text-muted text-center" name="blog_post_data">
             <span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
             <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
-            <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With 
+            <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With
                 <a t-attf-href="#comments">
                     <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
                     <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
@@ -169,13 +169,13 @@
             <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
                 <span class="icon-tags"/>
                 <t t-foreach="blog_post.tag_ids" t-as="tag">
-                    <a t-attf-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
+                    <a t-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
                 </t>
             </p>
         </xpath>
     </template>
 
-    <!-- Page --> 
+    <!-- Page -->
     <template id="index" name="Blog" page="True">
         <t t-call="website.layout">
             <t t-set="head">
@@ -188,7 +188,7 @@
                         <div class="col-lg-12 col-sm-12" t-if="not blog_post" id="blog_post">
                             <t t-if="category and editable">
                                 <div class="row">
-                                    <a t-attf-href="/blog/#{category.id}/new" class="btn btn-primary pull-right">New Blog Post</a>
+                                    <a t-href="/blog/#{category.id}/new" class="btn btn-primary pull-right">New Blog Post</a>
                                 </div>
                             </t>
                             <t t-foreach="blog_posts" t-as="blog_post" data-publish="">
@@ -301,7 +301,7 @@
             <ul class="nav nav-pills nav-stacked">
                 <t t-foreach="categories" t-as="nav_category">
                     <li>
-                        <a t-attf-href="/blog/#{nav_category.id}">
+                        <a t-href="/blog/#{nav_category.id}">
                             <span t-field="nav_category.name"/>
                         </a>
                     </li>
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 16b76c58213..5e22a3fc592 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -182,7 +182,10 @@ class website_event(http.Controller):
 
         _values = None
         for key, value in post.items():
-            quantity = int(value)
+            try:
+                quantity = int(value)
+            except:
+                quantity = None
             ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
             if not ticket_id or not quantity:
                 continue
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index c93420c5a34..6f802f89fd8 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -12,7 +12,7 @@
         </xpath>
     </template>
 
-    <!-- Page --> 
+    <!-- Page -->
     <template id="index" name="Events" page="True">
         <t t-call="website.layout">
           <div id="wrap">
@@ -124,7 +124,7 @@
 
                 <h1 class="text-center" t-field="event_id.name"></h1>
                 <h4 class="text-center text-muted">
-                    <i class="icon-time"></i> <span t-field="event_id.date_begin"/> to 
+                    <i class="icon-time"></i> <span t-field="event_id.date_begin"/> to
                     <span t-field="event_id.date_end"/>
                 </h4>
                 <h4 t-if="event_id.city and event_id.country_id" class="text-center text-muted">
@@ -262,12 +262,12 @@
 
                         <ul class="list-unstyled">
                             <li t-if="event_id.type">
-                                <a t-att-href="'/event?type='+str(event_id.type.id)"><strong><span class="icon-double-angle-right"/> Other <t t-esc="event_id.type.name"/></strong></a>
+                                <a t-href="/event?type=#{event_id.type.id}"><strong><span class="icon-double-angle-right"/> Other <t t-esc="event_id.type.name"/></strong></a>
                             </li>
                             <li t-if="event_id.country_id">
-                                <a t-att-href="'/event?country='+str(event_id.country_id.id)"><strong><span class="icon-double-angle-right"/> Other Events in <span t-esc="event_id.country_id.name"/></strong></a>
+                                <a t-href="/event?country=#{event_id.country_id.id}"><strong><span class="icon-double-angle-right"/> Other Events in <span t-esc="event_id.country_id.name"/></strong></a>
                             </li>
-                            <li><a href="/event"><strong><span class="icon-double-angle-right"/> All Events</strong></a></li>
+                            <li><a t-href="/event"><strong><span class="icon-double-angle-right"/> All Events</strong></a></li>
                         </ul>
                     </div>
                 </div>