diff options
| -rwxr-xr-x | urpmi | 12 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
2 files changed, 11 insertions, 7 deletions
@@ -421,8 +421,8 @@ sub ask_choice { if ($parallel && $X) { #- do it early, we'll have ui outputs while resolving deps require gurpm; - gurpm::init(N("Package installation..."), N("Initializing...")); - $urpm->{ui} = { msg => sub { gurpm::label($_[0]) }, progress => sub { gurpm::progress($_[0]) } }; + gurpm::init(to_utf8(N("Package installation...")), to_utf8(N("Initializing..."))); + $urpm->{ui} = { msg => sub { gurpm::label(to_utf8($_[0])) }, progress => sub { gurpm::progress($_[0]) } }; } #- do the resolution of dependencies between requested package (and auto selection if any). @@ -538,7 +538,7 @@ unless ($local_sources || $list) { if ($X && !$parallel) { #- for $parallel, already done require gurpm; - gurpm::init(N("Package installation..."), N("Initializing...")); + gurpm::init(to_utf8(N("Package installation...")), to_utf8(N("Initializing..."))); } my %sources = %$local_sources; @@ -590,7 +590,7 @@ foreach my $set (@{$state->{transaction} || []}) { if ($X) { if ($mode eq 'start') { $file =~ s|/*\s*$||; $file =~ s|.*/||; - gurpm::label(N("Downloading package `%s'...", $file)); + gurpm::label(to_utf8(N("Downloading package `%s'...", $file))); } elsif ($mode eq 'progress') { gurpm::progress($percent/100); } elsif ($mode eq 'end') { @@ -691,9 +691,9 @@ foreach my $set (@{$state->{transaction} || []}) { if ($subtype eq 'start') { if ($type eq 'trans') { - gurpm::label(N("Preparing...")); + gurpm::label(to_utf8(N("Preparing..."))); } else { - gurpm::label(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$progress_nb, $total_nb)); + gurpm::label(to_utf8(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$progress_nb, $total_nb))); } } elsif ($subtype eq 'progress') { gurpm::progress($amount/$total); @@ -8,7 +8,7 @@ %define name urpmi %define version 4.4.5 -%define release 1mdk +%define release 2mdk %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"') @@ -236,6 +236,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1); %{compat_perl_vendorlib}/urpm/parallel_ssh.pm %changelog +* Tue Feb 3 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 4.4.5-2mdk +- convert some gurpmi dialogs to UTF8 as they should (part of + #7156, needs latest change in perl-Locale-gettext as well) + * Fri Jan 30 2004 Olivier Blin <blino@mandrake.org> 4.4.5-1mdk - add --resume and --no-resume options in urpmi (to resume transfer of partially-downloaded files) |