From 852a1f66cf8837551c68c8c0db2478d967e5b5b7 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 25 Jan 2010 09:40:05 +0000 Subject: [PATCH] MDL-20717 GPL version 3 at the Copyright notice during the installation The new string 'gpl3' replaces the legacy string 'gpl'. Once we have proper lang branching, 'gpl' string should be removed from 2.0/HEAD. --- admin/cli/install.php | 2 +- admin/index.php | 2 +- lang/en_utf8/moodle.php | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/admin/cli/install.php b/admin/cli/install.php index eb04b8b59698e..e13e4a722a8eb 100644 --- a/admin/cli/install.php +++ b/admin/cli/install.php @@ -465,7 +465,7 @@ cli_separator(); cli_heading(get_string('copyrightnotice')); echo "Moodle - Modular Object-Oriented Dynamic Learning Environment\n"; - echo get_string('gpl')."\n\n"; + echo get_string('gpl3')."\n\n"; echo get_string('doyouagree')."\n"; $prompt = get_string('cliyesnoprompt', 'admin'); $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin'))); diff --git a/admin/index.php b/admin/index.php index c4b21c7b71ee9..6e02c92592b2d 100644 --- a/admin/index.php +++ b/admin/index.php @@ -126,7 +126,7 @@ echo $OUTPUT->header(); echo $OUTPUT->heading('Moodle - Modular Object-Oriented Dynamic Learning Environment'); echo $OUTPUT->heading(get_string('copyrightnotice')); - $copyrightnotice = text_to_html(get_string('gpl')); + $copyrightnotice = text_to_html(get_string('gpl3')); $copyrightnotice = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $copyrightnotice); // extremely ugly validation hack echo $OUTPUT->box($copyrightnotice, 'copyrightnotice'); echo '
'; diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php index 8e67ad2539021..b3ba0b539dbad 100644 --- a/lang/en_utf8/moodle.php +++ b/lang/en_utf8/moodle.php @@ -772,6 +772,19 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the Moodle License information page for full details: +http://docs.moodle.org/en/License'; +$string['gpl3'] = 'Copyright (C) 1999 onwards Martin Dougiamas (http://moodle.com) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the Moodle License information page for full details: http://docs.moodle.org/en/License'; $string['grade'] = 'Grade';