From 19e4365e340cee480dc1d560e5c54c5140ed8b8a Mon Sep 17 00:00:00 2001 From: Katrin Fischer 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 Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 81875ab282c1daa98dec2e0f5f20ba74f411ac32) Signed-off-by: Martin Renvoize --- 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 | 6 +++--- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +++--- .../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, 19 insertions(+), 19 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 d44e883a62..e7de2e2a60 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -258,7 +258,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 b34089d3c7..03b9663214 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -53,8 +53,8 @@
[% END %] - + 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 dacd451f1a..33b4f755a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -17,9 +17,9 @@