jenkins-bot has submitted this change and it was merged.
Change subject: Add license to Main php file
......................................................................
Add license to Main php file
* Also add namemsg because the text is in en.json with the name.
* Update license to include MIT name above file.
* Converted spaces to tabs in en.json
Change-Id: Ice7dbe30dfdabf18329927f513e1d548653d4fd2
---
M GoogleAdSense.php
M LICENSE
M i18n/en.json
M i18n/qqq.json
4 files changed, 30 insertions(+), 27 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GoogleAdSense.php b/GoogleAdSense.php
index 0b467db..76eb49f 100644
--- a/GoogleAdSense.php
+++ b/GoogleAdSense.php
@@ -41,10 +41,12 @@
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'Google AdSense',
+ 'namemsg' => 'googleadsense-name',
'version' => '2.2.0',
'author' => 'Siebrand Mazeland',
'descriptionmsg' => 'googleadsense-desc',
- 'url' =>
'https://www.mediawiki.org/wiki/Extension:Google_AdSense_2',
+ 'url' =>
'https://www.mediawiki.org/wiki/Extension:Google_AdSense',
+ 'license-name' => 'MIT',
);
// Register class and localisations
diff --git a/LICENSE b/LICENSE
index 1772b96..33db107 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,21 @@
+The MIT License (MIT)
+
Copyright (c) 2008 Siebrand Mazeland
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/i18n/en.json b/i18n/en.json
index 1246a73..9b08075 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,9 +1,10 @@
{
- "@metadata": {
- "authors": [
- "Siebrand Mazeland"
- ]
- },
- "googleadsense": "Google AdSense",
- "googleadsense-desc": "Adds [http://www.google.com/adsense Google AdSense]
to the sidebar"
+ "@metadata": {
+ "authors": [
+ "Siebrand Mazeland"
+ ]
+ },
+ "googleadsense": "Google AdSense",
+ "googleadsense-name": "Google AdSense",
+ "googleadsense-desc": "Adds [http://www.google.com/adsense Google
AdSense] to the sidebar"
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index deabd25..005ea6e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,6 +7,7 @@
"Umherirrender"
]
},
- "googleadsense": "{{notranslate}}",
+ "googleadsense": "{{notranslate}} Header in the sidebar the Google
AdSense box appears under.",
+ "googleadsense-name": "{{optional}} Name of the extension on
[[Special:Version]].",
"googleadsense-desc": "{{desc|name=Google
AdSense|url=https://www.mediawiki.org/wiki/Extension:GoogleAdSense}}";
}
--
To view, visit https://gerrit.wikimedia.org/r/218152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice7dbe30dfdabf18329927f513e1d548653d4fd2
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/GoogleAdSense
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
