[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.01-85-g38b29a7

[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, 3.22.x has been updated
       via  38b29a78f8aa05d4f1ff9693dafbacfe94c7e54b (commit)
       via  47be997be035f67548e478c6cb99b667f006b1f3 (commit)
      from  44358716ba845d0f4d7ed7d94a669cf6d143d0c7 (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 38b29a78f8aa05d4f1ff9693dafbacfe94c7e54b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jan 6 11:17:00 2016 +0000

    Bug 15477: (follow-up) Bug 14100: Better errors handling
    
    On bug 14100, the patch "Better errors handling" introduced an ...
    error.
    The user always get "An error occurred when updating this translation"
    although it has been updated in DB.
    
    Test plan:
    Edit translations for an item type: you should not get an error when
    everything went fine.
    
    Tested on top of 15487, error message does no longer appear.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit e706cd18f0d24365a197ac50fe77d7dc16014ca6)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 47be997be035f67548e478c6cb99b667f006b1f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jan 6 16:59:22 2016 +0000

    Bug 15487: Fix encoding issue on localization
    
    It has been introduced
      commit ed0ff59152a41f6690b480d0b13b607250678418
        Bug 11559: Supporting changes for Rancor
    
    Pushed at the same time as bug 14100.
    
    Test plan:
    Add/update translations for item types, confirm there is no encoding
    issues.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit 7fdb4d21d62674b29958022840aea2c2f82ef97c)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/admin/localization.tt          |    8 +++--
 svc/localization                                   |   33 +++++++++++---------
 2 files changed, 23 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
main Koha release repository