summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-23 16:39:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-23 16:39:16 +0000
commit674eaf78680f3ce36108f644ef65fe8719d8402d (patch)
tree306195b4880c2bfc5872339f65d30fb8d5cc209f
parentb8c2f69510e50362a56ad365d9f9232cf2f4f0c4 (diff)
downloaddrakx-674eaf78680f3ce36108f644ef65fe8719d8402d.tar
drakx-674eaf78680f3ce36108f644ef65fe8719d8402d.tar.gz
drakx-674eaf78680f3ce36108f644ef65fe8719d8402d.tar.bz2
drakx-674eaf78680f3ce36108f644ef65fe8719d8402d.tar.xz
drakx-674eaf78680f3ce36108f644ef65fe8719d8402d.zip
(summary): display more nicely the current X config when fbdev
(selectLanguage): no need to handle "Cancel" on language choosing :)
-rw-r--r--perl-install/install_steps_interactive.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 92304fb3d..5b530f74b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -54,8 +54,7 @@ sub charsetChanged {}
sub selectLanguage {
my ($o) = @_;
- $o->{lang} = any::selectLanguage($o, $o->{lang}, $o->{langs} ||= {})
- || return $o->ask_yesorno('', N("Do you really want to leave the installation?")) ? $o->exit : &selectLanguage;
+ $o->{lang} = any::selectLanguage($o, $o->{lang}, $o->{langs} ||= {});
install_steps::selectLanguage($o);
$o->charsetChanged;
@@ -862,7 +861,7 @@ sub summary {
{ label => N("Timezone"), val => \$o->{timezone}{timezone}, clicked => sub { $o->configureTimezone(1) } },
{ label => N("Printer"), val => \$o->{printer}, clicked => sub { $o->configurePrinter(1) }, format => $format_printers },
{ label => N("Bootloader"), val => \$o->{bootloader}, clicked => sub { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) }, format => sub { "$o->{bootloader}{method} on $o->{bootloader}{boot}" } },
-{ label => N("Graphical interface"), val => \$o->{raw_X}, clicked => sub { configureX($o, 'expert') }, format => sub { $o->{raw_X} ? Xconfig::resolution_and_depth::to_string($o->{raw_X}->get_resolution) : N("not configured") } },
+{ label => N("Graphical interface"), val => \$o->{raw_X}, clicked => sub { configureX($o, 'expert') }, format => sub { $o->{raw_X} ? Xconfig::various::to_string($o->{raw_X}) : N("not configured") } },
{ label => N("Network"), val => \$o->{netcnx}{type}, format => sub { $_[0] || N("not configured") }, clicked => sub {
require network::netconnect;
network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf}, 0, $o->{lang} eq "fr_FR" && $o->{keyboard}{KEYBOARD} eq "fr", 1);