From b7671cf8426c3d59b93c757946f0752375fb25f8 Mon Sep 17 00:00:00 2001 From: Victor Grousset Date: Wed, 20 Dec 2017 17:13:40 +0100 Subject: [PATCH] Bug 19849: Make a string translatable again after a rebase error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug 16621 reverted part of bug 12509 1. Log in the OPAC and staff interface 2. Restrict the user logged in the OPAC (restricting yourself works) Staff interface → Patron page → Restrictions → Add manual restriction Put this comment the "OVERDUES_PROCESS Give the books back or we're comming!" 3. Install the fr_FR locale and switch the interface to it 4. Go to OPAC: /cgi-bin/koha/opac-user.pl 5. Then you should see the ugly comment with "OVERDUES_PROCESS" 6. Apply this patch 7. Update the translation: ./translate update or equivalent 8. Open misc/translator/po/fr-FR-opac-bootstrap.po 9. Find the string containing "Restriction added by overdues process" 10. Remove the fuzzy flag 11. Install the language 12. Refresh the page in the OPAC 13. Then you should see the translation + the comment instead of "OVERDUES_PROCESS" + the comment --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 158cd77..3339f01 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -112,7 +112,11 @@ Using this account is not recommended because some parts of Koha will not functi Comment: - [% BORROWER_INFO.debarredcomment %] + [% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] + [% ELSE %] + [% BORROWER_INFO.debarredcomment | html_line_break %] + [% END %] [% END %] @@ -120,6 +124,7 @@ Using this account is not recommended because some parts of Koha will not functi End date: [% BORROWER_INFO.userdebarreddate | $KohaDates %] [% END %] + Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. Go to your account page [% END %] [% END %] -- 2.7.4