From c82a677a4caa4b5aed585c4493b9ed1945b875dd Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Fri, 8 Mar 2024 11:49:26 +0000 Subject: [PATCH] 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: /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 Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer (cherry picked from commit b9f97ec015e4f101546e308754db4ed532987fde) Signed-off-by: Fridolin Somers (cherry picked from commit 5559ebc3bf8a6d3a3462e1367ce3901084cc7501) Signed-off-by: Lucas Gass --- .../opac-tmpl/bootstrap/en/includes/i18n.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc index 3ad521e843..269785005d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc @@ -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 %] -- 2.39.5