From 6e4d2e36aab50470e3253d9d09afe71286cb2070 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 15 Nov 2017 14:15:10 +0100
Subject: [PATCH] [FIX] base_setup,etcie: translate left setting menu

In left menu used for switching between "apps" particular menu, the
apps names were not translated.

This commit use the "string" attribute which is translated instead of
"data-string" fallbacking on data-string (so things still work without
updating the module).

opw-781728
closes #20972
---
 addons/account/views/res_config_settings_views.xml              | 2 +-
 addons/base_setup/views/res_config_settings_views.xml           | 2 +-
 addons/crm/views/res_config_settings_views.xml                  | 2 +-
 addons/event/views/res_config_settings_views.xml                | 2 +-
 addons/hr/views/res_config_settings_views.xml                   | 2 +-
 addons/hr_attendance/views/res_config_settings_views.xml        | 2 +-
 addons/hr_expense/views/res_config_settings_views.xml           | 2 +-
 addons/hr_payroll/views/res_config_settings_views.xml           | 2 +-
 addons/hr_recruitment/views/res_config_settings_views.xml       | 2 +-
 addons/hr_timesheet/views/res_config_settings_views.xml         | 2 +-
 .../views/res_config_settings_views.xml                         | 2 +-
 addons/mass_mailing/views/res_config_settings_views.xml         | 2 +-
 addons/mrp/views/res_config_settings_views.xml                  | 2 +-
 addons/project/views/res_config_settings_views.xml              | 2 +-
 addons/purchase/views/res_config_settings_views.xml             | 2 +-
 addons/sale/views/res_config_settings_views.xml                 | 2 +-
 addons/stock/views/res_config_settings_views.xml                | 2 +-
 addons/website/views/res_config_settings_views.xml              | 2 +-
 odoo/addons/base/static/src/js/res_config_settings.js           | 1 +
 odoo/addons/base/static/src/tests/base_setting_test.js          | 2 +-
 20 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index f2a8eae8f27..564d8a1cfaf 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -16,7 +16,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block o_not_app" data-string="Invoicing" data-key="account_invoicing" groups="account.group_account_manager">
+                    <div class="app_settings_block o_not_app" data-string="Invoicing" string="Invoicing" data-key="account_invoicing" groups="account.group_account_manager">
                         <field name="has_chart_of_accounts" invisible="1"/>
                         <field name="has_accounting_entries" invisible="1"/>
                             <h2 attrs="{'invisible': [('has_accounting_entries','!=',False)]}">Fiscal Localization</h2>
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 0b1f910424b..12b60ef5914 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="General Settings" data-key="general_settings">
+                    <div class="app_settings_block" data-string="General Settings" string="General Settings" data-key="general_settings">
                         <div id="business_documents">
                             <h2>Business Documents</h2>
                             <div class="row mt16 o_settings_container">
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 2b6a43b2161..e06b7c9f7ec 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
+                <div class="app_settings_block" data-string="CRM" string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
                     <h2>CRM</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-xs-12 col-md-6 o_setting_box" id="crm_lead">
diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml
index d8004b443e4..0c6ee6f132a 100644
--- a/addons/event/views/res_config_settings_views.xml
+++ b/addons/event/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Events" data-key="event" groups="event.group_event_manager">
+                    <div class="app_settings_block" data-string="Events" string="Events" data-key="event" groups="event.group_event_manager">
                         <h2>Events</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box" title="Add a navigation menu to your event web pages with schedule, tracks, a track proposal form, etc.">
diff --git a/addons/hr/views/res_config_settings_views.xml b/addons/hr/views/res_config_settings_views.xml
index 6e39c8f6a54..7c7bb5f7fe5 100644
--- a/addons/hr/views/res_config_settings_views.xml
+++ b/addons/hr/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="Employees" data-key="hr" groups="hr.group_hr_manager">
+                <div class="app_settings_block" data-string="Employees" string="Employees" data-key="hr" groups="hr.group_hr_manager">
                     <h2>Work Organization</h2>
                     <div class="row mt16 o_settings_container" title="Prout prout prout">
                         <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/hr_attendance/views/res_config_settings_views.xml b/addons/hr_attendance/views/res_config_settings_views.xml
