From 120d13b0e75e142b55c802a4075c31563ca0f67f Mon Sep 17 00:00:00 2001
From: Olivier-LAURENT <olivier.laurent@acsone.eu>
Date: Fri, 28 Dec 2018 20:30:39 +0100
Subject: [PATCH] [CHG] change some terms and add FR translations

---
 email_template_configurator/i18n/fr.po        | 107 ++++++++++++++++++
 .../models/email_template.py                  |   3 +-
 .../models/email_template_placeholder.py      |   3 +-
 .../security/email_template_placeholder.xml   |   2 +-
 .../views/email_template.xml                  |   4 +-
 .../views/email_template_placeholder.xml      |   6 +-
 6 files changed, 117 insertions(+), 8 deletions(-)
 create mode 100644 email_template_configurator/i18n/fr.po

diff --git a/email_template_configurator/i18n/fr.po b/email_template_configurator/i18n/fr.po
new file mode 100644
index 00000000..6190fed2
--- /dev/null
+++ b/email_template_configurator/i18n/fr.po
@@ -0,0 +1,107 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* email_template_configurator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-28 18:59+0000\n"
+"PO-Revision-Date: 2018-12-28 18:59+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,active:0
+msgid "Active"
+msgstr "Actif"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,create_uid:0
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,create_date:0
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,display_name:0
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: email_template_configurator
+#: model:ir.model,name:email_template_configurator.model_email_template_placeholder
+msgid "Email Template Placeholder"
+msgstr "Champ de fusion de modèle de courriel"
+
+#. module: email_template_configurator
+#: model:ir.model,name:email_template_configurator.model_email_template
+msgid "Email Templates"
+msgstr "Modèles de courriels"
+
+#. module: email_template_configurator
+#: view:email.template.placeholder:email_template_configurator.email_template_placeholder_search_view
+msgid "Group by..."
+msgstr "Grouper par..."
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,__last_update:0
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,write_uid:0
+msgid "Last Updated by"
+msgstr "Dernière modification par"
+
+#. module: email_template_configurator
+#: field:email.template.placeholder,write_date:0
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: email_template_configurator
+#: view:email.template.placeholder:email_template_configurator.email_template_placeholder_search_view
+#: field:email.template.placeholder,model_id:0
+msgid "Model"
+msgstr "Modèle"
+
+#. module: email_template_configurator
+#: field:email.template,placeholder_id:0
+#: field:email.template.placeholder,name:0
+msgid "Placeholder"
+msgstr "Champ de fusion"
+
+#. module: email_template_configurator
+#: field:email.template,placeholder_value:0
+#: field:email.template.placeholder,placeholder:0
+msgid "Placeholder value"
+msgstr "Valeur du champ de fusion"
+
+#. module: email_template_configurator
+#: help:email.template,placeholder_value:0
+msgid "Placeholder value to copy-paste in the desired template field"
+msgstr "Valeur du champ de fusion à copier-coller dans le champ de modèle désiré"
+
+#. module: email_template_configurator
+#: model:res.groups,name:email_template_configurator.group_email_template_placeholders_manager
+msgid "Placeholders Manager"
+msgstr "Gestionnaire de champs de fusion"
+
+#. module: email_template_configurator
+#: view:email.template:email_template_configurator.email_template_form_view
+#: model:ir.actions.act_window,name:email_template_configurator.email_template_placeholder_act_window
+#: model:ir.ui.menu,name:email_template_configurator.email_template_placeholder_menu
+msgid "Predefined Placeholders"
+msgstr "Champs de fusion prédéfinis"
+
diff --git a/email_template_configurator/models/email_template.py b/email_template_configurator/models/email_template.py
index 6634676a..6769e8f1 100644
--- a/email_template_configurator/models/email_template.py
+++ b/email_template_configurator/models/email_template.py
@@ -12,7 +12,8 @@ class EmailTemplate(models.Model):
     # Fake field for auto-completing placeholder
     placeholder_id = fields.Many2one(
         'email.template.placeholder', string="Placeholder")
