From 88c600e3de264ebb273b5e95c4e89985d527262e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 29 Jul 2022 16:03:26 +0200 Subject: [PATCH] Bug 30650: Fix some typos * Curbside pickups are not enabled for your location. = library * Pickup Date/Time = capitalization * ... it is an holiday = it is a holiday. (multiple) * Deliver Date/Time = capitalization * There is no waiting holds for this patron at this location. = There are no... at this library * No pickup time define for this day. = defined (multiple) * You don't have waiting holds at this location = library Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/atomicupdate/bug_30650.pl | 2 +- .../data/mysql/en/mandatory/sample_notices.yml | 2 +- .../prog/en/modules/circ/circulation-home.tt | 2 +- .../prog/en/modules/circ/curbside_pickups.tt | 18 +++++++++--------- .../prog/en/modules/intranet-main.tt | 2 +- .../en/modules/opac-curbside-pickups.tt | 8 ++++---- t/db_dependent/Koha/CurbsidePickups.t | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_30650.pl b/installer/data/mysql/atomicupdate/bug_30650.pl index 53015d2c43..3f8aa19d16 100755 --- a/installer/data/mysql/atomicupdate/bug_30650.pl +++ b/installer/data/mysql/atomicupdate/bug_30650.pl @@ -158,7 +158,7 @@ return { } $dbh->do( q{ - INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ('reserves','NEW_CURBSIDE_PICKUP','',0,"You have schedule a curbside pickup for [% branch.branchname %]","[%- USE KohaDates -%]\n[%- SET cp = curbside_pickup -%]\n\nYou have a curbside pickup scheduled for [% cp.scheduled_pickup_datetime | $KohaDates with_hours => 1 %] at [% cp.library.branchname %].\n\nAny holds waiting for you at the pickup time will be included in this pickup. At this time, that list includes:\n[%- FOREACH h IN cp.patron.holds %]\n [%- IF h.branchcode == cp.branchcode && h.found == 'W' %]\n* [% h.biblio.title %], [% h.biblio.author %] ([% h.item.barcode %])\n [%- END %]\n[%- END %]\n\nOnce you have arrived, please call your library or log into your account and click the \"Alert staff of your arrival\" button to let them know you are there.",'email','default'); + INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ('reserves','NEW_CURBSIDE_PICKUP','',0,"You have scheduled a curbside pickup for [% branch.branchname %]","[%- USE KohaDates -%]\n[%- SET cp = curbside_pickup -%]\n\nYou have a curbside pickup scheduled for [% cp.scheduled_pickup_datetime | $KohaDates with_hours => 1 %] at [% cp.library.branchname %].\n\nAny holds waiting for you at the pickup time will be included in this pickup. At this time, that list includes:\n[%- FOREACH h IN cp.patron.holds %]\n [%- IF h.branchcode == cp.branchcode && h.found == 'W' %]\n* [% h.biblio.title %], [% h.biblio.author %] ([% h.item.barcode %])\n [%- END %]\n[%- END %]\n\nOnce you have arrived, please call your library or log into your account and click the \"Alert staff of your arrival\" button to let them know you are there.",'email','default'); } ); diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 2d56c94288..0bbe55db5d 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1322,7 +1322,7 @@ tables: branchcode: "" name: "Curbside pickups" is_html: 0 - title: "You have schedule a curbside pickup for [% branch.branchname %]." + title: "You have scheduled a curbside pickup for [% branch.branchname %]" message_transport_type: email lang: default content: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index bbdfb78873..9cc2b96708 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -85,7 +85,7 @@ [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
  • - Curbside Pickups + Curbside pickups
    • [% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 8f8ea7bd85..f41a59d1ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -60,7 +60,7 @@ [% UNLESS policy.enabled %]
    - Curbside pickups are not enabled for your location. + Curbside pickups are not enabled for your library.
    [% INCLUDE 'intranet-bottom.inc' %] [% STOP %] @@ -72,7 +72,7 @@ [% CASE 'not_enabled' %] The curbside pickup feature is not enabled for this library. [% CASE 'library_is_closed' %] - Cannot create a curbside pickup for this day, it is an holiday. + Cannot create a curbside pickup for this day, it is a holiday. [% CASE 'no_waiting_holds' %] This patron does not have waiting holds. [% CASE 'too_many_pickups' %] @@ -150,7 +150,7 @@ - + @@ -219,7 +219,7 @@
    Pickup Date/TimePickup date/time Patron Items for pickup Action
    - + @@ -301,7 +301,7 @@
    Pickup Date/TimePickup date/time Patron Items for pickup Staged by
    - + @@ -383,7 +383,7 @@
    Pickup Date/TimePickup date/time Patron Items for pickup Staged by
    - + @@ -466,7 +466,7 @@

    [% END %] [% ELSE %] - There is no waiting holds for this patron at this location. + There are no waiting holds for this patron at this location. [% END %] @@ -546,14 +546,14 @@ let available_count = 0; let dow = selectedDate.day(); // Sunday is 0 (at least for now) if (!slots_per_day[dow]){ - $('#pickup-times').html("
    "+_("No pickup time define for this day.")+"
    "); + $('#pickup-times').html("
    "+_("No pickup time defined for this day.")+"
    "); return; } slots_per_day[dow].forEach(function(slot){ let pickup_interval = policy.pickup_interval; if (!pickup_interval) { - $('#pickup-times').html("
    "+_("No pickup time define for this day.")+"
    "); + $('#pickup-times').html("
    "+_("No pickup time defined for this day.")+"
    "); return; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 02b7c5d265..0c7e229466 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -243,7 +243,7 @@ [% IF new_curbside_pickups.count %]
    - New curbside pickups + New curbside pickups: [% new_curbside_pickups.count | html %]
    [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt index 35e3efad2d..f20786b052 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt @@ -68,7 +68,7 @@ [% CASE 'not_enabled' %] The curbside pickup feature is not enabled for this library. [% CASE 'library_is_closed' %] - Cannot create a curbside pickup for this day, it is an holiday. + Cannot create a curbside pickup for this day, it is a holiday. [% CASE 'no_waiting_holds' %] This patron does not have waiting holds. [% CASE 'too_many_pickups' %] @@ -268,7 +268,7 @@ $("#pickup-branch option").each(function(){ if ( $(this).val() != "" && !policies[$(this).val()].enabled ) { $(this).prop("disabled", "disabled"); - $(this).attr("title", _("You don't have waiting holds at this location")); + $(this).attr("title", _("You don't have waiting holds at this library")); } }); @@ -306,14 +306,14 @@ let available_count = 0; let dow = selectedDate.day(); // Sunday is 0 (at least for now) if (!policy.slots_per_day[dow]){ - $('#pickup-times').html("
    "+_("No pickup time define for this day.")+"
    "); + $('#pickup-times').html("
    "+_("No pickup time defined for this day.")+"
    "); return; } policy.slots_per_day[dow].forEach(function(slot){ let pickup_interval = policy.pickup_interval; if (!pickup_interval) { - $('#pickup-times').html("
    "+_("No pickup time define for this day.")+"
    "); + $('#pickup-times').html("
    "+_("No pickup time defined for this day.")+"
    "); return; } diff --git a/t/db_dependent/Koha/CurbsidePickups.t b/t/db_dependent/Koha/CurbsidePickups.t index eb9cf29758..ead077ffe0 100755 --- a/t/db_dependent/Koha/CurbsidePickups.t +++ b/t/db_dependent/Koha/CurbsidePickups.t @@ -296,7 +296,7 @@ subtest 'notify_new_pickup' => sub { { borrowernumber => $patron->borrowernumber } ); is( $messages->[0]->{subject}, - sprintf ("You have schedule a curbside pickup for %s.", $library->branchname), + sprintf ("You have scheduled a curbside pickup for %s", $library->branchname), "Notice correctly generated" ); my $biblio_title = $item->biblio->title; -- 2.39.5
    Deliver Date/TimeDeliver date/time Patron Items checked out