From 53c9858656ddda861b9f90a06f2c08961d6e0f09 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 28 Jan 2018 04:29:24 +0100 Subject: [I18N] Update translation terms from Transifex --- addons/barcodes/i18n/sl.po | 19 +++++++++++-------- addons/barcodes/i18n/zh_CN.po | 11 ++++++----- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'addons/barcodes') diff --git a/addons/barcodes/i18n/sl.po b/addons/barcodes/i18n/sl.po index 2d2f4ac350c..45211122501 100644 --- a/addons/barcodes/i18n/sl.po +++ b/addons/barcodes/i18n/sl.po @@ -2,12 +2,15 @@ # This file contains the translation of the following modules: # * barcodes # +# Translators: +# matjaz k , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" +"Last-Translator: matjaz k , 2018\n" "Language-Team: Slovenian (https://www.transifex.com/odoo/teams/41243/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -130,13 +133,13 @@ msgstr "" #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_uid msgid "Created by" -msgstr "" +msgstr "Ustvaril" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_date #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_date msgid "Created on" -msgstr "" +msgstr "Ustvarjeno" #. module: barcodes #: selection:barcode.rule,type:0 @@ -208,26 +211,26 @@ msgstr "" #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_id #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin_id msgid "ID" -msgstr "" +msgstr "ID" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature___last_update #: model:ir.model.fields,field_description:barcodes.field_barcode_rule___last_update #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin___last_update msgid "Last Modified on" -msgstr "" +msgstr "Zadnjič spremenjeno" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_uid #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_uid msgid "Last Updated by" -msgstr "" +msgstr "Zadnjič posodobil" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_date #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_date msgid "Last Updated on" -msgstr "" +msgstr "Zadnjič posodobljeno" #. module: barcodes #: selection:barcode.rule,type:0 @@ -290,7 +293,7 @@ msgstr "" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_sequence msgid "Sequence" -msgstr "" +msgstr "Zaporedje" #. module: barcodes #. openerp-web @@ -351,7 +354,7 @@ msgstr "" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_type msgid "Type" -msgstr "" +msgstr "Tip" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_upc_ean_conv diff --git a/addons/barcodes/i18n/zh_CN.po b/addons/barcodes/i18n/zh_CN.po index 2e4d12214ea..39f362dee4a 100644 --- a/addons/barcodes/i18n/zh_CN.po +++ b/addons/barcodes/i18n/zh_CN.po @@ -6,22 +6,23 @@ # liAnGjiA , 2017 # 苏州远鼎 , 2017 # Joray <13637815@qq.com>, 2017 -# Jeffery CHEN , 2017 +# Jeffery CHEN Fan , 2017 # Gary Wei , 2017 -# Martin Trigaux , 2017 -# fausthuang , 2017 +# Martin Trigaux, 2017 +# fausthuang, 2017 # mrshelly , 2017 # Gang LIU , 2017 # Si Ling Lau , 2017 # waveyeung , 2017 # xiaobin wu , 2017 +# 老窦 北京 <2662059195@qq.com>, 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: xiaobin wu , 2017\n" +"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -202,7 +203,7 @@ msgstr "编码" #: code:addons/barcodes/static/src/js/barcode_form_view.js:301 #, python-format msgid "Error : Barcode command is undefined" -msgstr "" +msgstr "错误：条码命令未定义" #. module: barcodes #. openerp-web -- cgit v1.2.3 From d06bf070cbdf89bbf8d0c8c8aceef5f2bbf66238 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 28 Jan 2018 07:04:23 +0100 Subject: [I18N] Update translation terms from Transifex --- addons/barcodes/i18n/zh_CN.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'addons/barcodes') diff --git a/addons/barcodes/i18n/zh_CN.po b/addons/barcodes/i18n/zh_CN.po index 593952080e4..b8d23102465 100644 --- a/addons/barcodes/i18n/zh_CN.po +++ b/addons/barcodes/i18n/zh_CN.po @@ -3,16 +3,17 @@ # * barcodes # # Translators: -# Jeffery CHEN , 2016 +# Jeffery CHEN Fan , 2016 # 苏州远鼎 , 2016 # liAnGjiA , 2017 +# 老窦 北京 <2662059195@qq.com>, 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: liAnGjiA , 2017\n" +"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -193,7 +194,7 @@ msgstr "编码" #: code:addons/barcodes/static/src/js/barcode_form_view.js:301 #, python-format msgid "Error : Barcode command is undefined" -msgstr "" +msgstr "错误：条码命令未定义" #. module: barcodes #. openerp-web -- cgit v1.2.3 From 513fad42a0bdebd5378fb9472bc7084e91435884 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 31 Jan 2018 12:41:31 +0100 Subject: [FIX] barcodes: delay between keys In order to detect if a barcode scanner is being used, we detect the delay between keypresses. The value is hardcoded to 55 ms. However, in the case of a bluetooth scanner, this delay is often not enough, resulting in an incorrect capture of the barcode. We add the config parameter `barcode.max_time_between_keys_in_ms` which allows the user to fine tune this delay for his hardware. opw-806398 --- addons/barcodes/models/__init__.py | 1 + addons/barcodes/models/ir_http.py | 14 ++++++++++++++ addons/barcodes/static/src/js/barcode_events.js | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 addons/barcodes/models/ir_http.py (limited to 'addons/barcodes') diff --git a/addons/barcodes/models/__init__.py b/addons/barcodes/models/__init__.py index ce467f9134f..7d377d5a2b1 100644 --- a/addons/barcodes/models/__init__.py +++ b/addons/barcodes/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- import barcodes import barcode_events_mixin +from . import ir_http diff --git a/addons/barcodes/models/ir_http.py b/addons/barcodes/models/ir_http.py new file mode 100644 index 00000000000..7ff6aa7c8f2 --- /dev/null +++ b/addons/barcodes/models/ir_http.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models + + +class IrHttp(models.AbstractModel): + _inherit = 'ir.http' + + def session_info(self): + res = super(IrHttp, self).session_info() + res['max_time_between_keys_in_ms'] = int( + self.env['ir.config_parameter'].sudo().get_param('barcode.max_time_between_keys_in_ms', default='55')) + return res diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js index 0adff5f8e1b..bff05aa4636 100644 --- a/addons/barcodes/static/src/js/barcode_events.js +++ b/addons/barcodes/static/src/js/barcode_events.js @@ -2,6 +2,7 @@ odoo.define('barcodes.BarcodeEvents', function(require) { "use strict"; var core = require('web.core'); +var session = require('web.session'); var mixins = core.mixins; @@ -26,7 +27,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, { suffix: /[\n\r\t]+/, // Keys from a barcode scanner are usually processed as quick as possible, // but some scanners can use an intercharacter delay (we support <= 50 ms) - max_time_between_keys_in_ms: 55, + max_time_between_keys_in_ms: session.max_time_between_keys_in_ms || 55, init: function() { mixins.PropertiesMixin.init.call(this); -- cgit v1.2.3