X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=620053405de9a0b6e6ff5c61ffb4549c3125ccf7;hb=dc1f8cc1360f5abb632e30e72753e2e132ff9290;hp=c8cd39df920de4dca0a2f2f2f9e2cb2cc5ee159d;hpb=a3e6aa1e34000d0a7faa1773bd6bc32c32cfa625;p=deb%2Fpackages.git

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index c8cd39d..6200534 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -137,7 +137,7 @@ sub pmoreinfo {
 	} else {
 	    foreach( @$files ) {
 		my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
-		for ($page->get_newest('archive')) {
+		for ("$suite/".$page->get_newest('archive')) {
 		    /security/o && do {
 			$str .= "<a href=\"$env->{security}/$src_dir/$src_file_name\">["; last };
 		    /volatile/o && do {
@@ -145,7 +145,7 @@ sub pmoreinfo {
 		    /backports/o && do {
 			$str .= "<a href=\"$env->{backports}/$src_dir/$src_file_name\">["; last };
 		    /non-us/io && do {
-			$str .= "<a href=\"$env->{nonus_site}/$src_dir/$src_file_name\">["; last };
+			$str .= "<a href=\"$env->{'non-US'}/$src_dir/$src_file_name\">["; last };
  		    $str .= "<a href=\"$env->{us}/$src_dir/$src_file_name\">[";
  		}
 		if ($src_file_name =~ /dsc$/) {
@@ -239,13 +239,14 @@ sub dep_item {
 } # end dep_item
 
 sub provides_string {
-    my ($path, $entry) = @_;
+    my ($path, $entry,$also) = @_;
     my @provided_by = split /\s/, $entry;
-    my $short_desc = "virtual package provided by ";
+    my $short_desc = $also ? _g("also a virtual package provided by ")
+	: _g("virtual package provided by ");
     if (@provided_by < 10) {
 	$short_desc .= join( ', ',map { "<a href=\"$path/$_\">$_</a>" } @provided_by);
     } else {
-	$short_desc .= scalar(@provided_by)." packages";
+	$short_desc .= sprintf( _g("%s packages"), scalar(@provided_by));
     }
     return $short_desc;
 }
@@ -258,7 +259,6 @@ sub print_deps {
     my $res = "<ul class=\"ul$dep_type{$type}\">\n";
     my $first = 1;
     my $suite = $opts->{suite}[0];
-    my $one_archive = @{$opts->{archive}} > 1 ? '': $opts->{archive}[0];
 
 #    use Data::Dumper;
 #    debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 ) if DEBUG;
@@ -300,9 +300,8 @@ sub print_deps {
 	    my $short_desc = $entry->[-1];
 	    my $arch = $entry->[3];
 	    my $archive = $entry->[1];
+	    my $path = $entry->[2];
 	    if ( $short_desc ) {
-		my $path = $one_archive eq $archive ? "$suite/$archive" :
-		    $suite;
 		if ( $is_old_pkgs ) {
 		    push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
 					      $p_name, "$pkg_version$arch_str" );
@@ -310,7 +309,8 @@ sub print_deps {
 		    $entries{$p_name} ||= $entry;
 		    $short_desc = encode_entities( $short_desc, "<>&\"" );
 		    $short_desc .= "<br>".provides_string( "$ROOT/$path",
-							   $entry->[0] )
+							   $entry->[0],
+							   1 )
 			if defined $entry->[0];
 		    push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
 					      $p_name, "$pkg_version$arch_str", $short_desc );