index c102c41e6a3..9cbeeba3f7d 100644
--- a/addons/hr_attendance/views/res_config_settings_views.xml
+++ b/addons/hr_attendance/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Attendances" data-key="hr_attendance" groups="hr_attendance.group_hr_attendance_manager">
+                    <div class="app_settings_block" data-string="Attendances" string="Attendances" data-key="hr_attendance" groups="hr_attendance.group_hr_attendance_manager">
                     <h2>Check-In/Out</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-xs-12 col-md-6 o_setting_box" title="Set PIN codes in the employee detail form (in HR Settings tab).">
diff --git a/addons/hr_expense/views/res_config_settings_views.xml b/addons/hr_expense/views/res_config_settings_views.xml
index fdf0f30bf87..3ea7b74fc22 100644
--- a/addons/hr_expense/views/res_config_settings_views.xml
+++ b/addons/hr_expense/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Expenses" data-key="hr_expense" groups="hr_expense.group_hr_expense_manager">
+                    <div class="app_settings_block" data-string="Expenses" string="Expenses" data-key="hr_expense" groups="hr_expense.group_hr_expense_manager">
                         <h2>Recording</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box" title="You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too.">
diff --git a/addons/hr_payroll/views/res_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml
index 88c70d60d9e..1e219332506 100644
--- a/addons/hr_payroll/views/res_config_settings_views.xml
+++ b/addons/hr_payroll/views/res_config_settings_views.xml
@@ -15,7 +15,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Payroll" data-key="hr_payroll" groups="hr_payroll.group_hr_payroll_manager">
+                    <div class="app_settings_block" data-string="Payroll" string="Payroll" data-key="hr_payroll" groups="hr_payroll.group_hr_payroll_manager">
                     <field name="module_l10n_fr_hr_payroll" invisible="1"/>
                     <field name="module_l10n_be_hr_payroll" invisible="1"/>
                     <field name="module_l10n_in_hr_payroll" invisible="1"/>
diff --git a/addons/hr_recruitment/views/res_config_settings_views.xml b/addons/hr_recruitment/views/res_config_settings_views.xml
index 90ff4a14037..e651f2bae83 100644
--- a/addons/hr_recruitment/views/res_config_settings_views.xml
+++ b/addons/hr_recruitment/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Recruitment" data-key="hr_recruitment" groups="hr_recruitment.group_hr_recruitment_manager">
+                    <div class="app_settings_block" data-string="Recruitment" string="Recruitment" data-key="hr_recruitment" groups="hr_recruitment.group_hr_recruitment_manager">
                         <h2>Job Posting</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml
index 10cece001d8..f32ebf53616 100644
--- a/addons/hr_timesheet/views/res_config_settings_views.xml
+++ b/addons/hr_timesheet/views/res_config_settings_views.xml
@@ -10,7 +10,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
+                <div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
                     <h2>Timesheet Apps</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml b/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
index 4ae2eabfadf..4c095e2eea5 100644
--- a/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
+++ b/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Fleet" data-key="fleet" groups="fleet.fleet_group_manager">
+                    <div class="app_settings_block" data-string="Fleet" string="Fleet" data-key="fleet" groups="fleet.fleet_group_manager">
                         <h2>Fleet Management</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/mass_mailing/views/res_config_settings_views.xml b/addons/mass_mailing/views/res_config_settings_views.xml
index 2885ee9c253..6412319d20f 100644
--- a/addons/mass_mailing/views/res_config_settings_views.xml
+++ b/addons/mass_mailing/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Email Marketing" data-key="mass_mailing" groups="mass_mailing.group_mass_mailing_user">
+                    <div class="app_settings_block" data-string="Email Marketing" string="Email Marketing" data-key="mass_mailing" groups="mass_mailing.group_mass_mailing_user">
                       <h2>Email Marketing</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-md-6 o_setting_box col-xs-12" title="This tool is advised if your marketing campaign is composed of several emails.">
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 9f4b61d4b97..260820cd976 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
+                    <div class="app_settings_block" data-string="Manufacturing" string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
                         <h2>Operations</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-md-6 col-xs-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index d4117b93bfa..058a8f55655 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="Project" data-key="project" groups="project.group_project_manager">
