From 9091151d546e5d749b47e2efce3ff651784fcc8c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 6 Nov 2002 13:20:21 +0000 Subject: replace "_" with "N" and "__" with "N_" rationale: - currently, we use _("xxx") as a shorthand for gettext("xxx"). It also used to call xgettext with --keyword=_ - alas, function &_ is global and not by package (notice esp. that _ is not exported in common.pm) - this lead to big ugly pb with packages defining their own &_, overriding common.pm's &_ - a fix is to set @::textdomains to add a new domain (the default being "libDrakX") but relying on the global "_" is still dangerous! --- perl-install/standalone.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/standalone.pm') diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index b0db40100..a97267669 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -46,7 +46,7 @@ sub install { if ($o->{in}->isa('interactive::newt')) { $o->{in}->suspend; } else { - $wait = $o->{in}->wait_message('', _("Installing packages...")); + $wait = $o->{in}->wait_message('', N("Installing packages...")); } standalone::explanations("installed packages @l"); my $ret = system('urpmi', '--allow-medium-change', '--auto', '--best-output', @l) == 0; @@ -63,12 +63,12 @@ sub ensure_is_installed { my ($o, $pkg, $file, $auto) = @_; if (! -e $file) { - $o->{in}->ask_okcancel('', _("The package %s needs to be installed. Do you want to install it?", $pkg), 1) + $o->{in}->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) or return if !$auto; $o->{in}->do_pkgs->install($pkg); } if (! -e $file) { - $o->{in}->ask_warn('', _("Mandatory package %s is missing", $pkg)); + $o->{in}->ask_warn('', N("Mandatory package %s is missing", $pkg)); return; } 1; -- cgit v1.2.1