https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Patch complexity|--- |Trivial patch -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #2 from David Cook <dcook@prosentient.com.au> --- For reference: https://wiki.koha-community.org/wiki/Terminology#S -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107049|0 |1 is obsolete| | --- Comment #3 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 107226 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107226&action=edit Bug 26015: Terminology: Use staff interface instead of staff client We have agreed to use 'staff interface' instead of 'staff client' and similar terms. This fixes the template files where staff client appears: To test: - Check Administration > Patron categories - Check the title of the staff interface start page in your browser tab - Check the description of hte catalogue permission - One more: this changes the message shown when someone managed to log in as the database user - as we no longer allow that, I am not sure if it can be triggered. Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Joonas Kylmälä <joonas.kylmala@helsinki.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107226|0 |1 is obsolete| | --- Comment #4 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- Created attachment 107643 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107643&action=edit Bug 26015: Terminology: Use staff interface instead of staff client We have agreed to use 'staff interface' instead of 'staff client' and similar terms. This fixes the template files where staff client appears: To test: - Check Administration > Patron categories - Check the title of the staff interface start page in your browser tab - Check the description of hte catalogue permission - One more: this changes the message shown when someone managed to log in as the database user - as we no longer allow that, I am not sure if it can be triggered. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Jonathan Druart from comment #5)

There are more occurrences that need to be replaced IMO:

api/v1/swagger/definitions/patron.json: "description": "a note on the patron's account visible in OPAC and staff client"

koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc: <a title="Staff client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff client</a> koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc: <a title="Staff client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff client</a>

a lot of .pref

koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/ mappings.tt: <th>Staff client</th>

t/db_dependent/selenium/authentication.t: like( $driver->get_title, qr(Koha staff client), 'Patron with flags catalogue should be able to login' ); t/db_dependent/selenium/authentication.t: like( $driver->get_title, qr(Koha staff client), 'Patron with flags superlibrarian should be able to login' );

Hi Joubu, I can take care of the other occurrences, although I think this could still bep ushed as a first step. the .pref are taken care of on bug 25630 - but I haven't managed to rebase David's follow-up. :( Help much appreciated. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 108305 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=108305&action=edit Bug 26015: Terminology: Fix tons more staff clients to staff interfaces This takes care of more occurences of staff client and changes it to staff interface, including in code comments. To test: - I think in this case careful code review is what we look for. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Joonas Kylmälä <joonas.kylmala@helsinki.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |joonas.kylmala@helsinki.fi Status|Signed Off |Patch doesn't apply --- Comment #10 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- The patches don't apply anymore: Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 26015: Terminology: Fix tons more staff clients to staff interfaces -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #108304|0 |1 is obsolete| | Attachment #108305|0 |1 is obsolete| | --- Comment #11 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 109141 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=109141&action=edit Bug 26015: Terminology: Use staff interface instead of staff client We have agreed to use 'staff interface' instead of 'staff client' and similar terms. This fixes the template files where staff client appears: To test: - Check Administration > Patron categories - Check the title of the staff interface start page in your browser tab - Check the description of hte catalogue permission - One more: this changes the message shown when someone managed to log in as the database user - as we no longer allow that, I am not sure if it can be triggered. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Joonas Kylmälä <joonas.kylmala@helsinki.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #13 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- This breaks at least the following test:

t/db_dependent/selenium/authentication.t .. # Failed test 'Patron with flags catalogue should be able to login' # at t/db_dependent/selenium/authentication.t line 62. # 'Koha staff client' # doesn't match '(?^u:Koha staff interface)' # Looks like you failed 1 test of 5.

I wanted to test the other tests too but they don't run on the default koha-testing-docker settings or maybe there is a bug in them too (although unrelated to these string changes):

t/db_dependent/www/auth_values_input_www.t .. Warning: <retrieval> element has non-unique value in 'name' key attribute: F at t/db_dependent/www/auth_values_input_www.t line 36. Warning: <retrieval> element has non-unique value in 'name' key attribute: B at t/db_dependent/www/auth_values_input_www.t line 36. Error GETing /cgi-bin/koha/mainpage.pl: URL must be absolute at t/db_dependent/www/auth_values_input_www.t line 65.

There seems to be still Staff client in koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt. Given this turned out to be not so trivial change I would like to request someone to sign-off the second patch before submitting this for QA team to review. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #15 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Jonathan Druart from comment #14)

Created attachment 109143 [details] [review] Bug 26015: Fix selenium test

Well, we are doing the reverse! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #16 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 109144 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=109144&action=edit Bug 26015: Replace 2 missing occurrences -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #109141|0 |1 is obsolete| | Attachment #109142|0 |1 is obsolete| | Attachment #109144|0 |1 is obsolete| | --- Comment #17 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 109145 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=109145&action=edit Bug 26015: Terminology: Use staff interface instead of staff client We have agreed to use 'staff interface' instead of 'staff client' and similar terms. This fixes the template files where staff client appears: To test: - Check Administration > Patron categories - Check the title of the staff interface start page in your browser tab - Check the description of hte catalogue permission - One more: this changes the message shown when someone managed to log in as the database user - as we no longer allow that, I am not sure if it can be triggered. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #19 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 109147 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=109147&action=edit Bug 26015: Replace 2 missing occurrences Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also|https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=25630 | Blocks| |25630 --- Comment #21 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- It seems that remaining occurrences are fixed on bug 25630 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25630 [Bug 25630] More capitalization and terminology fixes for system preferences -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #23 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Katrin Fischer from comment #22)

Thx for your help, Jonathan.

I wanted to sign-off, but the selenium tests are giving me trouble (kohadevbox, freshly provisioned) :(

I think this is me... so no reason to fail.

kohadev-koha@kohadevbox:/home/vagrant/kohaclone$ perl t/db_dependent/selenium/authentication.t 1..2 Could not create new session: Unable to connect to host 127.0.0.1 on port 7055 after 45000 ms. Firefox console output: [...] at /home/vagrant/kohaclone/t/lib/Selenium.pm line 58. # Looks like your test exited with 255 before it could output anything. kohadev-koha@kohadevbox:/home/vagrant/kohaclone$ exit exit

I've been trying to update and all, but still no luck. Coudl someone else quickly verify the tests passing please? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 --- Comment #26 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 109280 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=109280&action=edit Bug 26015: Terminology: Fix tons more staff clients to staff interfaces This takes care of more occurences of staff client and changes it to staff interface, including in code comments. To test: - I think in this case careful code review is what we look for. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |20.11.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26015 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com --- Comment #29 from Lucas Gass <lucas@bywatersolutions.com> --- enhancement will not be backported to 20.05.x -- You are receiving this mail because: You are watching all bug changes.