diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 56f84735d55..7221500de09 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -34,25 +34,25 @@ from openerp.tools.translate import _
ADDRESS_FORMAT_LAYOUTS = {
'%(city)s %(state_code)s\n%(zip)s': """
-
-
+
+
-
+
""",
'%(zip)s %(city)s': """
-
-
+
+
-
+
""",
'%(city)s\n%(state_name)s\n%(zip)s': """
-
-
-
+
+
+
"""
}
@@ -66,7 +66,7 @@ class format_address(object):
if k in fmt:
doc = etree.fromstring(arch)
for node in doc.xpath("//div[@class='address_format']"):
- tree = etree.fromstring(v)
+ tree = etree.fromstring(v % {'city': _('City'), 'zip': _('ZIP'), 'state': _('State')})
node.getparent().replace(node, tree)
arch = etree.tostring(doc)
break