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

(-)a/Koha/Template/Plugin/Expand.pm (+58 lines)
Line 0 Link Here
1
package Koha::Template::Plugin::Expand;
2
3
# This file is part of Koha.
4
#
5
# Koha is free software; you can redistribute it and/or modify it
6
# under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 3 of the License, or
8
# (at your option) any later version.
9
#
10
# Koha is distributed in the hope that it will be useful, but
11
# WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
17
18
use Modern::Perl;
19
20
use Koha::I18N;
21
22
use base qw( Template::Plugin::Filter );
23
24
our $DYNAMIC = 1;
25
26
=head1 SYNOPSIS
27
28
    [% USE Expand %]
29
    [% PROCESS 'i18n.inc' %]
30
31
    [% t('Hello {name}') | html | $Expand name = "<strong>World !</strong>" %]
32
33
=head1 DESCRIPTION
34
35
This module is a Template::Toolkit filter that allows to replace portions of
36
text enclosed in braces by the content of a variable
37
38
Its main purpose is to be used with i18n macros : it allows translations to be
39
filtered (with the html filter for instance) while allowing variables to have
40
content that should not be filtered
41
42
=cut
43
44
=head1 METHODS
45
46
=head2 filter
47
48
See L<Template::Plugin::Filter>
49
50
=cut
51
52
sub filter {
53
    my ( $self, $text, $args, $conf ) = @_;
54
55
    return Koha::I18N::_expand($text, %$conf);
56
}
57
58
1;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc (-9 / +9 lines)
Lines 2-38 Link Here
2
[% USE raw %]
2
[% USE raw %]
3
3
4
[% MACRO t(msgid) BLOCK %]
4
[% MACRO t(msgid) BLOCK %]
5
    [% I18N.t(msgid) | $raw %]
5
    [%- I18N.t(msgid) | $raw -%]
6
[% END %]
6
[% END %]
7
7
8
[% MACRO tx(msgid, vars) BLOCK %]
8
[% MACRO tx(msgid, vars) BLOCK %]
9
    [% I18N.tx(msgid, vars) | $raw %]
9
    [%- I18N.tx(msgid, vars) | $raw -%]
10
[% END %]
10
[% END %]
11
11
12
[% MACRO tn(msgid, msgid_plural, count) BLOCK %]
12
[% MACRO tn(msgid, msgid_plural, count) BLOCK %]
13
    [% I18N.tn(msgid, msgid_plural, count) | $raw %]
13
    [%- I18N.tn(msgid, msgid_plural, count) | $raw -%]
14
[% END %]
14
[% END %]
15
15
16
[% MACRO tnx(msgid, msgid_plural, count, vars) BLOCK %]
16
[% MACRO tnx(msgid, msgid_plural, count, vars) BLOCK %]
17
    [% I18N.tnx(msgid, msgid_plural, count, vars) | $raw %]
17
    [%- I18N.tnx(msgid, msgid_plural, count, vars) | $raw -%]
18
[% END %]
18
[% END %]
19
19
20
[% MACRO txn(msgid, msgid_plural, count, vars) BLOCK %]
20
[% MACRO txn(msgid, msgid_plural, count, vars) BLOCK %]
21
    [% I18N.txn(msgid, msgid_plural, count, vars) | $raw %]
21
    [%- I18N.txn(msgid, msgid_plural, count, vars) | $raw -%]
22
[% END %]
22
[% END %]
23
23
24
[% MACRO tp(msgctxt, msgid) BLOCK %]
24
[% MACRO tp(msgctxt, msgid) BLOCK %]
25
    [% I18N.tp(msgctxt, msgid) | $raw %]
25
    [%- I18N.tp(msgctxt, msgid) | $raw -%]
26
[% END %]
26
[% END %]
27
27
28
[% MACRO tpx(msgctxt, msgid, vars) BLOCK %]
28
[% MACRO tpx(msgctxt, msgid, vars) BLOCK %]
29
    [% I18N.tpx(msgctxt, msgid, vars) | $raw %]
29
    [%- I18N.tpx(msgctxt, msgid, vars) | $raw -%]
30
[% END %]
30
[% END %]
31
31
32
[% MACRO tnp(msgctxt, msgid, msgid_plural, count) BLOCK %]
32
[% MACRO tnp(msgctxt, msgid, msgid_plural, count) BLOCK %]
33
    [% I18N.tnp(msgctxt, msgid, msgid_plural, count) | $raw %]
