[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-246-ga734dc5
Git repo owner
gitmaster at git.koha-community.org
Sun Apr 21 16:00:38 CEST 2013
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.12.x has been updated
via a734dc5dbb58002839a14b186e69ad24ff64274d (commit)
via 2bb7ddb185ba10a471ed9dbeccab682ea78d9b1b (commit)
via 9af46e7de460cf4e18ff40b6c20b042a07647fd6 (commit)
via ea3ea841d0c928ffab796324a7a91043a0febed6 (commit)
from 1a934d0fcc7e52f58ad5e5fc77a0b7218efa51f5 (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 a734dc5dbb58002839a14b186e69ad24ff64274d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Apr 15 09:23:58 2013 -0400
Bug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates
This patch is an alternate solution to the problem of "0" not appearing
on the comment tab in translated templates. It uses the Template Toolkit
option of specifying a default value for a variable:
[% reviews.size || 0 %]
This syntax is already in use elsewhere in the template.
Same test plan:
1) Make sure comments/reviews are activated
2) Find a record with 0 comments/reviews in the opac
3) The tab shows: Comments ( 0 )
4) Switch to any other languages.
5) Tab now shows: <translation of Comments> ( )
6) Apply patch
7) Check English templates stil work correctly
8) Rerun 'perl translate install <langcode>
9) Check display is now correct.
10) Also check that number shows correctly for records
with comments.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Tested with nb-NO. English still works after the patch. Norwegian
was showing "Comments" untranslated, which had me a bit unnerved.
Turns out the string to be translated changed from "Comments ( %s%s%s%s )"
to "Comments ( %s )", so to make sure all was well, I had to update
the nb-NO translation, fix the number of %s's in the Norwegian string,
make sure it was not marked as fuzzy and then install nb-NO. And it
works!
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 6910bec11677bbee4e29a4c79587cbcf60c28e85)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 2bb7ddb185ba10a471ed9dbeccab682ea78d9b1b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 27 13:57:01 2013 -0400
Bug 9839 - when importing MARC records, item record not created even when set to "always add"
Test Plan:
1) Catalog a new record with an ISBN
2) Add some items to the record
3) Download the record as MARCXML
4) Delete the itemnumbers from the 952 fields in the record,
Change the barcode fields to unused barcodes
5) Use xml2marc to save as a standard MARC file
6) Import the record using the 'Stage MARC for import' tool
Use the settings:
Record matching rule: ISBN
Action if matching record found: ignore
Action if no match found: ignore
Item processing: always_add
Check for embedded item record data?: Yes
How to process items: Always add items
7) Import, note the bib is ignored, and the items are not processed
8) Undo import into catalog
8) Apply this patch
9) Import this batch into the catalog
10) Note the items were processed and are now added to the matching
record
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Tested with UNIMARC record. I followed the test plan, just changing 952 by 995
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit a986c92c4d92da6fb1bba330cf693dde31207877)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 9af46e7de460cf4e18ff40b6c20b042a07647fd6
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 8 09:07:43 2013 -0400
Bug 9995 - For reference items no longer listed in XSLT result lists
Re-added the xsl that shouldn't have been removed.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested with different settings for OpacItemLocation
and not for loan set in the item and for the item type.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit cbe3e7656d9050dbebb6224f7f7c5fb419a2e6c3)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit ea3ea841d0c928ffab796324a7a91043a0febed6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 16 09:37:24 2013 -0400
Bug 10065 - Style invoice edit form according to standard structure
The structure of the invoice edit form does not match that of similar
forms in the staff client. This patch alters it to be consistent.
To test you must also have the patch for Bug 10046 applied.
Go to Acquisitions -> Invoices and search for invoices. Click an invoice
to view/edit details. The form displaying fields for shipment date,
billing date, etc. should look correct and work correctly.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 6e88f5c736689cab23561e3f8be968e973f52c61)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ImportBatch.pm | 1 +
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 82 ++++++++++----------
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 19 ++++-
4 files changed, 62 insertions(+), 42 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list