From 40d50efe38645236d4d19fd39c1d25ea1ea1f01d Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Fri, 14 Aug 2020 17:09:58 +0000
Subject: [PATCH] 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.
---
 C4/Search.pm                                       |  2 +-
 Koha/Filter/MARC/ViewPolicy.pm                     |  2 +-
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |  4 +--
 admin/preferences.pl                               |  2 +-
 admin/systempreferences.pl                         |  2 +-
 api/v1/swagger/definitions/patron.json             |  2 +-
 debian/docs/koha-create.xml                        |  2 +-
 debian/templates/koha-conf-site.xml.in             |  2 +-
 installer/data/mysql/kohastructure.sql             | 18 +++++-----
 installer/data/mysql/sysprefs.sql                  | 42 +++++++++++-----------
 installer/data/mysql/userflags.sql                 |  2 +-
 .../admin/searchengine/elasticsearch/mappings.tt   |  2 +-
 misc/load_testing/benchmark_circulation.pl         |  2 +-
 misc/load_testing/benchmark_staff.pl               |  2 +-
 t/db_dependent/selenium/authentication.t           |  2 +-
 t/db_dependent/www/auth_values_input_www.t         |  2 +-
 t/db_dependent/www/batch.t                         |  4 +--
 t/db_dependent/www/search_utf8.t                   |  2 +-
 18 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index bd4953e67b..56b7991a04 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1375,7 +1375,7 @@ sub buildQuery {
 
                 # Add index-specific attributes
 
-                #Afaik, this 'yr' condition will only ever be met in the staff client advanced search
+                #Afaik, this 'yr' condition will only ever be met in the staff interface advanced search
                 #for "Publication date", since typing 'yr:YYYY' into the search box produces a CCL query,
                 #which is processed higher up in this sub. Other than that, year searches are typically
                 #handled as limits which are not processed her either.
diff --git a/Koha/Filter/MARC/ViewPolicy.pm b/Koha/Filter/MARC/ViewPolicy.pm
index a963e3f129..1b7ef7468c 100644
--- a/Koha/Filter/MARC/ViewPolicy.pm
+++ b/Koha/Filter/MARC/ViewPolicy.pm
@@ -273,7 +273,7 @@ sub should_hide_marc {
 
 =head1 CONFIGURATION AND ENVIRONMENT
 
-Install Koha. This filter will be used appropriately by the OPAC or Staff client.
+Install Koha. This filter will be used appropriately by the OPAC or staff interface.
 
 =head1 INCOMPATIBILITIES
 
diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index 8f3aea9445..486e7738ba 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -1112,7 +1112,7 @@ sub _split_query {
 Generate a list of searchable fields to be used for Elasticsearch queries
 applied to multiple fields.
 
-Returns an arrayref of field names for either OPAC or Staff client, with
+Returns an arrayref of field names for either OPAC or staff interface, with
 possible weights and subfield appended to each field name depending on the
 options provided.
 
@@ -1121,7 +1121,7 @@ options provided.
 =item C<$params>
 
 Hashref with options. The parameter C<is_opac> indicates whether the searchable
-fields for OPAC or Staff client should be retrieved. If C<weighted_fields> is set
+fields for OPAC or staff interface should be retrieved. If C<weighted_fields> is set
 fields weights will be applied on returned fields. C<subfield> can be used to
 provide a subfield that will be appended to fields as "C<field_name>.C<subfield>".
 
diff --git a/admin/preferences.pl b/admin/preferences.pl
index c5fd6ebb8f..480e5415b5 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -84,7 +84,7 @@ sub _get_chunk {
             $interface = 'opac';
             $theme     = C4::Context->preference('opacthemes');
         } else {
-            # this is the staff client
+            # this is the staff interface
             $interface = 'intranet';
             $theme     = C4::Context->preference('template');
         }
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 32a5c93782..15faac54c0 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -182,7 +182,7 @@ sub GetPrefParams {
             $theme     = C4::Context->preference('opacthemes');
         } else {
 
-            # this is the staff client
+            # this is the staff interface
             $interface = 'intranet';
             $theme     = C4::Context->preference('template');
         }
diff --git a/api/v1/swagger/definitions/patron.json b/api/v1/swagger/definitions/patron.json
index a4f998c04d..827702385b 100644
--- a/api/v1/swagger/definitions/patron.json
+++ b/api/v1/swagger/definitions/patron.json
@@ -177,7 +177,7 @@
     },
     "opac_notes": {
       "type": ["string", "null"],
-      "description": "a note on the patron's account visible in OPAC and staff client"
+      "description": "a note on the patron's account visible in OPAC and staff interface"
     },
     "altaddress_notes": {
       "type": ["string", "null"],
diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index f37eb206cd..44758e5eae 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -224,7 +224,7 @@
     <para><command>koha-create</command>  creates  a new Koha instance.  It is meant for a site that provides Koha hosting, and serves several sites from the same host.</para>
     <para>The name of the instance is used as the domain name  for  Apache,  Unix user and group names, and MySQL username and database names are derived from it.  Unix user and group are named instance-koha. MySQL username is koha_instance, and database is koha_instance.</para>
     <para>The Unix user has logins disabled.  The password for MySQL is generated randomly, and printed to the terminal.</para>
-    <para>The instance name is used as the domain name (ServerName)  for  Apache. The public catalogue (OPAC), for library customers, is on port 80.  The staff client interface is configured similarly, depending on the settings in <filename>/etc/koha/koha-sites.conf</filename> or alternate config file.</para>
+    <para>The instance name is used as the domain name (ServerName)  for  Apache. The public catalogue (OPAC), for library customers, is on port 80.  The staff interface is configured similarly, depending on the settings in <filename>/etc/koha/koha-sites.conf</filename> or alternate config file.</para>
     <para>After  the  Koha  instance  is created, it is ready to be used, but the librarian needs to log in via the intranet and configure things.</para>
     <para>Several configuration variables are available for adjusting this behavior. The variables are put into <filename>/etc/koha/koha-sites.conf</filename>. The following variables are obeyed:</para>
     
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 182e964c99..b02204d85c 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -318,7 +318,7 @@ __END_SRU_PUBLICSERVER__
  <!-- Secret passphrase used by Mojolicious for signed cookies -->
  <api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
 
- <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
+ <!-- Accessible directory from the staff interface, uncomment the following line and define a valid path to let the intranet user access it-->
  <!--
  <access_dirs>
      <access_dir></access_dir>
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 35c643fa38..9147c800f4 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -113,7 +113,7 @@ CREATE TABLE `authorised_values` ( -- stores values for authorized values catego
   `id` int(11) NOT NULL auto_increment, -- unique key, used to identify the authorized value
   `category` varchar(32) NOT NULL default '', -- key used to identify the authorized value category
   `authorised_value` varchar(80) NOT NULL default '', -- code use to identify the authorized value
-  `lib` varchar(200) default NULL, -- authorized value description as printed in the staff client
+  `lib` varchar(200) default NULL, -- authorized value description as printed in the staff interface
   `lib_opac` varchar(200) default NULL, -- authorized value description as printed in the OPAC
   `imageurl` varchar(200) default NULL, -- authorized value URL
   PRIMARY KEY  (`id`),
@@ -223,7 +223,7 @@ CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field
   `unique_id` tinyint(1) NOT NULL default 0, -- defines if this value needs to be unique (1 for yes, 0 for no)
   `opac_display` tinyint(1) NOT NULL default 0, -- defines if this field is visible to patrons on their account in the OPAC (1 for yes, 0 for no)
   `opac_editable` tinyint(1) NOT NULL default 0, -- defines if this field is editable by patrons on their account in the OPAC (1 for yes, 0 for no)
-  `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no)
+  `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff interface (1 for yes, 0 for no)
   `authorised_value_category` varchar(32) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
   `display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
   `category_code` VARCHAR(10) NULL DEFAULT NULL,-- defines a category for an attribute_type
@@ -576,13 +576,13 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower
   `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
   `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
   `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
-  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
+  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
   `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
   `sex` varchar(1) default NULL, -- patron/borrower's gender
   `password` varchar(60) default NULL, -- patron/borrower's encrypted password
   `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
-  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff client log in
-  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff client
+  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
+  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
   `contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
   `sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
   `sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library
@@ -1502,13 +1502,13 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons
   `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
   `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
   `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
-  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
+  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
   `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
   `sex` varchar(1) default NULL, -- patron/borrower's gender
   `password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password
   `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
-  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff client log in
-  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff client
+  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
+  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
   `contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
   `sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
   `sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library
@@ -1722,7 +1722,7 @@ CREATE TABLE `opac_news` ( -- data from the news tool
   `branchcode` varchar(10) default NULL, -- branch code users to create branch specific news, NULL is every branch.
   `title` varchar(250) NOT NULL default '', -- title of the news article
   `content` MEDIUMTEXT NOT NULL, -- the body of your news article
-  `lang` varchar(50) NOT NULL default '', -- location for the article (koha is the staff client, slip is the circulation receipt and language codes are for the opac)
+  `lang` varchar(50) NOT NULL default '', -- location for the article (koha is the staff interface, slip is the circulation receipt and language codes are for the opac)
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, -- pulibcation date and time
   `expirationdate` date default NULL, -- date the article is set to expire or no longer be visible
   `number` int(11) default NULL, -- the order in which this article appears in that specific location
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index d1efc4b42c..e800987360 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -50,7 +50,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('AlternateHoldingsField','',NULL,'The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).','free'),
 ('AlternateHoldingsSeparator','',NULL,'The string to use to separate subfields in alternate holdings displays.','free'),
 ('AmazonAssocTag','','','See:  http://aws.amazon.com','free'),
-('AmazonCoverImages','0','','Display Cover Images in Staff Client from Amazon Web Services','YesNo'),
+('AmazonCoverImages','0','','Display Cover Images in staff interface from Amazon Web Services','YesNo'),
 ('AmazonLocale','US','US|CA|DE|FR|IN|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
 ('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
 ('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
@@ -73,7 +73,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
 ('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
 ('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple'),
-('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
+('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff interface from unauthorized IP addresses','YesNo'),
 ('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
 ('autoMemberNum','0','','If ON, patron number is auto-calculated','YesNo'),
 ('AutoRemoveOverduesRestrictions','0',NULL,'Defines whether an OVERDUES debarment should be lifted automatically if all overdue items are returned by the patron.','YesNo'),
@@ -107,7 +107,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('BorrowersTitles','Mr|Mrs|Miss|Ms',NULL,'Define appropriate Titles for patrons','free'),
 ('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
 ('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
-('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff client','YesNo'),
+('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff interface','YesNo'),
 ('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
 ('CalculateFinesOnBackdate','1','','Switch to control if overdue fines are calculated on return when backdating','YesNo'),
 ('CalendarFirstDayOfWeek','0','0|1|2|3|4|5|6','Select the first day of week to use in the calendar.','Choice'),
@@ -137,7 +137,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
 ('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
 ('CurrencyFormat','US','US|FR|CH','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\'  in \'FR\' or \'360,000.00\'  in \'US\'.','Choice'),
-('CustomCoverImages','0',NULL,'If enabled, the custom cover images will be displayed in the staff client. CustomCoverImagesURL must be defined.','YesNo'),
+('CustomCoverImages','0',NULL,'If enabled, the custom cover images will be displayed in the staff interface. CustomCoverImagesURL must be defined.','YesNo'),
 ('CustomCoverImagesURL','',NULL,'Define an URL serving book cover images, using the following patterns: %issn%, %isbn%, FIXME ADD MORE (use it with CustomCoverImages and/or OPACCustomCoverImages)','free'),
 ('dateformat','us','metric|us|iso|dmydot','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd, dmydot dd.mm.yyyy)','Choice'),
 ('DebugLevel','2','0|1|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'),
@@ -159,7 +159,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
 ('DefaultToLoggedInLibraryOverdueTriggers',  '0', NULL ,  'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.',  'YesNo'),
 ('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
-('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','Choice'),
+('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding staff interface XSLT option must be on','Choice'),
 ('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
 ('displayFacetCount','0',NULL,NULL,'YesNo'),
 ('DisplayIconsXSLT','1','','If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.','YesNo'),
@@ -224,7 +224,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('HoldsAutoFillPrintSlip','0',NULL,'If on, hold slip print dialog will be displayed automatically','YesNo'),
 ('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo'),
 ('HoldsQueueSkipClosed', '0', NULL, 'If enabled, any libraries that are closed when the holds queue is built will be ignored for the purpose of filling holds.', 'YesNo'),
-('HoldsSplitQueue','nothing','nothing|branch|itemtype|branch_itemtype','In the staff client, split the holds view by the given criteria','Choice'),
+('HoldsSplitQueue','nothing','nothing|branch|itemtype|branch_itemtype','In the staff interface, split the holds view by the given criteria','Choice'),
 ('HoldsToPullStartDate','2',NULL,'Set the default start date for the Holds to pull list to this many days ago','Integer'),
 ('HomeOrHoldingBranch','holdingbranch','holdingbranch|homebranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','Choice'),
 ('HouseboundModule',0,'','If ON, enable housebound module functionality.','YesNo'),
@@ -256,12 +256,12 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
 ('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
 ('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
-('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'),
-('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
-('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
+('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff interface', 'YesNo'),
+('intranetcolorstylesheet','','50','Define the color stylesheet to use in the staff interface','free'),
+('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the staff interface','free'),
 ('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
-('IntranetNav','','70|10','Use HTML tabs to add navigational links to the top-hand navigational bar in the Staff Client','Textarea'),
-('IntranetNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number staff client searches','YesNo'),
+('IntranetNav','','70|10','Use HTML tabs to add navigational links to the top-hand navigational bar in the staff interface','Textarea'),
+('IntranetNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number staff interface searches','YesNo'),
 ('intranetreadinghistory','1','','If ON, Reading History is enabled for all patrons','YesNo'),
 ('IntranetReportsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
 ('IntranetSlipPrinterJS','','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','Free'),
@@ -282,7 +282,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
 ('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
 ('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
-('language','en',NULL,'Set the default language in the staff client.','Languages'),
+('language','en',NULL,'Set the default language in the staff interface.','Languages'),
 ('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
 ('LibraryName','','','Define the library name as displayed on the OPAC',''),
 ('LibraryThingForLibrariesEnabled','0','','Enable or Disable Library Thing for Libraries Features','YesNo'),
@@ -343,15 +343,15 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('NovelistSelectEnabled','0',NULL,'Enable Novelist Select content.  Requires Novelist Profile and Password','YesNo'),
 ('NovelistSelectPassword','',NULL,'Novelist select user Password','free'),
 ('NovelistSelectProfile','',NULL,'Novelist Select user Profile','free'),
-('NovelistSelectStaffEnabled','0',NULL,'Enable Novelist Select content in the staff client.  Requires Novelist Profile and Password','YesNo'),
-('NovelistSelectStaffProfile','',NULL,'Novelist Select user Profile for staff client','free'),
-('NovelistSelectStaffView','tab','tab|above|below','Where to display Novelist Select content in the staff client','Choice'),
+('NovelistSelectStaffEnabled','0',NULL,'Enable Novelist Select content in the staff interface.  Requires Novelist Profile and Password','YesNo'),
+('NovelistSelectStaffProfile','',NULL,'Novelist Select user Profile for staff interface','free'),
+('NovelistSelectStaffView','tab','tab|above|below','Where to display Novelist Select content in the staff interface','Choice'),
 ('NovelistSelectView','tab','tab|above|below|right','Where to display Novelist Select content','Choice'),
 ('NumberOfSuggestionDays','',NULL,'Number of days that will be used to determine the MaxTotalSuggestions limit','Free'),
 ('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'),
 ('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'),
 ('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
-('numSearchResultsDropdown', 0, NULL, 'Enable option list of number of results per page to show in staff client search results','YesNo'),
+('numSearchResultsDropdown', 0, NULL, 'Enable option list of number of results per page to show in staff interface search results','YesNo'),
 ('numSearchRSSResults','50',NULL,'Specify the maximum number of results to display on a RSS page of results','Integer'),
 ('OAI-PMH','0',NULL,'if ON, OAI-PMH server is enabled','YesNo'),
 ('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
@@ -482,7 +482,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OverduesBlockRenewing','allow','allow|blockitem|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'),
 ('PatronAnonymizeDelay','',NULL,'Delay for anonymizing patrons', 'Integer'),
 ('PatronAutoComplete','1','Try|Don\'t try','to guess the patron being entered while typing a patron search for circulation or patron search. Only returns the first 10 results at a time.','YesNo'),
-('patronimages','0',NULL,'Enable patron images for the Staff Client','YesNo'),
+('patronimages','0',NULL,'Enable patron images for the staff interface','YesNo'),
 ('PatronRemovalDelay','',NULL,'Delay for removing anonymized patrons', 'Integer'),
 ('PatronSelfModificationBorrowerUnwantedField','',NULL,'Name the fields you don\'t want to display when a patron is editing their information via the OPAC.','free'),
 ('PatronSelfRegistration','0',NULL,'If enabled, patrons will be able to register themselves via the OPAC.','YesNo'),
@@ -600,12 +600,12 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
 ('SpineLabelFormat','<itemcallnumber><copynumber>','30|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),
 ('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),
-('staffClientBaseURL','',NULL,'Specify the base URL of the staff client starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)','free'),
+('staffClientBaseURL','',NULL,'Specify the base URL of the staff interface starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)','free'),
 ('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
-('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff client','Choice'),
-('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff client','Free'),
+('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff interface','Choice'),
+('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
 ('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
-('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the Staff client','Integer'),
+('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),
 ('StaticHoldsQueueWeight','0',NULL,'Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective','Integer'),
 ('StatisticsFields','location|itype|ccode', NULL, 'Define Fields (from the items table) used for statistics members','Free'),
 ('StockRotation','0',NULL,'If ON, enables the stock rotation module','YesNo'),
diff --git a/installer/data/mysql/userflags.sql b/installer/data/mysql/userflags.sql
index 40ec125eea..82acf496d3 100644
--- a/installer/data/mysql/userflags.sql
+++ b/installer/data/mysql/userflags.sql
@@ -1,7 +1,7 @@
 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
 (0,'superlibrarian','Access to all librarian functions',0),
 (1,'circulate','Check out and check in items',0),
-(2,'catalogue','<b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff client.',0),
+(2,'catalogue','<b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff interface.',0),
 (3,'parameters','Manage Koha system settings (Administration panel)',0),
 (4,'borrowers','Add or modify patrons',0),
 (5,'permissions','Set user permissions',0),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index bf6d73d2fe..6452f2a98b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -169,7 +169,7 @@ a.add, a.delete {
                   </tr>
                   <tr>
                     <th colspan=3>&nbsp;</th>
-                    <th>Staff client</th>
+                    <th>Staff interface</th>
                     <th>OPAC</th>
                     <th>&nbsp;</th>
                   </tr>
diff --git a/misc/load_testing/benchmark_circulation.pl b/misc/load_testing/benchmark_circulation.pl
index 5c6ecdb005..36ab41881f 100755
--- a/misc/load_testing/benchmark_circulation.pl
+++ b/misc/load_testing/benchmark_circulation.pl
@@ -72,7 +72,7 @@ print "--------------\n";
 print "Koha circulation benchmarking utility\n";
 print "--------------\n";
 print "Benchmarking with $max_tries occurrences of each operation and $concurrency concurrent sessions \n";
-print "Load testing staff client dashboard page";
+print "Load testing staff interface dashboard page";
 for (my $i=1;$i<=$max_tries;$i++) {
     push @mainpage,"$baseurl/mainpage.pl";
 }
diff --git a/misc/load_testing/benchmark_staff.pl b/misc/load_testing/benchmark_staff.pl
index f060464435..9c0a92fc54 100644
--- a/misc/load_testing/benchmark_staff.pl
+++ b/misc/load_testing/benchmark_staff.pl
@@ -154,7 +154,7 @@ if ($steps=~ /1/) {
     my $b0 = HTTPD::Bench::ApacheBench->new;
     $b0->concurrency( $concurrency );    my @mainpage;
     unless ($short_print) {
-        print "Step 1: staff client main page     ";
+        print "Step 1: staff interface main page     ";
     }
     for (my $i=1;$i<=$max_tries;$i++) {
         push @mainpage,"$baseurl/mainpage.pl";
diff --git a/t/db_dependent/selenium/authentication.t b/t/db_dependent/selenium/authentication.t
index 418346a202..a544da8783 100644
--- a/t/db_dependent/selenium/authentication.t
+++ b/t/db_dependent/selenium/authentication.t
@@ -59,7 +59,7 @@ SKIP: {
         $driver->get($mainpage . q|?logout.x=1|);
         $patron->flags(4)->store; # catalogue permission
         $s->auth( $patron->userid, $password );
-        like( $driver->get_title, qr(Koha staff client), 'Patron with flags catalogue should be able to login' );
+        like( $driver->get_title, qr(Koha staff interface), 'Patron with flags catalogue should be able to login' );
 
         $driver->get($mainpage . q|?logout.x=1|);
         like( $driver->get_title(), qr(Log in to Koha), 'If logout is requested, login form should be displayed' );
diff --git a/t/db_dependent/www/auth_values_input_www.t b/t/db_dependent/www/auth_values_input_www.t
index d5aa09765a..78255b3f2b 100644
--- a/t/db_dependent/www/auth_values_input_www.t
+++ b/t/db_dependent/www/auth_values_input_www.t
@@ -67,7 +67,7 @@ $agent->form_name('loginform');
 $agent->field( 'password', $password );
 $agent->field( 'userid',   $user );
 $agent->field( 'branch',   '' );
-$agent->click_ok( '', 'login to staff client' );
+$agent->click_ok( '', 'login to staff interface' );
 $agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
 
 #---------------------------------------- Test with corean, greek and emoji chars
diff --git a/t/db_dependent/www/batch.t b/t/db_dependent/www/batch.t
index b2b48ed01e..5dbabfd80e 100644
--- a/t/db_dependent/www/batch.t
+++ b/t/db_dependent/www/batch.t
@@ -48,7 +48,7 @@ my $intranet = $ENV{KOHA_INTRANET_URL};
 if (not defined $intranet) {
     plan skip_all =>
          "You must set the environment variable KOHA_INTRANET_URL to ".
-         "point this test to your staff client. If you do not have ".
+         "point this test to your staff interface. If you do not have ".
          "KOHA_CONF set, you must also set KOHA_USER and KOHA_PASS for ".
          "your username and password";
 }
@@ -66,7 +66,7 @@ $agent->form_name('loginform');
 $agent->field( 'password', $password );
 $agent->field( 'userid',   $user );
 $agent->field( 'branch',   '' );
-$agent->click_ok( '', 'login to staff client' );
+$agent->click_ok( '', 'login to staff interface' );
 
 $agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
 
diff --git a/t/db_dependent/www/search_utf8.t b/t/db_dependent/www/search_utf8.t
index 859b0114a9..7b034900ea 100644
--- a/t/db_dependent/www/search_utf8.t
+++ b/t/db_dependent/www/search_utf8.t
@@ -138,7 +138,7 @@ sub test_search{
     $agent->field( 'password', $password );
     $agent->field( 'userid',   $user );
     $agent->field( 'branch',   '' );
-    $agent->click_ok( '', 'login to staff client' );
+    $agent->click_ok( '', 'login to staff interface' );
 
     $agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
 
-- 
2.11.0