[MediaWiki-commits] [Gerrit] mediawiki...AntiBot[master]: Do some maintenance
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370616 )
Change subject: Do some maintenance
..
Do some maintenance
* Remove I18n php shim
* Provide COPYING file
* Provide license label
Note: This is breaking for MW 1.22.x and lower.
Bug:T123943
Bug:T168353
Change-Id: Ie444972d5fd30a995535e0929b1f8405ef12007a
---
D AntiBot.i18n.php
M AntiBot.php
A COPYING
3 files changed, 340 insertions(+), 36 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AntiBot.i18n.php b/AntiBot.i18n.php
deleted file mode 100644
index bbef9a3..000
--- a/AntiBot.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimffdc37c2583959e3' ) ) {
- function wfJsonI18nShimffdc37c2583959e3( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimffdc37c2583959e3';
-}
diff --git a/AntiBot.php b/AntiBot.php
index 0c5b36a..fe908a1 100644
--- a/AntiBot.php
+++ b/AntiBot.php
@@ -40,10 +40,10 @@
'url' => 'https://www.mediawiki.org/wiki/Extension:AntiBot',
'author' => 'Tim Starling',
'descriptionmsg' => 'antibot-desc',
+ 'license-label' => 'GPL-2.0+'
);
$wgMessagesDirs['AntiBot'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['AntiBot'] = __DIR__ . '/AntiBot.i18n.php';
/**
* A map of payload types to callbacks
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know
[MediaWiki-commits] [Gerrit] mediawiki...AntiBot[master]: Do some maintenance
Kghbln has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370616 )
Change subject: Do some maintenance
..
Do some maintenance
* Remove I18n php shim
* Provide COPYING file
* Provide license label
Note: This is breaking for MW 1.22.x and lower.
Bug:T123943
Bug:T168353
Change-Id: Ie444972d5fd30a995535e0929b1f8405ef12007a
---
D AntiBot.i18n.php
M AntiBot.php
A COPYING
3 files changed, 340 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiBot
refs/changes/16/370616/1
diff --git a/AntiBot.i18n.php b/AntiBot.i18n.php
deleted file mode 100644
index bbef9a3..000
--- a/AntiBot.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimffdc37c2583959e3' ) ) {
- function wfJsonI18nShimffdc37c2583959e3( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimffdc37c2583959e3';
-}
diff --git a/AntiBot.php b/AntiBot.php
index 0c5b36a..fe908a1 100644
--- a/AntiBot.php
+++ b/AntiBot.php
@@ -40,10 +40,10 @@
'url' => 'https://www.mediawiki.org/wiki/Extension:AntiBot',
'author' => 'Tim Starling',
'descriptionmsg' => 'antibot-desc',
+ 'license-label' => 'GPL-2.0+'
);
$wgMessagesDirs['AntiBot'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['AntiBot'] = __DIR__ . '/AntiBot.i18n.php';
/**
* A map of payload types to callbacks
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so the
