From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 17 May 2010 12:17:27 +0000 (+0000)
Subject: Add cc-by-sa and cc-by-nc-sa licenses to list and update text about being WP-compatib... 
X-Git-Tag: 1.31.0-rc.0~36816
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=4370c9cbced5b99120dc643887667cb1abe7163f;p=lhc%2Fweb%2Fwiklou.git

Add cc-by-sa and cc-by-nc-sa licenses to list and update text about being WP-compatible. Added new images for builtin CC licenses.
---

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 745be2ae9c..d762cfaef8 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -345,18 +345,19 @@ A '''private wiki''' only allows approved users to view pages, with the same gro
 More complex user rights configurations are available after installation, see the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
 	'config-license'                  => 'Copyright and license:',
 	'config-license-none'             => 'No license footer',
-	'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2 or later',
+	'config-license-cc-by-sa'         => 'Creative Commons Attribution Share Alike (Wikipedia-compatible)',
+	'config-license-cc-by-nc-sa'      => 'Creative Commons Attribution Non-Commercial Share Alike',
+	'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2',
 	'config-license-gfdl-current'     => 'GNU Free Documentation License 1.3 or later',
 	'config-license-pd'               => 'Public Domain',
-	'config-license-cc-choose'        => 'A Creative Commons license',
+	'config-license-cc-choose'        => 'Select a custom Creative Commons license',
 	'config-license-help'             => "Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
 This helps to create a sense of community ownership and encourages long-term contribution.
 It is not generally necessary for a private or corporate wiki.
 
-If you want to be able to use text from Wikipedia, and you want Wikipedia to be able to accept text copied from your wiki, you should choose '''GNU Free Documentation License 1.2'''.
-However, this license has some features which make reuse and interpretation difficult.
+If you want to be able to use text from Wikipedia, and you want Wikipedia to be able to accept text copied from your wiki, you should choose '''Creative Commons Attribution Share Alike'''.
 
-If Wikipedia-compatibility is not important, '''Creative Commons''' with the '''Share Alike''' option (cc-by-sa) is a good choice.",
+The GNU Free Documentation License was the old license Wikipedia was under. It is still a valid license, however, this license has some features which make reuse and interpretation difficult.",
 	'config-email-settings'           => 'E-mail settings',
 	'config-enable-email'             => 'Enable outbound e-mail',
 	'config-enable-email-help'        => "If you want e-mail to work, [http://www.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly.
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b0e7f576ac..706250642c 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -178,6 +178,14 @@ abstract class Installer {
 			'icon' => '',
 			'text' => ''
 		),
+		'cc-by-sa' => array(
+			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
+			'icon' => '{$wgStylePath}/common/images/cc-by-sa.png',
+		),
+		'cc-by-nc-sa' => array(
+			'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+			'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
+		),
 		'pd' => array(
 			'url' => 'http://creativecommons.org/licenses/publicdomain/',
 			'icon' => '{$wgStylePath}/common/images/public-domain.png',
diff --git a/skins/common/images/cc-by-nc-sa.png b/skins/common/images/cc-by-nc-sa.png
new file mode 100644
index 0000000000..0f2a0f1072
Binary files /dev/null and b/skins/common/images/cc-by-nc-sa.png differ
diff --git a/skins/common/images/cc-by-sa.png b/skins/common/images/cc-by-sa.png
new file mode 100644
index 0000000000..f0a944e0b8
Binary files /dev/null and b/skins/common/images/cc-by-sa.png differ