Bugzilla – Attachment 79656 Details for
Bug 14786
Use text "MARC file" instead of "ISO2709" everywhere
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14786: Use MARC istead of ISO2709 everywhere
Bug-14786-Use-MARC-istead-of-ISO2709-everywhere.patch (text/plain), 12.57 KB, created by
Katrin Fischer
on 2018-09-30 12:02:39 UTC
(
hide
)
Description:
Bug 14786: Use MARC istead of ISO2709 everywhere
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-09-30 12:02:39 UTC
Size:
12.57 KB
patch
obsolete
>From cc9505e112479920c2aa1be2cac435496f8e56cf Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sun, 12 Aug 2018 17:08:57 +0200 >Subject: [PATCH] Bug 14786: Use MARC istead of ISO2709 everywhere > >This patch changes the term ISO2709 in the templates to use >MARC instead. > >Test plan: >- The term was changed on the following pages in staff: > - Advanced catalouging editor > Save to catalog > - Patron account > Check out (Activate ExportCircHistory) > Format > - Patron account > Check out > Help page > - Lists > Download list > - Acquisitions > Add order to basket > From a staged file (breadcrumbs) > - Administration > System preferences > ExportRemoveFields > - Cart > Download > - Tools > Export data > Output format >--- > koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 +- > .../intranet-tmpl/prog/en/includes/checkouts-table.inc | 6 +++--- > .../prog/en/includes/virtualshelves-toolbar.inc | 2 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 3 +-- > .../prog/en/modules/admin/preferences/circulation.pref | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +- > .../intranet-tmpl/prog/en/modules/basket/downloadcart.tt | 2 +- > .../intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt | 8 ++++---- > .../prog/en/modules/virtualshelves/downloadshelf.tt | 2 +- > 10 files changed, 15 insertions(+), 16 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 501dd0de39..5bf7472f79 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -259,7 +259,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } > }, > 'iso2709': { >- saveLabel: _("Save as ISO2709 (.mrc) file"), >+ saveLabel: _("Save as MARC (.mrc) file"), > save: function( id, record, done ) { > saveAs( new Blob( [record.toISO2709()], { 'type': 'application/octet-stream;charset=utf-8' } ), 'record.mrc' ); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >index f9265dc8ad..d78e001da0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >@@ -54,8 +54,8 @@ > <fieldset> > <label for="issues-table-output-format"><b>Export checkouts using format:</b></label> > <select name="issues-table-output-format" id="issues-table-output-format"> >- <option value="iso2709_995">ISO2709 with items</option> >- <option value="iso2709">ISO2709 without items</option> >+ <option value="iso2709_995">MARC with items</option> >+ <option value="iso2709">MARC without items</option> > [% IF csv_profiles.size %] > <option value="csv">CSV</option> > [% END %] >@@ -68,7 +68,7 @@ > [% END %] > </select> > [% END %] >- <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% Koha.Preference('ExportRemoveFields') | html %]" title="Use for iso2709 exports" /> >+ <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% Koha.Preference('ExportRemoveFields') | html %]" title="Use for MARC exports" /> > <input type="hidden" name="op" value="export" /> > <input type="hidden" id="output_format" name="output_format" value="iso2709" /> > <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >index 8d2df293ae..831534cabf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >@@ -17,7 +17,7 @@ > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber | html %]">iso2709</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber | html %]">MARC</a></li> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber | html %]">RIS</a></li> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&shelfid=[% shelf.shelfnumber | html %]">BibTex</a></li> > [% FOREACH csv_profile IN csv_profiles %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 3431a06e5d..50d8773251 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -19,8 +19,7 @@ > <body id="acq_addorderiso2709" class="acq"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> › Add orders from iso2709 file</div> >- >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> › Add orders from MARC file</div> > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-6 col-sm-offset-3 col-md-8 col-md-offset-2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 952eb81405..c4ef425ec5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -136,7 +136,7 @@ Circulation: > no: "Don't show" > - the export patron checkout history options. > - >- - The following fields should be excluded from the patron checkout history CSV or iso2709 export >+ - The following fields should be excluded from the patron checkout history CSV or MARC (ISO 2709) export > - pref: ExportRemoveFields > - (separate fields with space, e.g. 100a 200b 300c) > - >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 7db0450188..52dcec3e58 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -50,7 +50,7 @@ > <div class="btn-group"> > <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list | html %]">iso2709</a></li> >+ <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list | html %]">MARC</a></li> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list | html %]">RIS</a></li> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&bib_list=[% bib_list | html %]">BibTex</a></li> > [% FOREACH csv_profile IN csv_profiles %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt >index 53ea19049d..2e00738e1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt >@@ -13,7 +13,7 @@ > <label for="format">Format:</label> > <select name="format" id="format"> > <option value="">-- Choose format --</option> >- <option value="iso2709">iso2709</option> >+ <option value="iso2709">MARC</option> > <option value="ris">RIS</option> > <option value="bibtex">BibTex</option> > [% FOREACH csv_profile IN csv_profiles %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index 503552fa0f..c80943d587 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -42,7 +42,7 @@ > <ul class="dropdown-menu" id="save-dropdown"> > </ul> > </div> >- <button class="btn btn-default btn-sm" id="import-records" title="Import an ISO2709 or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >+ <button class="btn btn-default btn-sm" id="import-records" title="Import an MARC (ISO 2709) or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> > <button class="btn btn-default btn-sm" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index 74b772e2f3..5878d400c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -139,12 +139,12 @@ > <ol><li> > <label for="output_format">File format: </label> > <select id="output_format" name="output_format"> >- <option value="iso2709">marc</option> >- <option value="xml">xml</option> >+ <option value="iso2709">MARC</option> >+ <option value="xml">XML</option> > [% IF csv_profiles %] >- <option value="csv">csv</option> >+ <option value="csv">CSV</option> > [% ELSE %] >- <option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">csv</option> >+ <option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">CSV</option> > [% END %] > </select> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >index be9fd866ae..710602ffe5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >@@ -30,7 +30,7 @@ > <label for="format">Format: </label> > <select name="format" id="format"> > <option value="">-- Choose format --</option> >- <option value="iso2709">iso2709</option> >+ <option value="iso2709">MARC</option> > <option value="ris">RIS</option> > <option value="bibtex">BibTex</option> > [% FOREACH csv_profile IN csv_profiles %] >-- >2.17.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 14786
:
77726
|
79552
|
79656
|
79657
|
80054
|
80226