-    placeholder_value = fields.Char()
+    placeholder_value = fields.Char(
+        help='Placeholder value to copy-paste in the desired template field')
 
     @api.onchange('placeholder_id')
     def _onchange_placeholder_id(self):
diff --git a/email_template_configurator/models/email_template_placeholder.py b/email_template_configurator/models/email_template_placeholder.py
index c47fbafc..513938f0 100644
--- a/email_template_configurator/models/email_template_placeholder.py
+++ b/email_template_configurator/models/email_template_placeholder.py
@@ -10,9 +10,10 @@ class EmailTemplatePlaceholder(models.Model):
     _name = 'email.template.placeholder'
     _description = 'Email Template Placeholder'
 
-    name = fields.Char(required=True)
+    name = fields.Char(string='Placeholder', required=True)
     model_id = fields.Many2one(
         'ir.model', string='Model', required=True)
     placeholder = fields.Char(
+        string='Placeholder value',
         required=True, default='${object.}')
     active = fields.Boolean(default=True)
diff --git a/email_template_configurator/security/email_template_placeholder.xml b/email_template_configurator/security/email_template_placeholder.xml
index 4ed17a0f..c8a03c1c 100644
--- a/email_template_configurator/security/email_template_placeholder.xml
+++ b/email_template_configurator/security/email_template_placeholder.xml
@@ -6,7 +6,7 @@
 <data>
 
     <record id="group_email_template_placeholders_manager" model="res.groups">
-        <field name="name">Template Placeholders Manager</field>
+        <field name="name">Placeholders Manager</field>
     </record>
 
     <record model="ir.model.access" id="email_template_placeholder_access_user">
diff --git a/email_template_configurator/views/email_template.xml b/email_template_configurator/views/email_template.xml
index a73ff96f..3385ca22 100644
--- a/email_template_configurator/views/email_template.xml
+++ b/email_template_configurator/views/email_template.xml
@@ -11,10 +11,10 @@
         <field name="inherit_id" ref="email_template.email_template_form"/>
         <field name="arch" type="xml">
             <xpath expr="//page[.//field[@name='model_object_field']]" position="attributes">
-                <attribute name="groups">email_template_configurator.group_email_template_placeholders_manager</attribute>
+                <attribute name="groups" translation="off">email_template_configurator.group_email_template_placeholders_manager</attribute>
             </xpath>
             <xpath expr="//page[.//field[@name='model_object_field']]" position="after">
-                <page name="configured_placeholders" string="Configured Placeholders">
+                <page name="configured_placeholders" string="Predefined Placeholders">
                     <group>
                         <field name="placeholder_id"
                                domain="[('model_id','=',model_id)]"
diff --git a/email_template_configurator/views/email_template_placeholder.xml b/email_template_configurator/views/email_template_placeholder.xml
index 82108225..56b4d246 100644
--- a/email_template_configurator/views/email_template_placeholder.xml
+++ b/email_template_configurator/views/email_template_placeholder.xml
@@ -31,7 +31,7 @@
             <search>
                 <field name="name"/>
                 <field name="model_id"/>
-                <group expand="0" string="Group by...">
+                <group string="Group by...">
                     <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                 </group>
             </search>
@@ -51,7 +51,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="email_template_placeholder_act_window">
-        <field name="name">Template Placeholders</field>
+        <field name="name">Predefined Placeholders</field>
         <field name="res_model">email.template.placeholder</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[]</field>
@@ -59,7 +59,7 @@
     </record>
 
     <record model="ir.ui.menu" id="email_template_placeholder_menu">
-        <field name="name">Template Placeholders</field>
+        <field name="name">Predefined Placeholders</field>
         <field name="parent_id" ref="base.menu_email"/>
         <field name="action" ref="email_template_placeholder_act_window"/>
     </record>