move long messages (like license) to a new package: install_messages.pm

3 files changed, 150 insertions, 131 deletions

diff --git a/perl-install/install_messages.pm b/perl-install/install_messages.pm
new file mode 100644
index 000000000..31ff25668
--- /dev/null
+++ b/perl-install/install_messages.pm
@@ -0,0 +1,142 @@
+package install_messages; # $Id$
+
+use diagnostics;
+use strict;
+
+use common;
+
+sub main_license {
+N("Introduction
+
+The operating system and the different components available in the Mandrake Linux distribution 
+shall be called the \"Software Products\" hereafter. The Software Products include, but are not 
+restricted to, the set of programs, methods, rules and documentation related to the operating 
+system and the different components of the Mandrake Linux distribution.
+
+
+1. License Agreement
+
+Please read this document carefully. This document is a license agreement between you and  
+MandrakeSoft S.A. which applies to the Software Products.
+By installing, duplicating or using the Software Products in any manner, you explicitly 
+accept and fully agree to conform to the terms and conditions of this License. 
+If you disagree with any portion of the License, you are not allowed to install, duplicate or use 
+the Software Products. 
+Any attempt to install, duplicate or use the Software Products in a manner which does not comply 
+with the terms and conditions of this License is void and will terminate your rights under this 
+License. Upon termination of the License,  you must immediately destroy all copies of the 
+Software Products.
+
+
+2. Limited Warranty
+
+The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
+extent permitted by law.
+MandrakeSoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
+incidental, direct or indirect damages whatsoever (including without limitation damages for loss of 
+business, interruption of business, financial loss, legal fees and penalties resulting from a court 
+judgment, or any other consequential loss) arising out of  the use or inability to use the Software 
+Products, even if MandrakeSoft S.A. has been advised of the possibility or occurence of such 
+damages.
+
+LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
+
+To the extent permitted by law, MandrakeSoft S.A. or its distributors will, in no circumstances, be 
+liable for any special, incidental, direct or indirect damages whatsoever (including without 
+limitation damages for loss of business, interruption of business, financial loss, legal fees 
+and penalties resulting from a court judgment, or any other consequential loss) arising out 
+of the possession and use of software components or arising out of  downloading software components 
+from one of Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.
+This limited liability applies to, but is not restricted to, the strong cryptography components 
+included in the Software Products.
+
+
+3. The GPL License and Related Licenses
+
+The Software Products consist of components created by different persons or entities.  Most 
+of these components are governed under the terms and conditions of the GNU General Public 
+Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, 
+duplicate, adapt or redistribute the components which they cover. Please read carefully the terms 
+and conditions of the license agreement for each component before using any component. Any question 
+on a component license should be addressed to the component author and not to MandrakeSoft.
+The programs developed by MandrakeSoft S.A. are governed by the GPL License. Documentation written 
+by MandrakeSoft S.A. is governed by a specific license. Please refer to the documentation for 
+further details.
+
+
+4. Intellectual Property Rights
+
+All rights to the components of the Software Products belong to their respective authors and are 
+protected by intellectual property and copyright laws applicable to software programs.
+MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in 
+parts, by all means and for all purposes.
+\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  
+
+
+5. Governing Laws 
+
+If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this 
+portion is excluded from this contract. You remain bound by the other applicable sections of the 
+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 MandrakeSoft S.A.  
+");
+}
+
+sub warning_about_patents {
+"Warning: Free Software may not necessarily be patent free, and some Free
+Software included may be covered by patents in your country. For example, the
+MP3 decoders included may require a licence for further usage (see
+http://www.mp3licensing.com for more details). If you are unsure if a patent
+may be applicable to you, check your local laws.";
+}
+sub com_license { 
+N("
+Warning
+
+Please read carefully the terms below. If you disagree with any
+portion, you are not allowed to install the next CD media. Press 'Refuse' 
+to continue the installation without using these media.
+
+
+Some components contained in the next CD media are not governed
+by the GPL License or similar agreements. Each such component is then
+governed by the terms and conditions of its own specific license. 
+Please read carefully and comply with such specific licenses before 
+you use or redistribute the said components. 
+Such licenses will in general prevent the transfer,  duplication 
+(except for backup purposes), redistribution, reverse engineering, 
+de-assembly, de-compilation or modification of the component. 
+Any breach of agreement will immediately terminate your rights under 
+the specific license. Unless the specific license terms grant you such
+rights, you usually cannot install the programs on more than one
+system, or adapt it to be used on a network. In doubt, please contact 
+directly the distributor or editor of the component. 
+Transfer to third parties or copying of such components including the 
+documentation is usually forbidden.
+
+
+All rights to the components of the next CD media belong to their 
+respective authors and are protected by intellectual property and 
+copyright laws applicable to software programs.
+");
+}
+
+sub install_completed {
+N("Congratulations, installation is complete.
+Remove the boot media and press return to reboot.
+
+
+For information on fixes which are available for this release of Mandrake Linux,
+consult the Errata available from:
+
+
+%s
+
+
+Information on configuring your system is available in the post
+install chapter of the Official Mandrake Linux User's Guide.",
+N("http://www.mandrakelinux.com/en/90errata.php3"));
+}
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 648548626..31cf25644 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -590,7 +590,7 @@ sub installPackages {
 	    my $name = pkgs::mediumDescr($o->{packages}, $medium);
 	    local $| = 1; print "\a";
 	    my $time = time();
-	    my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($install_steps_interactive::com_license), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
+	    my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
             $r &&= $o->ask_okcancel('', N("Change your Cd-Rom!
 
 Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8e2f1dfc5..1d2c1cfb3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -3,39 +3,10 @@ package install_steps_interactive; # $Id$
 
 use diagnostics;
 use strict;
-use vars qw(@ISA $new_bootstrap $com_license);
+use vars qw(@ISA $new_bootstrap);
 
 @ISA = qw(install_steps);
 
-$com_license = N("
-Warning
-
-Please read carefully the terms below. If you disagree with any
-portion, you are not allowed to install the next CD media. Press 'Refuse' 
-to continue the installation without using these media.
-
-
-Some components contained in the next CD media are not governed
-by the GPL License or similar agreements. Each such component is then
-governed by the terms and conditions of its own specific license. 
-Please read carefully and comply with such specific licenses before 
-you use or redistribute the said components. 
-Such licenses will in general prevent the transfer,  duplication 
-(except for backup purposes), redistribution, reverse engineering, 
-de-assembly, de-compilation or modification of the component. 
-Any breach of agreement will immediately terminate your rights under 
-the specific license. Unless the specific license terms grant you such
-rights, you usually cannot install the programs on more than one
-system, or adapt it to be used on a network. In doubt, please contact 
-directly the distributor or editor of the component. 
-Transfer to third parties or copying of such components including the 
-documentation is usually forbidden.
-
-
-All rights to the components of the next CD media belong to their 
-respective authors and are protected by intellectual property and 
-copyright laws applicable to software programs.
-");
 
 #-######################################################################################
 #- misc imports
@@ -46,6 +17,7 @@ use partition_table::raw;
 use install_steps;
 use install_interactive;
 use install_any;
+use install_messages;
 use detect_devices;
 use run_program;
 use devices;
@@ -109,90 +81,9 @@ sub acceptLicence {
     return if $o->{useless_thing_accepted};
 
     $o->set_help('license');
-    $o->{useless_thing_accepted} = $o->ask_from_list_(N("License agreement"), formatAlaTeX(
-N("Introduction
-
-The operating system and the different components available in the Mandrake Linux distribution 
-shall be called the \"Software Products\" hereafter. The Software Products include, but are not 
-restricted to, the set of programs, methods, rules and documentation related to the operating 
-system and the different components of the Mandrake Linux distribution.
-
-
-1. License Agreement
-
-Please read this document carefully. This document is a license agreement between you and  
-MandrakeSoft S.A. which applies to the Software Products.
-By installing, duplicating or using the Software Products in any manner, you explicitly 
-accept and fully agree to conform to the terms and conditions of this License. 
-If you disagree with any portion of the License, you are not allowed to install, duplicate or use 
-the Software Products. 
-Any attempt to install, duplicate or use the Software Products in a manner which does not comply 
-with the terms and conditions of this License is void and will terminate your rights under this 
-License. Upon termination of the License,  you must immediately destroy all copies of the 
-Software Products.
-
-
-2. Limited Warranty
-
-The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
-extent permitted by law.
-MandrakeSoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
-incidental, direct or indirect damages whatsoever (including without limitation damages for loss of 
-business, interruption of business, financial loss, legal fees and penalties resulting from a court 
-judgment, or any other consequential loss) arising out of  the use or inability to use the Software 
-Products, even if MandrakeSoft S.A. has been advised of the possibility or occurence of such 
-damages.
-
-LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
-
-To the extent permitted by law, MandrakeSoft S.A. or its distributors will, in no circumstances, be 
-liable for any special, incidental, direct or indirect damages whatsoever (including without 
-limitation damages for loss of business, interruption of business, financial loss, legal fees 
-and penalties resulting from a court judgment, or any other consequential loss) arising out 
-of the possession and use of software components or arising out of  downloading software components 
-from one of Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.
-This limited liability applies to, but is not restricted to, the strong cryptography components 
-included in the Software Products.
-
-
-3. The GPL License and Related Licenses
-
-The Software Products consist of components created by different persons or entities.  Most 
-of these components are governed under the terms and conditions of the GNU General Public 
-Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, 
-duplicate, adapt or redistribute the components which they cover. Please read carefully the terms 
-and conditions of the license agreement for each component before using any component. Any question 
-on a component license should be addressed to the component author and not to MandrakeSoft.
-The programs developed by MandrakeSoft S.A. are governed by the GPL License. Documentation written 
-by MandrakeSoft S.A. is governed by a specific license. Please refer to the documentation for 
-further details.
-
-
-4. Intellectual Property Rights
-
-All rights to the components of the Software Products belong to their respective authors and are 
-protected by intellectual property and copyright laws applicable to software programs.
-MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in 
-parts, by all means and for all purposes.
-\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  
-
-
-5. Governing Laws 
-
-If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this 
-portion is excluded from this contract. You remain bound by the other applicable sections of the 
-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 MandrakeSoft S.A.  
-") . "\n\n
-Warning: Free Software may not necessarily be patent free, and some Free
-Software included may be covered by patents in your country. For example, the
-MP3 decoders included may require a licence for further usage (see
-http://www.mp3licensing.com for more details). If you are unsure if a patent
-may be applicable to you, check your local laws.
-"), [ N_("Accept"), N_("Refuse") ], "Refuse") eq "Accept" and return;
+    $o->{useless_thing_accepted} = $o->ask_from_list_(N("License agreement"), 
+						      formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()), 
+						      [ N_("Accept"), N_("Refuse") ], "Refuse") eq "Accept" and return;
 
     $o->ask_yesorno('', N("Are you sure you refuse the licence?"), 1) and $o->exit;
 
@@ -788,7 +679,7 @@ sub installPackages {
 	$method eq 'cdrom' && !$::oem and do {
 	    my $name = pkgs::mediumDescr($o->{packages}, $medium);
 	    local $| = 1; print "\a";
-	    my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($com_license), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
+	    my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
             $r &&= $o->ask_okcancel('', N("Change your Cd-Rom!
 
 Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
@@ -1296,21 +1187,7 @@ Do you really want to quit now?"), 0);
 
     $o->ask_from_no_check(
 	{
-	 messages => formatAlaTeX(
-N("Congratulations, installation is complete.
-Remove the boot media and press return to reboot.
-
-
-For information on fixes which are available for this release of Mandrake Linux,
-consult the Errata available from:
-
-
-%s
-
-
-Information on configuring your system is available in the post
-install chapter of the Official Mandrake Linux User's Guide.",
-N("http://www.mandrakelinux.com/en/90errata.php3"))),
+	 messages => formatAlaTeX(install_messages::install_completed()),
 	 cancel => '',
 	},      
 	[