From fd595b4a25c09427f335f0afc2241569d287c544 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 18 Sep 2012 10:39:48 +0000 Subject: (main_license) factorize call to warning_about_patents() --- perl-install/any.pm | 2 +- perl-install/messages.pm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index b86cbb7d0..401464579 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1092,7 +1092,7 @@ sub acceptLicense { $in->ask_from_({ title => N("License agreement"), focus_first => 1, cancel => N("Quit"), - messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()), + messages => formatAlaTeX(messages::main_license()), interactive_help_id => 'acceptLicense', callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, }, diff --git a/perl-install/messages.pm b/perl-install/messages.pm index b2c5a65c6..440d25c5c 100644 --- a/perl-install/messages.pm +++ b/perl-install/messages.pm @@ -91,7 +91,8 @@ agreement. The terms and conditions of this License are governed by the Laws of France. All disputes on the terms of this license will preferably be settled out of court. As a last resort, the dispute will be referred to the appropriate Courts of Law of Paris - France. -For any question on this document, please contact Mageia.") +For any question on this document, please contact Mageia."), + warning_about_patents() ); } -- cgit v1.2.1