diff options
| -rw-r--r-- | perl-install/any.pm | 6 | ||||
| -rw-r--r-- | perl-install/network/smbnfs.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 4 | ||||
| -rw-r--r-- | perl-install/standalone/localedrake | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/logdrake | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 525ced9f5..4ee1c3ac7 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -659,14 +659,14 @@ sub autologin { } sub selectLanguage { - my ($in, $lang, $langs_) = @_; + my ($in, $lang, $o_langs_) = @_; my $common = { messages => N("Please choose a language to use."), title => 'language choice', interactive_help_id => 'selectLanguage' }; if ($::isInstall) { - my $langs = $langs_ || {}; + my $langs = $o_langs_ || {}; my $using_images = $in->isa('interactive::gtk') && listlength(cat_('/proc/fb')); #- to create the default value, use the first location for that value :/ @@ -691,7 +691,7 @@ when your installation is complete and you restart your system.")), if_($using_images, image2f => sub { $name2l{$_[0]} =~ /^[a-z]/ ? ('', "langs/lang-$name2l{$_[0]}") : $_[0] }), format => sub { $1.lang::l2name($2) if $_[0] =~ /(.*\|)(.*)/ }, list => \@langs, sort => 0 }, - if_($langs_, if_($::isInstall, + if_($o_langs_, if_($::isInstall, { val => \$in->{locale}{utf8}, type => 'bool', text => N("Use Unicode by default"), advanced => 1 }), { val => \$langs->{all}, type => 'bool', text => N("All languages"), advanced => 1 }, map { diff --git a/perl-install/network/smbnfs.pm b/perl-install/network/smbnfs.pm index 528a87be2..97f2bd6e6 100644 --- a/perl-install/network/smbnfs.pm +++ b/perl-install/network/smbnfs.pm @@ -7,8 +7,8 @@ use fs; sub new { - my ($class, $v) = @_; - bless($v || {}, $class); + my ($class, $o_v) = @_; + bless($o_v || {}, $class); } sub server_to_string { diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index e9dbbdc72..b4bb9c606 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -109,7 +109,7 @@ my @menu_items = create_dialog(N("Harddrake help"), N("Description of the fields:\n\n") #-PO Do not alter the <span ..> and </span> tags - . join("\n\n", map { if_($fields{$_}[0], formatAlaTeX("<span foreground=\"royalblue3\">$fields{$_}[0]:</span> $fields{$_}[1]")) } sort keys %$current_device), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}), height => 400, scroll => 1 }) + . join("\n\n", map { if_($fields{$_}[0], formatAlaTeX(qq(<span foreground="royalblue3">$fields{$_}[0]:</span> $fields{$_}[1]))) } sort keys %$current_device), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}), height => 400, scroll => 1 }) } else { create_dialog(N("Select a device !"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{window}) }) @@ -219,7 +219,7 @@ $tree->get_selection->signal_connect('changed' => sub { } sort keys %$current_device ]); foreach (keys %$current_device) { - print "Warning: skip \"$_\" field => \"$current_device->{$_}\"\n\n" unless $fields{$_}[0]; + print qq(Warning: skip "$_" field => "$current_device->{$_}"\n\n) unless $fields{$_}[0]; }; # if we've valid driver, let's offer to configure it, else hide buttons diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index 4f5a433e3..11187758c 100644 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -35,10 +35,10 @@ my $locale = lang::read('', $>); my $in = 'interactive'->vnew; my $one_lang_only; -sub select_language { +sub select_language() { $locale->{lang} = any::selectLanguage($in, $locale->{lang}); } -sub select_country { +sub select_country() { any::selectCountry($in, $locale); } diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index f97766b65..fd38b9614 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -196,7 +196,7 @@ gtkadd($my_win->{window}, $::Wizard_no_cancel = 1; $::WizardWindow->destroy if defined $::WizardWindow; undef $::WizardWindow; - } elsif ($err) { print "CRITICAL: \"$err\" =>\n" } + } elsif ($err) { print qq(CRITICAL: "$err" =>\n) } })), gtksignal_connect(Gtk2::Button->new(N("Save")), clicked => \&save), gtksignal_connect(Gtk2::Button->new($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) @@ -409,7 +409,7 @@ my $initdir = "/etc/init.d"; webmin => N("Webmin Service"), xinetd => N("Xinetd Service") }; - my @installed_d = (); + my @installed_d; foreach my $serv (keys %$service) { -e "$initdir/$serv" && push @installed_d, $serv; } @@ -422,7 +422,7 @@ my $initdir = "/etc/init.d"; $cron .= "#- check services\n"; foreach (keys %services_to_check) { next unless $services_to_check{$_}; - $cron .= "\$r .= \"Service $_ ($service->{$_} is not running)\\n\" unless -e \"/var/lock/subsys/$_\";\n"; + $cron .= qq(\$r .= "Service $_ ($service->{$_} is not running)\\n" unless -e "/var/lock/subsys/$_";\n); } step_load: @@ -451,7 +451,7 @@ EOF { label => "" }, { label => "Email", val => \$email }, ]) or goto step_load; - if ($email !~ /[\w.-]*@[\w.-]/) { + if ($email !~ /[\w.-]*\@[\w.-]/) { err_dialog(N("Wrong email"), N("\"%s\" is not a valid email!")); goto step_output; } |