pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_sales: wrong multi-lang in website_sale.dashboard_sales

Browse Source 
The problem comes from how a language handle things like "Last week,
last month, last year".

For example, in Vietnamese, the "last" come after the week/month/year
instead of doing before like what is in English

closes odoo/odoo#60263

X-original-commit: 6eb9dddb9fae117d51d0ae4ca47c01846c9030a3
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
David Tran
2020-10-19 11:38:48 +00:00
parent 522365c64f
commit 1655d6aed5
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/i18n/website_sale.pot
+18 -2
View File
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-29 13:45+0000\n"
"PO-Revision-Date: 2020-09-29 13:45+0000\n"
"PO-Revision-Date: 2020-10-19 09:20+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -2398,7 +2398,23 @@ msgstr ""
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#, python-format
msgid "Sales Since Last"
msgid "Sales Since Last Month"
msgstr ""
#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#, python-format
msgid "Sales Since Last Week"
msgstr ""
#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:0
#, python-format
msgid "Sales Since Last Year"
msgstr ""
#. module: website_sale
addons/website_sale/static/src/xml/website_sale_dashboard.xml
+16 -4
View File
@@ -29,8 +29,14 @@
<div class="col-12 row o_box">
<t t-if="widget.dashboards_data.sales.summary.order_count">
<h2 class="col-lg-7 col-12">
<t t-if="widget.date_range">
Sales Since Last <t t-esc="widget.date_range"></t>
<t t-if="widget.date_range=='week'">
<h2>Sales Since Last Week</h2>
</t>
<t t-elif="widget.date_range=='month'">
<h2>Sales Since Last Month</h2>
</t>
<t t-elif="widget.date_range=='year'">
<h2>Sales Since Last Year</h2>
</t>
<t t-else="">Sales</t>
</h2>
@@ -43,8 +49,14 @@
</div>
</t>
<t t-if="! widget.dashboards_data.sales.summary.order_count">
<t t-if="widget.date_range">
<h2>Sales Since Last <t t-esc="widget.date_range"></t></h2>
<t t-if="widget.date_range=='week'">
<h2>Sales Since Last Week</h2>
</t>
<t t-elif="widget.date_range=='month'">
<h2>Sales Since Last Month</h2>
</t>
<t t-elif="widget.date_range=='year'">
<h2>Sales Since Last Year</h2>
</t>
<t t-else=""><h2>Sales</h2></t>
<div class="col-lg-12 col-12">