From 935b6d6aabbff780bde81eb0803e9533c65b3672 Mon Sep 17 00:00:00 2001
From: ougc27 <oscar.garza@jarsa.com.mx>
Date: Wed, 14 Mar 2018 09:39:13 -0600
Subject: [PATCH] [FIX] base_address_city: add missing placeholder

for city and city_id fields
To be consistent with the other fields

Closes #23662
---
 .../i18n/base_address_city.pot                | 20 +++++++++----------
 .../base_address_city/models/res_partner.py   |  8 +++++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/base_address_city/i18n/base_address_city.pot b/addons/base_address_city/i18n/base_address_city.pot
index 513fe9350a8..dda57b45382 100644
--- a/addons/base_address_city/i18n/base_address_city.pot
+++ b/addons/base_address_city/i18n/base_address_city.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:52+0000\n"
-"PO-Revision-Date: 2017-09-20 09:52+0000\n"
+"POT-Creation-Date: 2018-03-15 07:58+0000\n"
+"PO-Revision-Date: 2018-03-15 07:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -29,17 +29,14 @@ msgid "Cities"
 msgstr ""
 
 #. module: base_address_city
+#: code:addons/base_address_city/models/res_partner.py:36
 #: model:ir.model,name:base_address_city.model_res_city
-#: model:ir.model.fields,field_description:base_address_city.field_res_city_country_id
-#: model:ir.ui.view,arch_db:base_address_city.view_city_filter
-#: model:ir.ui.view,arch_db:base_address_city.view_city_tree
-msgid "City"
-msgstr ""
-
-#. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_partner_city_id
 #: model:ir.model.fields,field_description:base_address_city.field_res_users_city_id
-msgid "Company"
+#: model:ir.ui.view,arch_db:base_address_city.view_city_filter
+#: model:ir.ui.view,arch_db:base_address_city.view_city_tree
+#, python-format
+msgid "City"
 msgstr ""
 
 #. module: base_address_city
@@ -49,6 +46,7 @@ msgstr ""
 
 #. module: base_address_city
 #: model:ir.model,name:base_address_city.model_res_country
+#: model:ir.model.fields,field_description:base_address_city.field_res_city_country_id
 msgid "Country"
 msgstr ""
 
diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py
index 27b08b5a2a3..15841594eec 100644
--- a/addons/base_address_city/models/res_partner.py
+++ b/addons/base_address_city/models/res_partner.py
@@ -4,6 +4,8 @@
 from lxml import etree
 
 from odoo import api, models, fields
+from odoo.tools.translate import _
+
 
 class Partner(models.Model):
     _inherit = 'res.partner'
@@ -28,10 +30,10 @@ class Partner(models.Model):
             replacement_xml = """
             <div>
                 <field name="country_enforce_cities" invisible="1"/>
-                <field name='city' attrs="{'invisible': [('country_enforce_cities', '=', True), ('city_id', '!=', False)], 'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"/>
-                <field name='city_id' attrs="{'invisible': [('country_enforce_cities', '=', False)], 'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" context="{'default_country_id': country_id}" domain="[('country_id', '=', country_id)]"/>
+                <field name='city' placeholder="%s" attrs="{'invisible': [('country_enforce_cities', '=', True), ('city_id', '!=', False)], 'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"/>
+                <field name='city_id' placeholder="%s" attrs="{'invisible': [('country_enforce_cities', '=', False)], 'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" context="{'default_country_id': country_id}" domain="[('country_id', '=', country_id)]"/>
             </div>
-            """
+            """ % (_('City'), _('City'))
             city_id_node = etree.fromstring(replacement_xml)
             city_node.getparent().replace(city_node, city_id_node)