+                <div class="app_settings_block" data-string="Project" string="Project" data-key="project" groups="project.group_project_manager">
                         <h2>Task Management</h2>
                         <div class="row mt16 o_settings_container" title="This replaces task's description text field by a collaborative rich text pad. This is advised if tasks involve several people.">
                             <div id="use_collaborative_pad" class="col-xs-12 col-md-6 o_setting_box" title="Lets the company customize which Pad installation should be used to link to new pads (for example: http://etherpad.com/).">
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index a5f5d3b6dc7..1ad55e12968 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="Purchase" data-key="purchase" groups="purchase.group_purchase_manager">
+                <div class="app_settings_block" data-string="Purchase" string="Purchase" data-key="purchase" groups="purchase.group_purchase_manager">
                     <field name="po_double_validation" invisible="1"/>
                     <field name="company_currency_id" invisible="1"/>
                     <field name="po_lock" invisible="1"/>
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 35baa54aff5..651c9cf5909 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block o_not_app" data-string="Sales" data-key="sale_management" groups="sales_team.group_sale_manager">
+                <div class="app_settings_block o_not_app" data-string="Sales" string="Sales" data-key="sale_management" groups="sales_team.group_sale_manager">
                     <h2>Product Catalog</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index b31661b34ce..1fb913eba20 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside" >
-                    <div class="app_settings_block" data-string="Inventory" data-key="stock" groups="stock.group_stock_manager">
+                    <div class="app_settings_block" data-string="Inventory" string="Inventory" data-key="stock" groups="stock.group_stock_manager">
                         <h2>Operations</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 8ef61e3db6c..7e164bb1375 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Website" data-key="website" groups="website.group_website_designer">
+                    <div class="app_settings_block" data-string="Website" string="Website" data-key="website" groups="website.group_website_designer">
                             <field name="website_id" invisible="1"/>
                             <h2>Website</h2>
                             <div class="row mt16 o_settings_container" id="webmaster_settings">
diff --git a/odoo/addons/base/static/src/js/res_config_settings.js b/odoo/addons/base/static/src/js/res_config_settings.js
index 9af3e9c782b..c6cef6362af 100644
--- a/odoo/addons/base/static/src/js/res_config_settings.js
+++ b/odoo/addons/base/static/src/js/res_config_settings.js
@@ -62,6 +62,7 @@ var BaseSettingRenderer = FormRenderer.extend({
             var isNotApp = $(settingView).hasClass('o_not_app');
             if(group && !isNotApp) {
                 var data = $(settingView).data();
+                data.string = $(settingView).attr('string') || data.string;
                 self.modules.push({
                     key: data.key,
                     string: data.string,
diff --git a/odoo/addons/base/static/src/tests/base_setting_test.js b/odoo/addons/base/static/src/tests/base_setting_test.js
index 726bab3923b..e6a17810390 100644
--- a/odoo/addons/base/static/src/tests/base_setting_test.js
+++ b/odoo/addons/base/static/src/tests/base_setting_test.js
@@ -52,7 +52,7 @@ QUnit.module('base_settings_tests', {
                         '<div class="settings_tab"/>'+
                         '<div class="settings">' +
                             '<div class="notFound o_hidden">No Record Found</div>' +
-                            '<div class="app_settings_block" data-string="CRM" data-key="crm">' +
+                            '<div class="app_settings_block" string="CRM" data-key="crm">' +
                                 '<div class="row mt16 o_settings_container">'+
                                     '<div class="col-xs-12 col-md-6 o_setting_box">'+
                                         '<div class="o_setting_left_pane">' +