Bugzilla – Attachment 12673 Details for
Bug 8862
merge.pl contains untranslatable strings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8862 - merge.pl contains untranslatable strings
Bug-8862---mergepl-contains-untranslatable-strings.patch (text/plain), 4.19 KB, created by
Frédéric Demians
on 2012-10-04 08:35:16 UTC
(
hide
)
Description:
Bug 8862 - merge.pl contains untranslatable strings
Filename:
MIME Type:
Creator:
Frédéric Demians
Created:
2012-10-04 08:35:16 UTC
Size:
4.19 KB
patch
obsolete
>From 11f37ace7d0a755ef743d888e5cf04b51508203c Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 2 Oct 2012 08:58:40 -0400 >Subject: [PATCH] Bug 8862 - merge.pl contains untranslatable strings >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Frédéric Demians <f.demians@tamil.fr> > >It works: (1) merging's still effective, and (2) two new error messages appear >in staff .po file after update it. >--- > cataloguing/merge.pl | 7 ++--- > .../prog/en/modules/cataloguing/merge.tt | 32 ++++++++++++++++------ > 2 files changed, 27 insertions(+), 12 deletions(-) > >diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl >index 020001d..1492f1f 100755 >--- a/cataloguing/merge.pl >+++ b/cataloguing/merge.pl >@@ -81,7 +81,7 @@ if ($merge) { > # If some items could not be moved : > if (scalar(@notmoveditems) > 0) { > my $itemlist = join(' ',@notmoveditems); >- push @errors, "The following items could not be moved from the old record to the new one: $itemlist"; >+ push @errors, { code => "CANNOT_MOVE", value => $itemlist }; > } > > # Moving subscriptions from the other record to the reference record >@@ -123,7 +123,7 @@ if ($merge) { > my $biblionumber = $input->param('biblionumber'); > > if (scalar(@biblionumber) != 2) { >- push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged."; >+ push @errors, { code => "WRONG_COUNT", value => scalar(@biblionumber) }; > } > else { > my $data1 = GetBiblioData($biblionumber[0]); >@@ -206,8 +206,7 @@ if ($merge) { > > if (@errors) { > # Errors >- my @errors_loop = map{{error => $_}}@errors; >- $template->param( errors => \@errors_loop ); >+ $template->param( errors => \@errors ); > } > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 911c2f0..310f5c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -183,15 +183,24 @@ function changeFramework(fw) { > <h1>Merging records</h1> > [% IF ( result ) %] > [% IF ( errors ) %] >+ > [% FOREACH error IN errors %] >- <div class="dialog alert">[% error.error %].<br />Therefore, the record to be merged has not been deleted.</div> >- [% END %] >+ <div class="dialog alert"> > >- [% ELSE %] >- <script type="text/javascript">window.location.href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio1 %]"</script> >- <p>The merging was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio1 %]">Click here to see the merged record.</a></p> >+ [% IF error.code == 'CANNOT_MOVE' %] >+ The following items could not be moved from the old record to the new one: [% error.value %] >+ [% ELSE %] >+ [% error %] >+ [% END %] >+ >+ <br />Therefore, the record to be merged has not been deleted.</div> > [% END %] > >+ [% ELSE %] >+ <script type="text/javascript">window.location.href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio1 %]"</script> >+ <p>The merging was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio1 %]">Click here to see the merged record.</a></p> >+ [% END %] >+ > [% ELSE %] > > [% IF ( choosereference ) %] >@@ -228,9 +237,16 @@ function changeFramework(fw) { > [% ELSE %] > [% IF ( errors ) %] > <div class="dialog alert"> >- [% FOREACH error IN errors %] >- <p>[% error.error %]</p> >- [% END %] >+ [% FOREACH error IN errors %] >+ <p> >+ [% IF error.code == 'WRONG_COUNT' %] >+ Number of records provided for merging: [% error.value %]. Currently only 2 records can be merged at a time. >+ [% ELSE %] >+ [% error %] >+ [% END %] >+ >+ </p> >+ [% END %] > </div> > [% ELSE %] > <form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()"> >-- >1.7.11.1
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 8862
:
12631
|
12632
|
12633
| 12673