33
    [%- I18N.tnp(msgctxt, msgid, msgid_plural, count) | $raw -%]
34
[% END %]
34
[% END %]
35
35
36
[% MACRO tnpx(msgctxt, msgid, msgid_plural, count, vars) BLOCK %]
36
[% MACRO tnpx(msgctxt, msgid, msgid_plural, count, vars) BLOCK %]
37
    [% I18N.tnpx(msgctxt, msgid, msgid_plural, count, vars) | $raw %]
37
    [%- I18N.tnpx(msgctxt, msgid, msgid_plural, count, vars) | $raw -%]
38
[% END %]
38
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-42 / +52 lines)
Lines 6-16 Link Here
6
[% USE Price %]
6
[% USE Price %]
7
[% USE KohaNews %]
7
[% USE KohaNews %]
8
[% PROCESS 'i18n.inc' %]
8
[% PROCESS 'i18n.inc' %]
9
[% USE Expand %]
9
[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
10
[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
10
[% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
11
[% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
11
[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
12
[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
12
[% INCLUDE 'doc-head-open.inc' %]
13
[% INCLUDE 'doc-head-open.inc' %]
13
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
14
<title>[% IF ( LibraryNameTitle ) %][% tx('{LibraryNameTitle} catalog', LibraryNameTitle = LibraryNameTitle) | html %][% ELSE %][% t('Koha online catalog') | html %][% END %]</title>
14
[% INCLUDE 'doc-head-close.inc' %]
15
[% INCLUDE 'doc-head-close.inc' %]
15
[% BLOCK cssinclude %][% END %]
16
[% BLOCK cssinclude %][% END %]
16
</head>
17
</head>
Lines 22-35 Link Here
22
        <ul class="breadcrumb">
23
        <ul class="breadcrumb">
23
            [% IF news_item %]
24
            [% IF news_item %]
24
                <li class="breadcrumb-item">
25
                <li class="breadcrumb-item">
25
                    <a href="/cgi-bin/koha/opac-main.pl">Home</a>
26
                    <a href="/cgi-bin/koha/opac-main.pl">[% t('Home') | html %]</a>
26
                </li>
27
                </li>
27
                <li class="breadcrumb-item active" aria-current="page">
28
                <li class="breadcrumb-item active" aria-current="page">
28
                    [% news_item.title | html %]
29
                    [% news_item.title | html %]
29
                </li>
30
                </li>
30
            [% ELSE %]
31
            [% ELSE %]
31
                <li class="breadcrumb-item active" aria-current="page">
32
                <li class="breadcrumb-item active" aria-current="page">
32
                    <a href="/cgi-bin/koha/opac-main.pl">Home</a>
33
                    <a href="/cgi-bin/koha/opac-main.pl">[% t('Home') | html %]</a>
33
                </li>
34
                </li>
34
            [% END %]
35
            [% END %]
35
        </ul>
36
        </ul>
Lines 69-80 Link Here
69
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
70
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
70
            [% UNLESS news_item %]
71
            [% UNLESS news_item %]
71
                <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
72
                <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
72
                    <label for="news-branch">Display news for: </label>
73
                    <label for="news-branch">[% t('Display news for:') | html %] </label>
73
                    <select id="news-branch" name="branch">
74
                    <select id="news-branch" name="branch">
74
                        [% IF ( branchcode == "" ) %]
75
                        [% IF ( branchcode == "" ) %]
75
                            <option value="" selected="selected">System-wide only</option>
76
                            <option value="" selected="selected">[% t('System-wide only') | html %]</option>
76
                        [% ELSE %]
77
                        [% ELSE %]
77
                            <option value="">System-wide only</option>
78
                            <option value="">[% t('System-wide only') | html %]</option>
78
                        [% END %]
79
                        [% END %]
79
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
80
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
80
                    </select>
81
                    </select>
Lines 87-93 Link Here
87
            [% IF single_news_error %]
88
            [% IF single_news_error %]
88
89
89
                <div class="alert alert-error">
90
                <div class="alert alert-error">
90
                    This news item does not exist.
91
                    [% t('This news item does not exist.') | html %]
91
                </div>
92
                </div>
92
93
93
            [% ELSE %]
94
            [% ELSE %]
Lines 105-121 Link Here
105
                            </h4>
106
                            </h4>
106
                            <div class="newsbody">[% koha_new.content | $raw %]</div>
107
                            <div class="newsbody">[% koha_new.content | $raw %]</div>
107
                            <div class="newsfooter">
108
                            <div class="newsfooter">
108
                                Published on [% koha_new.published_on | $KohaDates %]
109
                                [% published_on = BLOCK %][% koha_new.published_on | $KohaDates %][% END %]
109
                                [% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %]
110
                                [% author = BLOCK %]
110
                                    [% IF news_item %]
111
                                    [% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %]
111
                                        [% SET author = koha_new.author %]
112
                                        [% IF news_item %]
112
                                        by <span class="newsauthor_title">[% author.title | html %] </span>[% author.firstname | html %] [% author.surname | html %]
113
                                            <span class="newsauthor_title">[% koha_new.author.title | html %] </span>[% koha_new.author.firstname | html %] [% koha_new.author.surname | html %]
113
                                    [% ELSE %]
114
                                        [% ELSE %]
114
                                        by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %]
115
                                            <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %]
116
                                        [% END %]
115
                                    [% END %]
117
                                    [% END %]
116
                                [% END %]
118
                                [% END %]
119
                                [% IF author %]
120
                                    [% t('Published on {published_on} by {author}') | html | $Expand published_on = published_on, author = author %]
121
                                [% ELSE %]
122
                                    [% t('Published on {published_on}') | html | $Expand published_on = published_on %]
123
                                [% END %]
117
                                [% IF ( news_item ) %]
124
                                [% IF ( news_item ) %]
118
                                    &bull; <a href="/cgi-bin/koha/opac-main.pl">Show all news</a>
125
                                    &bull; <a href="/cgi-bin/koha/opac-main.pl">[% t('Show all news') | html %]</a>
119
                                [% END %]
126
                                [% END %]
120
                            </div>
127
                            </div>
121
                        </div>
128
                        </div>
Lines 128-142 Link Here
128
                                <i class="fa fa-rss" aria-hidden="true"></i>
135
                                <i class="fa fa-rss" aria-hidden="true"></i>
129
                                [% IF Branches.all.size == 1 %]
136
                                [% IF Branches.all.size == 1 %]
130
                                    [% IF branchcode %]
137
                                    [% IF branchcode %]
131
                                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news
138
                                        [% libraryName = BLOCK %][% Branches.GetName(branchcode) | html %][% END %]
139
                                        [% t('RSS feed for {libraryName} library news') | html | $Expand libraryName = libraryName %]
132
                                    [% ELSE %]
140
                                    [% ELSE %]
133
                                        RSS feed for library news
141
                                        [% t('RSS feed for library news') | html %]
134
                                    [% END %]
142
                                    [% END %]
135
                                [% ELSE %]
143
                                [% ELSE %]
136
                                    [% IF branchcode %]
144
                                    [% IF branchcode %]
137
                                        RSS feed for [% Branches.GetName( branchcode ) | html %] and system-wide library news
145
                                        [% libraryName = BLOCK %][% Branches.GetName(branchcode) | html %][% END %]
146
                                        [% t('RSS feed for {libraryName} and system-wide library news') | html | $Expand libraryName = libraryName %]
138
                                    [% ELSE %]
147
                                    [% ELSE %]
139
                                        RSS feed for system-wide library news
148
                                        [% t('RSS feed for system-wide library news') | html %]
140
                                    [% END %]
149
                                    [% END %]
141
                                [% END %]
150
                                [% END %]
142
                            </a>
151
                            </a>
Lines 150-156 Link Here
150
            [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
159
            [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
151
                <div id="news" class="newscontainer">
160
                <div id="news" class="newscontainer">
152
                    <div class="newsitem">
161
                    <div class="newsitem">
153
                        <div class="newsbody">No news to display.</div>
162
                        <div class="newsbody">[% t('No news to display.') | html %]</div>
154
                        <div class="newsfooter"></div>
163
                        <div class="newsfooter"></div>
155
                    </div>
164
                    </div>
156
                </div>
165
                </div>
Lines 161-167 Link Here
161
        [% UNLESS news_item # Don't show under single news item %]
170
        [% UNLESS news_item # Don't show under single news item %]
162
            [% IF ( daily_quote ) %]
171
            [% IF ( daily_quote ) %]
163
                <div id="daily-quote">
172
                <div id="daily-quote">
164
                    <h3>Quote of the day</h3>
173
                    <h3>[% t('Quote of the day') | html %]</h3>
165
                    <div>
174
                    <div>
166
                        <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
175
                        <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
167
                    </div>
176
                    </div>
Lines 186-198 Link Here
186
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
195
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
187
                                    <input type="hidden" name="koha_login_context" value="opac" />
196
                                    <input type="hidden" name="koha_login_context" value="opac" />
188
                                    <fieldset class="brief">
197
                                    <fieldset class="brief">
189
                                        <legend>Log in to your account:</legend>
198
                                        <legend>[% t('Log in to your account:') | html %]</legend>
190
                                        <label for="userid">Login:</label>
199
                                        <label for="userid">[% t('Login:') | html %]</label>
191
                                        <input class="form-control" type="text" id="userid" name="userid" />
200
                                        <input class="form-control" type="text" id="userid" name="userid" />
192
                                        <label for="password">Password:</label>
201
                                        <label for="password">[% t('Password:') | html %]</label>
193
                                        <input class="form-control" type="password" id="password" name="password" />
202
                                        <input class="form-control" type="password" id="password" name="password" />
194
                                        <fieldset class="action">
203
                                        <fieldset class="action">
195
                                            <input type="submit" value="Log in" class="btn btn-primary" />
204
                                            <input type="submit" value="[% t('Log in') | html %]" class="btn btn-primary" />
196
                                        </fieldset>
205
                                        </fieldset>
197
                                        [% IF ( OpacLoginInstructions ) %]
206
                                        [% IF ( OpacLoginInstructions ) %]
198
                                            <div id="nologininstructions-main" class="nologininstructions">
207
                                            <div id="nologininstructions-main" class="nologininstructions">
Lines 201-212 Link Here
201
                                        [% END %]
210
                                        [% END %]
202
                                        [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
211
                                        [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
203
                                            <div id="forgotpassword-main" class="forgotpassword">
212
                                            <div id="forgotpassword-main" class="forgotpassword">
204
                                                <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
213
                                                <p><a href="/cgi-bin/koha/opac-password-recovery.pl">[% t('Forgot your password?') | html %]</a></p>
205
                                            </div>
214
                                            </div>
206
                                        [% END %]
215
                                        [% END %]
207
                                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
216
                                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
208
                                            <div id="patronregistration-main" class="patronregistration">
217
                                            <div id="patronregistration-main" class="patronregistration">
209
                                                <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
218
                                                <p>[% t('Don\'t have an account?') | html %] <a href="/cgi-bin/koha/opac-memberentry.pl">[% t('Register here.') | html %]</a></p>
210
                                            </div>
219
                                            </div>
211
                                        [% END %]
220
                                        [% END %]
212
                                    </fieldset>
221
                                    </fieldset>
Lines 216-260 Link Here
216
                    [% ELSE %]
225
                    [% ELSE %]
217
                        [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
226
                        [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
218
                            <div id="user_summary">
227
                            <div id="user_summary">
219
                                <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3>
228
                                [% user = BLOCK %]<a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a>[% END %]
229
                                <h3>[% t('Welcome, {user}') | html | $Expand user = user %]</h3>
220
                                <ul id="user_summary_shortcuts">
230
                                <ul id="user_summary_shortcuts">
221
                                    [% IF checkouts && checkouts > 0 %]
231
                                    [% IF checkouts && checkouts > 0 %]
222
                                        <li>
232
                                        <li>
223
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">
233
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">
224
                                                <span class="user_checkouts_count count_label">[% checkouts | html %]</span>
234
                                                [% count = BLOCK %]<span class="user_checkouts_count count_label">[% checkouts | html %]</span>[% END %]
225
                                                [% tn('checkout', 'checkouts', checkouts ) | html %]
235
                                                [% tn('{count} checkout', '{count} checkouts', checkouts) | html | $Expand count = count %]
226
                                            </a>
236
                                            </a>
227
                                        </li>
237
                                        </li>
228
                                    [% END %]
238
                                    [% END %]
229
                                    [% IF overdues && overdues > 0 %]
239
                                    [% IF overdues && overdues > 0 %]
230
                                        <li>
240
                                        <li>
231
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">
241
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">
232
                                                <span class="user_overdues_count count_label">[% overdues | html %]</span>
242
                                                [% count = BLOCK %]<span class="user_overdues_count count_label">[% overdues | html %]</span>[% END %]
233
                                                [% tn('overdue', 'overdues', overdues ) | html %]
243
                                                [% tn('{count} overdue', '{count} overdues', overdues) | html | $Expand count = count %]
234
                                            </a>
244
                                            </a>
235
                                        </li>
245
                                        </li>
236
                                    [% END %]
246
                                    [% END %]
237
                                    [% IF holds_pending && holds_pending > 0 %]
247
                                    [% IF holds_pending && holds_pending > 0 %]
238
                                        <li>
248
                                        <li>
239
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
249
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
240
                                                <span class="user_holds_pending_count count_label">[% holds_pending | html %]</span>
250
                                                [% count = BLOCK %]<span class="user_holds_pending_count count_label">[% holds_pending | html %]</span>[% END %]
241
                                                [% tn('hold pending', 'holds pending', holds_pending ) | html %]
251
                                                [% tn('{count} hold pending', '{count} holds pending', holds_pending) | html | $Expand count = count %]
242
                                            </a>
252
                                            </a>
243
                                        </li>
253
                                        </li>
244
                                    [% END %]
254
                                    [% END %]
245
                                    [% IF holds_waiting && holds_waiting > 0 %]
255
                                    [% IF holds_waiting && holds_waiting > 0 %]
246
                                        <li>
256
                                        <li>
247
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
257
                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
248
                                                <span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span>
258
                                                [% count = BLOCK %]<span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span>[% END %]
249
                                                [% tn('hold waiting', 'holds waiting', holds_waiting ) | html %]
259
                                                [% tn('{count} hold waiting', '{count} holds waiting', holds_waiting) | html | $Expand count = count %]
250
                                            </a>
260
                                            </a>
251
                                        </li>
261
                                        </li>
252
                                    [% END %]
262
                                    [% END %]
253
                                    [% IF total_owing && total_owing > 0 %]
263
                                    [% IF total_owing && total_owing > 0 %]
254
                                        <li>
264
                                        <li>
255
                                            <a href="/cgi-bin/koha/opac-account.pl">
265
                                            <a href="/cgi-bin/koha/opac-account.pl">
256
                                                <span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span>
266
                                                [% amount = BLOCK %]<span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span>[% END %]
257
                                                due in fines and charges
267
                                                [% t('{amount} due in fines and charges') | html | $Expand amount = amount %]
258
                                            </a>
268
                                            </a>
259
                                        </li>
269
                                        </li>
260
                                    [% END %]
270
                                    [% END %]
Lines 262-276 Link Here
262
                                        [% IF opacnote %]
272
                                        [% IF opacnote %]
263
                                            <li>
273
                                            <li>
264
                                                <a href="/cgi-bin/koha/opac-user.pl">
274
                                                <a href="/cgi-bin/koha/opac-user.pl">
265
                                                    <span class="count_label">[% patron_messages.count + 1 | html %]</span>
275
                                                    [% count = BLOCK %]<span class="count_label">[% patron_messages.count + 1 | html %]</span>[% END %]
266
                                                    [% tn('message', 'messages', patron_messages.count + 1 ) | html %]
276
                                                    [% tn('{count} message', '{count} messages', patron_messages.count + 1) | html | $Expand count = count %]
267
                                                </a>
277
                                                </a>
268
                                            </li>
278
                                            </li>
269
                                        [% ELSE %]
279
                                        [% ELSE %]
270
                                            <li>
280
                                            <li>
271
                                                <a href="/cgi-bin/koha/opac-user.pl">
281
                                                <a href="/cgi-bin/koha/opac-user.pl">
272
                                                    <span class="count_label">[% patron_messages.count | html %]</span>
282
                                                    [% count = BLOCK %]<span class="count_label">[% patron_messages.count | html %]</span>[% END %]
273
                                                    [% tn('message', 'messages', patron_messages.count ) | html %]
283
                                                    [% tn('{count} message', '{count} messages', patron_messages.count) | html | $Expand count = count %]
274
                                                </a>
284
                                                </a>
275
                                            </li>
285
                                            </li>
276
                                        [% END %]
286
                                        [% END %]
(-)a/t/Koha/Template/Plugin/Expand.t (-1 / +11 lines)
Line 0 Link Here
0
- 
1
#!/usr/bin/env perl
2
3
use Modern::Perl;
4
5
use Test::More tests => 1;
6
use Koha::Template::Plugin::Expand;
7
8
my $filter = Koha::Template::Plugin::Expand->new();
9
10
my $filtered = $filter->filter('Hello, {name}', [], { name => 'World!' });
11
is($filtered, 'Hello, World!', '{name} was replaced by World!');

Return to bug 26392