@@ -, +, @@ problems for staff client in 6 Files koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc - 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 --- .../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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ a/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 %]
Patron | [% END %]Barcode | @@ -53,8 +52,7 @@ $(document).ready(function() {
---|---|
[% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %] | [% END %][% IF ( issue.barcode ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -107,13 +107,8 @@
- [% IF ( ( CAN_user_tools_moderate_comments && pendingcomments )
- || ( CAN_user_tools_moderate_tags && pendingtags )
- || ( CAN_user_borrowers && pending_borrower_modifications )
- || ( CAN_user_acquisition && pendingsuggestions )
- || ( CAN_user_borrowers && pending_discharge_requests )
- || pending_article_requests
- ) %]
+ [%# Following statment must be in one line for translatability %]
+ [% IF ( ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers && pending_discharge_requests ) || pending_article_requests) %]
[% IF pending_article_requests %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -114,8 +114,7 @@
| Patron details
- [% IF !pm.extended_attributes and pm.size > 3 or
- pm.extended_attributes and pm.size > 4 %]
+ [% IF !pm.extended_attributes and pm.size > 3 or pm.extended_attributes and pm.size > 4 %]
[%# timestamp+verification_token+borrowernumber=3 %]
|