Merge branch 'dev' into add-support-for-lido-iframe-videos

config/vufind/EDS.ini

@@ -406,16 +406,21 @@ AU = None
 
 ; This section controls how the authors of EDS records are displayed.
 [AuthorDisplay]
-; Control which data is used to display author information in search results.
-; - 'Short' (the default) is fetched from the RecordInfo section of a record (the
+; The following two settings control which data is used to display author
+; information in search results (ResultListFormat) and item detail pages
+; (DetailPageFormat). Both settings support two options:
+; - 'Short' (the default for ResultListFormat) is fetched from the RecordInfo section of a record (the
 ;   'BibRecord/BibRelationships/HasContributorRelationships/*PersonEntity/Name/NameFull' data).
-;   Also, when you set 'ResultListFormat' to 'Short' you can change the default delimiter "; " between
+;   This format also suppresses the display of 'AuInfo' group data on the detail page
+;   when activated there.
+;   In this display mode, you can change the default delimiter "; " between
 ;   the author names by overriding the styles defined in the EDS.css file
 ;   under: 'Author name delimiters'.
-; - 'Long' is fetched from the item 'Au' group data.
+; - 'Long' (the default for DetailPageFormat) is fetched from the item 'Au' group data.
 ResultListFormat = 'Short'
-; This setting controls how many author names to display when ResultListFormat is
-; set to 'Short'. It is ignored if the setting is 'Long'. If a record has more author names
-; than you define in AuthorNameLimit, then VuFind will display the more_authors_abbrev text.
+DetailPageFormat = 'Long'
+; This setting controls how many author names to display when ResultListFormat or DetailPageFormat
+; are set to 'Short'. It is ignored if the setting is 'Long'. If a record has more author names
+; than you define in ShortAuthorLimit, then VuFind will display the more_authors_abbrev text.
 ; If undefined, the default value is 3.
 ;ShortAuthorLimit = 3

config/vufind/KohaRest.ini

@@ -47,6 +47,8 @@ host = "http://koha-server/api"
 ; - updatecharges
 ;   - payout
 ;   - remaining_permissions
+; - recalls
+;   - manage_recalls
 ;
 ; Add an API key to the user and copy the values for Client ID and Secret below.
 ; To add an API key in Koha, go to the patron screen and click More -> Manage API
@@ -125,6 +127,11 @@ updateFields = frozen:frozenThrough:pickUpLocation
 ; is false.
 ;allowCancelInTransit = false
 
+; Uncomment the following line to enable recalls (disabled by default). Requires a
+; Koha version that includes
+; https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36075
+;enableRecalls = true
+
 ; This section controls article request behavior. To enable, uncomment (at minimum)
 ; the HMACKeys and extraFields settings below.
 [StorageRetrievalRequests]
@@ -160,10 +167,10 @@ extraFields = item-issue:acceptTerms:pickUpLocation
 ; false. Requires Koha REST DI plugin version 23.11.06 or later (earlier versions
 ; included suspended holds by default).
 ;includeSuspendedHoldsInQueueLength = false
-; This section allows libraries to define different custom itemLimit rules for 
+; This section allows libraries to define different custom itemLimit rules for
 ; different biblio-level item types.
 ; In Koha the biblio-level item type is defined in the 942$c subfield.
-; Set 'itemLimit' to set a fallback value that will be used for any item types not given a more 
+; Set 'itemLimit' to set a fallback value that will be used for any item types not given a more
 ; specific setting.
 ; Set 'itemLimitByType' followed by a [] containing a string for the Koha biblio-level item type.
 ; The string after the equal sign is the number of items to display in the holdings tab.

config/vufind/config.ini

@@ -52,6 +52,9 @@ theme           = sandal
 ; standard themes since they support responsive design.
 ;mobile_theme    = mobile
 
+; Uncomment the following line to use a different theme for Admin module.
+;admin_theme     = sandal
+
 ; Automatic asset minification and concatenation setting. When active, HeadScript
 ; and HeadLink will concatenate and minify all viable files to reduce requests and
 ; load times. This setting is off by default.
@@ -1467,7 +1470,7 @@ show_in_holdings = false    ; include in holdings tab of record view
 ; If set to true, this setting will attempt to embed results from the link
 ; resolver directly in search results instead of opening a new window or page.
 ; This will override the window_settings option if set! Embedding is currently
-; unsupported when the resolver setting above is set to "other".
+; unsupported when the resolver setting above is set to "generic".
 embed = false
 
 ; When embed is true and this is set to true results from the link resolver will
@@ -2056,9 +2059,12 @@ hide_holdings[] = "World Wide Web"
 ; Available options:
 ;    Channels - Display links to channels of content related to record
 ;    Bookplate - Display a bookplate image or something similar
+;    MoreByAuthorSolr - Display books from the Solr index matching the current
+;                       record's primary author.
 ;    Similar - Similarity based on Solr lookup
 ;    WorldCatSimilar - Similarity based on WorldCat lookup
 related[] = "Similar"
+;related[] = "MoreByAuthorSolr"
 
 ; The following settings are for the related Bookplate module. They can be
 ; enabled here by uncommenting below or from another config file of your choice.

config/vufind/export.ini

@@ -86,8 +86,10 @@ headers[] = "Content-type: application/rdf+xml"
 requiredMethods[] = getTitle
 ;limit = 100
 headers[] = "Content-type: application/x-bibtex; charset=utf-8"
+headers[] = "Content-Disposition: attachment; filename=\"VuFindExport.bibtex\";"
 
 [RIS]
 requiredMethods[] = getTitle
 ;limit = 100
 headers[] = "Content-type: application/x-research-info-systems; charset=utf-8"
+headers[] = "Content-Disposition: attachment; filename=\"VuFindExport.ris\";"

config/vufind/permissions.ini

@@ -21,9 +21,11 @@
 ; insecureCookie  - Grant the permissions to users who have the named cookie(s) set in
 ;                   their browser. This can be easily spoofed by an end user, so it
 ;                   should not be used to protect secure features; however, it may be
-;                   useful for setting flags to control unprotected behavior. If you use
-;                   the cookie consent option, also be sure to add any custom cookies you
-;                   create to CookieConsent.yaml so they are properly documented.
+;                   useful for setting flags to control unprotected behavior.
+;                   The sessionKey permission provider is a more secure alternative to the
+;                   insecureCookie permission provider.
+;                   If you use the cookie consent option, also be sure to add any custom cookies
+;                   you create to CookieConsent.yaml so they are properly documented.
 ; ipRange         - Grant the permission to the single IP address or to the range.
 ;                   Accepts a single IP address or a range with a minus character without
 ;                   blanks as separator. Also partial addresses can be used (e.g. 192.168
@@ -43,6 +45,12 @@
 ;                   with optional modifier ~ (match instead of string comparison, values
 ;                   are treated as regular expressions), ! (not) or !~ (no match). Only
 ;                   one of the values must match (OR).
+; sessionKey      - Grant the permissions to users who have the named key(s) stored in
+;                   the permission provider's session container. Keys can be set using
+;                   the provider's setSessionValue() method. For an example of this, see
+;                   \VuFindDevTools\Controller\DevtoolsController::permissionsAction().
+;                   A demo is available in the development tools; for details, see:
+;                   https://vufind.org/wiki/development:devtools
 ; shibboleth      - Same as serverParam with support for Shibboleth multi-valued
 ;                   attributes (values separated by semicolons). The IdP entityId can be
 ;                   referenced with idpentityid. Please note that only checking the IdP
@@ -67,6 +75,7 @@
 ; ipRange[] = "1.2.3.7-1.2.5.254"
 ; insecureCookie = "VUFIND_CUSTOM_COOKIE_NAME"
 ; permission = sample.permission
+; sessionKey = "VUFIND_SESSION_KEY_NAME"
 
 ; Example configuration (grants the "sample.permission" permission to users
 ; who are from myCollege or who is a studentmajor (.*studentmajor.*):

import/index_java/src/org/vufind/index/ConfigManager.java

@@ -70,25 +70,28 @@ public static ConfigManager instance()
     private File findConfigFile(String filename) throws IllegalStateException
     {
         // Find VuFind's home directory in the environment; if it's not available,
-        // try using a relative path on the assumption that we are currently in
-        // VuFind's import subdirectory:
+        // we cannot proceed:
         String vufindHome = System.getenv("VUFIND_HOME");
         if (vufindHome == null) {
             // this shouldn't happen since import-marc.sh and .bat always set VUFIND_HOME
             throw new IllegalStateException("VUFIND_HOME must be set");
         }
 
-        // Check for VuFind 2.0's local directory environment variable:
+        // Check for VuFind's local directory environment variable:
         String vufindLocal = System.getenv("VUFIND_LOCAL_DIR");
 
-        // Get the relative VuFind path from the properties file, defaulting to
-        // the 2.0-style config/vufind if necessary.
+        // If VUFIND_LOCAL_DIR is not set, issue a warning and try to derive it from VUFIND_HOME
+        if (vufindLocal == null || vufindLocal.length() == 0) {
+            vufindLocal = vufindHome + "/local";
+            logger.warn("The VUFIND_LOCAL_DIR environment variable is missing. Defaulting to " + vufindLocal);
+        }
+
+        // Get the relative VuFind path from the properties file, defaulting to config/vufind if necessary.
         String relativeConfigPath = PropertyUtils.getProperty(
             vuFindConfigs, "vufind.config.relative_path", "config/vufind"
         );
 
-        // Try several different locations for the file -- VuFind 2 local dir,
-        // VuFind 2 base dir, VuFind 1 base dir.
+        // Try several different locations for the file -- VuFind local dir, VuFind base dir, legacy base dir.
         File file;
         if (vufindLocal != null) {
             file = new File(vufindLocal + "/" + relativeConfigPath + "/" + filename);
@@ -100,7 +103,7 @@ private File findConfigFile(String filename) throws IllegalStateException
         if (file.exists()) {
             return file;
         }
-        file = new File(vufindHome + "/web/conf/" + filename);
+        file = new File(vufindHome + "/web/conf/" + filename); // legacy from VuFind 1.x
         return file;
     }
 

languages/CreatorRoles/hr.ini

@@ -48,9 +48,9 @@ bdd = "Dizajner uveza"
 bearb = "Urednik"
 begr = "Osnivač"
 Beiträger = "Pridonositelj"
-beiträger = "Književni pridonositelj"
-beiträger k = "Umjetnički pridonositelj"
-beiträger m = "Glazbeni pridonositelj"
+beiträger = "Književni doprinositelj"
+beiträger k = "Umjetnički doprinositelj"
+beiträger m = "Doprinositelj glazbe"
 bjd = "Dizajner omota"
 bkd = "Dizajner knjiga"
 bkp = "Proizvođač knjiga"
@@ -125,7 +125,7 @@ drm = "Tehnički crtač"
 drt = "Redatelj"
 dsr = "Dizajner"
 dst = "Distributor"
-dtc = "Davatelj podataka"
+dtc = "Doprinositelj podataka"
 dte = "Posvećenik"
 dtm = "Upravitelj podataka"
 dto = "Posvećuje"

languages/HoldingStatus/fi.ini

@@ -5,3 +5,5 @@ service_available_presentation = "Käyttö vain kirjastossa"
 service_loan = "Lainaus"
 service_presentation = "Käyttö kirjastossa"
 services_available_html = "Käytettävissä toiminnoille: %%list%%"
+transit_to = "Matkalla kohteeseen %%location%%"
+transit_to_date = "Matkalla kohteeseen %%location%%, lähtenyt %%date%%"

languages/HoldingStatus/sv.ini

@@ -5,3 +5,5 @@ service_available_presentation = "Endast i biblioteksbruk"
 service_loan = "Lån"
 service_presentation = "I biblioteksbruk"
 services_available_html = "Tillgänglig för %%list%%"
+transit_to = "På väg till %%location%%"
+transit_to_date = "På väg till %%location%%, skickad %%date%%"

languages/ISO639-3/de.ini

@@ -1482,7 +1482,7 @@ ctn = "Chhintange"
 cto = "Emberá-Catío"
 ctp = "Chatino, Western Highland"
 cts = "Bikol, Northern Catanduanes"
-ctt = "Wayanad Chetti "
+ctt = "Wayanad Chetti"
 ctu = "Chol-Sprache"
 ctz = "Chatino, Zacatepec"
 cua = "Cua"
@@ -3907,7 +3907,7 @@ maw = "Mampruli"
 max = "Malay, North Moluccan"
 maz = "Zentral-Mazahua"
 mba = "Higaonon"
-mbb = "West-Bukidnon-Manobo "
+mbb = "West-Bukidnon-Manobo"
 mbc = "Macushi"
 mbd = "Dibabawon Manobo"
 mbe = "Molale"
@@ -4314,7 +4314,7 @@ mrd = "Magar, Western"
 mre = "Martha’s Vineyards Gebärdensprache"
 mrf = "Elseng"
 mrg = "Mising"
-mrh = "Mara Chin "
+mrh = "Mara Chin"
 mri = "Maori"
 mrj = "West-Mari"
 mrk = "Hmwaveke"
@@ -6233,7 +6233,7 @@ suy = "Suyá"
 suz = "Sunwar"
 sva = "Swanische Sprache"
 svb = "Ulau-Suain"
-svc = "Vincentisches Kreol "
+svc = "Vincentisches Kreol"
 sve = "Serili"
 svk = "Slowakische Gebärdensprache"
 svm = "Moliseslawisch"
@@ -6697,7 +6697,7 @@ tsl = "Ts'ün-Lao"
 tsm = "Türkische Gebärdensprache"
 tsn = "Setswana"
 tso = "Tsonga"
-tsp = "Nord-Tusya "
+tsp = "Nord-Tusya"
 tsq = "Thai-Gebärdensprache"
 tsr = "Akei"
 tss = "Taiwanesische Gebärdensprache"
@@ -6965,7 +6965,7 @@ vaa = "Vaagri Booli"
 vae = "Vale"
 vaf = "Vafsi"
 vag = "Vagla"
-vah = "Varhadi-Nagpuri "
+vah = "Varhadi-Nagpuri"
 vai = "Vai"
 vaj = "Vasekela Bushman"
 val = "Vehes"

languages/en.ini

@@ -842,6 +842,7 @@ More options = "More options"
 More Summon results = "More Summon results…"
 More Topics = "More Topics"
 more_authors_abbrev = "et al."
+more_by_author = "Also by %%name%%"
 more_ellipsis = "more…"
 more_info_toggle = "Show/hide more info."
 more_options_ellipsis = "More options…"

languages/fr.ini

@@ -401,6 +401,7 @@ epf_recommendations = "Résultats dans les publications"
 epf_recommendations_more = "Plus de résultats dans les publications"
 ePub Full Text = "Texte intégral au format ePub"
 Era = "Période"
+error_creating_marc_xml = "Une erreur s'est produite lors du formatage en MARC."
 error_inconsistent_parameters = "Hélas une erreur est survenue. De mauvais paramètres ont été détectés."
 error_page_parameter_list_heading = "Paramètres de la requête"
 Exception = "Exception"
@@ -947,6 +948,7 @@ od_info_unavail = "Cette information n'est pas disponible pour le moment."
 od_is_checkedout = "Vous avez emprunté ce titre. Il doit être retourné pour le %%due_date%%."
 od_is_on_hold = "Vous avez fait une demande pour ce titre."
 od_loans = "Emprunts OverDrive"
+od_mag_issue_ischeckedout = "emprunté"
 od_mycontent_help = 'Pour trouver des informations et une aide pour le téléchargement de ces titres, veuillez consulter <a href="%%url%%">l\'aide OverDrive</a>.'
 od_none_found = "Aucun titre n'a été trouvé."
 od_return_failure = "Ce titre ne peut pas être retourné."
@@ -1124,6 +1126,7 @@ relais_success_message = "La demande numéro #%%id%% a été créée. Vous recev
 Related Author = "Auteurs similaires"
 Related Items = "Documents similaires"
 Related Subjects = "Sujets similaires"
+Relevance = "Pertinence"
 Remove filter = "Enlever le filtre"
 Remove Filters = "Enlever les filtres"
 Remove from Book Bag = "Retirer du panier"

languages/hr.ini

@@ -430,6 +430,7 @@ explain_coord = "* %%coord%% (prilagodi broj podudaranja u usporedbi s pretragom
 explain_difference_score = "razlika u odnosu na najbolji rezultat"
 explain_disabled = "Objašnjenje je deaktivirano za %%searchClassId%%"
 explain_for_search = "Obrazloženje za pretragu"
+explain_function_query_label = "Funkcija"
 explain_modified_value = "Proizvod od %%relevanceValue%% (vrijednost relevantnosti)"
 explain_modifier = "s modifikatorom od %%modifier%%"
 explain_record_score = "ocjena zapisa"
@@ -1345,6 +1346,7 @@ sort_due_date_desc = "Datum roka posudbe (najprije najnovije)"
 sort_relevance = "Relevantnost"
 sort_return_date_asc = "Datum vraćanja posudbe (najprije najstarije)"
 sort_return_date_desc = "Datum vraćanja posudbe (najprije najnovije)"
+sort_saved = "Datum spremanja (najprije najnovija)"
 sort_title = "Naslov"
 sort_year = "Datum uzlazno"
 sort_year_asc = "Datum silazno"
@@ -1353,6 +1355,7 @@ Source Title = "Naslov izvora"
 spell_expand_alt = "Proširi pretragu"
 spell_suggest = "Alternative za pretragu"
 Staff View = "Prikaz za djelatnike knjižnice"
+standalone_record_link = "Samostalni zapis"
 Start a new Advanced Search = "Započni novu naprednu pretragu"
 Start a new Basic Search = "Započni novu osnovnu pretragu"
 Start Page = "Početna stranica"