X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FTemplate.pm;h=a3268a35f046d5141003e1d6da5b6fffd7540010;hp=6ae96b4b7ccad66d6b4876359c1e106c17dde72a;hb=3954845023a55026b0e57a131877cfd1b7fdc0b7;hpb=1b69eafb0f33afa134e3a0c0c794c72cbaf37294

diff --git a/lib/Packages/Template.pm b/lib/Packages/Template.pm
index 6ae96b4..a3268a3 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 ();
@@ -39,10 +38,14 @@ sub new {
     if ($vars->{cat}) {
 	$vars->{g} = sub { return Packages::I18N::Locale::g($vars->{cat}, @_) };
     }
-    $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->{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(@_,'<>&"') };
@@ -77,6 +80,10 @@ 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',
@@ -108,11 +115,13 @@ sub error_page {
 
 sub languages {
     my ( $lang, @used_langs ) = @_;
-    
+    my $cat = Packages::I18N::Locale->get_handle($lang)
+	|| Packages::I18N::Locale->get_handle('en');
+
     my @langs;
 
     if (@used_langs) {
-	
+
 	my @printed_langs = ();
 	foreach (@used_langs) {
 	    next if $_ eq $lang; # Never print the current language
@@ -125,13 +134,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;
 }