Bugzilla – Attachment 138319 Details for
Bug 30650
Add a curbside pickup module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30650: Fix some typos
Bug-30650-Fix-some-typos.patch (text/plain), 13.33 KB, created by
Jonathan Druart
on 2022-07-29 15:09:44 UTC
(
hide
)
Description:
Bug 30650: Fix some typos
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-07-29 15:09:44 UTC
Size:
13.33 KB
patch
obsolete
>From d1dc90505cc4573627201bd7928d438c43241c41 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 >--- > 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 53015d2c434..3f8aa19d16f 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 2d56c942887..0bbe55db5de 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 bbdfb788733..9cc2b967080 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 @@ > </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> >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 8f8ea7bd851..f41a59d1ede 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 %] > <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; > } > >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 02b7c5d2654..0c7e2294661 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 %] > <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 %] >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 35e3efad2dc..f20786b052b 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' %] > <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; > } > >diff --git a/t/db_dependent/Koha/CurbsidePickups.t b/t/db_dependent/Koha/CurbsidePickups.t >index eb9cf297580..ead077ffe0b 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.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30650
:
136584
|
136585
|
136586
|
136587
|
136588
|
136589
|
136590
|
136591
|
136592
|
136593
|
136594
|
136595
|
136596
|
136597
|
136598
|
136599
|
136600
|
136601
|
136602
|
136603
|
136604
|
136605
|
136606
|
136607
|
136608
|
136609
|
136610
|
137095
|
137100
|
137199
|
137211
|
137212
|
137277
|
137278
|
137279
|
137280
|
137281
|
137282
|
137283
|
137284
|
137285
|
137286
|
137287
|
137288
|
137289
|
137290
|
137291
|
137292
|
137293
|
137294
|
137295
|
137296
|
137297
|
137298
|
137299
|
137300
|
137301
|
137302
|
137303
|
137304
|
137305
|
137306
|
137307
|
138261
|
138262
|
138263
|
138264
|
138265
|
138266
|
138267
|
138268
|
138269
|
138270
|
138271
|
138272
|
138273
|
138274
|
138275
|
138276
|
138277
|
138278
|
138279
|
138280
|
138281
|
138282
|
138283
|
138284
|
138285
|
138286
|
138287
|
138288
|
138289
|
138290
|
138291
|
138292
|
138319
|
138320
|
138321
|
138322
|
138323
|
138324
|
138325
|
138330
|
138331
|
138332
|
138333
|
138334
|
138335
|
138336
|
138337
|
138338
|
138339
|
138340
|
138341
|
138342
|
138343
|
138344
|
138345
|
138346
|
138347
|
138348
|
138349
|
138350
|
138351
|
138352
|
138353
|
138354
|
138355
|
138356
|
138357
|
138358
|
138359
|
138360
|
138361
|
138362
|
138363
|
138364
|
138365
|
138366
|
138367
|
138368
|
138369
|
138375
|
138401
|
138610