r87870 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87869‎ | r87870 | r87871 >
Date:04:01, 11 May 2011
Author:kaldari
Status:ok
Tags:
Comment:
readding generic public domain option per comments at r87862
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/Installer.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.php
@@ -255,6 +255,10 @@
256256 'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
257257 'icon' => '{$wgStylePath}/common/images/cc-0.png',
258258 ),
 259+ 'pd' => array(
 260+ 'url' => '',
 261+ 'icon' => '{$wgStylePath}/common/images/public-domain.png',
 262+ ),
259263 'gfdl' => array(
260264 'url' => 'http://www.gnu.org/copyleft/fdl.html',
261265 'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -395,6 +395,7 @@
396396 'config-license-cc-by-nc-sa' => 'Creative Commons Attribution Non-Commercial Share Alike',
397397 'config-license-cc-0' => 'Creative Commons Zero (Public Domain)',
398398 'config-license-gfdl' => 'GNU Free Documentation License 1.3 or later',
 399+ 'config-license-pd' => 'Public Domain',
399400 'config-license-cc-choose' => 'Select a custom Creative Commons license',
400401 'config-license-help' => "Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
401402 This helps to create a sense of community ownership and encourages long-term contribution.

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r87862Updating license choices for installer. CC public domain dedication is deprec...kaldari00:32, 11 May 2011

Status & tagging log