Bugzilla – Attachment 64411 Details for
Bug 18703
Translatability: Resolve some remaining %%] problems for staff client in 6 Files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18703 - Translatability: Resolve some remaining %%] problems for staff client in 6 Files
Bug-18703---Translatability-Resolve-some-remaining.patch (text/plain), 10.27 KB, created by
Brendan Gallagher
on 2017-06-16 18:35:22 UTC
(
hide
)
Description:
Bug 18703 - Translatability: Resolve some remaining %%] problems for staff client in 6 Files
Filename:
MIME Type:
Creator:
Brendan Gallagher
Created:
2017-06-16 18:35:22 UTC
Size:
10.27 KB
patch
obsolete
>From 3b5bd81cd324794c9f30f819ed2da1d060864509 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 30 May 2017 20:44:30 +0200 >Subject: [PATCH] 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 <josef.moravec@gmail.com> > >Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com> >--- > .../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 @@ > <span class="seefrom">used for/see from:</span> > [% FOREACH seefro IN summary.seefrom %] > <div class="authref"> >- [% 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 %] > </div> > [% END %] > </div> >@@ -117,12 +111,8 @@ > <span class="seealso">see also:</span> > [% FOREACH seeals IN summary.seealso %] > <div class="authref"> >- [% 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 %] > </div> > [% END %] > </div> >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 @@ > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li> >- [% IF Koha.Preference('BatchCheckouts') && >- Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %] >+ [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %] > [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&batch=1">Batch check out</a></li> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >index 2492ec6..76226a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >@@ -40,15 +40,13 @@ > [% END %] > <option value="pb">Publisher</option> > <option value="pl">Publisher location</option> >- [%# >- Use non-normalized st-year instead of st-numeric, >- since pubdate can include 'u' to signify unkown >- dates. See "Legal Characters" at: >- http://www.loc.gov/marc/bibliographic/bd008a.html > >- This search is also for date ranges due to the >- special Zebra r=r CCL mapping for 'yr' >- %] >+ [%# Use non-normalized st-year instead of st-numeric, %] >+ [%# since pubdate can include 'u' to signify unkown %] >+ [%# dates. See "Legal Characters" at: %] >+ [%# http://www.loc.gov/marc/bibliographic/bd008a.html %] >+ [%# This search is also for date ranges due to the %] >+ [%# special Zebra r=r CCL mapping for 'yr' %] > <option value="yr,st-year">Publication date (yyyy-yyyy)</option> > <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option> > </select> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index ed58a96..ae5117d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -39,8 +39,7 @@ $(document).ready(function() { > <h4>Checked out [% total %] times</h4> > <table id="table_issues"> > <thead><tr> >- [% IF Koha.Preference('intranetreadinghistory') >- AND CAN_user_circulate_circulate_remaining_permissions %] >+ [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] > <th>Patron</th> > [% END %] > <th>Barcode</th> >@@ -53,8 +52,7 @@ $(document).ready(function() { > <tbody> > [% FOREACH issue IN issues %] > <tr> >- [% IF Koha.Preference('intranetreadinghistory') >- AND CAN_user_circulate_circulate_remaining_permissions %] >+ [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] > <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issue.borrowernumber %]">[% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %]</a></td> > [% END %] > <td>[% IF ( issue.barcode ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 5d56d56..a5e76ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -108,13 +108,8 @@ > </div><!-- /yui-u --> > </div><!-- /yui-g --> > <div class="yui-g"> >- [% 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) %] > <div id="area-pending"> > [% IF pending_article_requests %] > <div class="pending-info" id="article_requests_pending"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >index fecf80d..40fc42d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >@@ -114,8 +114,7 @@ > <label for="ignore_modify_[% pm.borrowernumber %]">Ignore</label> > | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber %]" >Patron details</a> > </div> >- [% 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 %] > <div class="members-update-table"> > <table> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18703
:
63852
|
64031
|
64032
| 64411 |
64412