diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py index 3d038ac0813..645564b4eeb 100644 --- a/addons/base_gengo/res_company.py +++ b/addons/base_gengo/res_company.py @@ -30,6 +30,7 @@ class res_company(osv.Model): "gengo_public_key": fields.text("Gengo Public Key"), "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"), "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."), + "gengo_sandbox": fields.boolean("Sandbox", help="Enable if you using testing account"), } _defaults = { diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml index 0f99efc8ad0..d08d809eb9c 100644 --- a/addons/base_gengo/res_company_view.xml +++ b/addons/base_gengo/res_company_view.xml @@ -17,8 +17,13 @@ - - + + + + + + + diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py index 00c175e1450..9b96e8c91e3 100644 --- a/addons/base_gengo/wizard/base_gengo_translations.py +++ b/addons/base_gengo/wizard/base_gengo_translations.py @@ -74,7 +74,7 @@ class base_gengo_translations(osv.osv_memory): gengo = MyGengo( public_key=user.company_id.gengo_public_key.encode('ascii'), private_key=user.company_id.gengo_private_key.encode('ascii'), - sandbox = True, + sandbox = user.company_id.gengo_sandbox, ) gengo.getAccountStats() return (True, gengo) diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index 12c740300c6..a2893e61248 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -119,7 +119,7 @@ console.log(this.translations); if (trans.length) { node.setAttribute('data-oe-translation-id', trans[0].id); - if(trans[0].state && trans[0].state == 'inprogress'){ + if(trans[0].state && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){ node.className += ' oe_translatable_inprogress'; } } else { diff --git a/addons/website_gengo/controllers/main.py b/addons/website_gengo/controllers/main.py index 167e3e7bd36..7c22829464e 100644 --- a/addons/website_gengo/controllers/main.py +++ b/addons/website_gengo/controllers/main.py @@ -14,6 +14,6 @@ class website_gengo(http.Controller): result['total'] += len(trans.source.split()) if trans.state == 'translated': result['done'] += len(trans.source.split()) - elif trans.state == 'inprogress': + elif trans.state in ['inprogress','to_translate']: result['inprogess'] += len(trans.source.split()) return result diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js index 94cc2ab5c11..badb51f9296 100644 --- a/addons/website_gengo/static/src/js/website_gengo.js +++ b/addons/website_gengo/static/src/js/website_gengo.js @@ -9,6 +9,7 @@ 'click a[data-action=translation_gengo]': 'translation_gengo', 'click a[data-action=translation_gengo_post]': 'translation_gengo_post', 'click a[data-action=translation_gengo_info]': 'translation_gengo_info', + 'click a[data-action=reload]': 'reload', }), start: function () { this.gengo_translate = false; @@ -32,12 +33,12 @@ self.translate().then(function () { self.gengo_translate = false; if($('.oe_translatable_todo').length > 0){ - self.$el.find('.gengo_translate').addClass("hidden"); - self.$el.find('.gengo_post').removeClass("hidden"); + self.$el.find('form.navbar-form.navbar-left > *').addClass("hidden"); + self.$el.find('.gengo_post,.gengo_info,.gengo_discard').removeClass("hidden"); } else{ - self.$el.find('.gengo_translate').addClass("hidden"); - self.$el.find('.gengo_inprogress').removeClass("hidden"); + self.$el.find('form.navbar-form.navbar-left > *').addClass("hidden"); + self.$el.find('.gengo_inprogress,.gengo_info,.gengo_discard').removeClass("hidden"); } }); @@ -71,6 +72,8 @@ openerp.jsonRpc('/website/set_translations', 'call', { 'data': trans, 'lang': website.get_context()['lang'], + }).done(function(){ + $('.oe_translatable_todo').addClass('oe_translatable_inprogress').removeClass('oe_translatable_todo'); }); }); @@ -87,6 +90,9 @@ }); }, + reload: function () { + website.reload(); + }, }); website.GengoTranslatorDialog = openerp.Widget.extend({ @@ -121,9 +127,14 @@ }), template: 'website.GengoTranslatorStatisticDialog', init:function(res){ + var self = this; this.total = res.total; this.inprogess = res.inprogess; this.done = res.done; + this.new_words = 0; + $('.oe_translatable_todo').each(function () { + self.new_words += $(this).text().split(" ").length; + }); return this._super.apply(this, arguments); }, start: function (res) { diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml index 39338a15fca..00733829d42 100644 --- a/addons/website_gengo/static/src/xml/website.gengo.xml +++ b/addons/website_gengo/static/src/xml/website.gengo.xml @@ -1,7 +1,9 @@ - Buy Translation + Gengo Translation + +