Some changes related to recent commits to patron images: Markup and javascript change...

[koha.git] / tools / koha-news.pl

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index e81a808..3c06f91 100755 (executable)
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -29,7 +29,7 @@ use C4::Context;
 use C4::Dates qw(format_date_in_iso);
 use C4::Output;
 use C4::NewsChannels;
-use C4::Languages;
+use C4::Languages qw(getTranslatedLanguages);
 use Date::Calc qw/Date_to_Days Today/;
 
 my $cgi = new CGI;
@@ -60,8 +60,8 @@ my $tlangs = getTranslatedLanguages() ;
 foreach my $language ( @$tlangs ) {
     push @lang_list,
       {
-        language => $language->{'language_code'},
-        selected => ( $new_detail->{lang} eq $language->{'language_code'} ? 1 : 0 ),
+        language => $language->{'language'},
+        selected => ( $new_detail->{lang} eq $language->{'language'} ? 1 : 0 ),
       };
 }
 
@@ -105,7 +105,7 @@ else {
                #$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'});
         my @date = split (/-/,$new->{'expirationdate'});
         if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){
-                       $new->{'hasexpirated'} = 1;
+                       $new->{'expired'} = 1;
         }
     }