Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev-11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
EreMaijala committed Oct 1, 2024
2 parents e185493 + 5e939de commit cb30f75
Show file tree
Hide file tree
Showing 155 changed files with 863 additions and 403 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Setup node
if: ${{ matrix.phing_tasks == 'qa-console' }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'

Expand Down
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = function(grunt) {
const fs = require("fs");
const os = require("node:os");

// Load dart-sass
grunt.loadNpmTasks('grunt-dart-sass');
Expand Down Expand Up @@ -275,7 +276,7 @@ module.exports = function(grunt) {
expand: true,
cwd: path.join('themes', themeList[i], 'scss'),
src: ['compiled.scss'],
dest: checkOnly ? null : path.join('themes', themeList[i], 'css'),
dest: path.join(checkOnly ? os.tmpdir() : 'themes', themeList[i], 'css'),
ext: '.css'
}]
};
Expand Down
5 changes: 5 additions & 0 deletions config/vufind/Folio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ extraHoldFields = requiredByDate:pickUpLocation
; Regex mode example
;excludeHoldLocations[] = "/.*RESERVE.*/i"

; Hide the place hold/recall/page link when an item is currently loaned to a member
; of one of the following FOLIO patron groups (matching on patron group name).
; For example, block requests for items currently loaned out to other institutions.
;excludeHoldCurrentLoanPatronGroups[] = 'interlibrary_loan_patron'

; When a request is cancelled through VuFind, use this cancellation reason ID. Most users
; will not have to change this ID unless they have replaced the cancellation reason
; reference data in mod-circulation-storage, or would prefer to use a cancellation
Expand Down
10 changes: 10 additions & 0 deletions config/vufind/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2001,6 +2001,16 @@ callnumber_handler = false
load_batch_wise = true
load_observable_only = true

; If set to true, the item status display will include additional holdings text fields.
; This option will only take effect when show_full_status is also set to true.
include_holdings_text_fields = true

; The set of additional holdings text fields shown in the item status display. If not
; set explicitly, the default is to show all fields defined in holdings_text_fields[].
;displayed_holdings_text_fields[] = 'holdings_notes'
;displayed_holdings_text_fields[] = 'summary'


