From 0fe94e4eb3e262a3c0d1314880c267bb050326ea Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 26 Oct 2020 11:55:57 +0000 Subject: [PATCH] Bug 26816: Chomp whitespace around i18n strings This patch adds the chomp shorthand [%- -%] to the output of i18n.inc to prevent extra spaces from being inserted. To test, apply the patch and perform a catalog search in the staff interface which will return results with multiple items. In the items column, the availability information should not have unwanted spaces: 3 items, 3 available: ...instead of 3 items , 3 available: Signed-off-by: Barbara Johnson --- koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc index 3ad521e843..269785005d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc +++ b/koha-tmpl/intranet-tmpl/prog/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.11.0