From ea8cf1b7a22fd59fdc15281d0536d8e6137c77df Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Jan 2018 11:31:10 +0100 Subject: [PATCH 1/3] [FIX] doc: escape code --- doc/reference/testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/reference/testing.rst b/doc/reference/testing.rst index 0495e896d8b..eb09a0647cc 100644 --- a/doc/reference/testing.rst +++ b/doc/reference/testing.rst @@ -77,7 +77,7 @@ in each method:: .. note:: - Test methods must start with `test_` + Test methods must start with ``test_`` Running tests ------------- From d5e97eab8b2465c968f5d2abaaabf8c33641dee6 Mon Sep 17 00:00:00 2001 From: tbe-odoo Date: Fri, 12 Jan 2018 11:30:18 +0100 Subject: [PATCH 2/3] [FIX] web: Kanban image not showing in some languages - In some languages the kanban images are not displayed because of a bug in human_size method in JS. This method translates the Unit Size for data and strip with the string with a comma as separator. When the translatation contains spaces after the commas (like in the French translation), there is extra spaces in the final result. This then cause an issue with the method is_bin_size that expects a unique space between the value and its unit. Resulting in a bug in the method 'kanban_image'. opw #804973 #804970 #804648 --- addons/web/static/src/js/framework/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index c1b9758b625..3e9bd87f8de 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -288,7 +288,7 @@ function human_size (size) { size /= 1024; ++i; } - return size.toFixed(2) + ' ' + units[i]; + return size.toFixed(2) + ' ' + units[i].trim(); } /** From 26d3b77a1de2472a7ce69210dc6aef7f7a615e69 Mon Sep 17 00:00:00 2001 From: Guillaume Masson Date: Thu, 11 Jan 2018 21:30:40 +0100 Subject: [PATCH 3/3] [CLA] update CCLA for META IT To add github username Closes #22185 --- doc/cla/corporate/meta-it.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cla/corporate/meta-it.md b/doc/cla/corporate/meta-it.md index 01b33f35c8b..f321433af3f 100644 --- a/doc/cla/corporate/meta-it.md +++ b/doc/cla/corporate/meta-it.md @@ -12,4 +12,4 @@ Robin Lucbenet robin@meta-it.fr https://github.com/n1b0r List of contributors: -Guillaume Masson guillaume.masson@meta-it.fr +Guillaume Masson guillaume.masson@meta-it.fr https://github.com/metaminux