View | Details | Raw Unified | Return to bug 38377
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-2 / +2 lines)
Lines 363-371 function LoadIssuesTable() { Link Here
363
                    content += msg;
363
                    content += msg;
364
                    if ( can_renew || can_force_renew ) {
364
                    if ( can_renew || can_force_renew ) {
365
                        content += "<span class='renewals-info'>(";
365
                        content += "<span class='renewals-info'>(";
366
                        content += __("%s of %s renewals remaining").format(oObj.renewals_remaining, oObj.renewals_allowed);
366
                        content += __x("{renewals_left} of {renewals_allowed} renewals remaining", {renewals_left: oObj.renewals_remaining, renewals_allowed: oObj.renewals_allowed});
367
                        if (UnseenRenewals && oObj.unseen_allowed) {
367
                        if (UnseenRenewals && oObj.unseen_allowed) {
368
                            content += __(" and %s of %s unseen renewals remaining").format(oObj.unseen_remaining, oObj.unseen_allowed);
368
                            content += __x(" and {renewals_left} of {renewals_allowed} unseen renewals remaining", {renewals_left: oObj.unseen_remaining, renewals_allowed: oObj.unseen_allowed});
369
                        }
369
                        }
370
                        content += ")</span>";
370
                        content += ")</span>";
371
                    }
371
                    }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-6 / +6 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE I18N %]
6
[% USE ItemTypes %]
7
[% USE ItemTypes %]
7
[% USE Price %]
8
[% USE Price %]
8
[% USE AuthorisedValues %]
9
[% USE AuthorisedValues %]
Lines 465-471 Link Here
465
                                                                <span class="renewalfee badge text-bg-warning">[% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour</span>
466
                                                                <span class="renewalfee badge text-bg-warning">[% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour</span>
466
                                                            [% END %]
467
                                                            [% END %]
467
                                                            <span class="renewals">(
468
                                                            <span class="renewals">(
468
                                                                [% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining
469
                                                                [% I18N.tx("{renewals_left} of {renewals_allowed} renewals remaining", { renewals_left = ISSUE.renewsleft, renewals_allowed = ISSUE.renewsallowed }) %]
469
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
470
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
470
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
471
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
471
                                                                [% END %]
472
                                                                [% END %]
Lines 483-489 Link Here
483
                                                        [% ELSIF ISSUE.auto_too_much_oweing %]
484
                                                        [% ELSIF ISSUE.auto_too_much_oweing %]
484
                                                            <span class="usr-msg auto-renew-fines">Automatic renewal failed, you have unpaid fines.</span>
485
                                                            <span class="usr-msg auto-renew-fines">Automatic renewal failed, you have unpaid fines.</span>
485
                                                            <span class="renewals">(
486
                                                            <span class="renewals">(
486
                                                                [% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining
487
                                                                [% I18N.tx("{renewals_left} of {renewals_allowed} renewals remaining", { renewals_left = ISSUE.renewsleft, renewals_allowed = ISSUE.renewsallowed }) %]
487
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
488
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
488
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
489
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
489
                                                                [% END %]
490
                                                                [% END %]
Lines 491-497 Link Here
491
                                                        [% ELSIF ISSUE.auto_account_expired %]
492
                                                        [% ELSIF ISSUE.auto_account_expired %]
492
                                                            <span class="usr-msg auto-renew-expired">Automatic renewal failed, your account is expired.</span>
493
                                                            <span class="usr-msg auto-renew-expired">Automatic renewal failed, your account is expired.</span>
493
                                                            <span class="renewals">(
494
                                                            <span class="renewals">(
494
                                                                [% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining
495
                                                                [% I18N.tx("{renewals_left} of {renewals_allowed} renewals remaining", { renewals_left = ISSUE.renewsleft, renewals_allowed = ISSUE.renewsallowed }) %]
495
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
496
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
496
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
497
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
497
                                                                [% END %]
498
                                                                [% END %]
Lines 499-505 Link Here
499
                                                        [% ELSIF ( ISSUE.too_soon ) %]
500
                                                        [% ELSIF ( ISSUE.too_soon ) %]
500
                                                            <span class="usr-msg no-renewal-before">No renewal before [% ISSUE.soonestrenewdate | $KohaDates  as_due_date => 1 %]</span>
501
                                                            <span class="usr-msg no-renewal-before">No renewal before [% ISSUE.soonestrenewdate | $KohaDates  as_due_date => 1 %]</span>
501
                                                            <span class="renewals">(
502
                                                            <span class="renewals">(
502
                                                                [% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining
503
                                                                [% I18N.tx("{renewals_left} of {renewals_allowed} renewals remaining", { renewals_left = ISSUE.renewsleft, renewals_allowed = ISSUE.renewsallowed }) %]
503
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
504
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
504
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
505
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
505
                                                                [% END %]
506
                                                                [% END %]
Lines 805-811 Link Here
805
                                                                    <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber | uri %]&amp;bornum=[% OVERDUE.borrowernumber | uri %]">Renew</a>
806
                                                                    <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber | uri %]&amp;bornum=[% OVERDUE.borrowernumber | uri %]">Renew</a>
806
                                                                [% END %]
807
                                                                [% END %]
807
                                                                    <span class="renewals">(
808
                                                                    <span class="renewals">(
808
                                                                        [% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining
809
                                                                        [% I18N.tx("{renewals_left} of {renewals_allowed} renewals remaining", { renewals_left = OVERDUE.renewsleft, renewals_allowed = OVERDUE.renewsallowed }) %]
809
                                                                        [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
810
                                                                        [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
810
                                                                            / [% OVERDUE.unseenleft | html %] of [% OVERDUE.unseenallowed | html %] renewals left before the item must be seen by the library
811
                                                                            / [% OVERDUE.unseenleft | html %] of [% OVERDUE.unseenallowed | html %] renewals left before the item must be seen by the library
811
                                                                        [% END %]
812
                                                                        [% END %]
812
- 

Return to bug 38377