From ac8babe0e5fb6842b27d865434daf1bc6a9a3d5f Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Thu, 20 Mar 2014 17:37:58 +0530
Subject: [PATCH] [IMP] minor changes

bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
---
 addons/website/controllers/main.py                  | 2 +-
 addons/website/static/src/js/website.translator.js  | 2 +-
 addons/website_gengo/static/src/js/website_gengo.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 011a31e00e3..7e4b8f3b15f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -206,7 +206,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         views_ids = [view.get('id') for view in views if view.get('active')]
         domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)]
         irt = request.registry.get('ir.translation')
-        return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value','state'], context=request.context)
+        return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value','state','gengo_translation'], context=request.context)
 
     @http.route('/website/set_translations', type='json', auth='public', website=True)
     def set_translations(self, data, lang):
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 8ab736ef12b..0083ad8f464 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -117,7 +117,7 @@
             });
             if (trans.length) {
                 node.setAttribute('data-oe-translation-id', trans[0].id);
-                if(trans[0].state && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){
+                if(trans[0].gengo_translation && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){
                     if(this.gengo_translate){
                         node.className += ' oe_translatable_inprogress';
                         }
diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index b17c4761e49..6b8ea9cb148 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -135,7 +135,7 @@
             this.done =  res.done;
             this.new_words =  0;
             $('.oe_translatable_todo').each(function () {
-                self.new_words += $(this).text().split(" ").length;
+                self.new_words += $(this).text().trim().replace(/ +/g," ").split(" ").length;
             });
             return this._super.apply(this, arguments);
         },