From 8498c9038bbb35cb94bf97caf9b6ed01cc1bb77a Mon Sep 17 00:00:00 2001 From: Caroline Cyr La Rose Date: Mon, 17 Apr 2023 16:58:06 -0400 Subject: [PATCH] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted') Signed-off-by: Marius Mandrescu Signed-off-by: David Nind Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=33500 Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/admin-menu.inc | 2 +- .../prog/en/modules/admin/admin-home.tt | 4 +-- .../prog/en/modules/admin/restrictions.tt | 36 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index 9c9a24c545..96ca936832 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -55,7 +55,7 @@
  • Curbside pickup
    • [% END %] [% IF ( CAN_user_parameters_manage_patron_restrictions ) %] -
  • Patron restrictions
    • +
  • Patron restriction types
    • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 423d1f354c..9413049da8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -122,8 +122,8 @@
    Configure curbside pickup for libraries
    [% END %] [% IF ( CAN_user_parameters_manage_patron_restrictions ) %] -
    Patron restrictions
    -
    Define patron restrictions.
    +
    Patron restriction types
    +
    Define manual patron restriction types.
    [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt index 7ae546a983..fd06f6f279 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -4,8 +4,8 @@ [% PROCESS 'restriction-types.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% ELSE %]New restriction › [% END %][% END %] -[% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% END %]Patron restrictions › Administration › Koha +<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% ELSE %]New restriction type › [% END %][% END %] +[% IF op == 'delete_confirm' %]Confirm deletion of restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% END %]Patron restriction types › Administration › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -23,29 +23,29 @@ [% IF op == 'list' %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Patron restrictions + Patron restriction types [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - Patron restrictions + Patron restriction types [% END %] [% END %] [% IF op == 'add_form' %] [% IF restriction %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Modify restriction '[% PROCESS restriction_type_description %]' + Modify restriction type'[% PROCESS restriction_type_description %]' [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - New restriction + New restriction type [% END %] [% END %] [% END %] [% IF op == 'delete_confirm' %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Delete restriction? + Delete restriction type? [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] @@ -64,9 +64,9 @@ [% CASE 'update_success' %] Restriction type updated [% CASE 'duplicate_display_text' %] - Another restriction already has this label + Another restriction type already has this label [% CASE 'duplicate_code' %] - Another restriction already has this code + Another restriction type already has this code [% CASE 'delete_success' %] Restriction type deleted [% CASE 'delete_default' %] @@ -84,10 +84,10 @@ [% IF restriction %] -

    Modify restriction [% PROCESS restriction_type_description restriction_type=restriction %]

    +

    Modify restriction type [% PROCESS restriction_type_description restriction_type=restriction %]

    [% ELSE %] -

    New restriction

    +

    New restriction type

    [% END %]
      @@ -127,7 +127,7 @@
      - Confirm restriction deletion + Confirm restriction type deletion

      Are you sure you want to delete "[% PROCESS restriction_type_description restriction_type=restriction %]"?

      @@ -135,7 +135,7 @@
      - + Cancel
      @@ -145,10 +145,10 @@ [% IF op == 'list' %] -

      Patron restrictions

      +

      Patron restriction types

      [% IF restrictions %]
      @@ -188,7 +188,7 @@
      [% ELSE %] -
      No restrictions have been defined. Create a new restriction.
      +
      No restriction types have been defined. Create a new restriction type.
      [% END %] [% END %] @@ -207,8 +207,8 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %]