From 323964e11f3e2ad9048d37add5c0275241027251 Mon Sep 17 00:00:00 2001 From: Hammat Wele Date: Mon, 25 Mar 2024 16:16:55 +0000 Subject: [PATCH] Bug 31736: Editing 'All' to 'All libraries' This patch edit the term 'All' to 'All libraries/branches', beacause All can have different genders depending on the used language ( in french All could mean 'tous for 'male-gendered' things and 'toutes' for 'female-gendered' things). 1. Apply patch 2. View the following pages --> The pages work (no errors) --> 'All' should be replace by 'All libraries/branches' --> No spelling errors in 'All' libraries - Acquisitions > Invoices (Library filter on the left) - Circulation > Holds queue (Library filter) - Reports > Cash register (Transaction library filter) - Reports > Items lost (Library filter) - Serials > Check expiration (Library filter) - Serials > Search settings icon in the search bar > Advanced search (Library filter) - Acquisitions > Add to basket > From a subscription (Library filter on the left) - Installer > Onboarding > New circulation rule (Library) --- .../prog/en/includes/serials-advsearch.inc | 2 +- .../prog/en/includes/subscriptions-search.inc | 2 +- .../prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../en/modules/onboarding/onboardingstep5.tt | 117 +++++++++++++++++- .../en/modules/reports/cash_register_stats.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../en/modules/serials/checkexpiration.tt | 2 +- 8 files changed, 123 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc index ac1c51e629..7644fe853d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc @@ -35,7 +35,7 @@
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc index df7379f9ee..ace5b2ca9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc @@ -30,7 +30,7 @@
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index fb00c76613..1b817a6315 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -430,7 +430,7 @@
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 76b457569f..89ddb37c01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -310,7 +310,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index 114e03a1bc..267ba682d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -64,7 +64,7 @@
  • +<<<<<<< HEAD
  • +======= +
    + [% INCLUDE 'csrf-token.inc' %] +
    + + +
      +
    1. + + + Required +
    2. +
    3. + + + Required +
    4. + +
    5. + + + Required +
    6. +
    7. + + + Required +
    8. + +
    9. + + + Required +
    10. +
    11. + + + Required +
    12. +
    13. + + + Required +
    14. + +
    15. + + + Required +
    16. + +
    17. + + +
    18. + +
    19. + + +
    20. + +
    21. + + +
    22. + +
    23. + + +
    24. +
    +

    + To create circulation rule, go to: + Administration › Circulation and fine rules +

    +>>>>>>> Bug 31736: Editing 'All' to 'All libraries'
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index 6c379270bd..1d14f4db8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -107,7 +107,7 @@
  • - + [% PROCESS options_for_libraries libraries => Branches.all() %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt index ac46cb3e47..6ab3a1ee49 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -46,7 +46,7 @@
  • -- 2.34.1