X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=620053405de9a0b6e6ff5c61ffb4549c3125ccf7;hp=d6d194b5d35e1eaf5d16fc8702b18408a71457d2;hb=dc1f8cc1360f5abb632e30e72753e2e132ff9290;hpb=e6999b858367d9d83e0fa2c32cddfd31b4416486 diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index d6d194b..6200534 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -3,27 +3,25 @@ package Packages::HTML; use strict; use warnings; +use Exporter; use URI::Escape; use HTML::Entities; +use Locale::gettext; -use Packages::CGI; +use Packages::CGI (); 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 + ds_begin ds_item ds_end title marker pdesc pdeplegend pkg_list pmoreinfo print_deps print_src_deps ); our $CHANGELOG_URL = '/changelogs'; @@ -92,7 +90,7 @@ sub pkg_list { $str .= "
$p
\n". "\t
$short_desc
\n"; } else { - $str .= "
$p
\n\t
".gettext("Not available")."
\n"; + $str .= "
$p
\n\t
"._g("Not available")."
\n"; } } if ($str) { @@ -113,12 +111,12 @@ sub pmoreinfo { my $suite = $opts->{suite}[0]; my $str = "
"; - $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 ); } @@ -130,16 +128,16 @@ sub pmoreinfo { my $path = (@{$opts->{archive}} >1) ? $suite : "$suite/$opts->{archive}[0]"; - $str .= gettext( "Source Package:" ); + $str .= _g( "Source Package:" ); $str .= " $source, ". - gettext( "Download" ).":\n"; + _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) = split /\s/o, $_; - for ($page->get_newest('archive')) { + for ("$suite/".$page->get_newest('archive')) { /security/o && do { $str .= "{security}/$src_dir/$src_file_name\">["; last }; /volatile/o && do { @@ -147,7 +145,7 @@ sub pmoreinfo { /backports/o && do { $str .= "{backports}/$src_dir/$src_file_name\">["; last }; /non-us/io && do { - $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last }; + $str .= "{'non-US'}/$src_dir/$src_file_name\">["; last }; $str .= "{us}/$src_dir/$src_file_name\">["; } if ($src_file_name =~ /dsc$/) { @@ -158,7 +156,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; } @@ -168,12 +166,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 )."

"; } } @@ -186,7 +184,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" ); @@ -198,18 +196,18 @@ 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 ? "$ROOT/source" : $ROOT; - $str .= "

".sprintf( gettext( "Search for other versions of %s" ), + $str .= "

".sprintf( _g( "Search for other versions of %s" ), "$search_url/$encodedname", $name )."

\n"; } @@ -240,6 +238,19 @@ sub dep_item { return "$link$name$post_link$info$desc"; } # end dep_item +sub provides_string { + my ($path, $entry,$also) = @_; + my @provided_by = split /\s/, $entry; + my $short_desc = $also ? _g("also a virtual package provided by ") + : _g("virtual package provided by "); + if (@provided_by < 10) { + $short_desc .= join( ', ',map { "$_" } @provided_by); + } else { + $short_desc .= sprintf( _g("%s packages"), scalar(@provided_by)); + } + return $short_desc; +} + sub print_deps { my ( $packages, $opts, $pkg, $relations, $type) = @_; my %dep_type = ('depends' => 'dep', 'recommends' => 'rec', @@ -248,10 +259,9 @@ sub print_deps { my $res = "