It's "Ceština" and should be "Čeština"
Test plan:
1) apply the patch
1.1) update database
2) install Czech translation for Koha
3) note the language name in language switcher (in staff client and
opac) is right: "Čeština"
Signed-off-by: radiuscz <radek.siman@centrum.cz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit de2ba75c25)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3ea0d7ed99)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Some installer files still use WTHDRAWN instead of WITHDRAWN as an AV
category.
Test plan:
git grep WTHDRAWN installer
should not return any results
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ce076e0e75)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 78ce2bcb9f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Some installer files use COU and LAN instead of COUNTRY and LANG.
To uniformise these AVs, it would be good to use the same code.
Note that I do not think we should update existing installations
Carefully compared code.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 75a900d553)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit aa23153985)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
In a database update we alter the letter table, making a column
(branchcode) not be able to contain NULL values.
However if it already does, this SQL fails. So before changing the
column we change the NULL values
[Tue Sep 20 19:08:10 2016] updatedatabase.pl: DBD::mysql::db do failed:
Invalid use of NULL value [for Statement "
[Tue Sep 20 19:08:10 2016] updatedatabase.pl: ALTER TABLE letter MODIFY
COLUMN branchcode varchar(10) NOT NULL DEFAULT ''
[Tue Sep 20 19:08:10 2016] updatedatabase.pl: "] at
/home/mtompset/kohaclone/installer/data/mysql/updatedatabase.pl line
12638.
Reproduce:
on an ubuntu 16.04 LTS machine with MySQL 5.7 install git koha
development environment.
...
git checkout -b my_3.18.x origin/3.18.x
drop database koha_library;
create database koha_library;
quit;
web install all sample data
(ignore some issues with sample data, and one with mandatory)
git checkout -b bug_17234 origin/master
git bz apply 17292
git bz apply 17320
git bz apply 17260
git bz apply 17234
web install
Two warning messages are expected output from upgrade process, but
the above message is not.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Did not follow the test plan, but the changes make sense
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 0599ab0076)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3c2bd4ef3b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 547b5f95f6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 517e4eb553)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
See http://hea.koha-community.org/, the countries are filled is wrong
values.
If we decide to update the free text with a dropdown list, we need to
handle these wrong data.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 66d669d073)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e09f10a882)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This will avoid syntax problems with Hea when a user will fill this 2 sysprefs
The default choice for UsageStatsLibraryType and UsageStatsCountry is 'empty'
Test Plan
---------
1. Create a new Koha install
2. Go to the 'Administration' page
3. Go to 'Global system preferences'
4. Go to 'Administration'
5. At the end of this page you should see a dropdown menu for
- UsageStatsCountry with all countries
- UsageStatsLibraryType with all type of library
They both should be empty by default.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Not a complete list but is a start
Lots of new strings to translate :)
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 233dfb8c74)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 20db7d6ee6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
More changes to de-DE files
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9261fb4f5b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f37cbb96f2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
More changes to it-IT files
Checked marc21 and unimarc files
unimarc_relatorterms.sql had bad encoding, others minor
errors
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit be4cd79aea)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 6e4dbd3f9b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mostly fixes bad values in auth files ( '' -> 0 )
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6dc2f1ae7c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 25e314bee5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
More changes to pl-PL files
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 28191a538b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9d11edefea)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
More changes to nb-NO files
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4742f1035b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a05c4d11de)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
More changes to es-ES files
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8cfa6f633a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fd02ef7fc2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Needs Bug 13669
This patch fix web installer for
de-DE, es-ES, fr-CA, nb-NO and pl-PL
To test:
1) Apply patch
2) Try web installer for any/all listed languages.
a) de-DE, es-ES, fr-CA and pl-PL
There must be no problems for marc21 + all sample files
b) nb-NO
There must be no problems for normarc + all sample files
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e38cad45e8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 884e877be3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Needs Bug 13669
Rewrite autorites_norme_unimarc.sql to
use only one INSERT IGNORE.
New load method complains about duplicate keys,
and both auth files are mandatory!
Also removed blank space from sample_labels.sql
Tested with unimarc_complet and all sample files.
To test
1) Apply the patch
2) Try fr-FR web installer, unimarc_complet + all sample files
There must be no errors
Don't know if fr-FR marc21 and unimarc_lecture_pub are used,
need a look from french users.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b5ae31e7fd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ad9d0a3beb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
In the OPAC -> Advanced Search, the Language drop down menu incorrectly
lists Romanian as "Român (Romanian)" while the correct value (as reported
by Barry Cannon) is "Română (Romanian)".
This patch fixes that:
a) for _new_ installations by modifying
installer/data/mysql/mandatory/subtag_registry.sql (loaded by the web
installer when koha is installed), and also
b) for _existing_ installations by adding an atomicupdate file in
installer/data/mysql/atomicupdate/
Test plan:
1) In the OPAC, go to Advanced search (cgi-bin/koha/opac-search.pl).
2) In the 'Language' drop down menu, observe that the value for Romanian
is "Român (Romanian)".
3) Apply the patch, and run installer/data/mysql/updatedatabase.pl.
4) Refresh the Advanced search page in the OPAC. Confirm that the patch
worked, i.e. the Language drop down menu lists Romanian as
"Română (Romanian)" (notice the added 'ă').
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fc9279774f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit eceb09a8a3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
When you search in the OPAC it shows you the HOME branch on the location
in XSLT, but if you click through to the detail page it shows you the
CURRENT BRANCH in the holdings table which is very confusing to patrons.
I don't know what's the right solution - home or holding branch, but they
should be the same in both places for the patron's sake. If you do the same
search in the staff client you see the right branch info on the search results
and on the detail page.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Search the catalog, you search should include results with items
that have different home and holding libraries.
4) The results should look the same as before the patch
5) Change the system preference OPACResultsLibrary to "current location"
6) Refresh your page of search results
7) The results show now show the holding library instead of the home library
Signed-off-by: Barbara Walters <bwalters@ncrl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4db2e745e2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 17a103d8a0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 20f4235048)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3e37c9db17)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44785935bd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d2b20b2a82)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This patch change 'created_on' virtualshelves column to
datetime type
To test:
1) Apply the patch
2) Run updatedatabase.pl
3) Verify type of 'created_on' column
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 162b9015d9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ce68d9b7fd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Web install on Ubuntu 16.04/Mysql 5.7 fails.
This patch makes small changes to make installation
possible to kohastructure.sql and some sample files.
Sample values for quotes table can't have '0000-00-00 ...' values
nor NULL values, now() is perhaps an option.
Depends on Bug 16572
To test:
1) System with MySQL 5.7, for example Ubuntu 16.05
2) Apply 16572
3) Try web install, it fails
4) Apply this and next patch
5) Try again, now it succeed
This is only for English install, i18n files needs revision
I can do that if this is accepted.
Perphaps a change is needed to updatedatabase.pl
Ammended patch, 'created_on' field on virtualshelves
can't be timestamp default null, mysql 5.5 complains
that only one timestamp column can be defined as
default not null. Changed to 'datetime' type.
Can provide followup with updatedabase change,
but need an opinion if this type change makes sense.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 36b2b288a7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 8955b1b7c5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
followup to previous patch.
This patch fixes linkid value. It was set to '', but
declared as tinyint.
Mysql < 5.7 replaced this with nearest right value, i.e 0
Mysql 5.7 gives error here.
Also some normalization, all lines with data begins with two tabs
To test:
On top of Bug 16572 and previous patch
1) Run webinstaller
2) Add mandatory values
3) There must be no problems on MySQL 5.7
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d00d46112d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 58bd47a462)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f863e478b9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 947690e232)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This patch adds a timestamp column to the borrowers table in kohastructure
and updatedatabase. (And also to the deletedborrowers table.)
A timestamp may be useful in synchronizing with external systems (among other
reasons).
Test plan:
Run updatestructure on an existing database, or install a new one.
Verify that the borrowers table has a timestamp now.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested updatestructure and running kohastructure.sql.
Passed t/db_dependent/Members.t.
updatedatabase.pl did not apply. I edited and then run it. Columns were added as expected.
Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Bug 10459: Follow up to update to atomic update methodology
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
New column created, no errors.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 255596ae6c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b4d40f7d00)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
These 2 tables should be dropped before trying to create them
Test plan:
From the SQL CLI, source the kohastructure.sql file
source it again
=> Without this patch you get 2 warnings
ERROR 1050 (42S01) at line 3580 in file:
'installer/data/mysql/kohastructure.sql': Table
'additional_fields' already exi
sts
ERROR 1050 (42S01) at line 3596 in file:
'installer/data/mysql/kohastructure.sql': Table
'additional_field_values' alrea
dy exists
=> With this patch, you won't get them
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a01cd77e19)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b49adab4a1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Before Bug 16200 expired holds have used accounttype F which is also used by
other type of fines. This patch updates all existing expired holds to new
accounttype HE (Hold Expired).
To test:
-1. Make sure you translated the string in previous patch of this buug
1. Find a Patron with "Hold waiting too long" fines and go to his Fines tab
2. Change Koha's language to some other than English
3. Observe that "Hold waiting too long" is still in English
4. Apply patch and run database update
5. Go back to Patron's Fines tab
6. Observe that "Hold waiting too long" is now translated
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 09de19c427)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d803683702)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Alternative POC solution, on top of
previous patches, feel free to obsolte.
This patch use DBIx::RunSQL->run_sql_file
to procees each sql file.
To test:
1) Apply all patches
2) Same test plan of patch 1
Timing test running web installer, marc21,
all sample data, time in seconds
a) without patch
structure data
59.7 66.5
58.6 66.0
b) SQL::SplitStatement (patch 1+2)
59.4 101
59.7 102
c) DBIx::RunSQL (patch 3)
60.7 66.8
59.4 66.2
Tomas' version is a bit slower loading sample data,
all give similar results processing kohastructure.
New dependency to package: DBIx::RunSQL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e64f01ce0d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
The current table creation order is left to mysql's strategy, which is not
suitable for parsing the SQL files and passing one statement at a time in
the current order.
This patch just moves table creation statements around so FK constraints are
defined for previously created tables.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2358185379)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
When doing a hacked install off the master branch:
use ... {koha database name}
truncate creator_layouts;
truncate creator_templates;
truncate printers_profiles;
source installer/data/mysql/... {name of a sample_labels type file}
Warnings are generated, which may not be visible in the UI.
Most of the warnings were triggered by:
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_illegal_ha
In the Russian, the layout_name was truncated, because the layout_name was only 20. An atomic update sql and kohastructure.sql update were provided to widen it to 25.
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_warn_data_truncated
Also fr-FR, ru-RU, and uk-UA were slightly different in structure, so the structure was made the same as the other files.
See comment #1 for the test plan.
NOTE: pl-PL is likely very out of date, but is not affected in this regard.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works, no more warnings
mysql> show warnings;
Empty set (0.01 sec)
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d6ac9270b0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4e1b0e0242)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 74937f9c89)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>