Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 21794: (QA follow-up) Separate city and country with a comma

Browse source 
If only the city and country address information was provided they ended
up being glued together like this: CityCountry. (AddressFormat=US style)

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Joonas Kylmälä 2021-09-04 18:23:16 +00:00 committed by Jonathan Druart
parent ea9b9ba090
commit aba3611dc0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
View file

@ -26,7 +26,7 @@
[%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
<li class="patroncity">
[%~ patron.city |html ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html ~%][%~ END ~%]
[%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%]
[%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%]
</li>
[%~ END ~%]
[%~ END ~%]

2
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
View file

@ -23,7 +23,7 @@
[% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
<li class="patroncity">
[% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
[% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state ) %], [% END %][% patron.B_country | html %][% END %]
[% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %]
</li>
[% END %]
[% END %]