[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.10-57-g1aef2f34e5

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 19.05.x has been updated
       via  1aef2f34e5fb5602eaf228d9eefc93063be3e276 (commit)
      from  5741383cf3ad60efb7dd742334ef51966e2dbfce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1aef2f34e5fb5602eaf228d9eefc93063be3e276
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Apr 6 12:44:13 2020 +0200

    Bug 25069: Fix AddressFormat="fr" behavior
    
    Something went wrong during a rebase of bug 13618
      commit dcd1f5d48c758aee17b6c6f069c6146b42efe117
      Bug 13618: Add html filters to all the variables
    
    Several changes related to AddressFormat are wrong:
    
    -    [% IF Koha.Preference( 'AddressFormat' ) %]
    -        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
    -    [% ELSE %]
    -        [% INCLUDE 'member-main-address-style-us.inc' %]
    -    [% END %]
    +    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
    +        [% CASE 'de' %]
    +            [% INCLUDE 'member-main-address-style-de.inc' %]
    +        [% CASE # us %]
    +            [% INCLUDE 'member-main-address-style-us.inc' %]
    +     [% END %]
    
    Test plan:
    Create a patron with all the address fields filled
    Play with the 3 option values of AddressFormat, and confirm that the address is displayed correctly
    on the patron's view, and in the patron module (top left)
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit b7e9de9a436d59c811f459758094b9bb1ab86a59)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/includes/circ-menu.inc    |  9 ++++-----
 .../prog/en/modules/members/memberentrygen.tt       | 21 ++++++++++-----------
 2 files changed, 14 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository