From c8f91111c0e36d3bc867653a84958408d7a45c05 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 14 Apr 2013 17:44:43 +0200 Subject: [PATCH] Bug 8068: Standardize terms used on acquisitions statistics branch > library budget > fund bookseller, supplier > vendor and capitalization To test: 1) Go to Reports > Acquisitions statistics 2) Check the labels and options of the form for correctness. 3) Run a few test searches to make sure functionality is unchanged. Unfortunately, some strings are from the .pl file, so a follow up moving those to the templates is needed. To make the changes consistent I have changed them in the .pl file. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov (cherry picked from commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48) Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/reports/acquisitions_stats.tt | 14 +++++++------- reports/acquisitions_stats.pl | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 159e89a2af..66302dda2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -60,11 +60,11 @@ [% CASE '1' %] Placed on (to) [% CASE '2' %] Received on (from) [% CASE '3' %] Received on (to) - [% CASE '4' %] Supplier - [% CASE '5' %] Home branch + [% CASE '4' %] Vendor + [% CASE '5' %] Home library [% CASE '6' %] Collection [% CASE '7' %] Item type - [% CASE '8' %] Budget + [% CASE '8' %] Fund [% CASE '9' %] Sort1 [% CASE '10' %] Sort2 [% CASE %] Unknown filter @@ -173,7 +173,7 @@ [% CGIBudget %] diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index cdc5b9a561..8d5cb1d3e1 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -128,7 +128,7 @@ else { my @select; my %select; push @select, ""; - $select{''} = "All Item Types"; + $select{''} = "All item types"; while ( my ( $value, $desc ) = $req->fetchrow ) { push @select, $value; $select{$value} = $desc; @@ -147,7 +147,7 @@ else { undef @select; undef %select; push @select, ""; - $select{''} = "All budgets"; + $select{''} = "All funds"; while ( my ( $value, $desc ) = $req->fetchrow ) { push @select, $value; -- 2.39.5