X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=c9940a16bfc980af9a75cca6852a7108b90b4b94;hb=ace28538cff532f8c5ee31b2cadaf577c0ced079;hp=08eb376d236ddb237999af2258cae7048eabb64d;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 08eb376..c9940a1 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -75,19 +75,13 @@ sub do_show {
 	    foreach (@results, @non_results) {
 		my $a = $_->[1];
 		my $s = $_->[2];
-		if ($a =~ /^(?:us|security|non-US)$/o) {
-		    $all_suites{$s}++;
-		} else {
-		    $all_suites{"$s/$a"}++;
-		}
+		$all_suites{$s}++;
 	    }
 	    foreach (suites_sort(keys %all_suites)) {
-		if (("$suite/$archive" eq $_)
-		    || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+		if ($suite eq $_) {
 		    $$menu .= "[ <strong>$_</strong> ] ";
 		} else {
-		    $$menu .=
-			"[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
+		    $$menu .= "[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
 		}
 	    }
 	    $$menu .= '<br>';
@@ -163,7 +157,7 @@ sub do_show {
 
 			my $v_str = $version;
 			my $multiple_versions = grep { $_ ne $version } values %$versions;
-			$v_str .= " (and others)" if $multiple_versions;
+			$v_str .= _g(" and others") if $multiple_versions;
 			my $title .= sprintf( _g( "Package: %s (%s)" ), $pkg, $v_str );
 			$title .=  " ".marker( $archive ) if $archive ne 'us';
 			$title .=  " ".marker( $subsection ) if $subsection eq 'non-US'