Skip to content

Commit 3c568ae

Browse files
committed
[FIX] base,website_sale,fleet: do not use a space in xmlid
This probably a bad idea for odoo but is definitly a bad idea for pofile As shown in gettext reference, the spaces are used as separator in po files https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html For instance #: src/msgcmp.c:338 src/po-lex.c:699 #, c-format msgid "found %d fatal error" msgstr "..." The line "model_terms:ir.ui.view,arch_db:website_sale.search count" was considered as two references: - 'model_terms:ir.ui.view,arch_db:website_sale.search' - 'count' Correct external id of fleet, even if not translatable
1 parent d0805f2 commit 3c568ae

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

addons/fleet/data/fleet_cars_data.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<field name="name">Citroen</field>
5757
<field name="image" type="base64" file="fleet/static/img/brand_citroen-image.png"/>
5858
</record>
59-
<record id="brand_corre la licorne" model="fleet.vehicle.model.brand">
59+
<record id="brand_corre_la_licorne" model="fleet.vehicle.model.brand">
6060
<field name="name">Corre La Licorne</field>
6161
<field name="image" type="base64" file="fleet/static/img/brand_corre-la-licorne-image.png"/>
6262
</record>
@@ -128,7 +128,7 @@
128128
<field name="name">Lancia</field>
129129
<field name="image" type="base64" file="fleet/static/img/brand_lancia-image.png"/>
130130
</record>
131-
<record id="brand_land rover" model="fleet.vehicle.model.brand">
131+
<record id="brand_land_rover" model="fleet.vehicle.model.brand">
132132
<field name="name">Land Rover</field>
133133
<field name="image" type="base64" file="fleet/static/img/brand_land-rover-image.png"/>
134134
</record>
@@ -236,7 +236,7 @@
236236
<field name="name">Subaru</field>
237237
<field name="image" type="base64" file="fleet/static/img/brand_subaru-image.png"/>
238238
</record>
239-
<record id="brand_tesla motors" model="fleet.vehicle.model.brand">
239+
<record id="brand_tesla_motors" model="fleet.vehicle.model.brand">
240240
<field name="name">Tesla Motors</field>
241241
<field name="image" type="base64" file="fleet/static/img/brand_tesla-motors-image.png"/>
242242
</record>

addons/website_sale/i18n/website_sale.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2655,7 +2655,7 @@ msgid "eCommerce Shipping Costs"
26552655
msgstr ""
26562656

26572657
#. module: website_sale
2658-
#: model_terms:ir.ui.view,arch_db:website_sale.search count
2658+
#: model_terms:ir.ui.view,arch_db:website_sale.search_count_box
26592659
msgid "found)"
26602660
msgstr ""
26612661

addons/website_sale/views/templates.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</t>
110110
</template>
111111

112-
<template id="search count" inherit_id="website.website_search_box" active="False" customize_show="True" name="Show # found">
112+
<template id="search_count_box" inherit_id="website.website_search_box" active="False" customize_show="True" name="Show # found">
113113
<xpath expr="//button[hasclass('oe_search_button')]" position="inside">
114114
<span t-if='search' class='oe_search_found'> <small>(<t t-esc="search_count"/> found)</small></span>
115115
</xpath>

addons/website_sale_coupon/tests/test_shop_sale_coupon.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ class TestUi(HttpCase):
1111

1212
def test_01_admin_shop_sale_coupon_tour(self):
1313
# pre enable "Show # found" option to avoid race condition...
14-
self.env.ref("website_sale.search count").write({"active": True})
14+
self.env.ref("website_sale.search_count_box").write({"active": True})
1515
self.start_tour("/", 'shop_sale_coupon', login="admin")

odoo/addons/base/data/res.country.state.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ state_mx_nay,mx,"Nayarit","NAY"
504504
state_mx_nl,mx,"Nuevo León","NLE"
505505
state_mx_oax,mx,"Oaxaca","OAX"
506506
state_mx_pue,mx,"Puebla","PUE"
507-
state_mx_q roo,mx,"Quintana Roo","ROO"
507+
state_mx_q_roo,mx,"Quintana Roo","ROO"
508508
state_mx_qro,mx,"Querétaro","QUE"
509509
state_mx_sin,mx,"Sinaloa","SIN"
510510
state_mx_slp,mx,"San Luis Potosí","SLP"

0 commit comments

Comments
 (0)