Attachment 115037 Details for Bug 27325 – Bug 27325: Fix singular/plural forms on the OPAC dashboard

[patch] Bug 27325: Fix singular/plural forms on the OPAC dashboard

Bug-27325-Fix-singularplural-forms-on-the-OPAC-das.patch (text/plain), 7.57 KB, created by Lucas Gass (lukeg) on 2021-01-11 15:28:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2021-01-11 15:28:12 UTC

Size: 7.57 KB

patch

obsolete

>From c124cdf2a445a34410f62360cd8c762b0867f50a Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 6 Jan 2021 16:41:48 +0000
>Subject: [PATCH] Bug 27325: Fix singular/plural forms on the OPAC dashboard
>
>This patch adds handling of plurals to the display of counts on the
>logged-in user's dashboard: checkouts, overdues, etc.
>
>To test, apply the patch and log in to the OPAC.
>
> - Go to the OPAC main page and check the user dashboard area.
> - Confirm that the correct numbers and plural forms are shown for
> checkouts, overdues, holds pending, holds waiting, and messages.
> - Test each of those categories with counts of 0, 1, and more than one
> to confirm that the plural forms are correct.
> - Test with various counts of each type of message: OPAC notes as
> defined when editing a patron record and notes added via the checkout
> page.
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 50 +++++++++++++++++++---
> 1 file changed, 43 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>index 37c50aacdc..f2ccf82271 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -5,6 +5,7 @@
> [% USE Categories %]
> [% USE Price %]
> [% USE KohaNews %]
>+[% PROCESS 'i18n.inc' %]
> [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
> [% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
> [% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
>@@ -218,25 +219,60 @@
> <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></h3>
> <ul id="user_summary_shortcuts">
> [% IF checkouts && checkouts > 0 %]
>- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">[% checkouts | html %] checkout(s)</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">
>+ [% checkouts | html %]
>+ [% tn('checkout', 'checkouts', checkouts ) | html %]
>+ </a>
>+ </li>
> [% END %]
> [% IF overdues && overdues > 0 %]
>- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">[% overdues | html %] overdue(s)</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">
>+ [% overdues | html %]
>+ [% tn('overdue', 'overdues', overdues ) | html %]
>+ </a>
>+ </li>
> [% END %]
> [% IF holds_pending && holds_pending > 0 %]
>- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">[% holds_pending | html %] hold(s) pending</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
>+ [% holds_pending | html %]
>+ [% tn('hold pending', 'holds pending', holds_pending ) | html %]
>+ </a>
>+ </li>
> [% END %]
> [% IF holds_waiting && holds_waiting > 0 %]
>- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">[% holds_waiting | html %] hold(s) waiting</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
>+ [% holds_waiting | html %]
>+ [% tn('hold waiting', 'holds waiting', holds_waiting ) | html %]
>+ </a>
>+ </li>
> [% END %]
> [% IF total_owing && total_owing > 0 %]
>- <li><a href="/cgi-bin/koha/opac-account.pl">[% total_owing | $Price with_symbol => 1 %] due in fines and charges</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-account.pl">
>+ [% total_owing | $Price with_symbol => 1 %]
>+ due in fines and charges
>+ </a>
>+ </li>
> [% END %]
> [% IF patron_messages && patron_messages.count > 0 || opacnote %]
> [% IF opacnote %]
>- <li><a href="/cgi-bin/koha/opac-user.pl">[% patron_messages.count + 1 | html %] message(s)</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl">
>+ [% patron_messages.count + 1 | html %]
>+ [% tn('message', 'messages', patron_messages.count + 1 ) | html %]
>+ </a>
>+ </li>
> [% ELSE %]
>- <li><a href="/cgi-bin/koha/opac-user.pl">[% patron_messages.count | html %] message(s)</a></li>
>+ <li>
>+ <a href="/cgi-bin/koha/opac-user.pl">
>+ [% patron_messages.count | html %]
>+ [% tn('message', 'messages', patron_messages.count ) | html %]
>+ </a>
>+ </li>
> [% END %]
> [% END %]
> </ul>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27325: 114899 | 115015 | 115037 | 115102