Created attachment 30821 [details] [review] Bug 12765: Fix capitalization - "Try another search" To test: - Go to cataloguing - Perform a z39.50 search with no results - Check "Try another search" is displayed - Perform a z39.50 search with results - Verify display is correct as well.
I couldn't test this patch in the sandboxes. I tried applying this patch in one of the Biblibre sandboxes last night and in one of the PTFS sandboxes this morning and the sandboxes could not apply the patch to Koha. The error message the sandbox e-mailed me in both cases was: The sandbox you've requested is not ready. Some problems occurred applying patches from bug 12765: <h1>Something went wrong !</h1>Applying: Bug 12765: Fix capitalization - Try another search Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt Failed to merge in the changes. Patch failed at 0001 Bug 12765: Fix capitalization - Try another search When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 12765 - Capitalization: Cataloguing > Z39.50 search > Try another search 30821 - Bug 12765: Fix capitalization - Try another search Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-12765-Fix-capitalization---Try-another-search-isbnJe.patch .
Created attachment 31270 [details] [review] Bug 12765: Fix capitalization - "Try another search" To test: - Go to cataloguing - Perform a z39.50 search with no results - Check "Try another search" is displayed - Perform a z39.50 search with results - Verify display is correct as well.
I rebased the patch, I think it should work now.
Patch tested with a sandbox, by George Williams <georgew@latahlibrary.org>
Created attachment 31271 [details] [review] Revert "Bug 12176 - Remove HTML from additem.pl" This reverts commit 0033d287bad3344fad0861134d8dd3e03e56ed24. I made a mistake pushing this one before the UTF-8 work. Signed-off-by: George Williams <georgew@latahlibrary.org>
The current patch seems to be the wrong one. Please correct.
I think the sandbox did something weird here - I will upload a patch with the sign-off line later.
Created attachment 31303 [details] [review] [SIGNED OFF] Bug 12765: Fix capitalization - "Try another search" To test: - Go to cataloguing - Perform a z39.50 search with no results - Check "Try another search" is displayed - Perform a z39.50 search with results - Verify display is correct as well. Signed-off-by: George Williams <georgew@latahlibrary.org>
I have reattached the patch and added the sign off line - thx George!
The patch does not apply anymore.
Created attachment 31451 [details] [review] Bug 12765: Fix capitalization - "Try another search" To test: - Go to cataloguing - Perform a z39.50 search with no results - Check "Try another search" is displayed - Perform a z39.50 search with results - Verify display is correct as well. Signed-off-by: George Williams <georgew@latahlibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Ok I recreated the patch. Passed QA.
Patch pushed to master. Thanks Katrin!