diff options
| author | Artur Smęt <artur.smet@mirumee.com> | 2016-10-25 16:05:24 +0200 |
|---|---|---|
| committer | Artur Smęt <artur.smet@mirumee.com> | 2016-10-25 17:05:01 +0200 |
| commit | 7a2528d73bad44451af730fccb9dd3c6d885b3e0 (patch) | |
| tree | 00d52ca47be1d1d07e14a42acefc26dd72defcd0 /saleor/userprofile | |
| parent | 1ef52f3bff41aa6c6ddaefe0607fec0fe5e60b66 (diff) | |
| download | saleor-frontend-7a2528d73bad44451af730fccb9dd3c6d885b3e0.tar.gz saleor-frontend-7a2528d73bad44451af730fccb9dd3c6d885b3e0.tar.bz2 saleor-frontend-7a2528d73bad44451af730fccb9dd3c6d885b3e0.zip | |
Improve address formatting
Diffstat (limited to 'saleor/userprofile')
| -rw-r--r-- | saleor/userprofile/templatetags/i18n_address_tags.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/saleor/userprofile/templatetags/i18n_address_tags.py b/saleor/userprofile/templatetags/i18n_address_tags.py index a96641a3..279a25c9 100644 --- a/saleor/userprofile/templatetags/i18n_address_tags.py +++ b/saleor/userprofile/templatetags/i18n_address_tags.py @@ -9,7 +9,10 @@ register = template.Library() @register.simple_tag def format_address(address, latin=False): address_data = Address.objects.as_data(address) + address_data['name'] = '%(first_name)s %(last_name)s' % address_data address_data['country_code'] = address_data['country'] - address_data['street_address'] = '%s\n%s' % ( - address_data['street_address_1'], address_data['street_address_2']) - return mark_safe(i18naddress.format_address(address_data, latin)) + address_data['street_address'] = ('%(street_address_1)s\n' + '%(street_address_2)s' % address_data) + formatted_address = i18naddress.format_address(address_data, latin) + formatted_address = formatted_address.replace('\n', '<br>') + return mark_safe(formatted_address) |