Bugzilla – Attachment 24706 Details for
Bug 11571
Bug 7934 introduces a regression in the translate script
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 11571 - FIX regression introduced by bug 7934
SIGNED-OFF-Bug-11571---FIX-regression-introduced-b.patch (text/plain), 2.39 KB, created by
Mark Tompsett
on 2014-01-24 16:05:29 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 11571 - FIX regression introduced by bug 7934
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2014-01-24 16:05:29 UTC
Size:
2.39 KB
patch
obsolete
>From b796893524878797a791b46fd955609489f3f895 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 16 Jan 2014 15:47:42 +0100 >Subject: [PATCH] [SIGNED OFF] Bug 11571 - FIX regression introduced by bug > 7934 > >Bug 7934 breaks the -f option introduced in bug 9161. > >While the generation of the command tmpl_process3.pl, a space is >missing if the -x option is given. >The tmpl_process3.pl is called like: >/home/koha/src/misc/translator/tmpl_process3.pl -q update -i >/home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ -s >/home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po -r >-x 'help'-f pay.tt > >Revised test plan: >1) cd ./misc/translator >2) put a warn at LangInstaller.pm line 375. >3) time ./translate update fr-FR -f pay.tt >-- note the execution time and the output. The options in the > command contain "-x 'help'-f pay.tt" > The -f param is not passed to the script. > The execution time is strangely long. >5) git reset --hard origin/master >6) apply this patch >7) put a warn at LangInstaller.pm line 375. >8) time ./translate update fr-FR -f pay.tt >-- verify the output and the execution time is now corrected. > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >--- > misc/translator/LangInstaller.pm | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm >index 50ba308..158ca22 100644 >--- a/misc/translator/LangInstaller.pm >+++ b/misc/translator/LangInstaller.pm >@@ -349,7 +349,7 @@ sub install_tmpl { > "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r $excludes" . > ( > @$files >- ? '-f ' . join ' -f ', @$files >+ ? ' -f ' . join ' -f ', @$files > : '' > ) > } >@@ -378,7 +378,7 @@ sub update_tmpl { > "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r $excludes" . > ( > @$files >- ? '-f ' . join ' -f ', @$files >+ ? ' -f ' . join ' -f ', @$files > : '' > ) > } >@@ -417,7 +417,7 @@ sub create_tmpl { > "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r $excludes" . > ( > @$files >- ? '-f ' . join ' -f ', @$files >+ ? ' -f ' . join ' -f ', @$files > : '' > ) > } >-- >1.7.9.5
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 11571
:
24459
|
24484
|
24706
|
24729