[koha-commits] main Koha release repository branch master updated. v19.11.00-675-gb4f7dd50de
Git repo owner
gitmaster at git.koha-community.org
Mon Feb 10 11:42:44 CET 2020
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 b4f7dd50de9b2dfe659a0b7e90d3870fc6e75d98 (commit)
via 9d6ec5c64bd2d11cd143dfb357377e48237cb229 (commit)
via 17400198f02f30ec5ad2710efe6f10a950a96879 (commit)
via 27cc2d6a33619e34cf316a95c1633b3ded31fa75 (commit)
via 02275b8205f2c78d6754582b0278fe22524b8c1e (commit)
via 2dc6ef96312c9c2649719289c8e71466441a8da4 (commit)
via aa9ad782ced801981242504d417348b31fa9f8d8 (commit)
via 6e0a4d18d4f5c996c18b719f020adcfb800368b8 (commit)
via 1bcc2159a5c137c216f6afa759cb7da5f2f4a15d (commit)
from 013edd90e31a871c4125cee3d6f48fd25af40138 (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 b4f7dd50de9b2dfe659a0b7e90d3870fc6e75d98
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Wed Feb 5 01:04:52 2020 +0000
Bug 24585: Add 'Managed on' and 'Suggested on' columns to pat_purchase_suggestions.tt
This patch adds 2 new columns on the suggestions table on purchase-suggestions.tt. These use the data-order attribute to allow for sorting.
TEST PLAN:
1. Have a patron with some suggestions that have been managed by staff. (accept or reject the request).
2. View that patrons suggestions from purchase-suggestions.pl.
3. No suggested on or managaed on columns.
4. Apply patch and reload the page.
5. The new columns are there, have multiple suggestions and make sure sorting by the date works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9d6ec5c64bd2d11cd143dfb357377e48237cb229
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jan 4 21:08:29 2016 +0100
Bug 21156: Add plural translation capabilities to JS files
It adds Javascript equivalent of Koha::I18N's exported subroutines, and
they are used the same way.
String extraction is done only on *.js files and require gettext 0.19
(available in Debian jessie, and also in wheezy-backports)
It adds Javascript library Gettext.js for handling translation and a
Perl script po2json to transform PO file into JSON.
Gettext.js and po2json both come from Locale::Simple.
There are several tools named po2json. It's simpler to integrate this
one into Koha than to check if the good one is installed on the system.
Locale::Simple is not needed.
To avoid polluting the global namespace too much, this patch also
introduce a global JS object named Koha and add some stuff in Koha.i18n
Test plan:
1. Add a translatable string in a JS file. For example, add this:
alert(__nx("There is one item", "There are {count} items", 3,
{count: 3}));
to staff-global.js
2. cd misc/translator && ./translate update fr-FR
3. Open misc/translator/po/fr-FR-messages-js.po, verify that your
string is present, and translate it
4. cd misc/translator && ./translate install fr-FR
5. (Optional) Verify that
koha-tmpl/intranet-tmpl/prog/fr-FR/js/locale_data.js exists and
contains your translation
6. Open your browser on the staff main page, change language and verify
that the message is translated
7. Repeat 1-6 on OPAC side
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works well, translation is OK and test message is displayed correctly.
Current qa-tool error is a false positive.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 17400198f02f30ec5ad2710efe6f10a950a96879
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 6 11:33:12 2020 +0100
Bug 24526: Add the confirm flag to the cronjob files
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 27cc2d6a33619e34cf316a95c1633b3ded31fa75
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 5 16:05:19 2020 +0100
Bug 24526: Set verbose if confirm not set
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 02275b8205f2c78d6754582b0278fe22524b8c1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 5 16:03:42 2020 +0100
Bug 24526: Replace commit with confirm
Usually commit takes a value
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2dc6ef96312c9c2649719289c8e71466441a8da4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 5 16:02:25 2020 +0100
Bug 24526: Use sprintf for readability
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aa9ad782ced801981242504d417348b31fa9f8d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 29 13:48:09 2020 +0000
Bug 24526: (follow-up) clean up verbose conditional
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6e0a4d18d4f5c996c18b719f020adcfb800368b8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 28 14:27:06 2020 +0000
Bug 24526: Add verbose and commit options to automatic_renewals cronjob
To test:
1 - Apply patch
2 - Have some items marked for auto-renewal
3 - Run the job with no parameters
4 - It should print 'Test mode'
5 - Provide -v
6 - It should print 'Test mode' then a line for each item
7 - Provide -v -c
8 - It should not say test mode, but should provide a line for each item
9 - Provide -c
10 - Shoudl run as expected with no output
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1bcc2159a5c137c216f6afa759cb7da5f2f4a15d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Aug 8 15:40:09 2018 +0200
Bug 21177: Use koha-conf.xml in misc/devel/update_dbix_class_files.pl
It is annoying to have to specify database connection parameters each
time DBIx::Class files need to be updated.
This patch adds a new option --koha-conf that takes an optional <path>
which defaults to the value of KOHA_CONF environment variable, and use
the database connection parameters found in that file.
--db_* options override values from $KOHA_CONF
Test plan:
1. Run the script with the same parameters as before the patch and see
that it still works.
Example:
misc/devel/update_dbix_class_files.pl --db_name koha_dev \
--db_user koha --db_pass koha
2. Verify that KOHA_CONF is set and execute:
misc/devel/update_dbix_class_files.pl --koha-conf
Verify that Koha/Schema files were updated accordingly
3. Execute:
misc/devel/update_dbix_class_files.pl --koha-conf \
/path/to/another/koha-conf.xml
Verify that Koha/Schema files were updated accordingly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 2 +-
debian/koha-common.cron.daily | 2 +-
koha-tmpl/intranet-tmpl/js/Gettext.js | 1264 ++++++++++++++++++++
koha-tmpl/intranet-tmpl/js/i18n.js | 51 +
.../prog/en/includes/doc-head-close.inc | 8 +
.../en/modules/members/purchase-suggestions.tt | 9 +
koha-tmpl/opac-tmpl/bootstrap/js/Gettext.js | 1264 ++++++++++++++++++++
koha-tmpl/opac-tmpl/bootstrap/js/i18n.js | 51 +
misc/cronjobs/automatic_renewals.pl | 36 +-
misc/cronjobs/crontab.example | 2 +-
misc/devel/update_dbix_class_files.pl | 64 +-
misc/translator/LangInstaller.pm | 70 +-
misc/translator/po2json | 249 ++++
13 files changed, 3046 insertions(+), 26 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/js/Gettext.js
create mode 100644 koha-tmpl/intranet-tmpl/js/i18n.js
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/Gettext.js
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/i18n.js
create mode 100755 misc/translator/po2json
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list