[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-6-g23f4637

[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.18.x has been updated
       via  23f46375f5e283985a22c1a74a1946052033cd70 (commit)
       via  a3c8f2a838c94ea17f853a300cb2a15ebdb9841b (commit)
       via  8d3c58171cf2fbb11306a00425979f1180d8002a (commit)
       via  28fbce880743877bb4c0a35da762c40c177000d9 (commit)
      from  58e10601ce1903c51eb7a05ad70774262dedd2af (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 23f46375f5e283985a22c1a74a1946052033cd70
Author: Marc Véron <veron at veron.ch>
Date:   Thu Mar 12 08:04:14 2015 +0100

    Bug 13826 - OPAC: Display RSS icon on list of recent comments
    
    This patch adds RSS icon to OPAC page 'Recent comments'
    
    To test:
    1)
    Enable display of 'Recent comments' in OPAC (Syspref OpacShowRecentComments)
    2)
    In OPAC, go to Home > Recent comments
    3)
    Verify that there is a link in the head part of the HTML source code (<link rel="alternate" type="application/rss+xml"....), but no RSS icon on the pate itself (like in search results).
    4)
    Apply patch
    Result: Icon with link to RSS feed is displayed  next to title.
    
    Bug 13826 - Follow-Up: Close </h3>
    
    There was a slash missing.
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by for the Follow Up: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e043b5563f4f4fc038c8857b6f9d54c80f8dbbbe)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit a3c8f2a838c94ea17f853a300cb2a15ebdb9841b
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Tue Mar 10 10:29:15 2015 +0100

    Bug 13768: Correction of double quotes escaped into double quotes
    
    Without the patch the translated pages for quotes.tt may have the problematic line broken.
    So the js is broken too. The line with bad usage of double quotes escaped :
    var sEmptyTable = _("No quotes available. Please use the \"Add quote\" button to add a quote.");
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    diff on staff PO file
    
    -msgid ""
    -"No quotes available. Please use the \\\"Add quote\\\" button to add a quote."
    +#, fuzzy
    +msgid "No quotes available. Please use the 'Add quote' button to add a quote."
    
    No koha-qa errors
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 7e148240091ab89d268e60fb7d1ff467a0c78c7b)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 8d3c58171cf2fbb11306a00425979f1180d8002a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Mar 18 01:46:18 2015 +0100

    Bug 13861: \n in confirmation message on closing a budget
    
    \n in strings doesn't translate well, so we move it outside
    the translated string.
    
    To test:
    - create at least 2 budgets
    - close one of the budgets (moving orders from one budget to the other)
    - after selecting the budget to move your orders to, save
    - the confirmation message shown should read:
    
    You have chosen to move all unreceived orders from 'budget 1' to 'budget 2'.
    This action cannot be reversed. Do you wish to continue?
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit b4a9b23ab7d926f8d2031de0b0fc822988a8e5ae)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 28fbce880743877bb4c0a35da762c40c177000d9
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue Mar 10 11:28:39 2015 -0300

    Bug 13748: Acquisition wizard: some strings not translatable
    
    This patch removes all instances of CGI::scrolling_list from
    reports/acquisitions_stats.pl, which prevented proper translation
    
    To test:
    1) Install and enable a language (es-ES or de-DE are good choices)
    2) On Acquisitons wizard, some pulldown labels are not translated
    3) Apply the patch
    4) Update and install again the language
    5) Check labels are translated and all pulldown works
    
    This does not solve the 'Collection code' problem,
    is more strange
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, good improvement.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a7d4d05a7c0afcb4b7b390882ec950d1d359abcb)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 .../prog/en/modules/admin/aqbudgetperiods.tt       |    2 +-
 .../prog/en/modules/reports/acquisitions_stats.tt  |   40 +++++++-
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |    2 +-
 .../bootstrap/en/modules/opac-showreviews.tt       |    2 +-
 reports/acquisitions_stats.pl                      |  105 +++++++-------------
 5 files changed, 74 insertions(+), 77 deletions(-)


hooks/post-receive
-- 
main Koha release repository