; This section controls the behavior of the Record module.
[Record]
; Set this to true in order to enable "next" and "previous" links to navigate
Expand Down
3 changes: 3 additions & 0 deletions languages/HoldingStatus/ar.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "غير مؤكد"
copies_ordered_on_date = "تم طلب %%copies%% نسخة في %%date%%"
copy_ordered_on_date = "تم طلب نسخة واحدة في %%date%%"
holding_no_items_availability_message = "مشاهدة التسجيلة الكاملة"
service_available_presentation = "للاستخدام داخل المكتبة فقط"
service_loan = "استعارة"
service_presentation = "استخدام داخل المكتبة"
services_available_html = "متاح لـ %%قائمة%%"
transit_to = "في النقل إلى %%location%%"
transit_to_date = "في النقل إلى %%location%%, تم الإرسال في %%date%%"
1 change: 1 addition & 0 deletions languages/HoldingStatus/fi.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
availability_uncertain = "Epävarma"
copies_ordered_on_date = "%%copies%% kappaletta tilattu %%date%%"
copy_ordered_on_date = "%%copies%% kappale tilattu %%date%%"
holding_no_items_availability_message = "Katso koko tietue"
service_available_presentation = "Käyttö vain kirjastossa"
service_loan = "Lainaus"
service_presentation = "Käyttö kirjastossa"
Expand Down
3 changes: 3 additions & 0 deletions languages/HoldingStatus/hy.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "Անորոշ"
copies_ordered_on_date = "%%copies%% պատվիրված պատճենները %%date%%"
copy_ordered_on_date = "Պատվիրված է 1 օրինակ %%date%%"
holding_no_items_availability_message = "Տե՛ս ամբողջական գրառումը"
service_available_presentation = "Միայն գրադարանում օգտագործման համար"
service_loan = "փոխառություն"
service_presentation = "Գրադարանում օգտագործման համար"
services_available_html = "Հասանելի է %%list%%"
transit_to = "Տեղափոխման մեջ է դեպի %%location%%"
transit_to_date = "Տեղափոխման մեջ է դեպի %%location%%, ուղարկված է %%date%%"
3 changes: 3 additions & 0 deletions languages/HoldingStatus/mn.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "Тодорхойгүй"
copies_ordered_on_date = "%%date%% %%copies%% захиалсан"
copy_ordered_on_date = "%%date%% 1 хувийг захиалсан"
holding_no_items_availability_message = "Бүрэн бичлэгийг үзэх"
service_available_presentation = "Зөвхөн номын санд ашиглах"
service_loan = "Түрээслэх"
service_presentation = "Зөвхөн номын сангийн хэрэгцээнд ашиглах"
services_available_html = "%%list%% ашиглах боломжтой"
transit_to = "%%location%% руу шилжүүлэх байна"
transit_to_date = "%%location%% руу шилжүүлэж байна, %%date%% илгээсэн"
3 changes: 3 additions & 0 deletions languages/HoldingStatus/pt-br.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "Incerto"
copies_ordered_on_date = "%%copies%% cópias pedidas em %%date%%"
copy_ordered_on_date = "1 cópia solicitada em %%date%%"
holding_no_items_availability_message = "Ver registro completo"
service_available_presentation = "Uso somente na biblioteca"
service_loan = "Empréstimo"
service_presentation = "No uso da biblioteca"
services_available_html = "Disponível para %%list%%"
transit_to = "Em trânsito para %%location%%"
transit_to_date = "Em trânsito para %%location%%, enviado em %%date%%"
3 changes: 3 additions & 0 deletions languages/HoldingStatus/ru.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "Неопределенно"
copies_ordered_on_date = "%%copies%% экземпляров заказано %%date%%"
copy_ordered_on_date = "1 экземпляр заказан %%date%%"
holding_no_items_availability_message = "Посмотреть полную запись"
service_available_presentation = "В библиотеке использовать только"
service_loan = "Кредит"
service_presentation = "В библиотеке использовать"
services_available_html = "Доступно для %%list%%"
transit_to = "Находится в пути %%location%%"
transit_to_date = "Находится в пути %%location%%, отправленный %%date%%"
1 change: 1 addition & 0 deletions languages/HoldingStatus/sv.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
availability_uncertain = "Osäker"
copies_ordered_on_date = "%%copies%% exemplar beställt %%date%%"
copy_ordered_on_date = "1 exemplar beställt %%date%%"
holding_no_items_availability_message = "Se fullständig post"
service_available_presentation = "Endast i biblioteksbruk"
service_loan = "Lån"
service_presentation = "I biblioteksbruk"
Expand Down
3 changes: 3 additions & 0 deletions languages/HoldingStatus/tr.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
availability_uncertain = "Belirsiz"
copies_ordered_on_date = "%%kopyalar%% şu tarihte sipariş edilen kopyalar %%date%%"
copy_ordered_on_date = "yandaki tarihte 1 kopya sipariş edildi %%date%%"
holding_no_items_availability_message = "Tüm kaydı görüntüle"
service_available_presentation = "Sadece Kütüphane İçi Kullanım"
service_loan = "Ödünç"
service_presentation = "Kütüphane içi kullanım"
services_available_html = "%%listesi%% için kullanılabilir"
transit_to = "%%location%%'a aktarımda"
transit_to_date = "%%location%%'a aktarımda, %%date%% tarihinde gönderildi"
3 changes: 3 additions & 0 deletions languages/ILSMessages/ar.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "لديك مواد متاحة للالتقا
checkout_block = "لا يمكنك إعارة المزيد من المواد"
electronic_resources_block = "لا يمكنك الوصول إلى الموارد الإلكترونية"
hold_wrong_user_institution = "لا يمكنك حجز المواد من المكتبة المطلوبة."
ill_item_renewal_limit = "إعادة بحلول تاريخ الاستحقاق (تم بلوغ الحد الأقصى للتجديدات)."
ill_renewal_too_soon = "سيتم تجديد المادة تلقائياً (ما لم تكن مطلوبة بواسطة آخرين)"
lost_card = "تم الإبلاغ عن ضياع بطاقتك"
message_from_library = "لديك رسالة من مكتبتك"
no_change_password_scope = "غير مسموح لك بتغيير كلمة المرور."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "غير مسموح لك بتحديث الاسم ف
no_update_patron_scope = "غير مسموح لك بتحديث بيانات المستفيد."
no_write_items_scope = "غير مسموح لك بكتابة المواد."
renewal_block = "لا يمكنك تجديد الإعارات"
renewal_recalled = "تم طلب الماة - تم تغيير تاريخ الاستحقاق - إعادة في تاريخ الاستحقاق"
renewal_too_soon = "لا يمكن التجديد بعد"
requests_blocked = "لا يمكنك وضع طلب على مادة المكتبة"
special_circulation = "النسخة لها إعارة خاص"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/fi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Sinulla on aineistoa valmiina noudettavaksi
checkout_block = "Et voi lainata enempää aineistoa"
electronic_resources_block = "Sinulla ei ole pääsyä elektronisiin aineistoihin"
hold_wrong_user_institution = "Et voi varata tämän kirjaston aineistoa."
ill_item_renewal_limit = "Palauta eräpäivään mennessä (ei uusimiskertoja jäljellä)."
ill_renewal_too_soon = "Laina uusitaan automaattisesti (jos ei ole varauksia)"
lost_card = "Kirjastokorttisi on merkitty kadonneeksi"
message_from_library = "Sinulle on viesti kirjastosta"
no_change_password_scope = "Sinulla ei ole salasanan vaihto-oikeutta."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Sinulla ei ole asiakkaan nimen päivitysoikeutta.
no_update_patron_scope = "Sinulla ei ole asiakastietojen päivitysoikeuksia."
no_write_items_scope = "Sinulla ei ole tietojen muokkausoikeuksia."
renewal_block = "Et voi uusia lainoja"
renewal_recalled = "Aineistoon on varauksia - eräpäivä muuttunut - palauta eräpäivään mennessä"
renewal_too_soon = "Ei voida uusia vielä"
requests_blocked = "Et voi tehdä varauksia"
special_circulation = "Nide on nopeakierrossa"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/hy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Դուք ունեք նյութ վերցնե
checkout_block = "Դուք չեք կարող ստանալ ավելի շատ նյութեր"
electronic_resources_block = "Դուք չեք կարող մուտք գործել էլեկտրոնային պաշարներ"
hold_wrong_user_institution = "Դուք չեք կարող պահումներ տեղադրել հայցվող գրադարանից նյութերի համար:"
ill_item_renewal_limit = "Վերադարձ մինչև վերջնաժամկետը (առավելագույնը երկարաձգվել է):"
ill_renewal_too_soon = "Նյութը ինքնաշխատ կթարմացվի (եթե ուրիշների կողմից պահանջված չէ)"
lost_card = "Ձեր քարտը հաղորդվում է որպես կորած"
message_from_library = "Դուք հաղորդագրություն ունեք ձեր գրադարանից"
no_change_password_scope = "Դուք իրավունք չունեք փոխել գաղտնաբառը:"
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Ձեզ չի թույլատրվում թարմաց
no_update_patron_scope = "Ձեզ չի թույլատրվում թարմացնել հաճախորդի տվյալները:"
no_write_items_scope = "Դուք իրավունք չունեք նյութեր գրել:"
renewal_block = "Դուք չեք կարող թարմացնել դուրս տրումները"
renewal_recalled = "Պահանջվող նյութ - վերադարձի ժամկետը փոխվել է - վերադարձրեք ժամկետի ավարտին"
renewal_too_soon = "Դեռևս հնարավոր չէ թարմացնել"
requests_blocked = "Դուք չեք կարող հարցում կատարել գրադարանային նյութի մասին"
special_circulation = "Պատճենը ունի հատուկ տացք"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/mn.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Та хүлээн авах боломжто
checkout_block = "Та илүү ихийг үйлчилгээгээр авах боломжгүй"
electronic_resources_block = "Та цахим нөөцийг хандах боломжгүй"
hold_wrong_user_institution = "Таны номын сангийн захиалсан материалыг захиалах боломжгүй."
ill_item_renewal_limit = "Буцаах хугацаа (дээд шинэчлэлт хүрсэн)."
ill_renewal_too_soon = "Хэрэв өөр хүн хүсэлт гаргаагүй бол зүйлийг автоматаар сунгагдана"
lost_card = "Таны уншигчийн карт алдагдсан гэж мэдээлсэн"
message_from_library = "Таньд номын сангаас зурвас ирсэн байна."
no_change_password_scope = "Та нууц үг өөрчлөх боломжгүй."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Та уншигчийн мэдээлэлд нэр
no_update_patron_scope = "Та өөрийн уншигчийн мэдээллийг өөрчлөх боломжгүй."
no_write_items_scope = "Та материалуудад бичих боломжгүй."
renewal_block = "Та үйлчилгээний материалуудыг сунгах боломжгүй"
renewal_recalled = "Зүйлийг хүсэлтээр буцаасан - буцаах хугацаа өөрчлөгдсөн"
renewal_too_soon = "Одоохондоо шинэчлэх боломжгүй"
requests_blocked = "Та номын сангийн материалд хүсэлт гаргах боломжгүй"
special_circulation = "Хуулбар нь тусгай эргэлттэй"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/pt-br.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Você tem material disponível para retirad
checkout_block = "Você não pode verificar mais itens"
electronic_resources_block = "Você não pode acessar recursos eletrônicos"
hold_wrong_user_institution = "Não é possível reservar o item na biblioteca seelcionada."
ill_item_renewal_limit = "Devolver até a data de vencimento (máximo de renovações atingido)."
ill_renewal_too_soon = "O item será renovado automaticamente (a menos que solicitado por outros)"
lost_card = "Seu cartão foi reportado como perdido"
message_from_library = "Você tem uma mensagem de sua biblioteca"
no_change_password_scope = "Não é permitido alterar a senha."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Você não tem permissão para atualizar o nome d
no_update_patron_scope = "Você não tem permissão para atualizar os dados dos usuários."
no_write_items_scope = "Você não tem permissão para escrever itens."
renewal_block = "Você não pode renovar empréstimos"
renewal_recalled = "Item solicitado - data de vencimento alterada - devolver na data de vencimento"
renewal_too_soon = "Não é possível renovar ainda"
requests_blocked = "Você não pode fazer um pedido de material da biblioteca"
special_circulation = "Cópia possui circulação especial"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/ru.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "У вас есть материалы дл
checkout_block = "Вы не можете получить дополнительные элементы"
electronic_resources_block = "Вы не можете получить доступ к электронным ресурсам"
hold_wrong_user_institution = "Вы не можете удерживать материалы из запрошенной библиотеки."
ill_item_renewal_limit = "Верните в установленный срок (максимальное количество продлений достигнуто)."
ill_renewal_too_soon = "Предмет будет автоматически продлеваться (если только его не попросят другие)"
lost_card = "Ваша карта потеряна"
message_from_library = "У вас есть сообщение из вашей библиотеки"
no_change_password_scope = "Вам не разрешено менять пароль."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Вам не разрешено обновлять
no_update_patron_scope = "Вам не разрешено обновлять данные патрона."
no_write_items_scope = "Вам не разрешено писать элементы."
renewal_block = "Вы не можете продлевать кассы"
renewal_recalled = "Запрошенное изделие - изменен срок исполнения - возврат в установленный срок"
renewal_too_soon = "Пока невозможно продлить"
requests_blocked = "Вы не можете отправить запрос на библиотечный материал"
special_circulation = "Копия имеет особое распространение"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/sv.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Du har material tillgänglig för avhämtni
checkout_block = "Du kan inte låna material"
electronic_resources_block = "Du har inte tillgång till elektroniska material"
hold_wrong_user_institution = "Du kan inte reservera material från det utvalda biblioteket."
ill_item_renewal_limit = "Återlämna på förfallodagen (förnyad max. antal gånger)."
ill_renewal_too_soon = "Exemplaret förnyas automatiskt (om ingen har reserverat det)"
lost_card = "Ditt bibliotekskort har anmälts försvunnet"
message_from_library = "Du har ett meddelande från biblioteket"
no_change_password_scope = "Du har inte rättigheter att byta lösenord."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Du har inte rättigheter att uppdatera namn i kun
no_update_patron_scope = "Du har inte rättigheter att uppdatera kundinformation."
no_write_items_scope = "Du har inte rättigheter att skriva poster."
renewal_block = "Du kan inte förnya material"
renewal_recalled = "Exemplaret har reserverats – förfallodagen ändrad – återlämna på förfallodagen"
renewal_too_soon = "Kan ännu inte förnyas"
requests_blocked = "Du kan inte reservera material"
special_circulation = "Exemplaret är i snabbcirkulation"
Expand Down
3 changes: 3 additions & 0 deletions languages/ILSMessages/tr.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ available_for_pickup_notification = "Materyalleriniz teslim alınabilir"
checkout_block = "Daha fazla materyal ödünç alamazsınız"
electronic_resources_block = "Elektronik kaynaklara erişemezsiniz"
hold_wrong_user_institution = "İstenen kütüphaneden materyal ayırtamazsınız."
ill_item_renewal_limit = "Son teslim tarihine kadar iade edin (maksimum yenileme sayısına ulaşıldı)."
ill_renewal_too_soon = "Materyalin süresi otomatik olarak uzatılacak (başkaları tarafından talep edilmediği sürece)"
lost_card = "Kartınızın kayıp olduğu bildirildi"
message_from_library = "Kütüphanenizden bir mesajınız var"
no_change_password_scope = "Şifreyi değiştirmenize izin verilmiyor."
Expand All @@ -16,6 +18,7 @@ no_update_patron_name_scope = "Kullanıcı bilgilerindeki adı güncellemenize i
no_update_patron_scope = "Kullanıcı verilerini güncellemenize izin verilmiyor."
no_write_items_scope = "Materyal yazmanıza izin verilmiyor."
renewal_block = "Ödünç aldığınız materyallerin süresini uzatamazsınız"
renewal_recalled = "Materyal talep edildi - son tarih değiştirildi - son tarihte iade edildi"
renewal_too_soon = "Henüz yenilenemiyor"
requests_blocked = "Kütüphane materyali için istekte bulunamazsınız"
special_circulation = "Kopyanın özel dolaşımı var"
Expand Down
Loading

0 comments on commit cb30f75

Please sign in to comment.