changeset bbc1e8aeae2a in modules/party:default
details: https://hg.tryton.org/modules/party?cmd=changeset&node=bbc1e8aeae2a
description:
Always show country name in English language
issue10179
review343871002
diffstat:
CHANGELOG | 1 +
address.py | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diffs (41 lines):
diff -r 11eaa6492bfc -r bbc1e8aeae2a CHANGELOG
--- a/CHANGELOG Sun Feb 13 00:43:49 2022 +0100
+++ b/CHANGELOG Mon Mar 14 11:13:42 2022 +0100
@@ -1,3 +1,4 @@
+* Always show country name in English language
* Add fr_siren and fr_siret identifiers
* Add optional address to identifiers
* Add autonomous city as subdivision type for Spain
diff -r 11eaa6492bfc -r bbc1e8aeae2a address.py
--- a/address.py Sun Feb 13 00:43:49 2022 +0100
+++ b/address.py Mon Mar 14 11:13:42 2022 +0100
@@ -154,12 +154,19 @@
filter(None, (x.strip() for x in full_address.splitlines())))
def _get_address_substitutions(self):
+ pool = Pool()
+ Country = pool.get('country.country')
+
context = Transaction().context
subdivision_code = ''
if getattr(self, 'subdivision', None):
subdivision_code = self.subdivision.code or ''
if '-' in subdivision_code:
subdivision_code = subdivision_code.split('-', 1)[1]
+ country_name = ''
+ if getattr(self, 'country', None):
+ with Transaction().set_context(language='en'):
+ country_name = Country(self.country.id).name
substitutions = {
'party_name': '',
'attn': '',
@@ -170,8 +177,7 @@
'subdivision': (self.subdivision.name
if getattr(self, 'subdivision', None) else ''),
'subdivision_code': subdivision_code,
- 'country': (self.country.name
- if getattr(self, 'country', None) else ''),
+ 'country': country_name,
'country_code': (self.country.code or ''
if getattr(self, 'country', None) else ''),
}