Created attachment 63100 [details] [review] Update Ukrainian installer sample files for 17.05 Update and translate sample SQL file of the Ukrainian installer. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems.
Don't forget to switch to "needs sign-off"! :)
(In reply to Katrin Fischer from comment #1) > Don't forget to switch to "needs sign-off"! :) Thanks, Katrin!
Updated Ukrainian installation sql-files can be seen alive on demonstration installations (http://koha.org.ua/wiki/index.php?title=%D0%94%D0%B5%D0%BC%D0%BE%D0%BD%D1%81%D1%82%D1%80%D0%B0%D1%86%D1%96%D0%B9%D0%BD%D1%96_%D1%81%D0%B5%D1%80%D0%B2%D0%B5%D1%80%D0%B8_%D0%90%D0%91%D0%86%D0%A1_Koha_%D1%82%D0%B0_%D0%B2%D1%96%D1%80%D1%82%D1%83%D0%B0%D0%BB%D1%8C%D0%BD%D1%96_%D0%BE%D0%B1%D1%80%D0%B0%D0%B7%D0%B8) of Ukrainian users group of Koha.
Created attachment 63770 [details] [review] Update Ukrainian installer sample files for 17.05 Update and translate sample SQL file of the Ukrainian installer. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems. Signed-off-by: Serhij Dubyk {Сергій Дубик} <serhijdubyk@gmail.com> https://bugs.koha-community.org/show_bug.cgi?id=18537 Followed test plan and the patch works with all files loading without problems Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Revised all changes. Thanks for corrections!
There is something wrong happening when I apply the patch: error: patch failed: installer/data/mysql/uk-UA/authorised_values/authorised_values_[IND_852].sql:1 error: installer/data/mysql/uk-UA/authorised_values/authorised_values_[IND_852].sql: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index.
Comment on attachment 63100 [details] [review] Update Ukrainian installer sample files for 17.05 Attempting resurrection and corrections properly, thought the old one may apply cleanly and work from there.
Comment on attachment 63100 [details] [review] Update Ukrainian installer sample files for 17.05 Both apply for me.
(In reply to M. Tompsett from comment #8) > Comment on attachment 63100 [details] [review] [review] > Update Ukrainian installer sample files for 17.05 > > Both apply for me. AH! onboarding reorganized everything.
Created attachment 65179 [details] [review] Update Ukrainian installer sample files for 17.05 Added changes from Alex Buckley and prepared new patch for the master. Update and translate sample SQL file of the Ukrainian installer. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems.
Hi Serhij, The patch still does not apply: Using index info to reconstruct a base tree... .git/rebase-apply/patch:2662: trailing whitespace. ('rubbkk', 'Таблиці ББК для краєзнавчих каталогів бібліотек', 1, 'generic'), .git/rebase-apply/patch:4067: trailing whitespace. error: patch failed: installer/data/mysql/uk-UA/authorised_values/authorised_values_[IND_852].sql:1 error: installer/data/mysql/uk-UA/authorised_values/authorised_values_[IND_852].sql: patch does not apply .git/rebase-apply/patch:936: new blank line at EOF. + .git/rebase-apply/patch:2401: new blank line at EOF. + .git/rebase-apply/patch:2481: new blank line at EOF. + error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0001 Update and translate sample SQL file of the Ukrainian installer. Could you double check please?
Created attachment 66382 [details] [review] new patch I tried to remove the trailing whitespace everywhere. Perhaps there is still some problem in the patch preparation itself. I did the following: git clone git://git.koha-community.org/koha.git kohaclone git checkout -b my_master origin/master git fetch git rebase origin/master replace folder kohaclone/installer/data/mysql/uk-UA with new content from https://www.dropbox.com/sh/nybt54x8yhh7frq/AACfsG32sJnBgNh1CdivXDjYa?dl=0%27 (folder SQL_Koha_17_05.01/uk-UA or uk-UA_SQL_Koha_17_05.01.zip) git commit -a git log git format-patch origin/master attach 0001-Bug-18537-Update-Ukr~ler-sample-files-fo.patch to Bugzilla Do I need to execute a command "git rm file" for all deleted or renamed files? I hope that there will be no problems with this version of the patch. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems.
Created attachment 66512 [details] [review] Bug 18537 - Update Ukrainian installer sample files for 17.05 Update and translate sample SQL files of the Ukrainian installer. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
I have tested the web installer with MARC21 and UNIMARC, installing all sample files each time. There were no SQL errors. I would suggest to bring the Ukrainian installer more in line with the en installer long term, as this might help with new features like the onboarding tool and with updating in the future.
Thank you for testing! This patch got a lot of changes in Ukrainian sql-files in a few years. I tried to make all the latest changes from the English set of sql-files (as well as other languages). The structure of the directories and filenames and sql-sets is as close as possible to the English collection. I tried to spread all the marc-dependent changes to the relevant folders (this applies to system variables, relatorterms, sample marc data, z39-50 servers, matching_rules). Keep in line match was not very successful, since I tried to make sql-files easy to read. This is especially true for marc structures. Separately was written perl script for such formatting. Future changes in Ukrainian sql-files I hope to do with small correction patches.
Hi Serhij, it's alright, I was thinking about the separate files for different authorised values for example. As a rule we ask contributors to also update the different installers, when new categories or sample notices are added. If the files are named the same and the structure matches this is a lot easier to do.
I still get the same error from git.
I got not problems - it applies cleanly. I have tested on a standard kohadevbox and just now tried it against master in my super old git dev installation.
Created attachment 66634 [details] [review] Bug 18537 - Update Ukrainian installer sample files for 17.05 Update and translate sample SQL files of the Ukrainian installer. To test: - Start with an empty database - Install uk-UA - Run the web installer in uk-UA/Ukrainian - Verify all files load without any problems. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pushed to master for 17.11, thanks to everybody involved!
Pushed to 17.05.x, will be in 17.05.05.
Obviously not for 16.11.x :)