[koha-commits] main Koha release repository branch master updated. v3.14.00-918-g54a62cd
Git repo owner
gitmaster at git.koha-community.org
Sun Apr 27 23:38:31 CEST 2014
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, master has been updated
via 54a62cddb323aea1fd05c3de8b5579bed07d106f (commit)
via 050a9c97fd60489da20c8fa67f45034e4c81c1ba (commit)
via e64c52866be5f148874798de7c6fb050f3f0b454 (commit)
via 9e9088049c343cc8676630cfd6a5cde7fa897f0f (commit)
via d3a36c6612500793766cb565feb21ae74b9b4055 (commit)
via c2295530401f53653386ff07a43c668a6a574d65 (commit)
via baa2fb2fbacf660a92fed4042697f3a87b193cde (commit)
from 67e5181ca42f6f2e7d4525d755c9de957ef6d7a2 (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 54a62cddb323aea1fd05c3de8b5579bed07d106f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 17 13:13:00 2014 -0400
Bug 11769: (follow-up) style required fields
This follow up adds the correct "required" style to the required form
fields as well as the "required" text after each required field.
To test, apply all patches and go to Administration -> MARC
bibliographic framework -> New framework. The framework code and
description fields should show that they are required.
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described and feels a million times better.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, template changes only.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 050a9c97fd60489da20c8fa67f45034e4c81c1ba
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 14 15:17:44 2014 -0500
Bug 11769 - Use validation plugin when creating new MARC framework
The page for adding a new MARC framework includes some custom form
validation JavaScript which can be removed in favor of HTML5 validation
attributes and Koha's built-in validation plugin. This patch does so.
To test, apply the patch and go to Administration -> MARC bibliographic
framework -> New framework. Try submitting the form without entering a
tag number. This should trigger a validation warning.
Submission of the form with valid data should work correctly. Editing an
existing framework should also work correctly.
Patch behaves as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e64c52866be5f148874798de7c6fb050f3f0b454
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Apr 3 10:10:33 2014 -0300
Bug 11227: remove some JavaScript from staff PO files
This patch rewrites authorities_js.inc so translate
script will process it correctly. To do that I added
<script></script> at the file
To test:
1) Update po files for your preffered language
2) Check occurrence of mergeAuth on staff PO file
or try
egrep -n "Merging with authority: |Cancel merge"
strings appear in a JS func
3) Apply the patch
4) Update translations again, check again, old
strings now begin with #~ (obsoleted) and there
are new entries for the messages
5) Check functionality provided by script
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described and fixes a translation difficulty.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9e9088049c343cc8676630cfd6a5cde7fa897f0f
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Thu Apr 24 14:51:28 2014 +0300
Bug 12138 - Use placeholders in translatable Javascript strings
Currently translating Javascript strings with variables in them is hard,
because the strings are created from separate parts. For example:
_("Are you sure you want to delete the") + " " + count + " " +
_("attached items?")
This is translated in two different parts, and the translator cannot
affect the place where the count-variable is.
Now, if the javascript strings allowed placeholders, similar to how the
template strings do, the above could be written as:
_("Are you sure you want to delete the %s attached
items?").format(count)
This would make translation much easier.
Attached patch adds a Javascript string formatter, and changes all the
concatenated translatable JS strings used in intranet to use that.
To test:
1) cd misc/translator
2) perl translate update xx-YY
3) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po | sort | uniq >
xx-YY-pre
4) apply patch
5) perl translate update xx-YY
6) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po | sort | uniq >
xx-YY-post
7) compare the files: diff -Nurd xx-YY-pre xx-yy-post | less
should show the javascript strings that changed.
8) Test the UIs where the formatted js strings are used.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I tested *most* of the changed files. There were some instances where it
wasn't clear to me how to trigger the warnings which were modified,
especially tags/review.tt, admin/manage-marc-import.tt, and holidays.tt.
Everything I was able to test worked correctly.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely, no regressions found. Thx!
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d3a36c6612500793766cb565feb21ae74b9b4055
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Apr 3 15:58:08 2014 -0300
Bug 11497: remove TT construct for picking a default string that i18n toolchain fails to pick up
The i18n toolchain fails to pick up constant text defined inside
[% ... %]. In particular, in a construct like this
[% var OR "string" %]
the string "string" will not be available to be translated.
This patch fixes all the cases I could find.
To test:
1. Update your preferred language
(cd misc/translator; perl translate update fi-FI)
2. Count headers for example
egrep "^msgid.*Koha online" misc/translator/po/fi-FI-* | wc -l
3. Apply the patch
4. Repeat 1 and 2, now there are more lines
Or translate to some lang and visit every touched page and look the title
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described. Template changes only.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c2295530401f53653386ff07a43c668a6a574d65
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Thu Apr 24 11:01:52 2014 +0300
Bug 11631: Make i18n toolchain ignore useless strings
This patch removes several types of strings from the
PO files that cannot be usefully translated, including
ones that consist entirely of punctuation and/or HTML entities.
Test:
1) Update PO files of some lang, xx-YY-*po
cd misc/translator
perl translate update xx-YY
2) Do it again, just in case
3) rm po/xx-YY*po~
4) Extract all msgid's, sorted
cat po/xx-YY*po | egrep "^msgid" | sort | uniq > xx-YY-pre
5) Apply the patch
6) Repeat 1-3
7) Repeat 4 again, other file
cat po/xx-YY*po | egrep "^msgid" | sort | uniq > xx-YY-post
8) Do a diff, inspect results, only strings with %s and \s
diff xx-YY-pre xx-YY-post | less
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works as described, 380 strings less to 'translate'
No koha-qa errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested according to test plan, works as described.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit baa2fb2fbacf660a92fed4042697f3a87b193cde
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Apr 15 00:11:16 2014 +1200
Bug 10823: add class info to enumchron data in detail.tt, for better styling
This patch adds spans to style parts of the enumchron and serialseq
information in the holdings table in the taff interface:
These include:
- items.enumchron
- the separator used
- serial.serialseq
- items.publisheddate
TEST PLAN
---------
1) Apply patch 10825
2) Find a biblio where the enumchron and serialseq are different.
-- in MySQL:
SELECT items.biblionumber,items.enumchron,serial.serialseq
FROM items,serial,serialitems
WHERE items.itemnumber=serilaitems.itemnumber
AND serialitems.serialid=serial.serialid;
3) In the staff client, view the source for that item.
-- It should be one class for the entire <td> cell.
4) Apply patch 10823
5) Refresh the page
6) Look at the source for that item again.
-- It should have <span> tags around the 4 things listed
above.
7) Run the koha qa test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template change only, no regression found.
Using [%- -%] could improve readability of HTML source code.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
.../prog/en/includes/authorities_js.inc | 4 ++
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 16 +++---
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 13 +++++
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/acqui/aqbasketuser_search.tt | 2 +-
.../prog/en/modules/acqui/booksellers.tt | 2 +-
.../prog/en/modules/acqui/invoices.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 5 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../prog/en/modules/acqui/z3950_search.tt | 2 +-
.../prog/en/modules/admin/biblio_framework.tt | 57 ++++++--------------
.../en/modules/admin/item_circulation_alerts.tt | 2 +-
.../en/modules/admin/marc_subfields_structure.tt | 2 +-
.../en/modules/authorities/authorities-home.tt | 2 +-
.../prog/en/modules/authorities/authorities.tt | 4 +-
.../en/modules/authorities/searchresultlist.tt | 2 +-
.../prog/en/modules/catalogue/detail.tt | 16 +++---
.../prog/en/modules/cataloguing/addbiblio.tt | 4 +-
.../prog/en/modules/cataloguing/additem.tt | 2 +-
.../cataloguing/value_builder/marc21_field_006.tt | 2 +-
.../cataloguing/value_builder/marc21_field_008.tt | 2 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/offline.tt | 10 ++--
.../prog/en/modules/labels/label-manage.tt | 6 +--
.../intranet-tmpl/prog/en/modules/members/pay.tt | 3 +-
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../prog/en/modules/patroncards/edit-batch.tt | 4 +-
.../prog/en/modules/patroncards/image-manage.tt | 4 +-
.../prog/en/modules/patroncards/manage.tt | 6 +--
.../prog/en/modules/reserve/request.tt | 2 +-
.../prog/en/modules/serials/serials-edit.tt | 2 +-
.../prog/en/modules/serials/subscription-add.tt | 6 +--
.../intranet-tmpl/prog/en/modules/tags/review.tt | 12 ++---
.../prog/en/modules/tools/holidays.tt | 8 +--
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 18 +++----
.../prog/en/modules/tools/modborrowers.tt | 2 +-
.../prog/en/modules/tools/quotes-upload.tt | 10 ++--
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 5 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 3 +-
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 3 +-
.../bootstrap/en/modules/opac-tags_subject.tt | 5 +-
koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 3 +-
.../prog/en/modules/opac-readingrecord.tt | 3 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 3 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 3 +-
.../opac-tmpl/prog/en/modules/opac-tags_subject.tt | 3 +-
misc/translator/xgettext.pl | 1 +
51 files changed, 141 insertions(+), 143 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list