From a68b6cfbf1a33ed38cfaf3e576ccbff1f09ebc32 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Tue, 28 Apr 2015 18:24:27 -0300 Subject: [PATCH] Bug 12192: Template toolkit code in HTML attributes is picked up into po-files This patch gives a partial solution for this problem. It ignores strings like "[% something %]", but not "[% IF ( value ) %][% value %][% END %]" We get 100+ strings less to translate To test: 1) Update translation files for your preferred language 2) Apply the patch 3) Update again 4) Compare, you must find 100+ strings removed from translation files eg. -msgid "[% SEARCH_RESULT.biblionumber |url %]" -msgid "[% accepteddate | $KohaDates %]" -msgid "[% amountoutstanding | format('%.2f') %]" -msgid "[% authtypetext |html %]" -msgid "[% barcode_llx |html %]" -msgid "[% barcode_lly |html %]" -msgid "[% biblio.quantity.length ? biblio.quantity : 1 %]" -msgid "[% billingdate | $KohaDates %]" -msgid "[% borname |html %]" ... Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Verified all strings removed from the po files were pure TT. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5caa05104dfc30d70be5ea1b17d406b5392d59bc) Signed-off-by: Chris Cormack --- misc/translator/xgettext.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/translator/xgettext.pl b/misc/translator/xgettext.pl index 976ab4769c..504dc9f389 100755 --- a/misc/translator/xgettext.pl +++ b/misc/translator/xgettext.pl @@ -40,6 +40,7 @@ sub string_negligible_p { || $t =~ /^[-\+\.,:;!\?'"%\(\)\[\]\|]+$/ # punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters || $t =~ /^(&[a-z]+;|&#\d+;|&#x[0-9a-fA-F]+;|%%|%s|\s|[[:punct:]])*$/ # html entities,placeholder,punct, ... + || ( $t =~ /^\[\%.*\%\]$/ and $t !~ /\%\].*\[\%/ ) # pure TT entities ) } -- 2.39.5