From 5b4c5b4b59f8ebc7eac363892ae896d6a6e04f03 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 5 Mar 2014 14:26:14 +0100 Subject: [PATCH] Bug 11366 - Acq basket group "No group" untranslatable in Acq baskets, there's a pull-down for basket groups. One of the entries in that pull-down is "No group", which is untranslatable. This string is hard-coded in perl. This patch removes the string from perl to set it has first option in select. To allow it to be default value, the option "Add new group" is moved to last position. Test plan : - Go to a closed aquisition basket in no basket group : cgi-bin/koha/acqui/basket.pl?basketno=x => You see "No group" selected in combobox "Basket group" - Cick on this combobox => You see "No group", then existing basket groups and then "Add new group" - Select a basket group and click on "change basket group" => You see the basket group name in combobox Use translation, for example fr-FR - go to src/misc/translator - run : perl translate update fr-FR => You find in PO file : #: intranet-tmpl/prog/en/modules/acqui/basket.tt:365 #, fuzzy, c-format msgid "No group" msgstr "Nom de groupe" - remove ", fuzzy" and correct translation : "Pas de groupe" - run : perl translate install fr-FR - Go to translated aquisition basket page => You see translated option in combobox Signed-off-by: Kyle M Hall --- acqui/basket.pl | 7 ------- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index e546948..047ae84 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -306,13 +306,6 @@ if ( $op eq 'delete_confirm' ) { $basketgroup = $bg; } } - my %emptygroup = ( id => undef, - name => "No group"); - if ( ! $basket->{basketgroupid} ) { - $emptygroup{default} = 1; - $emptygroup{nogroup} = 1; - } - unshift( @$basketgroups, \%emptygroup ); } # if the basket is closed, calculate estimated delivery date diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index e774a6e..cd31176 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -362,7 +362,7 @@ [%- END -%] [% ELSE %] -- 1.7.2.5