Bugzilla – Attachment 155621 Details for
Bug 34773
Improve translation of title tags: Cataloging tools
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34773: Improve translation of title tags: Cataloging tools
Bug-34773-Improve-translation-of-title-tags-Catalo.patch (text/plain), 32.52 KB, created by
Owen Leonard
on 2023-09-14 16:11:57 UTC
(
hide
)
Description:
Bug 34773: Improve translation of title tags: Cataloging tools
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-09-14 16:11:57 UTC
Size:
32.52 KB
patch
obsolete
>From aa769d59b2d4ce477db678f81b98f98e3fb5ef1a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 12 Sep 2023 18:02:43 +0000 >Subject: [PATCH] Bug 34773: Improve translation of title tags: Cataloging > tools > >This patch modifies cataloging tools templates so that title tags can be >more easily translated. The patch also makes some modifications to >titles, breadcrumb navigation, and page headers in order to make them >more consistent with each other and with other similar pages. > >Note that stockrotation.pl has been modified so that rota information is >available to the template in more cases for the purpose of showing that >information in navigation and headings. > >To test, apply the patch and go to Cataloging. Test each page and each >variation of the page to confirm that titles, breadcrumbs, and page >headers look correct. > >- Stage records for import > - Main page > - Upload file -> Stage for import >- Manage staged records > - Main page > - Batch details > - Import batch >- Batch item modification and batch item deletion > - Main page > - Submit batch > - Save >- Batch record modification > - Main page > - Submit batch > - Modify selected >- Batch record deletion > - Main page > - Submit batch > - Delete selected >- MARC modification templates > - Main page > - Edit actions for a template >- Item modifications by age > - Main page > - Add rules >- Stock rotation > - Main page > - New rota > - Edit rota > - Manage stages for rota > - New stage > - Edit stage > - Manage items for rota > - Add items >--- > .../automatic_item_modification_by_age.tt | 10 ++- > .../prog/en/modules/tools/batchMod-del.tt | 37 ++++++++-- > .../prog/en/modules/tools/batchMod-edit.tt | 36 ++++++++-- > .../prog/en/modules/tools/batchMod.tt | 11 ++- > .../en/modules/tools/batch_delete_records.tt | 38 +++++++++-- > .../tools/batch_record_modification.tt | 21 +++++- > .../en/modules/tools/manage-marc-import.tt | 37 ++++++---- > .../tools/marc_modification_templates.tt | 29 +++++--- > .../en/modules/tools/stage-marc-import.tt | 19 ++++-- > .../prog/en/modules/tools/stockrotation.tt | 67 ++++++++++++++----- > tools/stockrotation.pl | 6 ++ > 11 files changed, 247 insertions(+), 64 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index 22683cef3b..1ceac4b135 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -1,8 +1,16 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Automatic item modifications by age › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( op == 'edit_form' ) %] >+ [% t("Rules") | html %] › >+ [% END %] >+ [% t("Automatic item modifications by age") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 1608d37c64..8f62d3ac31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -3,10 +3,20 @@ > [% USE KohaDates %] > [% USE Asset %] > [% USE Branches %] >-[% SET footerjs = 1 %] > [% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch item deletion › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( show ) %] >+ [% t("Confirm selection") | html %] › >+ [% END %] >+ [% IF op == 'enqueued' %] >+ [% t("Job enqueued") | html %] › >+ [% END %] >+ [% t("Batch item deletion") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <!--[if IE]> > <style>#selections { display: none; }</style> >@@ -22,8 +32,24 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Batch item deletion</span> >+ [% IF ( show || op == "enqueued") %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item deletion</a> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch item deletion</span> >+ [% END %] >+ [% END %] >+ [% IF ( op == 'enqueued' ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Job enqueued") | html %] >+ [% END %] >+ [% END %] >+ [% IF ( show ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Confirm selection") | html %] >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -164,7 +190,8 @@ > > [% IF op == 'enqueued' %] > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> > <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > | <a href="/cgi-bin/koha/tools/batchMod.pl?del=1" title="New batch item deletion">New batch item deletion</a></p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 580c8b12df..0b43196fe1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -3,9 +3,20 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch item modification › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( show ) %] >+ [% t("Modifications") | html %] › >+ [% END %] >+ [% IF op == 'enqueued' %] >+ [% t("Job enqueued") | html %] › >+ [% END %] >+ [% t("Batch item modification") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>input[type=checkbox]{ margin : 0 .5em; }</style> > [% Asset.css("css/addbiblio.css") | $raw %] >@@ -22,8 +33,24 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Batch item modification</span> >+ [% IF ( show || op == "enqueued") %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch item modification</span> >+ [% END %] >+ [% END %] >+ [% IF ( op == 'enqueued' ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Job enqueued") | html %] >+ [% END %] >+ [% END %] >+ [% IF ( show ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Modifications") | html %] >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -33,7 +60,8 @@ > <h1>Batch item modification</h1> > [% IF op == 'enqueued' %] > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> > <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >index df5a93df6a..5fc21145db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -1,8 +1,17 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( del ) %] >+ [% t("Batch item deletion") | html %] >+ [% ELSE %] >+ [% t("Batch item modification") | html %] >+ [% END %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_batchMod" class="tools"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 6e30e93dd2..e3fb3f77f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -1,9 +1,20 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch record deletion › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'list' %] >+ [% t("Confirm selection") | html %] › >+ [% END %] >+ [% IF op == 'enqueued' %] >+ [% t("Job enqueued") | html %] › >+ [% END %] >+ [% t("Batch record deletion") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -17,8 +28,23 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Batch record deletion</span> >+ [% IF op == 'list' || op == 'enqueued' %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a> >+ [% END %] >+ [% END %] >+ [% IF op == 'list' %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Confirm selection") | html %] >+ [% END %] >+ [% ELSIF OP == 'enqueued' %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Job enqueued") | html %] >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch record deletion</span> >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -130,6 +156,8 @@ > | <a id="selectnotreserved" href="#">Select without holds</a> > | <a id="selectwithoutsubscriptions" href="#">Select without subscriptions</a> > </div> >+ >+ <div class="page-section"> > <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectrecords"> > <table id="biblios" class="records"> > <thead> >@@ -194,12 +222,14 @@ > <a class="cancel" href="/cgi-bin/koha/tools/batch_delete_records.pl">Cancel</a> > </fieldset> > </form> >+ </div> > [% ELSE %] > There are no record IDs defined. > [% END %] > [% ELSIF op == 'enqueued' %] > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> > <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > | <a href="/cgi-bin/koha/tools/batch_delete_records.pl" title="New batch record deletion">New batch record deletion</a></p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 2c83052eb1..da3fe5df5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -1,9 +1,19 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch record modification › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF view == 'list' %] >+ [% t("Confirm selection") | html %] › >+ [% ELSIF view == 'enqueued' %] >+ [% t("Job enqueued") | html %] › >+ [% END %] >+ [% t("Batch record modification") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] > </head> >@@ -27,7 +37,11 @@ > <a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Results</span> >+ [% IF view == 'list' %] >+ [% t("Confirm selection") | html %] >+ [% ELSIF view == 'enqueued' %] >+ [% t("Job enqueued") | html %] >+ [% END %] > [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] >@@ -263,7 +277,8 @@ > [% END %] > [% ELSIF view == 'enqueued' %] > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> > <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > | <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index e11c2611a1..25cff8a707 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -1,13 +1,20 @@ > [% USE raw %] > [% USE Asset %] > [% USE KohaDates %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] >+ [% IF ( job_enqueued ) %] >+ [% t("Job enqueued") | html %] › >+ [% END %] > [% IF ( import_batch_id ) %] >- Batch [% import_batch_id | html %] › [% END %] >- Manage staged MARC records › Cataloging › Koha >-</title> >+ [% tx("Batch {batch_import_number}", { batch_import_number = import_batch_id }) | html %] › >+ [% END %] >+ [% t("Manage staged MARC records") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] > <style> >@@ -26,13 +33,19 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > [% END %] >- [% IF ( import_batch_id ) %] >+ [% IF ( import_batch_id || job_enqueued ) %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged MARC records</a> > [% END %] >+ [% END %] >+ [% IF ( import_batch_id ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Batch [% import_batch_id | html %]</span> > [% END %] >+ [% ELSIF ( job_enqueued ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Job enqueued") | html %] >+ [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Manage staged MARC records</span> >@@ -45,11 +58,10 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Manage staged MARC records >- [% IF ( import_batch_id ) %] >- › Batch [% import_batch_id | html %] >- [% END %] >- </h1> >+ <h1>Manage staged MARC records</h1> >+ [% IF ( import_batch_id ) %] >+ <h2>Batch [% import_batch_id | html %]</h2> >+ [% END %] > [% FOREACH message IN messages %] > [% IF message.type == 'success' %] > <div class="dialog message"> >@@ -69,8 +81,9 @@ > > [% IF job_enqueued %] > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >- <p><a class="job_details" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> >+ <p><a class="job_details" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]">View detail of the enqueued job</a> > </div> > > [% ELSIF ( label_batch_msg ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 160a82f7a8..cf7100f83f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -2,9 +2,24 @@ > [% USE JSON.Escape %] > [% USE Asset %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>MARC modification templates › Cataloging › Koha</title> >+[% IF ( TemplatesLoop ) %] >+ [% FOREACH TemplatesLoo IN TemplatesLoop %] >+ [% IF ( TemplatesLoo.selected ) %] >+ [% SET template_name = TemplatesLoo.name %] >+ [% END %] >+ [% END %] >+[% END %] >+<title>[% FILTER collapse %] >+ [% IF ( template_name ) %] >+ [% tx("Actions for template '{template_name}'", template_name = template_name ) | html %] › >+ [% END %] >+ [% t("MARC modification templates") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% FILTER collapse %] > <style> >@@ -24,14 +39,6 @@ > [% INCLUDE 'cat-search.inc' %] > [% END %] > >-[% IF ( TemplatesLoop ) %] >- [% FOREACH TemplatesLoo IN TemplatesLoop %] >- [% IF ( TemplatesLoo.selected ) %] >- [% SET template_name = TemplatesLoo.name %] >- [% END %] >- [% END %] >-[% END %] >- > [% WRAPPER 'sub-header.inc' %] > [% WRAPPER breadcrumbs %] > [% WRAPPER breadcrumb_item %] >@@ -43,7 +50,7 @@ > <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- [% template_name | html %] >+ [% tx("Actions for template '{template_name}'", template_name = template_name ) | html %] > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >@@ -105,7 +112,7 @@ > > [% ELSE %] > >- <h1>Actions for <em>[% template_name | html %]</em></h1> >+ <h1>[% tx("Actions for template '{template_name}'", template_name = template_name ) | html %]</em></h1> > > [% IF ( ActionsLoop ) %] > <div class="page-section"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index be7669afff..1392b15325 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -1,8 +1,16 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Stage MARC records for import › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( job_enqueued ) %] >+ [% t("Job enqueued") | html %] › >+ [% END %] >+ [% t("Stage MARC records for import") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > #fileuploadstatus,#fileuploadfailed,#fileuploadcancel { display : none; } >@@ -22,18 +30,18 @@ > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > [% END %] > >- [% IF ( uploadmarc ) %] >+ [% IF ( job_enqueued ) %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>MARC staging results</span> >+ [% t("Job enqueued") | html %] > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Stage MARC records for import</span> > [% END %] >- [% END # /IF ( uploadmarc ) %] >+ [% END # /IF ( job_enqueued ) %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >@@ -67,7 +75,8 @@ > > <h1>MARC staging</h1> > <div class="dialog message"> >- <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ <h1>The job has been enqueued!</h1> >+ <p>It will be processed as soon as possible.</p> > [% INCLUDE "job_progress.inc" job_id=job_id %] > <p><a class="job_details" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > <div id="job_callback"></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index c7f18fb805..2d0adb1f1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -4,9 +4,31 @@ > [% USE Branches %] > [% USE KohaDates %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Stock rotation › Cataloging › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF (op == 'create_edit_rota' && rota.rota_id) %] >+ [% tx("Modify rota '{rota_title}'", rota_title = rota.title ) %] › >+ [% ELSIF (op == 'create_edit_rota' && !rota.rota_id) %] >+ [% t("New rota") | html %] › >+ [% ELSIF (op == 'manage_stages') %] >+ [% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %] › >+ [% ELSIF (op == 'create_edit_stage' && stage.id) %] >+ [% tx("Modify {library} stage", library = Branches.GetName(stage.branchcode_id) ) %] › >+ [% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %] › >+ [% ELSIF (op == 'create_edit_stage' && !stage.id) %] >+ [% t("New stage") | html %] › >+ [% ELSIF (op == 'manage_items') %] >+ [% tx("Manage items for '{rota_title}'", rota_title = rota.title ) %] › >+ [% ELSIF op == 'add_items_to_rota' %] >+ [% t("Add items" ) | html %] › >+ [% tx("Manage items for '{rota_title}'", rota_title = rota.title ) %] › >+ [% END # /IF (op == 'create_edit_rota' %] >+ [% t("Stock rotation") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -33,33 +55,40 @@ > > [% IF (op == 'create_edit_rota' && rota.rota_id) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Edit rota</span> >+ [% tx("Modify rota '{rota_title}'", rota_title = rota.title ) %] > [% END %] > [% ELSIF (op == 'create_edit_rota' && !rota.rota_id) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Create rota</span> >+ <span>New rota</span> > [% END %] > [% ELSIF (op == 'manage_stages') %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Manage stages</span> >+ [% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %] > [% END %] > [% ELSIF (op == 'create_edit_stage' && stage.id) %] > [% WRAPPER breadcrumb_item %] >- <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >+ <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">[% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Edit stage</span> >+ [% tx("Modify {library} stage", library = Branches.GetName(stage.branchcode_id) ) %] > [% END %] > [% ELSIF (op == 'create_edit_stage' && !stage.id) %] > [% WRAPPER breadcrumb_item %] >- <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >+ <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">[% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Create stage</span> >+ <span>New stage</span> >+ [% END %] >+ [% ELSIF op == 'add_items_to_rota' %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&rota_id=[% rota_id | uri %]">[% tx("Manage items for '{rota_title}'", rota_title = rota.title ) %]</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Add items") | html %] > [% END %] > [% ELSIF (op == 'manage_items') %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Manage items</span> >+ [% tx("Manage items for '{rota_title}'", rota_title = rota.title ) %] > [% END %] > [% END # /IF (op == 'create_edit_rota' %] > [% END #/ WRAPPER breadcrumbs %] >@@ -139,9 +168,9 @@ > [% ELSIF (op == 'create_edit_rota') %] > > [% IF rota.rota_id %] >- <h1>Edit "[% rota.title | html %]"</h1> >+ <h1>[% tx("Modify rota '{rota_title}'", rota_title = rota.title ) %]</h1> > [% ELSE %] >- <h1>Create new rota</h1> >+ <h1>New rota</h1> > [% END %] > > [% IF error == 'invalid_form' %] >@@ -196,7 +225,7 @@ > </div> > [% END %] > >- <h1>Manage <em>[% rota.title | html %]</em> stages</h1> >+ <h1>[% tx("Manage stages for '{rota_title}'", rota_title = rota.title ) %]</h1> > <div id="ajax_status" > data-saving-msg="Saving changes..." > data-success-msg="" >@@ -299,9 +328,9 @@ > [% ELSIF (op == 'create_edit_stage') %] > > [% IF stage.id %] >- <h1>Edit "[% Branches.GetName(stage.branchcode_id) | html %]"</h1> >+ <h1>[% tx("Modify {library} stage", library = Branches.GetName(stage.branchcode_id) ) %]</h1> > [% ELSE %] >- <h1>Create new stage</h1> >+ <h1>New stage</h1> > [% END %] > > [% IF error == 'invalid_form' %] >@@ -397,7 +426,7 @@ > </div> > [% END %] > >- <h1>Manage items assigned to <em>[% rota.title | html %]</em></h1> >+ <h1>[% tx("Manage items for '{rota_title}'", rota_title = rota.title ) %]</h1> > > <!-- Add items modal --> > <div class="modal" id="addItemsModal" tabindex="-1" role="dialog" aria-labelledby="addItemsLabel"> >@@ -406,7 +435,9 @@ > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> >- <h4 class="modal-title" id="addItemsLabel">Add item to <em>[% rota.title | html %]</em></h4> >+ <h1 class="modal-title" id="addItemsLabel"> >+ [% tx("Add items to rota '{rota_title}'", rota_title = rota.title ) %] >+ </h1> > </div> > <div class="modal-body"> > <fieldset class="rows"> >@@ -525,8 +556,8 @@ > > [% ELSIF op == 'add_items_to_rota' %] > >- <h1>Add items to rota report</h1> >- >+ <h1>[% tx("Add items to rota '{rota_title}'", rota_title = rota.title ) %]</h1> >+ <h2>Results</h2> > <div class="page-section"> > [% IF barcode_status.ok.size > 0 %] > <h4>Items added to rota:</h4> >diff --git a/tools/stockrotation.pl b/tools/stockrotation.pl >index ec60a17864..3bce9a679b 100755 >--- a/tools/stockrotation.pl >+++ b/tools/stockrotation.pl >@@ -161,10 +161,12 @@ if (!defined $op) { > > if (!defined $stage_id) { > >+ my $rota = Koha::StockRotationRotas->find($rota_id); > # No ID supplied, we're creating a new stage > $template->param( > branches => get_branches(), > stage => {}, >+ rota => $rota, > rota_id => $rota_id, > op => $op > ); >@@ -173,10 +175,12 @@ if (!defined $op) { > > # ID supplied, we're editing an existing stage > my $stage = Koha::StockRotationStages->find($stage_id); >+ my $rota = Koha::StockRotationRotas->find( $stage->rota->rota_id ); > > $template->param( > branches => get_branches(), > stage => $stage, >+ rota => $rota, > rota_id => $stage->rota->rota_id, > op => $op > ); >@@ -342,6 +346,7 @@ if (!defined $op) { > > # The rota we're adding the item to > my $rota_id = $params{rota_id}; >+ my $rota = Koha::StockRotationRotas->find($rota_id); > > # The uploaded file filehandle, > # which we may or may not have been passed >@@ -404,6 +409,7 @@ if (!defined $op) { > $template->param( > barcode_status => $barcode_status, > rota_id => $rota_id, >+ rota => $rota, > op => $op > ); > >-- >2.30.2
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 34773
:
155621
|
155622
|
155668
|
155710
|
158295
|
158296
|
158440
|
158441