ngettext fixes

2 files changed, 17 insertions, 9 deletions

diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 309b1a42..4aef115a 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -452,7 +452,8 @@ sub callback_choices {
     }
     my $callback = sub { interactive_msg(N("More information on package..."), get_info($_[0]), scroll => 1) };
     $choices = [ sort { $a->name cmp $b->name } @$choices ];
-    my @choices = interactive_list_(N("Please choose"), P("The following package is needed:", "One of the following packages is needed:", scalar(@$choices)),
+    my @choices = interactive_list_(N("Please choose"), scalar(@$choices)==1 ?
+    N("The following package is needed:") : N("One of the following packages is needed:"),
                                     [ map { urpm_name($_) } @$choices ], $callback);
     $choices->[$choices[0]];
 }
@@ -569,8 +570,12 @@ sub toggle_nodes {
                 } @cant;
                 my $count = @reasons;
                 interactive_msg(
-                    P("One package cannot be installed", "Some packages can't be installed", $count),
-                    P("Sorry, the following package cannot be selected:\n\n%s", "Sorry, the following packages can't be selected:\n\n%s", $count, join("\n", @reasons)),
+                    $count==1 ?
+                    N("One package cannot be installed")
+		    : N("Some packages can't be installed"),
+		    $count==1 ?
+                    N("Sorry, the following package cannot be selected:\n\n%s",join("\n", @reasons))
+		    : N("Sorry, the following packages can't be selected:\n\n%s", join("\n", @reasons)),
                     scroll => 1,
                 );
                 foreach (@cant) {
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index c6a4aeeb..857eb7a5 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -479,15 +479,18 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
     my $r = join "\n", urpm::select::translate_why_removed($urpm, $urpm->{state}, @to_remove);
 
     my $install_count = int(@pkgs);
-    my $to_install = $install_count ? 
-      #-PO: in singular form, we use %2\$
-      P("To satisfy dependencies, the following package is going to be installed:\n%2\$s\n", "To satisfy dependencies, the following %d packages are going to be installed:\n%s\n", $install_count, $install_count,
-      formatlistpkg(map { s!.*/!!; $_ } @pkgs)) : '';
+    my $to_install = $install_count == 0 ? '' :
+      $install_count == 1 ?
+      N("To satisfy dependencies, the following package is going to be installed:\n%s\n", formatlistpkg(map { s!.*/!!; $_ } @pkgs))
+      : P("To satisfy dependencies, the following %d package is going to be installed:\n%s\n", "To satisfy dependencies, the following %d packages are going to be installed:\n%s\n", $install_count, $install_count,
+      formatlistpkg(map { s!.*/!!; $_ } @pkgs));
     my $remove_count =  scalar(@to_remove);
     interactive_msg(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
                      ($r ? 
-                        (!$to_install ? join("\n\n", P("Remove one package?", "Remove %d packages?", $remove_count, $remove_count), $r) :
- P("The following package has to be removed for others to be upgraded:", "The following packages have to be removed for others to be upgraded:", $remove_count) . join("\n\n", $r, if_($to_install, $to_install)) . N("Is it ok to continue?"))
+                        (!$to_install ? join("\n\n", P("Remove %d package?", "Remove %d packages?", $remove_count, $remove_count), $r) :
+ $remove_count == 1 ?
+ N("The following package has to be removed for others to be upgraded:")
+ : N("The following packages have to be removed for others to be upgraded:") . join("\n\n", $r, if_($to_install, $to_install)) . N("Is it ok to continue?"))
                           : $to_install),
                      scroll => 1,
                      yesno => 1) or do {