";
- $str .= sprintf( "
".gettext( "More Information on %s" )."
",
+ $str .= sprintf( "
"._g( "More Information on %s" )."
",
$name );
-
if ($info{bugreports}) {
my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL;
- $str .= "
\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";
+ $str .= _g( "Source Package:" );
+ $str .= " 'source'})."\">$source, ".
+ _g( "Download" ).":\n";
unless (defined($files) and @$files) {
- $str .= gettext( "Not found" );
+ $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,12 +158,12 @@ 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 )."
";
}
}
@@ -194,7 +176,7 @@ sub pmoreinfo {
}
my ($maint_name, $maint_mail) = @{shift @$uploaders};
unless (@$uploaders) {
- $str .= "
\n".sprintf( gettext( "%s is responsible for this Debian package." ).
+ $str .= "
\n".sprintf( _g( "%s is responsible for this Debian package." ).
"\n",
"$maint_name"
);
@@ -206,18 +188,19 @@ sub pmoreinfo {
}
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 );
+ $up_str .= sprintf( _g( " 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 ) if $source;
+ $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 .= "
\n";
@@ -225,13 +208,11 @@ sub pmoreinfo {
}
sub dep_item {
- my ( $link, $name, $info, $desc ) = @_;
- my $post_link = '';
- if ($link) {
- $link = "