gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2022-07-29 16:03:26 +02:00 committed by Tomas Cohen Arazi
parent 13104f2db7
commit 88c600e3de
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/data/mysql/atomicupdate/bug_30650.pl
View File

@ -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');
}
);

2
installer/data/mysql/en/mandatory/sample_notices.yml
View File

@ -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:

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
View File

@ -85,7 +85,7 @@
</li>
[% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
<li>
<a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa fa-refresh"></i> Curbside Pickups</a>
<a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa fa-refresh"></i> Curbside pickups</a>
</li>
[% END %]
<li>

18
koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
View File

@ -60,7 +60,7 @@
[% UNLESS policy.enabled %]
<div class="dialog alert">
Curbside pickups are not enabled for your location.
Curbside pickups are not enabled for your library.
</div>
[% INCLUDE 'intranet-bottom.inc' %]
[% STOP %]
@ -72,7 +72,7 @@
[% CASE 'not_enabled' %]
<span>The curbside pickup feature is not enabled for this library.</span>
[% CASE 'library_is_closed' %]
<span>Cannot create a curbside pickup for this day, it is an holiday.</span>
<span>Cannot create a curbside pickup for this day, it is a holiday.</span>
[% CASE 'no_waiting_holds' %]
<span>This patron does not have waiting holds.</span>
[% CASE 'too_many_pickups' %]
@ -150,7 +150,7 @@
<table class="table table-striped">
<thead>
<tr>
<th>Pickup Date/Time</th>
<th>Pickup date/time</th>
<th>Patron</th>
<th>Items for pickup</th>
<th>Action</th>
@ -219,7 +219,7 @@
<table class="table table-striped">
<thead>
<tr>
<th>Pickup Date/Time</th>
<th>Pickup date/time</th>
<th>Patron</th>
<th>Items for pickup</th>
<th>Staged by</th>
@ -301,7 +301,7 @@
<table class="table table-striped">
<thead>
<tr>
<th>Pickup Date/Time</th>
<th>Pickup date/time</th>
<th>Patron</th>
<th>Items for pickup</th>
<th>Staged by</th>
@ -383,7 +383,7 @@
<table class="table table-striped">
<thead>
<tr>
<th>Deliver Date/Time</th>
<th>Deliver date/time</th>
<th>Patron</th>
<th>Items checked out</th>
</tr>
@ -466,7 +466,7 @@
</p>
[% END %]
[% ELSE %]
<span>There is no waiting holds for this patron at this location.</span>
<span>There are no waiting holds for this patron at this location.</span>
[% END %]
</span>
</li>
@ -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("<div>"+_("No pickup time define for this day.")+"</div>");
$('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
return;
}
slots_per_day[dow].forEach(function(slot){
let pickup_interval = policy.pickup_interval;
if (!pickup_interval) {
$('#pickup-times').html("<div>"+_("No pickup time define for this day.")+"</div>");
$('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
return;
}

2
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
View File

@ -243,7 +243,7 @@
[% IF new_curbside_pickups.count %]
<div class="pending-info" id="new_curbside_pickups">
<a href="/cgi-bin/koha/circ/curbside_pickups.pl">New curbside pickups </a>
<a href="/cgi-bin/koha/circ/curbside_pickups.pl">New curbside pickups</a>:
<span class="pending-number-link">[% new_curbside_pickups.count | html %]</span>
</div>
[% END %]

8
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
View File

@ -68,7 +68,7 @@
[% CASE 'not_enabled' %]
<span>The curbside pickup feature is not enabled for this library.</span>
[% CASE 'library_is_closed' %]
<span>Cannot create a curbside pickup for this day, it is an holiday.</span>
<span>Cannot create a curbside pickup for this day, it is a holiday.</span>
[% CASE 'no_waiting_holds' %]
<span>This patron does not have waiting holds.</span>
[% 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("<div>"+_("No pickup time define for this day.")+"</div>");
$('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
return;
}
policy.slots_per_day[dow].forEach(function(slot){
let pickup_interval = policy.pickup_interval;
if (!pickup_interval) {
$('#pickup-times').html("<div>"+_("No pickup time define for this day.")+"</div>");
$('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
return;
}

2
t/db_dependent/Koha/CurbsidePickups.t
View File

@ -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;