Clean up footer handling

[deb/packages.git] / lib / Packages / Template.pm

diff --git a/lib/Packages/Template.pm b/lib/Packages/Template.pm
index 7d85f46ba1cd53b1c3315bfc32525df0d89775c6..554f2ce0e4c8551248ad625a9d0224190c1fff01 100644 (file)
--- a/lib/Packages/Template.pm
+++ b/lib/Packages/Template.pm
@@ -38,6 +38,7 @@ sub new {
        %$options,
     } ) or fatal_error( sprintf( _g( "Initialization of Template Engine failed: %s" ), $Template::ERROR ) );
     $self->{format} = $format;
+    $self->{vars} = $vars;
 
     return $self;
 }
@@ -56,6 +57,10 @@ sub page {
 
     #use Data::Dumper;
     #die Dumper($self, $action, $page_content);
+    $page_content->{used_langs} ||= [ 'en' ];
+    $page_content->{langs} = languages( $page_content->{lang}
+                                       || $self->{vars}{lang} || 'en',
+                                       @{$page_content->{used_langs}} );
 
     my $txt;
     $self->process("$self->{format}/$action.tmpl", $page_content, \$txt)
@@ -77,18 +82,6 @@ sub error_page {
     return $txt;
 }
 
-sub trailer {
-    my ($self, $NAME, $LANG, $USED_LANGS, $timediff) = @_;
-
-    my $langs = languages( $LANG, @$USED_LANGS );
-
-    my $txt;
-    $self->process("$self->{format}/foot.tmpl", { langs => $langs, name => $NAME, benchmark => $timediff ? timestr($timediff) : '' }, \$txt)
-       or die sprintf( "template error: %s", $self->error ); # too late for reporting on-line
-
-    return $txt;
-}
-
 sub languages {
     my ( $lang, @used_langs ) = @_;