Bug 36282: Chomp whitespace around opac i18n strings
Same logic as bug 26816 but to OPAC
Test plan:
1) Apply test plan patch only
2) Visit opac home:
<opac_url>/cgi-bin/koha/opac-main.pl
3) Notice there's a space between 'Translated string' and ':', even though the markup does not contain a whitespace
4) Apply 2nd patch
5) Notice the white space is gone
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit b9f97ec015
)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
parent
61c8fc97fc
commit
5559ebc3bf
1 changed files with 9 additions and 9 deletions
|
@ -2,37 +2,37 @@
|
|||
[% USE raw %]
|
||||
|
||||
[% MACRO t(msgid) BLOCK %]
|
||||
[% I18N.t(msgid) | $raw %]
|
||||
[%- I18N.t(msgid) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tx(msgid, vars) BLOCK %]
|
||||
[% I18N.tx(msgid, vars) | $raw %]
|
||||
[%- I18N.tx(msgid, vars) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tn(msgid, msgid_plural, count) BLOCK %]
|
||||
[% I18N.tn(msgid, msgid_plural, count) | $raw %]
|
||||
[%- I18N.tn(msgid, msgid_plural, count) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tnx(msgid, msgid_plural, count, vars) BLOCK %]
|
||||
[% I18N.tnx(msgid, msgid_plural, count, vars) | $raw %]
|
||||
[%- I18N.tnx(msgid, msgid_plural, count, vars) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO txn(msgid, msgid_plural, count, vars) BLOCK %]
|
||||
[% I18N.txn(msgid, msgid_plural, count, vars) | $raw %]
|
||||
[%- I18N.txn(msgid, msgid_plural, count, vars) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tp(msgctxt, msgid) BLOCK %]
|
||||
[% I18N.tp(msgctxt, msgid) | $raw %]
|
||||
[%- I18N.tp(msgctxt, msgid) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tpx(msgctxt, msgid, vars) BLOCK %]
|
||||
[% I18N.tpx(msgctxt, msgid, vars) | $raw %]
|
||||
[%- I18N.tpx(msgctxt, msgid, vars) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tnp(msgctxt, msgid, msgid_plural, count) BLOCK %]
|
||||
[% I18N.tnp(msgctxt, msgid, msgid_plural, count) | $raw %]
|
||||
[%- I18N.tnp(msgctxt, msgid, msgid_plural, count) | $raw -%]
|
||||
[% END %]
|
||||
|
||||
[% MACRO tnpx(msgctxt, msgid, msgid_plural, count, vars) BLOCK %]
|
||||
[% I18N.tnpx(msgctxt, msgid, msgid_plural, count, vars) | $raw %]
|
||||
[%- I18N.tnpx(msgctxt, msgid, msgid_plural, count, vars) | $raw -%]
|
||||
[% END %]
|
||||
|
|
Loading…
Reference in a new issue