From ebad1aabf4b8b3bba3341ddb8778ae4a93aab373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 23 May 2017 17:09:49 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc contains a lot of (partial) template directives like: %%]%s %sLayout: [%% This patch fixes it To test: - Verify that code changes make sense - Apply patch - Create a translation (cd misc/translator , then: perl translate create aa-AA - Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%% for patroncards-errors.inc - Try to get an error: Try a link like http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1 ...where template_id and layout_id do not exist (Amended for comment #2 2017-06-05 mv) (Amended for comment #6 2017-08-02 mv) Signed-off-by: Owen Leonard --- .../prog/en/includes/patroncards-errors.inc | 58 +++++++++++++--------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc index 485c825..f220fe8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc @@ -1,46 +1,56 @@ +[% BLOCK asksysadmin %]Please have your system administrator check the error log for details.[% END %] +[% BLOCK b_batch %]Batch: [% END %] +[% BLOCK b_patronlist %]Patron list: [% END %] +[% BLOCK b_patronnumber %]Patron number: [% END %] +[% BLOCK b_layout %]Layout: [% END %] +[% BLOCK b_template %]Template: [% END %] + [% IF ( error || CGI.param('pdferr') ) %]

WARNING: - [% IF CGI.param('pdferr') %] - Error while creating PDF file. - [% IF CGI.param('errnocards') %]No cards created (empty batch or list?)[% END %] - [% IF CGI.param('errba') %]Batch: [% '' _ CGI.param('errba') _ '' %][% END %] - [% IF CGI.param('errpl') %]Patron list: [% '' _ CGI.param('errpl') _ '' %][% END %] - [% IF CGI.param('errpt') %]Patron number: [% '' _ CGI.param('errpt') _ '' %][% END %] - [% IF CGI.param('errlo') %]Layout: [% '' _ CGI.param('errlo') _ '' %][% END %] - [% IF CGI.param('errtpl') %]Template: [% '' _ CGI.param('errtpl') _ '' %][% END %] - - Please have your system administrator check the error log for details. + [% IF CGI.param('pdferr') %]Error while creating PDF file. + [% IF CGI.param('errnocards') %]No cards created (empty batch or list?) [% END %] + [% IF CGI.param('errba') %][% INCLUDE b_batch %][%- CGI.param('errba') -%][% END %] + [% IF CGI.param('errpl') %][% INCLUDE b_patronlist %][%- CGI.param('errpl') -%]][% END %] + [% IF CGI.param('errpt') %][% INCLUDE b_patronnumber %][%- CGI.param('errpt') -%][% END %] + [% IF CGI.param('errlo') %][% INCLUDE b_layout %][%- CGI.param('errlo') -%][% END %] + [% IF CGI.param('errtpl') %][% INCLUDE b_template %][%- CGI.param('errtpl') -%][% END %] + [% INCLUDE asksysadmin %] [% END %] + [% IF ( error == 101 ) %] - The database returned an error while [% IF ( card_element ) %]saving [% card_element %] [% element_id %][% ELSE %]attempting a save operation[% END %]. Please have your system administrator check the error log for details. + [% IF ( card_element ) %]The database returned an error while saving [% card_element %] [% element_id %]. + [% ELSE %]The database returned an error while attempting a save operation. [% END %][% INCLUDE asksysadmin %] [% ELSIF ( error == 102 ) %] - The database returned an error while [% IF ( card_element ) %]deleting [% card_element %] [% element_id %][% ELSIF ( image_ids ) %][% image_ids %][% ELSE %]attempting a delete operation[% END %]. Please have your system administrator check the error log for details. + [% IF ( card_element ) %]The database returned an error while deleting [% card_element %] [% element_id %]. + [% ELSIF ( image_ids ) %]The database returned an error while deleting [% image_ids %]. + [% ELSE %]The database returned an error while attempting a delete operation. [% END %][% INCLUDE asksysadmin %] [% ELSIF ( error == 201 ) %] - An unsupported operation was attempted[% IF ( element_id ) %] on [% card_element %] [% element_id %][% END %]. Please have your system administrator check the error log for details. + [%IF ( element_id ) %]An unsupported operation was attempted on [% card_element %] [% element_id %]. + [% ELSE %]An unsupported operation was attempted. [% END %][% INCLUDE asksysadmin %] [% ELSIF ( error == 202 ) %] - An error has occurred. Please ask your system administrator to check the error log for more details. + An error has occurred. [% INCLUDE asksysadmin %] [% ELSIF ( error == 203 ) %] - A non-existent or invalid library code was supplied. Please verify that you have a library selected. + A non-existent or invalid library code was supplied. Please verify that you have a library set. Set library [% ELSIF ( error == 301 ) %] - An error has occurred while attempting to upload the image file. Please ask your system administrator to check the error log for more details. + An error has occurred while attempting to upload the image file. [% INCLUDE asksysadmin %] [% ELSIF ( error == 302 ) %] - Image exceeds 500KB. Please resize and import again. + Image exceeds 500KB. Please resize and import again. [% ELSIF ( error == 303 ) %] - The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space. + The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space. [% ELSIF ( error == 304 ) %] - An image with the name '[% IMAGE_NAME %]' already exists. + An image with the name '[% IMAGE_NAME %]' already exists. [% ELSIF ( error == 401 ) %] - An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details. + An error has occurred and no items have been added to batch [% batch_id %]. [% INCLUDE asksysadmin %] [% ELSIF ( error == 402 ) %] - The item(s) was not added because the library is not set. Please set your library before adding items to a batch. + No items added because the library is not set. Please set your library before adding items to a batch. Set library [% ELSIF ( error == 403 ) %] - An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details. + An error has occurred and the item(s) was not removed from batch [% batch_id %]. [% INCLUDE asksysadmin %] [% ELSIF ( error == 404 ) %] - An error has occurred and batch [% batch_id %] was not deleted. Please have your system administrator check the error log for details. + An error has occurred and batch [% batch_id %] was not deleted. [% INCLUDE asksysadmin %] [% ELSIF ( error == 405 ) %] - An error has occurred and batch [% batch_id %] not fully de-duplicated. + An error has occurred and batch [% batch_id %] was not fully de-duplicated. [% END %]

-- 2.1.4