[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.08-71-g723ece1
Git repo owner
gitmaster at git.koha-community.org
Tue Jun 13 08:08:45 CEST 2017
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, 16.11.x has been updated
via 723ece1e614a48618a362625161253268f7681ab (commit)
via f82009d10efcc8c8b7188dbe4728642eb0ba01ee (commit)
via b64e0dfdbcc1a944b23d9a6eacb2b86cf14ea60f (commit)
via 08a2513df4cc7d7b853e3cdfe93f24cb149a28e7 (commit)
via cb028d353f8682bc3057f689f3db8aa03ed067ae (commit)
via 0eafd9f47b7f5df5e2c1e5955f0f0fecfd38c48c (commit)
via a844ae483feadf1b381138266396faa4ac4b35bd (commit)
via d94fa36bef2beba84d0844e47fd5b204ad6dbbb0 (commit)
via f45596baa43cb49e25413ef054a2c58e12aefde5 (commit)
via 5058c1cfcbd24f838a6554fa8485c81906909336 (commit)
via 13f28159ae1acf17af3c33f217fc4bbceb3ded6c (commit)
via e2900e5c30f00fad600da4217a5df5d22440a50f (commit)
via ac6f945f428419e4059ac8647466d054ffd4ab6e (commit)
via c71fada134ec5eb1f997c770d27dda0c68b34ae9 (commit)
via 55a86169953f3b21d5f6185ac7cae81a2884b9fb (commit)
via cac7439b0b6a1207cb5070a98abdbf6b1f8036d5 (commit)
via d9a40cefbc9d79693f6b02cbecff83faece9b43e (commit)
via ad7cf311847fecda6bcaabb2aae8271a884e656f (commit)
via 99a4aa57ad4161d2a841b7e11f2c25688ae2864b (commit)
via d197d725a85298a33670d5fe27acba20ee563821 (commit)
via dadfbe1ca112b4a38ddcad10857caed6713080fb (commit)
via 48e77a77b6105ae96d97d9d1d03034cf1c2478cc (commit)
via 3bbb4b17066b1a9e4887862a03e8fe4a4662e58d (commit)
via 1dc0ce2412d371390c969788edf3eb479c6787da (commit)
via 7c5c084d1f3db0fdcae5cceb15682bf0c9c2983c (commit)
from ab75a49507a676ce982f213dc86b035df04a1dfb (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 723ece1e614a48618a362625161253268f7681ab
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed May 31 16:10:41 2017 +0200
Bug 18706 - Remove useless Javascript
Whe checking a subfield to be deleted, the code
$(this).val($(this).siblings("[name='subfield']").val());
is useless, the checkbox already contains the subfield code :
<input type="checkbox" ... name="disable_input" value="[% ite.subfield %]" />
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 6bb4a0405abe0d03be3915644c6a05e2e3ee1e9f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7bf1bf36f4b075979e4e47beb5de0891a1f1e533)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f82009d10efcc8c8b7188dbe4728642eb0ba01ee
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed May 31 16:02:44 2017 +0200
Bug 18706 - subfields to delete not disabled anymore in batch item modification
In Tools > Batch item modification, one can click a checkbox to delete a subfield.
This click use to disable the input to change the field value.
This comes from the patch : Bug 13501: Move "Required" and checkbox after input/select
Because input is found using JQuery next().
This patch replaces with $(this).parent().find("[name='field_value']").
Test plan :
- Go to Tools > Batch item modification
- Enter a barcode and submit
- Click on a checkbox on a non-mandatory subfield
=> Without patch the input or select is not disabled
=> With patch the input or select is disabled
- Submit
=> Check that subfield is deleted
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 7c9273be169ca4da47059aa152f8c6ea11137a52)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit dc1f51959ad1b7a5e7ca7e6259e0e42cc6260643)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b64e0dfdbcc1a944b23d9a6eacb2b86cf14ea60f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 1 23:52:07 2017 -0300
Bug 18716: Remove CGI::param warns from updatesupplier.pl
This script floods the logs with this kind of warnings.
To test:
- Run:
$ koha-plack-err
- Edit a vendor in the acquisitions module
- Save
=> FAIL: Logs show lots of warnings that look like:
CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_acqui_updatesupplier_2epl
- Apply this patch
- Run:
$ restart_all
$ koha-plack-err
- Edit a vendor, add/delete vendor contacts
=> SUCESS: No more warnings
- Verify editing and storing vendor contacts works as expected.
- Sign off :-D
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c35932923407e9ec088957f877e8607289b6b914)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9c2d9c89a437605308ebf58d45fca858a3f56593)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 08a2513df4cc7d7b853e3cdfe93f24cb149a28e7
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 9 11:16:08 2017 -0300
Bug 18767: Remove useless diags from GetDailyQuote.t
This tests print useless debugging info.
To test:
- Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ prove t/db_dependent/Koha/GetDailyQuote.t
=> FAIL: Some output telling what is doing on each step is printed.
- Apply the patch
- Run
k$ prove t/db_dependent/Koha/GetDailyQuote.t
=> SUCCESS: No output, YAY!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 78a9f39f9a97179af3e3a38cf8cb17b3f043d88a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4def0870d85975c4e926fb62dbc2a9db2807ae20)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cb028d353f8682bc3057f689f3db8aa03ed067ae
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 5 06:52:58 2017 +0200
Bug 18727: System preferences loose part of values because of double quotes
System preferences do not display values of text fields properly if they
contain doulbe quotes.
To recreate:
- Go to Home > Administration > System preferences , then tab Acquisitions
- Enter values to both system preferences like proposed in the example (o=5|a="bar foo" and o=5|a="foo bar")
- Save
- Click on tab Acquisitions to reload
- Wrong result: Both preferences show a value of: o=5|a=
(parts with double quotes are truncated)
- Edit any of the email addresses (Bug 9814):
KohaAdminEmailAddress, NoticeBcc, ReplytoDefault, PayPalUser
- Set value to: "The Library" <thelibrary at example.com>
- Search for this email address syspref to re-display it
- Wrong result:
Use [ ] " autocomplete="off" /> as the email address for the
administrator of Koha.
To test:
- Apply patch
- Try to recreate issues above
- Additionally, edit other system preferences that could contain double
quotes, e.g. LibraryName or UsageStatsLibraryName
- Set value to: Bibliothek "Zur Leseratte"
(Note: patch contains a tiny fix for a typo in acquisitions.pref)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 6e7c125a56be8971ec9c9bb52373bff5004a936a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c5fcadf128e84c2a5deae5209b04fa82559845fb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0eafd9f47b7f5df5e2c1e5955f0f0fecfd38c48c
Author: Marc Véron <veron at veron.ch>
Date: Sun Jun 4 18:04:00 2017 +0200
Bug 18689: calendar error with double quotes in title or description of holiday
This patch fixes the calendar display with holidays having double qoutes in
title or description.
To test:
- Apply patch
- Go to Home > Tools > Calendar
- Create new holidays of each type (Day only, repeated wekly/yearly,
range, yearly repeated range and enter double qoutes in their titles and
descriptions
- Verify that calendar displays and works as expected
- Verify that you can edit the holidays
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f1d90f205e3dc8177c0d524b208d9d4a367cf56e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0f20a2c97acb04e137db35499f0c46d27d57bf0c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a844ae483feadf1b381138266396faa4ac4b35bd
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Jun 5 11:20:18 2017 +0000
Bug 18722: Fund name is not shown in received orders fund subtotals
Test plan:
1) Go to acquisition and receive some orders
2) Show the receive summary for invoice
--> without patch, the fund name in subtotal is not shown
--> with patch the name is shown as expected
Signed-off-by: Michael Cabus <michael at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 6a2ef935ac63c67a4b31d8c3eb9bcb8d974d844e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b0cb001e83a7810233e488f99b67fae7c4776918)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d94fa36bef2beba84d0844e47fd5b204ad6dbbb0
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Jun 5 12:24:07 2017 -0400
Bug 18730: Batch Mod Edit <label> HTML validation fails
[tag] [reply] [−] Description M. Tompsett 2017-06-05 16:30:21 UTC
Know the barcode of an existing item.
Home -> Tools -> Batch Item Modification
Enter the barcode
Click
View Page source
select and copy it into validator.w3.org direct input.
There will be complaints about <labels>.
Apply this patch
refresh the page.
select and copy it into validator.w3.org direct input.
There will be no complaints about <labels>.
This is intended to be a highly focused HTML bug, as the
missing form tag which will fix the <div> issues at the bottom
is corrected on bug 18710.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
(cherry picked from commit eb0a67ea10c9210dbfb42f810c280b7515b04a16)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d6c6392440396a3c4a9832e2bd924844ba87378b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f45596baa43cb49e25413ef054a2c58e12aefde5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 10:21:33 2017 -0300
Bug 18746: Add license and remove diag
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit fcec2c71b4e362ffa7e1a443cdff9ace91761b9d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 81f849d6da8c42983eaaee6113fd1255c4b841b1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5058c1cfcbd24f838a6554fa8485c81906909336
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 7 18:07:13 2017 -0400
Bug 18746: Text_CSV_Various parse failures
While it might be an idea to just delete it,
this patch attempts to catch everything and make it
clear that Text::CSV::Unicode (binary) is the parser
that should be used.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Running 'prove xt/author/Text_CSV_Various.t' passes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 89d36585bb3483ac46c87224391b6867ae8468bb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d3ccdd1df3eda8c933cbc841532a0000707cc9e2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 13f28159ae1acf17af3c33f217fc4bbceb3ded6c
Author: Marc Véron <veron at veron.ch>
Date: Sat May 20 09:18:10 2017 +0200
Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files
Template directives should not be exposed in translation, but lines like the following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All
This patch fixes it.
To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
still work and display the same string as before
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 18641: (RM-followup) for waitingreserves.tt
Code changed for waitingreserves.tt as asked for in comment #7
Bug 18641: Followup for pendingreserves.tt (less %s)
Change as of comment #13 to reduce %s
After creating a new translation for a "language" aa-AA, we have
the following in the file aa-AA-staff-prog.po
msgid ""
"(Inclusive, default is %s days ago to %s days ahead. Set other date ranges "
"as needed.)"
msgstr ""
msgid ""
"(Inclusive, default is %s days ago to today. Set other date ranges as "
"needed.)"
msgstr ""
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 78b30baf3fa975ab9eabc58733a2252b08d22f25)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 485f2cdc7e44b16c90c9c6ba5a9861751e31c215)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e2900e5c30f00fad600da4217a5df5d22440a50f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 10:08:37 2017 -0300
Bug 18759: (follow-up) Try to fix random failure from Circulation.t
If IndependentBranches, CanBookBeRenewed will set ITEMNOTSAMEBRANCH
or BORRNOTSAMEBRANCH flags, if the branches do not match.
(cherry picked from commit 1577460c713e3ac7e602dce81738f974e86ddf9d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d45bc6ad530bc28b3065818e1fbd29c75af43cce)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ac6f945f428419e4059ac8647466d054ffd4ab6e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 8 11:54:18 2017 -0300
Bug 18759: Try to fix random failure from Circulation.t
Circulation.t is failing randomly on our CI
https://jenkins.koha-community.org/job/Koha_Master_D8/192/console
# Failed test at t/db_dependent/Circulation.t line 1147.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1152.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1156.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1170.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1184.
# got: '1'
# expected: '0'
# Looks like you failed 5 tests of 23.
Sometimes one of the alert or impossible flags is set.
This patch guesses that it's because of the 'restricted' value of the item that is evaluated to 1.
If it is not fixed by this patch, we will have more info next time (at least know
if alert or impossible is set).
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
The fix is trivial. Using random data will lead to this situations. The good thing is that
it lets us spot places in which tests need more fine-grained data.
(cherry picked from commit 9a55f5783c91b92cb8518f423ab23bd9727051ee)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 178ecea26000f6c3b8b16630ac6f13277d828d68)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c71fada134ec5eb1f997c770d27dda0c68b34ae9
Author: Marc Véron <veron at veron.ch>
Date: Fri May 26 11:06:56 2017 +0200
Bug 18675: Translatability: Get rid of [%% in translation for csv-profiles.tt
Translation tool for file csv-profiles.tt picks following line:
%s [%% IF csv_profile.encoding == encoding OR NOT csv_profile AND encoding == 'utf8' %%]
It is is due to a line break inside a template directive. This patch removes it.
To test:
- Verify that code change makes sense
- Apply patch
- Verify that csv exports behave as before
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e464f291b8793909400d9f44d0b297d5bee238d7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 55a86169953f3b21d5f6185ac7cae81a2884b9fb
Author: Marc Véron <veron at veron.ch>
Date: Mon May 29 20:13:03 2017 +0200
Bug 18690 - Typos in Koha database description (Table "borrowers")
This string patch fixes typos in kohastructure.sql as described in initial
comment.
To test:
- Carefully verify that string changes make sense
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 279126d710233f7925432ab1f8fa6ae9f947889e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7ff2fd6e9a3bcd40e22a4f69c5c303fe0f7d1706)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cac7439b0b6a1207cb5070a98abdbf6b1f8036d5
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 09:37:02 2017 +0200
Bug 18681 - (followup) Remove on more [%% in translation for about.tt
Test plan same as in previous patch
Run QA tools in newest version (test for line breaks in tt directives)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 880c2e19c3c5f10f110fd80a44f0d111b9d05472)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3fa60aaf969962f5d184c2fdff2dc4c37bfbe5c5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d9a40cefbc9d79693f6b02cbecff83faece9b43e
Author: Marc Véron <veron at veron.ch>
Date: Fri May 26 19:11:59 2017 +0200
Bug 18681: Translatability: Get rid of [%% in translation for about.tt
Translation tool picks a line
%s [%% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords ||
...due to a line break inside a template directive.
This patch fixes it.
To test:
- Update QA tools
(see https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18675#c2)
- Verify that code change makes sense
- Apply patch
- Run QA tools
Followed test plan and everything was as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1c8c84f4be8665d95ededf5174c406e1a63d6529)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e90f5494f36f8af9dad5659d0220656767a9bbb3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ad7cf311847fecda6bcaabb2aae8271a884e656f
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 10:47:48 2017 +0200
Bug 18695: Translatability: Get rid of [%% INCLUDE in translation for circulation.tt
The file circ/circulation.tt exposes the following line to translation:
%s %s [%% INCLUDE 'blocked-fines.inc' fines = chargesamount %%] %s %s
Translators should not be confronted with code internals.
This patch fixes it by removing a line break.
To test:
- Verify that code change makes sense
- Run QA tools in newest version (check for line breaks in tt directives)
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that line mentioned above do
no longer appear in aa-AA-staff-prog.po )
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c5726913774ed25c4125e65a12054a00c2f7dd76)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 6a3477b2cc5d67adc51dae81a0c953f4923b1d99)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 99a4aa57ad4161d2a841b7e11f2c25688ae2864b
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 07:13:31 2017 +0200
Bug 18693: Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc
The file branch-selector.inc exposes the following line to translation
(due to newlines insied a tt directive):
%s %s [%% FOREACH branch IN branches; IF branch.selected; selectall = 0; END; END %%]
Additionally, export.tt exposes the following line to translation:
[%% INCLUDE 'branch-selector.inc' branches = libraries %%]
To test:
- Apply patch
- In Staff client, go to Home > Tools > Export data
- Verify that library selection behaves as before
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that lines mentioned above do
no longer appear in aa-AA-staff-prog.po
- Run QA tools (newest version with test for newlines in tt directives)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0ee3249438b85cb47aa9ff623bac4f405df7161f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b6f5f0331d6ea8b472a1e06b54d787482f4ae88d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d197d725a85298a33670d5fe27acba20ee563821
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 11:23:20 2017 +0200
Bug 18644: Translatability: Get rid of pure template directives in translation for memberentrygen.tt
Translation for memberentrygen.tt exposes a lot of template directives
like the following:
[% UNLESS opduplicate %][% othernames | html %][% END %]
Translators should not be confronted with such code internals.
To test:
- Review code changes
- Verify that creating / editing patrons works as before
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that lines like mentioned above
do no longer appear in aa-AA-staff-prog.po
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5a30dea05b158fd6a77b0495ee047310865072eb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 649cdbb91bffb37b0ea4958e80b55975ddce65bb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dadfbe1ca112b4a38ddcad10857caed6713080fb
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 14:27:56 2017 +0200
Bug 18682 - Translatability: Get rid of [%% in translation for 2 files av-build-dropbox.inc
Two files av-build-dropbox.inc has linebreaks inside template directives,
exposing internals (comments and tt code) to translations as mentioned
in initial comment.
Translators should not be confronted with such interal code.
This patch fixes it.
To test
- Verify, that code changes make sense and have no more line breaks insied
tt directives.
- Run QA tools in newest version (checking for line breaks inside tt
directives)
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that lines mentioned above do
no longer appear in aa-AA-staff-prog.po and in aa-AA-opac-bootstrap.po
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 953504a0769a38a60f379a2e9c72bf7b71814fd0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9db81e5ead064b21394c75ee9746cd825ec9954f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 48e77a77b6105ae96d97d9d1d03034cf1c2478cc
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 17:50:57 2017 +0200
Bug 18701: Translatability: Get rid of exposed tt directives in matching-rules.tt
Translation for file matching-rules.tt exposes a lot of template directives.
Translators should not be confronted with internal code like the following:
[%% PROCESS norms_select selected_norm=\"none\" id=\"mc_1_src_c_1_n_1_norm\" "name=\"mc_1_src_c_1_n_1_norm\" %%]
To test:
- Apply patch
- Verify that code changes make sense (removes line breaks in directives)
- Run QA tools in newset version (tests for line breaks in tt)
- Bonus test: create a new translation e.g. fpr language 'aa-AA', verify
that such lines no longer appear in po/aa-AA-staff-prog.po
(for matching-rules.tt)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1a023a670c1bf0faffe51faefc42fdd6407c2320)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 884467bf481a4c77d0dae5a7add47ebc828f17ce)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3bbb4b17066b1a9e4887862a03e8fe4a4662e58d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 13:24:07 2017 -0300
Bug 18648: Restore hyphen
(cherry picked from commit 6999dbafbd2d6708d4c3a8fae7e83855902ebdbb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7a181f3e912663ff642ba8dc569416ad4598ca26)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1dc0ce2412d371390c969788edf3eb479c6787da
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 6 11:06:29 2017 -0300
Bug 18648: Fix syntax 'unexpected end of input'
(cherry picked from commit 023b0890a25d1420a0f4ecb28d54c08a06e6479e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fae5977438c23ed2fd4a0f4eeb395729a77cae97)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7c5c084d1f3db0fdcae5cceb15682bf0c9c2983c
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 21:10:32 2017 +0200
Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains
template directives inside a div tag:
<span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]">
This is exposed in translation tool.
To test:
- Carefully examine code changes
- Apply patch, verify that the directive is no longer exposed (picked for
po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po
- If you know where / how this macles is used, verify that it behaves as before
(Note: New patch, needs new sign off)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e7cf94446e1c6ff413bb8d725f9c6cbf2e9adca9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
acqui/updatesupplier.pl | 2 +-
installer/data/mysql/kohastructure.sql | 30 +++++-----
.../prog/en/includes/av-build-dropbox.inc | 22 +++-----
.../prog/en/includes/branch-selector.inc | 10 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +-
.../prog/en/modules/admin/matching-rules.tt | 57 ++++---------------
.../prog/en/modules/admin/preferences.tt | 2 +-
.../en/modules/admin/preferences/acquisitions.pref | 2 +-
.../en/modules/cataloguing/value_builder/macles.tt | 3 +-
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/circ/pendingreserves.tt | 8 ++-
.../prog/en/modules/circ/waitingreserves.tt | 7 ++-
.../prog/en/modules/members/memberentrygen.tt | 20 +++----
.../prog/en/modules/tools/batchMod-edit.tt | 15 +++--
.../prog/en/modules/tools/csv-profiles.tt | 3 +-
.../intranet-tmpl/prog/en/modules/tools/export.tt | 3 +-
.../prog/en/modules/tools/holidays.tt | 9 ++-
.../bootstrap/en/includes/av-build-dropbox.inc | 19 +++----
t/db_dependent/Circulation.t | 13 +++--
t/db_dependent/Koha/GetDailyQuote.t | 23 ++++++--
xt/author/Text_CSV_Various.t | 59 +++++++++++++++-----
22 files changed, 163 insertions(+), 156 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list