From 6da6f8663b6d3e961a8e6001c8b3569ee7d54b96 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 9 Feb 2018 08:35:18 +0200 Subject: [PATCH] Bug 20166: Untranslatable course reserves delete prompt Having a Template Toolkit statements inside the javascript translation function _() prevents it from being picked for translation. The only example of such is the course reserve delete prompt. Move the TT statement outside the string. Test plan: 1) Update and install language xx-YY. Check that the msgids "Are you sure you want to delete this course? There is %s attached item." and "Are you sure you want to delete this course? There are %s attached items." do not exist in the xx-YY-staff-prog.po 2) Check the translated file intranet-tmpl/prog/fi-FI/modules/course_reserves/course-details.tt It should have two prompt texts above in English 3) Install patch 4) Update the language. Check that the msgids show up in xx-YY-staff-prog.po, translate them, and install the language. 5) Repeat 2, the prompts should now show up in the correct language. 6) Enable UsecourseReserves 7) Go to Home -> Course reserves 8) Create a new course, and add reserves to it 9) See the course details. Click on Delete course, the prompt should be correctly translated 10) Remove all but one of the reserves from the course 11) Repeat 9 To see if there are other such TT statements: rgrep -E '\b_\("[^"]*\[%' koha-tmpl/ Signed-off-by: Pasi Kallinen Signed-off-by: Roch D'Amour Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Signed-off-by: Nick Clemens --- .../prog/en/modules/course_reserves/course-details.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index e24be94130..9fb6005e53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -25,9 +25,9 @@ $("#delete_course").click(function(){ [% SET count = course_reserves.size || 0 %] [% IF count == 1 %] - return confirmDelete(_("Are you sure you want to delete this course? There is [% count %] attached item.") ); + return confirmDelete(_("Are you sure you want to delete this course? There is %s attached item.").format([% count %]) ); [% ELSIF count > 1 %] - return confirmDelete(_("Are you sure you want to delete this course? There are [% count %] attached items.") ); + return confirmDelete(_("Are you sure you want to delete this course? There are %s attached items.").format([% count %]) ); [% ELSE %] return confirmDelete(_("Are you sure you want to delete this course?")); [% END %] -- 2.39.5