perl_checker/translation fixes

1 files changed, 13 insertions, 15 deletions

diff --git a/perl-install/standalone/draknfs b/perl-install/standalone/draknfs
index c102009b3..7a44d1932 100644
--- a/perl-install/standalone/draknfs
+++ b/perl-install/standalone/draknfs
@@ -19,16 +19,12 @@
 
 my $version = "0.1";
 
-# i18n: IMPORTANT: to get correct namespace (draknfs instead of libDrakX)
-BEGIN { unshift @::textdomains, 'draknfs' }
-
 use strict;
 use lib qw(/usr/lib/libDrakX);
 use standalone;
 use common;
 
 use interactive;
-# must come *after* definition of textdomains for proper initialisation
 use ugtk2 qw(:ask :wrappers :create :dialogs);
 
 my $in = 'interactive'->vnew('su');
@@ -87,7 +83,7 @@ sub get_nfs_data {
 # /home/nis *(async,rw,no_root_squash)
 # /home/nis/guibo/Build *(async,rw,no_root_squash)
   foreach (cat_($CONF)) {
-    my ($dir, $access, $right, $options) = m/^(\/\S+)\s+(\S*)\((\S*)\)\s+(\S*)/;
+    my ($dir, $access, $right, $options) = m!^(/\S+)\s+(\S*)\((\S*)\)\s+(\S*)!;
     $dir and push @listshare, {
 			       dir => $dir,
 			       access => $access,
@@ -134,10 +130,10 @@ sub help_b {
   my ($tittle, $help_data) = @_;
   gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
 		      my $dialog = new Gtk2::Dialog();
-		      $dialog->set_title("Help");
+		      $dialog->set_title(N("Help"));
 		      $dialog->set_modal(1);
 		      gtkpack_($dialog->vbox,
-			       0, gtkadd(Gtk2::Frame->new(N("%s",$tittle)),
+			       0, gtkadd(Gtk2::Frame->new(translate($tittle)),
 					 gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
 						  0, $help_data,
 						 ),
@@ -158,9 +154,9 @@ sub add_modify_entry {
   undef $i;
   undef $iter;
 
-  map { $_ = Gtk2::Entry->new } $dir, $access, $anongid, $anonuid, $options;
-  map { $_ = Gtk2::OptionMenu->new } $lr, $luserid, $lsecure, $lsync;
-  my $luserid = new Gtk2::OptionMenu();
+  $_ = Gtk2::Entry->new foreach $dir, $access, $anongid, $anonuid, $options;
+  $_ = Gtk2::OptionMenu->new foreach $lr, $luserid, $lsecure, $lsync;
+  my $luserid = new Gtk2::OptionMenu;
 
   $luserid->set_popdown_strings(@listuserid);
   $lr->set_popdown_strings(@listr);
@@ -187,7 +183,7 @@ sub add_modify_entry {
     #    $anongid, $anonuid, $lr, $luserid, $lsecure, $lsync;
     $right = $listshare[$i]{right};
     my @opts = split(/,/, $right);
-    map { $_->set_text("") } $lr, $lsync, $anonuid, $anongid, $luserid, $lsecure;
+    $_->set_text("") foreach $lr, $lsync, $anonuid, $anongid, $luserid, $lsecure;
 
     foreach my $opt (@opts) {
       if ($opt =~ m/(\bro\b|\brw\b)/) {
@@ -214,19 +210,19 @@ sub add_modify_entry {
 		     ),
 	   0, gtkadd(Gtk2::Frame->new(N("Host access")),
                      gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
-			      0, $label_and_widgets->(N("Access:"), $access, help_b("Help User ID", $help_access)),
+			      0, $label_and_widgets->(N("Access:"), $access, help_b(N_("Help User ID"), $help_access)),
 			     ),
 		    ),
 	   0, gtkadd(Gtk2::Frame->new(N("User ID Mapping")),
                      gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
-			      0, $label_and_widgets->(N("User ID:"), $luserid, help_b("Help User ID", $help_userid)),
+			      0, $label_and_widgets->(N("User ID:"), $luserid, help_b(N_("Help User ID"), $help_userid)),
 			      0, $label_and_widgets->(N("anonuid:"), $anonuid, ""),
 			      0, $label_and_widgets->(N("anongid:"), $anongid, ""),
 			     ),
 		    ),
 	   0, gtkadd(Gtk2::Frame->new(N("General Options")),
                      gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
-			      0, $label_and_widgets->(N("Force sync:"), $lsync, help_b("Help General options", $help_global)),
+			      0, $label_and_widgets->(N("Force sync:"), $lsync, help_b(N_("Help General options"), $help_global)),
 			      0, $label_and_widgets->(N("port below 1024:"), $lsecure, ""),
 			      0, $label_and_widgets->(N("Read/Write request:"), $lr, ""),
 			     ),
@@ -242,7 +238,9 @@ sub add_modify_entry {
 				 my ($anonu, $anong);
 				 $anonuid->get_text and $anonu = "anonuid=" . $anonuid->get_text;
 				 $anongid->get_text and $anong = "anongid=" . $anongid->get_text;
-				 map { $_ and $all_right = $_ . "," . $all_right  } $luserid->get_text, $anonu, $anong, $lsync->get_text, $lsecure->get_text, $lr->get_text;
+				 foreach ($luserid->get_text, $anonu, $anong, $lsync->get_text, $lsecure->get_text, $lr->get_text) {
+				     $_ and $all_right = $_ . "," . $all_right;
+				 }
 				 if ($wanted =~ /add/) {
 				     my $test_dir = $dir->get_text;
 				     -d $test_dir or err_dialog(N("Error!"), N("Please enter a directory to share.")) and return;