From c67092bc3772bf42409330b0df9ab48ecdc9a986 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 26 Sep 2013 15:52:16 +0200 Subject: [PATCH] [WIP] load translation, mhhh bzr revid: fme@openerp.com-20130926135216-f1b1k6kg04it9dzs --- addons/website/static/src/js/website.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 70a3716f9e0..bc0db10ce88 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -80,7 +80,7 @@ $pagination.last().before(col); }); - var page_start = page - parseInt(Math.floor((scope-1)/2)); + var page_start = page - parseInt(Math.floor((scope-1)/2), 10); if (page_start < 1 ) page_start = 1; var page_end = page_start + (scope-1); if (page_end > page_count ) page_end = page_count; @@ -108,10 +108,10 @@ */ website.ready = function() { if (!all_ready) { - all_ready = dom_ready.then(function () { - // TODO: load translations - return website.load_templates(templates); - }); + var tpl = website.load_templates(templates); + // var session; + // var trads = openerp._t.database.load_translations(session, ['website'], website.get_context().lang); + all_ready = $.when(dom_ready, tpl); } return all_ready; };