X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=dca294ec72533f403915acaf4707c6a6bc71a1c8;hb=a430a7f2c477de0e9952384e896e7c78cea3f32f;hp=826461a0e944cb035a3a074c44802fd6373116a0;hpb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;p=deb%2Fpackages.git diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index 826461a..dca294e 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -3,28 +3,26 @@ package Packages::HTML; use strict; use warnings; +use Exporter; use URI::Escape; use HTML::Entities; +use Locale::gettext; -use Packages::CGI; +use Packages::CGI qw(make_url make_search_url); use Packages::Search qw( read_entry_simple ); use Packages::Config qw( :all ); #use Packages::Util; -#use Packages::I18N::Locale; -#use Packages::I18N::Languages; -#use Packages::I18N::LanguageNames; +use Packages::I18N::Locale; +use Packages::I18N::Languages; +use Packages::I18N::LanguageNames; #use Generated::Strings qw( gettext dgettext ); -# dummy routines -sub get_charset { return "utf-8" }; -sub gettext { return $_[0]; }; - our @ISA = qw( Exporter ); our @EXPORT = qw( header title trailer file_changed time_stamp read_md5_hash write_md5_hash simple_menu - ds_begin ds_item ds_end note title marker pdesc - pdeplegend pkg_list pmoreinfo print_deps ); + ds_begin ds_item ds_end title marker pdesc + pdeplegend pkg_list pmoreinfo print_deps print_src_deps ); our $CHANGELOG_URL = '/changelogs'; @@ -52,7 +50,7 @@ sub title { } sub marker { - return "[$_[0]]"; + return "[$_[0]]"; } sub pdesc { @@ -69,48 +67,40 @@ sub pdesc { } sub pdeplegend { - my $str = "
[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | "; + $str .= "[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | "; } $str .= "\n
\n".sprintf( gettext( "Check for Bug Reports about %s." )."
\n",
+ $str .= "
\n".sprintf( _g( "Check for Bug Reports about %s." )."
\n",
$bug_url.$name, $name );
}
- my $source = $page->get_src( 'name' );
+ my $source = $page->get_src( 'package' );
my $source_version = $page->get_src( 'version' );
my $src_dir = $page->get_src('directory');
if ($info{sourcedownload}) {
my $files = $page->get_src( 'files' );
- my $path = (@{$opts->{archive}} >1) ?
- $opts->{suite} :
- "$opts->{suite}/$opts->{archive}[0]";
- $str .= gettext( "Source Package:" );
- $str .= " $source, ".
- gettext( "Download" ).":\n";
-
- unless (@$files) {
- $str .= gettext( "Not found" );
+ $str .= _g( "Source Package:" );
+ $str .= " 'source'})."\">$source, ".
+ _g( "Download" ).":\n";
+
+ unless (defined($files) and @$files) {
+ $str .= _g( "Not found" );
} else {
foreach( @$files ) {
- my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
- for ($page->get_newest('archive')) {
- /security/o && do {
- $str .= "{security}/$src_dir/$src_file_name\">["; last };
- /volatile/o && do {
- $str .= "{volatile}/$src_dir/$src_file_name\">["; last };
- /non-us/io && do {
- $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last };
- $str .= "{us}/$src_dir/$src_file_name\">[";
- }
+ my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
+ # non-US hack
+ (my $server = lc $page->get_newest('archive')) =~ s/-//go;
+ $str .= sprintf("[",
+ $env->{$server}||$env->{us});
if ($src_file_name =~ /dsc$/) {
$str .= "dsc";
} else {
@@ -166,7 +148,7 @@ sub pmoreinfo {
$str .= "]\n";
}
}
-# $package_page .= sprintf( gettext( " (These sources are for version %s)\n" ), $src_version )
+# $package_page .= sprintf( _g( " (These sources are for version %s)\n" ), $src_version )
# if ($src_version ne $version) && !$src_version_given_in_control;
}
@@ -176,46 +158,49 @@ sub pmoreinfo {
$src_basename = "${source}_$src_basename";
$src_dir =~ s,pool/updates,pool,o;
$src_dir =~ s,pool/non-US,pool,o;
- $str .= "
".sprintf( gettext( "View the Debian changelog" ),
+ $str .= "
".sprintf( _g( 'View the Debian changelog' ),
"$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n";
my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/";
$copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" );
- $str .= sprintf( gettext( "View the copyright file" ),
+ $str .= sprintf( _g( 'View the copyright file' ),
$copyright_url )."
\n".sprintf( gettext( "%s is responsible for this Debian package." ). - "\n", - "$maint_name" - ); - } else { - my $up_str = "$maint_name"; - my @uploaders_str; - foreach (@uploaders) { - push @uploaders_str, "[1]\">$_->[0]"; + my $uploaders = $page->get_src( 'uploaders' ); + if ($uploaders && @$uploaders) { + foreach (@$uploaders) { + $_->[0] = encode_entities( $_->[0], '&<>' ); + } + my ($maint_name, $maint_mail) = @{shift @$uploaders}; + unless (@$uploaders) { + $str .= "
\n".sprintf( _g( "%s is responsible for this Debian package." ). + "\n", + "$maint_name" + ); + } else { + my $up_str = "$maint_name"; + my @uploaders_str; + foreach (@$uploaders) { + push @uploaders_str, "[1]\">$_->[0]"; + } + my $last_up = pop @uploaders_str; + $up_str .= ", ".join ", ", @uploaders_str if @uploaders_str; + $up_str .= sprintf( _g( " and %s are responsible for this Debian package." ), $last_up ); + $str .= "
\n$up_str "; } - my $last_up = pop @uploaders_str; - $up_str .= ", ".join ", ", @uploaders_str if @uploaders_str; - $up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up ); - $str .= "
\n$up_str "; } - $str .= sprintf( gettext( "See the developer information for %s." )."
", $QA_URL.$source, $name ); + $str .= sprintf( _g( "See the developer information for %s." )."", $QA_URL.$source, $name ) if $source; } if ($info{search}) { my $encodedname = uri_escape( $name ); - my $search_url = $is_source ? $SRC_SEARCH_URL : $SEARCH_URL; - $str .= "".sprintf( gettext( "Search for other versions of %s" ), $search_url.$encodedname, $name )."
\n"; + my $search_url = $is_source ? "$ROOT/source" : $ROOT; + $str .= "".sprintf( _g( "Search for other versions of %s" ), + "$search_url/$encodedname", $name )."
\n"; } $str .= "