From a85b023404ff0f7eadaac900fe391a2dd5e54f9b Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Tue, 11 Mar 2014 12:56:36 +0100 Subject: [PATCH] Bug 11559 - QA followup: fix translation issues and work around apache config --- .../intranet-tmpl/prog/en/includes/cateditor-ui.inc | 19 +++++++++---------- svc/cataloguing/framework | 2 +- 2 files changed, 10 insertions(+), 11 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 a831c3b..8a7d13b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -51,15 +51,15 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr // The columns that should show up in a search, in order, and keyed by the corresponding tag in the XSL and Pazpar2 config var z3950Labels = [ - [ "md-work-title", "Title" ], - [ "md-series-title", "Series-title" ], - [ "md-work-author", "Author" ], - [ "md-lccn", "LCCN" ], - [ "md-isbn", "ISBN" ], - [ "md-issn", "ISSN" ], - [ "md-medium", "Medium" ], - [ "md-edition", "Edition" ], - [ "md-description", "Description" ], + [ "md-work-title", _("Title") ], + [ "md-series-title", _("Series Title") ], + [ "md-work-author", _("Author") ], + [ "md-lccn", _("LCCN") ], + [ "md-isbn", _("ISBN") ], + [ "md-issn", _("ISSN") ], + [ "md-medium", _("Medium") ], + [ "md-edition", _("Edition") ], + [ "md-description", _("Description") ], ]; var state = { @@ -382,7 +382,6 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr result += ''; var $tr = $( result ); diff --git a/svc/cataloguing/framework b/svc/cataloguing/framework index 8213de6..39b1719 100755 --- a/svc/cataloguing/framework +++ b/svc/cataloguing/framework @@ -11,7 +11,7 @@ use C4::Service; my ( $query, $response ) = C4::Service->init( editcatalogue => 'edit_catalogue' ); -my ( $frameworkcode ) = C4::Service->require_params( 'frameworkcode' ); +my $frameworkcode = $query->param( 'frameworkcode' ) // ''; my $tagslib = GetMarcStructure( 1, $frameworkcode ); -- 1.9.0