From a2293ff6f5b77176506f182c9ac5f19fdc51ab63 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 2 Dec 2015 08:49:50 +0000 Subject: [PATCH] Bug 15099: Move admin/categorie.pl to admin/categories.pl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch fixes the filename categorie.pl correcting it by categories.pl The plurial is usually used for script names in the admin module. Test plan: Navigate to the patron categories page. Signed-off-by: Frédéric Demians No reference to categorie.pl anywhere in the code Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- C4/Form/MessagingPreferences.pm | 2 +- admin/{categorie.pl => categories.pl} | 2 +- .../prog/en/includes/admin-menu.inc | 2 +- .../prog/en/modules/admin/admin-home.tt | 2 +- .../admin/{categorie.tt => categories.tt} | 22 +++++++++---------- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/tools/overduerules.tt | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename admin/{categorie.pl => categories.pl} (99%) rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/{categorie.tt => categories.tt} (95%) diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm index bb981a6d8f..cbee804ad0 100644 --- a/C4/Form/MessagingPreferences.pm +++ b/C4/Form/MessagingPreferences.pm @@ -163,7 +163,7 @@ sub set_form_values { =head1 SEE ALSO -L, F, F, F +L, F, F, F =head1 AUTHOR diff --git a/admin/categorie.pl b/admin/categories.pl similarity index 99% rename from admin/categorie.pl rename to admin/categories.pl index cc153bd24b..1370b58e46 100755 --- a/admin/categorie.pl +++ b/admin/categories.pl @@ -39,7 +39,7 @@ my @messages; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "admin/categorie.tt", + template_name => "admin/categories.tt", query => $input, type => "intranet", authnotrequired => 0, 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 e38b0b43c1..7a8704fbf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -26,7 +26,7 @@
Patrons and circulation
    -
  • Patron types and categories
    • +
  • Patron types and categories
  • Circulation and fines rules
  • Patron attribute types
  • Library transfer limits
    • 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 885654aba6..846439dc96 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 @@ -40,7 +40,7 @@

    Patrons and circulation

    -
    Patron categories
    +
    Patron categories
    Define patron categories.
    [% IF CAN_user_parameters_manage_circ_rules %]
    Circulation and fines rules
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt similarity index 95% rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 8d9e4362f9..1e74c1b395 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -98,9 +98,9 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patrons-admin-search.inc' %] -[% END %] [% UNLESS ( no_add ) %]

    [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt index e561859430..ed422c76c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -167,7 +167,7 @@ $(document).ready(function() { [% ELSE %]
    You don't have patron categories defined, or the patron categories are not set to receive overdue notices.
    -
    If this is not what you were expecting, go to patron categories

    +
    If this is not what you were expecting, go to patron categories

    [% END %] -- 2.39.5