]> git.koha-community.org Git - koha.git/commit
Bug 18634: Handle colliding translation for preference sections
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Wed, 14 Jun 2017 13:37:55 +0000 (15:37 +0200)
committerKatrin Fischer <katrin.fischer.83@web.de>
Sat, 15 Jul 2017 18:13:36 +0000 (20:13 +0200)
commit193f139062226547d42f66ebfce5a094003e3ea4
treef3e31f9f264945ae7fe91a0b0a81de11f97e7e3d
parent885886fe2e414eff3fb7ee812f69b811938e1f06
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@rijksmuseum.nl>
Tested with fr-CA.

Signed-off-by: Blou <philippe.blouin@inlibro.com>
Reset the .po files, reproduced the problem.  Applied the patch and suddenly 'paypal' appeared.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 0d98089ec701bc96893e68408ce2dedad36f7235)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 7bcad818744b11180b2b2c31a5dda8d51552b862)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
misc/translator/LangInstaller.pm