From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- extensions/ConfirmEdit/.gitreview | 5 - extensions/ConfirmEdit/ApiFancyCaptchaReload.php | 34 ++ extensions/ConfirmEdit/Asirra.class.php | 2 +- extensions/ConfirmEdit/Asirra.i18n.php | 153 +++++++-- extensions/ConfirmEdit/Asirra.php | 16 +- extensions/ConfirmEdit/Captcha.php | 26 +- extensions/ConfirmEdit/ConfirmEdit.alias.php | 5 + extensions/ConfirmEdit/ConfirmEdit.i18n.php | 353 +++++++++++++-------- extensions/ConfirmEdit/ConfirmEdit.php | 4 +- extensions/ConfirmEdit/ConfirmEditHooks.php | 5 +- extensions/ConfirmEdit/FancyCaptcha.class.php | 114 ++++--- extensions/ConfirmEdit/FancyCaptcha.i18n.php | 128 +++++--- extensions/ConfirmEdit/FancyCaptcha.php | 16 + extensions/ConfirmEdit/MathCaptcha.class.php | 5 +- extensions/ConfirmEdit/QuestyCaptcha.class.php | 1 + extensions/ConfirmEdit/QuestyCaptcha.i18n.php | 162 +++++++--- extensions/ConfirmEdit/README | 6 + extensions/ConfirmEdit/ReCaptcha.class.php | 12 +- extensions/ConfirmEdit/ReCaptcha.i18n.php | 70 +++- extensions/ConfirmEdit/captcha.py | 5 +- extensions/ConfirmEdit/ext.confirmedit.asirra.js | 55 ---- .../maintenance/GenerateFancyCaptchas.php | 6 +- .../resources/ext.confirmEdit.asirra.js | 55 ++++ .../resources/ext.confirmEdit.fancyCaptcha.css | 41 +++ .../resources/ext.confirmEdit.fancyCaptcha.js | 37 +++ .../resources/images/ajax-loader-10x10.gif | Bin 0 -> 6147 bytes .../resources/images/fancycaptcha-reload-icon.png | Bin 0 -> 307 bytes 27 files changed, 953 insertions(+), 363 deletions(-) delete mode 100644 extensions/ConfirmEdit/.gitreview create mode 100644 extensions/ConfirmEdit/ApiFancyCaptchaReload.php delete mode 100644 extensions/ConfirmEdit/ext.confirmedit.asirra.js create mode 100644 extensions/ConfirmEdit/resources/ext.confirmEdit.asirra.js create mode 100644 extensions/ConfirmEdit/resources/ext.confirmEdit.fancyCaptcha.css create mode 100644 extensions/ConfirmEdit/resources/ext.confirmEdit.fancyCaptcha.js create mode 100644 extensions/ConfirmEdit/resources/images/ajax-loader-10x10.gif create mode 100644 extensions/ConfirmEdit/resources/images/fancycaptcha-reload-icon.png (limited to 'extensions/ConfirmEdit') diff --git a/extensions/ConfirmEdit/.gitreview b/extensions/ConfirmEdit/.gitreview deleted file mode 100644 index 780d35df..00000000 --- a/extensions/ConfirmEdit/.gitreview +++ /dev/null @@ -1,5 +0,0 @@ -[gerrit] -host=gerrit.wikimedia.org -port=29418 -project=mediawiki/extensions/ConfirmEdit.git -defaultbranch=master diff --git a/extensions/ConfirmEdit/ApiFancyCaptchaReload.php b/extensions/ConfirmEdit/ApiFancyCaptchaReload.php new file mode 100644 index 00000000..1de1947d --- /dev/null +++ b/extensions/ConfirmEdit/ApiFancyCaptchaReload.php @@ -0,0 +1,34 @@ +getCaptchaIndex(); + + $result = $this->getResult(); + $result->addValue( null, $this->getModuleName(), array ( 'index' => $captchaIndex ) ); + return true; + } + + public function getDescription() { + return 'Get a new FancyCaptcha.'; + } + + public function getAllowedParams() { + return array(); + } + + public function getParamDescription() { + return array(); + } + + public function getExamples() { + return array( 'api.php?action=fancycaptchareload&format=xml' ); + } +} diff --git a/extensions/ConfirmEdit/Asirra.class.php b/extensions/ConfirmEdit/Asirra.class.php index cbe51e26..bd58eb3a 100644 --- a/extensions/ConfirmEdit/Asirra.class.php +++ b/extensions/ConfirmEdit/Asirra.class.php @@ -17,7 +17,7 @@ class Asirra extends SimpleCaptcha { function getForm() { global $wgOut; - $wgOut->addModules( 'ext.confirmedit.asirra' ); + $wgOut->addModules( 'ext.confirmEdit.asirra' ); $js = Html::linkedScript( $this->asirra_clientscript ); $message = Xml::encodeJsVar( wfMessage( 'asirra-createaccount-fail' )->plain() ); diff --git a/extensions/ConfirmEdit/Asirra.i18n.php b/extensions/ConfirmEdit/Asirra.i18n.php index ac744712..75f33a76 100644 --- a/extensions/ConfirmEdit/Asirra.i18n.php +++ b/extensions/ConfirmEdit/Asirra.i18n.php @@ -24,29 +24,34 @@ $messages['en'] = array( /** Message documentation (Message documentation) * @author 2nd-player * @author Beta16 + * @author Shirayuki */ $messages['qqq'] = array( - 'asirra-desc' => '{{desc}}', - 'asirra-edit' => 'See also -*{{msg-mw|Captcha-edit}} -*{{msg-mw|Questycaptcha-edit}} -*{{msg-mw|Fancycaptcha-edit}} -*{{msg-mw|Recaptcha-edit}}', - 'asirra-addurl' => 'See also -*{{msg-mw|Captcha-addurl}} -*{{msg-mw|Questycaptcha-addurl}} -*{{msg-mw|Fancycaptcha-addurl}} -*{{msg-mw|Recaptcha-addurl}}', - 'asirra-badpass' => 'See also -*{{msg-mw|Captcha-badlogin}} -*{{msg-mw|Questycaptcha-badlogin}} -*{{msg-mw|Fancycaptcha-badlogin}} -*{{msg-mw|Recaptcha-badpass}}', - 'asirra-createaccount' => 'See also -*{{msg-mw|Captcha-createaccount}} -*{{msg-mw|Questycaptcha-createaccount}} -*{{msg-mw|Fancycaptcha-createaccount}} -*{{msg-mw|Recaptcha-createaccount}}', + 'asirra-desc' => '{{desc|name=Asirra|url=http://www.mediawiki.org/wiki/Extension:Asirra}}', + 'asirra-edit' => '{{Related|ConfirmEdit-edit}}', + 'asirra-addurl' => '{{Related|ConfirmEdit-addurl}}', + 'asirra-badpass' => '{{Related|ConfirmEdit-badlogin}}', + 'asirra-createaccount' => '{{Related|ConfirmEdit-createaccount}}', + 'asirra-createaccount-fail' => 'Used as failure message in JavaScript code. +{{Related|ConfirmEdit-createaccount-fail}}', + 'asirra-create' => '{{Related|ConfirmEdit-create}}', + 'asirra-nojs' => 'Used in HTML