X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FTemplate.pm;h=1a6aa0cfb558478c647207cf009506d516e76c90;hb=a6b39cb5eec2cf7d8a0d756f0090a9d8644443c9;hp=60cabd6acfb0aaf79e6928743ec9b6260c075711;hpb=f26361c6f851af80678295e935d48d8f3ee76927;p=deb%2Fpackages.git

diff --git a/lib/Packages/Template.pm b/lib/Packages/Template.pm
index 60cabd6..1a6aa0c 100644
--- a/lib/Packages/Template.pm
+++ b/lib/Packages/Template.pm
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use Template;
-use Locale::gettext;
 use URI ();
 use HTML::Entities ();
 use URI::Escape ();
@@ -36,11 +35,18 @@ sub new {
     };
     $vars->{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) };
     $vars->{make_url} = sub { return &Packages::CGI::make_url(@_) };
-    $vars->{g} = sub { return &Packages::I18N::Locale::tt_gettext(@_) };
-    $vars->{extract_host} = sub { my $uri = URI->new($_[0]);
-				  my $host = $uri->host;
-				  $host .= ':'.$uri->port if $uri->port != $uri->default_port;
-				  return $host;
+    $vars->{g} = sub { my ($f, @a) = @_; return sprintf($f, @a); };
+    if ($vars->{cat}) {
+	$vars->{g} = sub { return Packages::I18N::Locale::g($vars->{cat}, @_) };
+    }
+    $vars->{extract_host} = sub { my $uri_str = $_[0];
+    				  my $uri = URI->new($uri_str);
+				  if ($uri->can('host')) {
+				      my $host = $uri->host;
+				      $host .= ':'.$uri->port if $uri->port != $uri->default_port;
+				      return $host;
+				  }
+				  return $uri_str;
 			      };
     # needed to work around the limitations of the the FILTER syntax
     $vars->{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') };
@@ -75,9 +81,15 @@ sub page {
 
     #use Data::Dumper;
     #die Dumper($self, $action, $page_content);
+    if ($page_content->{cat}) {
+	$page_content->{g} =
+	    sub { return Packages::I18N::Locale::g($page_content->{cat}, @_) };
+    }
     $page_content->{used_langs} ||= \@LANGUAGES;
-    $page_content->{langs} = languages( $page_content->{lang}
-					|| $self->{vars}{lang} || 'en',
+    $page_content->{langs} = languages( $page_content->{po_lang}
+					|| $self->{vars}{po_lang} || 'en',
+					$page_content->{ddtp_lang}
+					|| $self->{vars}{ddtp_lang} || 'en',
 					@{$page_content->{used_langs}} );
 
     my $txt;
@@ -105,16 +117,19 @@ sub error_page {
 }
 
 sub languages {
-    my ( $lang, @used_langs ) = @_;
-    
+    my ( $po_lang, $ddtp_lang, @used_langs ) = @_;
+    my $cat = Packages::I18N::Locale->get_handle($po_lang, 'en');
+
     my @langs;
+    my $skip_lang = ($po_lang eq $ddtp_lang) ? $po_lang : '';
 
     if (@used_langs) {
-	
+
 	my @printed_langs = ();
 	foreach (@used_langs) {
-	    next if $_ eq $lang; # Never print the current language
-	    unless (get_selfname($_)) { warn "missing language $_"; next } #DEBUG
+	    next if $_ eq $skip_lang; # Don't print the current language
+	    unless (get_selfname($_)) { warn "missing language selfname $_"; next } #DEBUG
+	    unless (get_language_name($_)) { warn "missing language name $_"; next } #DEBUG
 	    push @printed_langs, $_;
 	}
 	return [] unless scalar @printed_langs;
@@ -123,13 +138,14 @@ sub languages {
 	foreach my $cur_lang (sort langcmp @printed_langs) {
 	    my %lang;
 	    $lang{lang} = $cur_lang;
-	    $lang{tooltip} = dgettext( "langs", get_language_name($cur_lang) );
-            $lang{selfname} = get_selfname($cur_lang);
-	    $lang{transliteration} = get_transliteration($cur_lang) if defined get_transliteration($cur_lang);
+	    $lang{tooltip} = $cat->g(get_language_name($cur_lang));
+	    $lang{selfname} = get_selfname($cur_lang);
+	    $lang{transliteration} = get_transliteration($cur_lang)
+		if defined get_transliteration($cur_lang);
 	    push @langs, \%lang;
 	}
     }
-    
+
     return \@langs;
 }