Bugzilla – Attachment 52216 Details for
Bug 16621
Translatability: Issues in opac-user.tt (sentence splitting)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16621: Translatability: Issues in opac-user.tt (sentence splitting)
Bug-16621-Translatability-Issues-in-opac-usertt-se.patch (text/plain), 9.30 KB, created by
Marc Véron
on 2016-06-10 08:49:42 UTC
(
hide
)
Description:
Bug 16621: Translatability: Issues in opac-user.tt (sentence splitting)
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2016-06-10 08:49:42 UTC
Size:
9.30 KB
patch
obsolete
>From d509c86e6b49174b131c5b628a085defc12ee8a4 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Fri, 10 Jun 2016 10:25:54 +0200 >Subject: [PATCH] Bug 16621: Translatability: Issues in opac-user.tt (sentence > splitting) > >This patch fixes issues due to sentence splitting in >koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt > >Note: This is a string patch. It does not add or change functionallity. > >To test: >- Examine code and verify that the text changes remove sentence splitting > and that the changes make sense. >- Log in to OPAC and verify that messages look correct > - with blocked /debarred user (with and without comment and date) > - with user who has to much fines (needs syspref OpacRenewalAllowed > and syspref OPACFineNoRenewals) > - with user who has his card marked as lost > - with user with an account that is about to expire > - with user with expired account > - with user with uncertain address information (with and without > syspref OPACPatronDetails set to Allow) >--- > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 25 +++++++++++++------- > opac/opac-user.pl | 7 ++---- > 2 files changed, 18 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index f31f47e..5bc26f4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -2,6 +2,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% USE ItemTypes %] >+[% USE Price %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home</title> >@@ -91,16 +92,22 @@ > <div class="alert"> > <ul> > [% IF ( userdebarred ) %] >- <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li> >+ <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen. >+ [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %] >+ [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %] >+ <em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li> > [% END %] > [% IF ( BORROWER_INFO.gonenoaddress ) %] >- <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file. Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li> >+ <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library. >+ <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a> >+ [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %] >+ </li> > [% END %] > [% IF ( BORROWER_INFO.lost ) %] >- <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li> >+ <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li> > [% END %] >- [% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %] >- <li id="renewal_blocked_fines"><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">[% IF renewal_blocked_fines != "0.00" %] more than <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %]</span> in [% END %] fines</a>, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li> >+ [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %] >+ <li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines | $Price %]</span>.[% ELSE %]You have fines.[% END %] > [% END %] > </ul> > </div> >@@ -115,9 +122,9 @@ > [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %] > [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %] > [% IF ( OPACFinesTab ) %] >- [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %] >- [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %] >- [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %] >+ [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %] > [% END %] > [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %] > </ul> >@@ -300,7 +307,7 @@ > <tbody> > <tr> > <td>You currently owe fines and charges amounting to:</td> >- <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding | $Price %]</a></td> > </tr> > </tbody> > </table> >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 413c26d..3cd5390 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -118,9 +118,8 @@ if ( C4::Context->preference('OpacRenewalAllowed') > $borr->{'flagged'} = 1; > $canrenew = 0; > $template->param( >- renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ), >- renewal_blocked_fines_amountoutstanding => >- sprintf( '%.02f', $borr->{amountoutstanding} ), >+ renewal_blocked_fines => $no_renewal_amt, >+ renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding}, > ); > } > >@@ -129,8 +128,6 @@ if ( $borr->{'amountoutstanding'} < 0 ) { > $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} ); > } > >-$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'}; >- > # Warningdate is the date that the warning starts appearing > if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) { > my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day ); >-- >1.7.10.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 16621
:
52216
|
53252
|
53269
|
53280