From dac9f80f709d5a78839e10c819a25004aa5d32b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 30 May 2017 20:44:30 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 18703 - Translatability: Resolve some remaining %%] problems for staff client in 6 Files There are some more files that expose parts of tt diretives to translations, mostly due to line breaks inside directives. Files covered with this Bug: koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt To test: - Review code, verify that line breaks are removed - Run QA tools - Bonus test: Create a "language" aa-AA and verify that no fragments containign %%] are picked for the 6 files Signed-off-by: Josef Moravec --- .../en/includes/authorities-search-results.inc | 28 +++++++--------------- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 3 +-- .../prog/en/includes/search_indexes.inc | 14 +++++------ .../prog/en/modules/catalogue/issuehistory.tt | 6 ++--- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 9 ++----- .../prog/en/modules/members/members-update.tt | 3 +-- 6 files changed, 21 insertions(+), 42 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc index c635b07..1b4efda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -1,11 +1,9 @@ [% BLOCK showreference %] -[%# - Parameters: - heading: the heading itself - linkType: currently 'seefrom' or 'seealso', controls the label for the entry - type: - authid: if it is a linked authority, its authid -%] +[%# Parameters: %] +[%# heading: the heading itself %] +[%# linkType: currently 'seefrom' or 'seealso', controls the label for the entry type: %] +[%# authid: if it is a linked authority, its authid %] + [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %] [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %] @@ -102,12 +100,8 @@ used for/see from: [% FOREACH seefro IN summary.seefrom %]
- [% PROCESS showreference - heading=seefro.heading - linkType='seefrom' - type=seefro.type - authid=seefro.authid - %] + [%# Following on one line for translatability %] + [% PROCESS showreference heading=seefro.heading linkType='seefrom' type=seefro.type authid=seefro.authid %]
[% END %] @@ -117,12 +111,8 @@ see also: [% FOREACH seeals IN summary.seealso %]
- [% PROCESS showreference - heading=seeals.heading - linkType='seealso' - type=seeals.type - authid=seeals.authid - %] + [%# Following on one line for translatability %] + [% PROCESS showreference heading=seeals.heading linkType='seealso' type=seeals.type authid=seeals.authid %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 8d90fa9..8bc4a5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -69,8 +69,7 @@