[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.01-39-g7bcad81

[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, 17.05.x has been updated
       via  7bcad818744b11180b2b2c31a5dda8d51552b862 (commit)
      from  15e6d33fc02f2c11e24c359dbc52da6b2f20fbf9 (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 7bcad818744b11180b2b2c31a5dda8d51552b862
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jun 14 15:37:55 2017 +0200

    Bug 18634: Handle colliding translation for preference sections
    
    Problem on this report was caused by translating the tabs Privacy
    and Payments by the same string. This caused overwriting a hash entry.
    
    This patch tests if the key already exists and if so, it merges the
    entries instead of overwriting the old contents.
    
    Test plan:
    [1] Make sure that e.g. Privacy and Payments translate to e.g Vie privee.
    [2] Run translate install fr-CA (or the language you altered)
    [3] Without this patch you should loose preferences from either Privacy or
        Payments. With this patch, they should be merged.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested with fr-CA.
    
    Signed-off-by: Blou <philippe.blouin at inlibro.com>
    Reset the .po files, reproduced the problem.  Applied the patch and suddenly 'paypal' appeared.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0d98089ec701bc96893e68408ce2dedad36f7235)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 misc/translator/LangInstaller.pm |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository