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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (-2 / +3 lines)
Lines 6-12 Link Here
6
    var CIRCULATION_RENEW_FAILED = _("Renew failed:");
6
    var CIRCULATION_RENEW_FAILED = _("Renew failed:");
7
    var NOT_CHECKED_OUT = _("not checked out");
7
    var NOT_CHECKED_OUT = _("not checked out");
8
    var TOO_MANY_RENEWALS = _("too many renewals");
8
    var TOO_MANY_RENEWALS = _("too many renewals");
9
    var ON_RESERVE = _("on reserve");
9
    var ON_RESERVE = _("on hold");
10
    var REASON_UNKNOWN = _("reason unkown");
10
    var REASON_UNKNOWN = _("reason unkown");
11
    var TODAYS_CHECKOUTS = _("Today's checkouts");
11
    var TODAYS_CHECKOUTS = _("Today's checkouts");
12
    var PREVIOUS_CHECKOUTS = _("Previous checkouts");
12
    var PREVIOUS_CHECKOUTS = _("Previous checkouts");
Lines 19-25 Link Here
19
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
19
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
20
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
20
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
21
    var UNTIL = _("until %s");
21
    var UNTIL = _("until %s");
22
    var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>"); //
22
    var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>");
23
    var ITEM_IS_WAITING_HERE = _("Item is <strong>waiting here</strong>");
23
    var AT = _("at %s");
24
    var AT = _("at %s");
24
    var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from %s since %s");
25
    var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from %s since %s");
25
    var FROM = _("from");
26
    var FROM = _("from");
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js (-2 / +10 lines)
Lines 64-74 $(document).ready(function() { Link Here
64
                            if ( oObj.barcode ) {
64
                            if ( oObj.barcode ) {
65
                                data += "<em>";
65
                                data += "<em>";
66
                                if ( oObj.found == "W" ) {
66
                                if ( oObj.found == "W" ) {
67
                                    data += ITEM_IS_WAITING;
68
67
69
                                    if ( ! oObj.waiting_here ) {
68
                                    if ( oObj.waiting_here ) {
69
                                        data += ITEM_IS_WAITING_HERE;
70
                                    } else {
71
                                        data += ITEM_IS_WAITING;
70
                                        data += " " + AT.format( oObj.waiting_at );
72
                                        data += " " + AT.format( oObj.waiting_at );
71
                                    }
73
                                    }
74
72
                                } else if ( oObj.transferred ) {
75
                                } else if ( oObj.transferred ) {
73
                                    data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent );
76
                                    data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent );
74
                                } else if ( oObj.not_transferred ) {
77
                                } else if ( oObj.not_transferred ) {
Lines 90-95 $(document).ready(function() { Link Here
90
                            return data;
93
                            return data;
91
                        }
94
                        }
92
                    },
95
                    },
96
                    {
97
                        "mDataProp": function( oObj ) {
98
                            return oObj.branchcode || "";
99
                        }
100
                    },
93
                    { "mDataProp": "expirationdate_formatted" },
101
                    { "mDataProp": "expirationdate_formatted" },
94
                    {
102
                    {
95
                        "mDataProp": function( oObj ) {
103
                        "mDataProp": function( oObj ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 826-831 No patron matched <span class="ex">[% message %]</span> Link Here
826
                    <th>Title</th>
826
                    <th>Title</th>
827
                    <th>Call number</th>
827
                    <th>Call number</th>
828
                    <th>Barcode</th>
828
                    <th>Barcode</th>
829
                    <th>Pickup at</th>
829
                    <th>Expiration</th>
830
                    <th>Expiration</th>
830
                    <th>Priority</th>
831
                    <th>Priority</th>
831
                    <th>Delete?</th>
832
                    <th>Delete?</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 469-474 function validate1(date) { Link Here
469
                    <th>Title</th>
469
                    <th>Title</th>
470
                    <th>Call number</th>
470
                    <th>Call number</th>
471
                    <th>Barcode</th>
471
                    <th>Barcode</th>
472
                    <th>Pickup at</th>
472
                    <th>Expiration</th>
473
                    <th>Expiration</th>
473
                    <th>Priority</th>
474
                    <th>Priority</th>
474
                    <th>Delete?</th>
475
                    <th>Delete?</th>
(-)a/svc/holds (-1 / +1 lines)
Lines 80-85 while ( my $h = $holds_rs->next() ) { Link Here
80
        title          => $h->biblio()->title(),
80
        title          => $h->biblio()->title(),
81
        author         => $h->biblio()->author(),
81
        author         => $h->biblio()->author(),
82
        reserve_id     => $h->reserve_id(),
82
        reserve_id     => $h->reserve_id(),
83
        branchcode     => $h->branchcode()->branchname(),
83
        reservedate    => $h->reservedate(),
84
        reservedate    => $h->reservedate(),
84
        expirationdate => $h->expirationdate(),
85
        expirationdate => $h->expirationdate(),
85
        suspend        => $h->suspend(),
86
        suspend        => $h->suspend(),
86
- 

Return to bug 9528