diff options
| -rw-r--r-- | perl-install/any.pm | 31 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 31 |
2 files changed, 31 insertions, 31 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 2ed01df13..596c16516 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -712,6 +712,37 @@ sub autologin { } } +sub acceptLicense { + my ($o) = @_; + + $o->{release_notes} = join("\n\n", map { + my $f = install_any::getFile($_); + $f && cat__($f); + } 'release-notes.txt', 'release-notes.' . arch() . '.txt'); + + return if $o->{useless_thing_accepted}; + + my $r = $::testing ? 'Accept' : 'Refuse'; + + $o->ask_from_({ title => N("License agreement"), + icon => 'banner-license', + cancel => N("Quit"), + messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()), + interactive_help_id => 'acceptLicense', + if_(!$::globetrotter, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]), + callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, + }, + [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]) + or do { + if ($::globetrotter) { + run_program::run('killall', 'Xorg'); + exec("/sbin/reboot"); + } + install_any::ejectCdrom(); + $o->exit; + }; +} + sub selectLanguage_install { my ($in, $locale) = @_; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 4bbc9d360..78898b8a9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -68,37 +68,6 @@ varies from language to language).")) if $o->{locale}{lang} !~ /^en/ && !lang::l so the messages will be displayed in english during installation") if $ENV{LANGUAGE} eq 'C'; } } - -sub acceptLicense { - my ($o) = @_; - - $o->{release_notes} = join("\n\n", map { - my $f = install_any::getFile($_); - $f && cat__($f); - } 'release-notes.txt', 'release-notes.' . arch() . '.txt'); - - return if $o->{useless_thing_accepted}; - - my $r = $::testing ? 'Accept' : 'Refuse'; - - $o->ask_from_({ title => N("License agreement"), - icon => 'banner-license', - cancel => N("Quit"), - messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()), - interactive_help_id => 'acceptLicense', - if_(!$::globetrotter, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]), - callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, - }, - [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]) - or do { - if ($::globetrotter) { - run_program::run('killall', 'Xorg'); - exec("/sbin/reboot"); - } - install_any::ejectCdrom(); - $o->exit; - }; -} #------------------------------------------------------------------------------ sub selectKeyboard { |