From de5e94c89377529203b17e0b84ecdfefa84e58e1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 12 Dec 2013 11:27:26 +0100 Subject: [PATCH] Bug 11263: Use all languages instead of translated only. This patch produces the same dropdown list as the one in the adv search. With this way, it won't be necessary to install additional templates to fill the locale list. Signed-off-by: Jonathan Druart --- serials/subscription-add.pl | 6 +++--- serials/subscription-numberpatterns.pl | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 2761dfc..f1acead 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -217,10 +217,10 @@ if ($op eq 'addsubscription') { my $languages = [ map { { - language => $_->{language}, - description => $_->{native_description} || $_->{language} + language => $_->{iso639_2_code}, + description => $_->{language_description} || $_->{language} } - } @{ C4::Languages::getTranslatedLanguages() } ]; + } @{ C4::Languages::getAllLanguages() } ]; $template->param( locales => $languages ); diff --git a/serials/subscription-numberpatterns.pl b/serials/subscription-numberpatterns.pl index 065ab01..71e5d4b 100755 --- a/serials/subscription-numberpatterns.pl +++ b/serials/subscription-numberpatterns.pl @@ -105,12 +105,13 @@ if($op && ($op eq 'new' || $op eq 'modify')) { my @frequencies = GetSubscriptionFrequencies(); my @subtypes; push @subtypes, { value => $_ } for (qw/ issues weeks months /); + my $languages = [ map { { - language => $_->{language}, - description => $_->{native_description} || $_->{language} + language => $_->{iso639_2_code}, + description => $_->{language_description} || $_->{language} } - } @{ C4::Languages::getTranslatedLanguages() } ]; + } @{ C4::Languages::getAllLanguages() } ]; $template->param( $op => 1, -- 1.7.10.4