[MediaWiki-commits] [Gerrit] Set dir and lang of insertables to the source messages's values - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105489
Change subject: Set dir and lang of insertables to the source messages's values
..
Set dir and lang of insertables to the source messages's values
Change-Id: I7254a1b17f104ba5f94da775043d1b5f0c86aeaa
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/89/105489/1
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index eed5ce1..3457269 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -420,11 +420,16 @@
addInsertables: function ( insertables ) {
var i,
count = insertables.length,
+ $sourceMessage = this.$editor.find(
'.sourcemessage' ),
$buttonArea = this.$editor.find(
'.tux-editor-insert-buttons' ),
$textarea = this.$editor.find(
'.tux-textarea-translation' );
for ( i = 0; i count; i++ ) {
$( 'button' )
+ .prop(
+ dir: $sourceMessage.prop( 'dir'
),
+ lang: $sourceMessage.prop(
'lang' )
+ )
.addClass( 'insertable
shortcut-activated' )
.text( insertables[i].display )
.data( 'iid', i )
--
To view, visit https://gerrit.wikimedia.org/r/105489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7254a1b17f104ba5f94da775043d1b5f0c86aeaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix day not showing on timestamps when thursday - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review. https://gerrit.wikimedia.org/r/105490 Change subject: Fix day not showing on timestamps when thursday .. Fix day not showing on timestamps when thursday Typo when declaring which messages to use fixed. Change-Id: I7096b75f912b6d82baff1383d2156a268b3c621a --- M MediaWikiChat.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/90/105490/1 diff --git a/MediaWikiChat.php b/MediaWikiChat.php index 773c8d7..bc9d1f0 100644 --- a/MediaWikiChat.php +++ b/MediaWikiChat.php @@ -35,7 +35,7 @@ 'messages' = array( 'january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december', - 'monday', 'tuesday', 'wednesday', 'thursay', 'friday', 'saturday', + 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday', 'chat-type-your-private-message', 'chat-no-other-users', 'chat-blocked-from-chat', 'chat-just-now', 'chat-a-minute-ago', 'chat-quarter-of-an-hour-ago', 'chat-half-an-hour-ago', -- To view, visit https://gerrit.wikimedia.org/r/105490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7096b75f912b6d82baff1383d2156a268b3c621a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix day not showing on timestamps when thursday - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged. Change subject: Fix day not showing on timestamps when thursday .. Fix day not showing on timestamps when thursday Typo when declaring which messages to use fixed. Change-Id: I7096b75f912b6d82baff1383d2156a268b3c621a --- M MediaWikiChat.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: UltrasonicNXT: Verified; Looks good to me, approved diff --git a/MediaWikiChat.php b/MediaWikiChat.php index 773c8d7..00da406 100644 --- a/MediaWikiChat.php +++ b/MediaWikiChat.php @@ -34,9 +34,9 @@ 'scripts' = 'MediaWikiChat.js', 'messages' = array( 'january', 'february', 'march', 'april', 'may', 'june', - 'july', 'august', 'september', 'october', 'november', 'december', - 'monday', 'tuesday', 'wednesday', 'thursay', 'friday', 'saturday', - 'sunday', 'chat-type-your-private-message', 'chat-no-other-users', + 'july', 'august', 'september', 'october', 'november', 'december', + 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', + 'sunday', 'chat-type-your-private-message', 'chat-no-other-users', 'chat-blocked-from-chat', 'chat-just-now', 'chat-a-minute-ago', 'chat-quarter-of-an-hour-ago', 'chat-half-an-hour-ago', 'chat-an-hour-ago', 'chat-minutes-ago', 'chat-youve-been-kicked', -- To view, visit https://gerrit.wikimedia.org/r/105490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7096b75f912b6d82baff1383d2156a268b3c621a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use JSON support in core for i18n messages - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Use JSON support in core for i18n messages .. Use JSON support in core for i18n messages Replace VisualEditor.i18n.php with a shim that uses the LocalisationCacheRecache hook to read messages from JSON files and add cache dependencies. Change-Id: Ib8490d3e327ddf5852827c24ee2aa2916c8af072 --- M VisualEditor.i18n.php M VisualEditor.php 2 files changed, 26 insertions(+), 19,510 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/102100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib8490d3e327ddf5852827c24ee2aa2916c8af072 Gerrit-PatchSet: 13 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Let users set __NOTOC__ __FORCETOC__ status - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Let users set __NOTOC__ __FORCETOC__ status
..
Let users set __NOTOC__ __FORCETOC__ status
This creates a new panel in the meta dialog, Page settings, where page-
level settings will be, err, set. For now, this exposes just the
behavioural switches for the presence/absence of the Table Of Contents –
__NOTOC__ and __FORCETOC__.
As part of this change, the meta dialog is renamed to Options to be
less confusing, and the icon for the meta dialog is changed to the
generic one for dialogs, which was previously unused. The page settings
pane is provided first in this list, given that the categories pane
(amongst others) is now directly accessible through the toolbar menu.
Bug: 56866
Bug: 56867
Change-Id: I33ce05c19d2e19b249e1cefd26fd0e3697d0085d
---
M VisualEditor.php
A modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
A modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
10 files changed, 296 insertions(+), 13 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index aafc1ca..5b527c7 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -525,6 +525,8 @@
'modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js',
+
'modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js',
+
'modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js',
'modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js',
'modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js',
@@ -570,6 +572,7 @@
'modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js',
'modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js',
+ 'modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js',
@@ -642,6 +645,12 @@
'visualeditor-dialog-meta-languages-name-label',
'visualeditor-dialog-meta-languages-readonlynote',
'visualeditor-dialog-meta-languages-section',
+ 'visualeditor-dialog-meta-settings-label',
+ 'visualeditor-dialog-meta-settings-section',
+ 'visualeditor-dialog-meta-settings-toc-default',
+ 'visualeditor-dialog-meta-settings-toc-disable',
+ 'visualeditor-dialog-meta-settings-toc-force',
+ 'visualeditor-dialog-meta-settings-toc-label',
'visualeditor-dialog-meta-title',
'visualeditor-dialog-reference-insert-button',
'visualeditor-dialog-reference-insert-title',
@@ -715,6 +724,7 @@
'visualeditor-savedialog-warning-dirty',
'visualeditor-saveerror',
'visualeditor-serializeerror',
+ 'visualeditor-settings-tool',
'visualeditor-toolbar-cancel',
'visualeditor-toolbar-insert',
'visualeditor-toolbar-savedialog',
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
b/modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
new file mode 100644
index 000..f8d7d1d
--- /dev/null
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
@@ -0,0 +1,47 @@
+/*!
+ * VisualEditor DataModel MWTOCDisableMetaItem class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * DataModel disable TOC meta item.
+ *
+ * @class
+ * @extends ve.dm.MetaItem
+ * @constructor
+ * @param {Object} element Reference to element in meta-linmod
+ */
+ve.dm.MWTOCDisableMetaItem = function VeDmMWTOCDisableMetaItem( element ) {
+ // Parent constructor
+ ve.dm.MetaItem.call( this, element );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.dm.MWTOCDisableMetaItem, ve.dm.MetaItem );
+
+/* Static Properties */
+
+ve.dm.MWTOCDisableMetaItem.static.name = 'mwTOCDisable';
+
+ve.dm.MWTOCDisableMetaItem.static.group = 'mwTOC';
+
[MediaWiki-commits] [Gerrit] Fix path to VE core i18n - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/105491 Change subject: Fix path to VE core i18n .. Fix path to VE core i18n Hadn't been properly updated for the repo split Change-Id: I1d6db13aeab9012b3a87a5f43d1a32fd510615cd --- M VisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/91/105491/1 diff --git a/VisualEditor.php b/VisualEditor.php index 5b527c7..e3a19b1 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -43,7 +43,7 @@ $wgAutoloadClasses['VisualEditorDataModule'] = $dir . 'VisualEditorDataModule.php'; $wgExtensionMessagesFiles['VisualEditor'] = $dir . 'VisualEditor.i18n.php'; $wgMessagesDirs['VisualEditor'] = array( - __DIR__ . '/lib/ve/i18n', + __DIR__ . '/lib/ve/modules/ve/i18n', __DIR__ . '/modules/ve-mw/i18n', __DIR__ . '/modules/ve-wmf/i18n', __DIR__ . '/lib/ve/lib/oojs-ui/i18n' -- To view, visit https://gerrit.wikimedia.org/r/105491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d6db13aeab9012b3a87a5f43d1a32fd510615cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path to VE core i18n - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Fix path to VE core i18n .. Fix path to VE core i18n Hadn't been properly updated for the repo split Change-Id: I1d6db13aeab9012b3a87a5f43d1a32fd510615cd --- M VisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.php b/VisualEditor.php index 5b527c7..e3a19b1 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -43,7 +43,7 @@ $wgAutoloadClasses['VisualEditorDataModule'] = $dir . 'VisualEditorDataModule.php'; $wgExtensionMessagesFiles['VisualEditor'] = $dir . 'VisualEditor.i18n.php'; $wgMessagesDirs['VisualEditor'] = array( - __DIR__ . '/lib/ve/i18n', + __DIR__ . '/lib/ve/modules/ve/i18n', __DIR__ . '/modules/ve-mw/i18n', __DIR__ . '/modules/ve-wmf/i18n', __DIR__ . '/lib/ve/lib/oojs-ui/i18n' -- To view, visit https://gerrit.wikimedia.org/r/105491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d6db13aeab9012b3a87a5f43d1a32fd510615cd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Call Language::getLocalisationCache() static - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Call Language::getLocalisationCache() static
..
Call Language::getLocalisationCache() static
Change-Id: Ibbe03b92f2beebaaf93ba9e3c5bebbf3d7626b7a
---
M tests/phpunit/includes/logging/LogFormatterTest.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php
b/tests/phpunit/includes/logging/LogFormatterTest.php
index 9650fb1..6210d09 100644
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -32,7 +32,7 @@
'wgExtensionMessagesFiles' = array( 'LogTests' =
__DIR__ . '/LogTests.i18n.php' ),
) );
- $wgLang-getLocalisationCache()-recache( $wgLang-getCode() );
+ Language::getLocalisationCache()-recache( $wgLang-getCode() );
$this-user = User::newFromName( 'Testuser' );
$this-title = Title::newMainPage();
@@ -47,7 +47,7 @@
parent::tearDown();
global $wgLang;
- $wgLang-getLocalisationCache()-recache( $wgLang-getCode() );
+ Language::getLocalisationCache()-recache( $wgLang-getCode() );
}
public function newLogEntry( $action, $params ) {
--
To view, visit https://gerrit.wikimedia.org/r/105456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbe03b92f2beebaaf93ba9e3c5bebbf3d7626b7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/105492 Change subject: Add COPYING .. Add COPYING Change-Id: If94e056f8368e589f312ca99823ff5eeecdefe78 --- A COPYING A libs/spyc/COPYING 2 files changed, 367 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/92/105492/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..e1df752 --- /dev/null +++ b/COPYING @@ -0,0 +1,346 @@ +The license text below applies to all files within this distribution, other +than those that are in a directory which contains files named LICENSE or +COPYING, or a subdirectory thereof. For those files, the license text contained in +said file overrides any license information contained in directories of smaller depth. +Alternative licenses are typically used for software that is provided by external +parties, and merely packaged with this software for convenience. + +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 their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a
[MediaWiki-commits] [Gerrit] Readable user dump, to be able to manually edit it - change (pywikibot/sf-export)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105497
Change subject: Readable user dump, to be able to manually edit it
..
Readable user dump, to be able to manually edit it
Change-Id: I7a56e9fb7f4743fddcfcef1137736c3880a99651
---
M jira.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/sf-export
refs/changes/97/105497/1
diff --git a/jira.py b/jira.py
index 37c6bbb..ab78020 100644
--- a/jira.py
+++ b/jira.py
@@ -193,7 +193,7 @@
print %s %s not found % (name, mail)
f = open('user-email-mapping.json', 'w')
-json.dump(users, f)
+json.dump(users, f, indent=4)
f.close()
for issue in retrIssues:
--
To view, visit https://gerrit.wikimedia.org/r/105497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a56e9fb7f4743fddcfcef1137736c3880a99651
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix check for existing bugs also import resolution - change (pywikibot/sf-export)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105494
Change subject: fix check for existing bugs also import resolution
..
fix check for existing bugs also import resolution
Change-Id: Ibaa9c17330695da90fdff23b266e998e2250478e
---
M jira.py
1 file changed, 54 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/sf-export
refs/changes/94/105494/1
diff --git a/jira.py b/jira.py
index d43fb6a..75c30d2 100644
--- a/jira.py
+++ b/jira.py
@@ -51,7 +51,7 @@
saveMigration = True
skip_existing = True
-if True:
+if False:
base_url = http://192.168.1.103:8080/xmlrpc.cgi;
saveMigration = False
skip_existing = False
@@ -142,7 +142,7 @@
issues = get(
'https://jira.toolserver.org/rest/api/2/search',
params={
-'jql': 'project = %s AND status in (Open, In Progress, Reopened, In
Review, Assigned, Waiting for customer)' % project,
+'jql': 'project = %s' % project, # AND status in (Open, In Progress,
Reopened, In Review, Assigned, Waiting for customer)' % project,
'fields': 'self',
'maxResults': stepsize
}
@@ -179,14 +179,20 @@
f.close()
for issue in retrIssues:
-# check if issue is already on BZ
-existing_bugs = [bug.bug_id for bug in bz.query({short_desc: PYWP-16})]
-if existing_bugs and skip_existing:
-print Skipping + issue['key'] + + fields['summary'] + ;
already uploaded? Check bug ID %r % existing_bugs
-continue
fields = issue['fields']
renderedFields = issue['renderedFields']
+# check if issue is already on BZ
+existing_bugs = bz.query({short_desc: issue['key'] + })
+if existing_bugs and skip_existing:
+found = False
+for bug in existing_bugs:
+if (issue['key'] + ) in bug.summary:
+print Skipping + issue['key'] + + fields['summary'] +
; already uploaded? Check bug ID %i % bug.bug_id
+found = True
+break
+if found:
+continue
cclist = set()
if fields['assignee']:
cclist.add(getBZuser(fields['assignee']['emailAddress'],
fields['assignee']['displayName']))
@@ -197,6 +203,10 @@
print issue['key'] + + fields['summary'],
sys.stdout.flush()
+
+if not runAll:
+if raw_input().upper() == A:
+runAll = True
if not renderedFields['description']:
renderedFields['description'] = u''
@@ -219,6 +229,7 @@
params['bug_severity'] = fields['priority']['name']
params['summary'] = issue['key'] + + fields['summary']
params['description'] = description
+params['assigned_to'] = username # set assignee to the bug convertor
initially
bug = bz.createbug(**params)
print -- bz id , bug.bug_id,
@@ -264,6 +275,41 @@
if user:
update['cc_add'].append(user)
+if fields['status']:
+sn = fields['status']['name']
+if sn in [Open, Reopened, Unassigned, Accepted, Waiting for
customer]:
+update['status'] = NEW
+elif sn in [In Progress, In Review, Assigned]:
+update['status'] = ASSIGNED
+elif sn in [Resolved, Closed, Declined, Done, Aborted]:
+update['status'] = RESOLVED
+if 'assigned_to' not in update:
+update['assigned_to'] = '(none)'
+update['comment'] =
+This bug was imported as RESOLVED. The original assignee has therefore not been
+set, and the original reporters/responders have not been added as CC, to
+prevent bugspam.
+
+If you re-open this bug, please consider adding these people to the CC list:
+Original assignee: %s
+CC list: %s % (update['assigned_to'], ', '.join(update['cc_add']))
+del update['assigned_to'] # no need to assign a bug that has been
resolved
+del update['cc_add'] # also no need to add CCs
+
+if fields['resolution']:
+if 'status' in update and update['status'] == RESOLVED:
+rn = fields['resolution']['name']
+if rn in [Fixed, Answered]:
+update['resolution'] = FIXED
+elif rn in [Won't Fix, Declined, External/Upstream]:
+update['resolution'] = WONTFIX
+elif rn in [Incomplete, Cannot Reproduce]:
+update['resolution'] = WORKSFORME
+elif rn in [Duplicate]:
+update['resolution'] = DUPLICATE # these should not be
imported in the first place...
+elif rn in [Not a bug]:
+update['resolution'] = INVALID
+
bzupdate = bz.build_update(**update)
try:
bz.update_bugs(bug.bug_id, bzupdate)
@@ -301,6 +347,4 @@
auth=('bugzilla-exporter', password)
)
-if not runAll:
-if raw_input().upper() == A:
-runAll = True
+
--
To view, visit https://gerrit.wikimedia.org/r/105494
To
[MediaWiki-commits] [Gerrit] use command line parameters - change (pywikibot/sf-export)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105495
Change subject: use command line parameters
..
use command line parameters
Change-Id: I223e8cb75b7ab3ac934301d6e4103414d42de171
---
M jira.py
1 file changed, 19 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/sf-export
refs/changes/95/105495/1
diff --git a/jira.py b/jira.py
index 75c30d2..405b38a 100644
--- a/jira.py
+++ b/jira.py
@@ -34,13 +34,27 @@
# iets met BugZilla nog
# JIRA config
-project = REPORTS # SET THIS!
stepsize = 1000
+
+if len(sys.argv) 3:
+print(Usage: {argv[0]} 'bugzilla component name within Tool Labs Tools'
'JIRA JQL query' [-importdoubles]
+
+-importdoubles can be used to double-import bugs, which is useful for
+ testing. Otherwise, bugs that already exist in Bugzilla
+ are skipped.
+
+Example:
+{argv[0]} 'DrTrigonBot - General' 'project = DRTRIGON'
+.format(argv=sys.argv))
+sys.exit(1)
+
+component = sys.argv[1]
+jql = sys.argv[2]
# BZ config
bug_defaults = {
'product': 'Tool Labs tools', # SET THIS!
-'component': 'tsreports', # SET THIS!
+'component': component, #Database Queries, # SET THIS!
'version': 'unspecified',
'blocked': '', # SET THIS! (to tracking bug or empty for no
tracking bug)
'op_sys': 'All',
@@ -49,7 +63,7 @@
base_url = https://bugzilla.wikimedia.org/xmlrpc.cgi;
saveMigration = True
-skip_existing = True
+skip_existing = -importdoubles not in sys.argv
if False:
base_url = http://192.168.1.103:8080/xmlrpc.cgi;
@@ -142,7 +156,7 @@
issues = get(
'https://jira.toolserver.org/rest/api/2/search',
params={
-'jql': 'project = %s' % project, # AND status in (Open, In Progress,
Reopened, In Review, Assigned, Waiting for customer)' % project,
+'jql': jql,
'fields': 'self',
'maxResults': stepsize
}
@@ -152,6 +166,7 @@
maillist = {}
retrIssues = []
+print Getting %i details... % len(issues)
for issue in issues:
issue = get(issue['self'] + ?expand=renderedFields)
retrIssues.append(issue)
--
To view, visit https://gerrit.wikimedia.org/r/105495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I223e8cb75b7ab3ac934301d6e4103414d42de171
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update build notice and licence file for 2014 - change (oojs/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/105499 Change subject: Update build notice and licence file for 2014 .. Update build notice and licence file for 2014 Change-Id: I77d12efa0e18f8b67f62e175936d82294f9f7a13 --- M LICENSE-MIT M src/intro.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/99/105499/1 diff --git a/LICENSE-MIT b/LICENSE-MIT index b9916e7..da0c48f 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2013 OOjs Team and other contributors. +Copyright 2011-2014 OOjs Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/src/intro.js b/src/intro.js index 66c58d3..bfc00b9 100644 --- a/src/intro.js +++ b/src/intro.js @@ -2,7 +2,7 @@ * OOjs v@VERSION * https://www.mediawiki.org/wiki/OOjs * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011-2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * -- To view, visit https://gerrit.wikimedia.org/r/105499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77d12efa0e18f8b67f62e175936d82294f9f7a13 Gerrit-PatchSet: 1 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update build headers for 2014 - change (oojs/ui)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/105500 Change subject: Update build headers for 2014 .. Update build headers for 2014 Change-Id: I248154f8cae6543861172822cda8b10b9bbe0e15 --- M src/intro.js M src/styles/intro.css 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/105500/1 diff --git a/src/intro.js b/src/intro.js index 52e6ff2..eb54d9c 100644 --- a/src/intro.js +++ b/src/intro.js @@ -2,7 +2,7 @@ * OOjs UI v@VERSION * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * diff --git a/src/styles/intro.css b/src/styles/intro.css index 06355ea..8ea8309 100644 --- a/src/styles/intro.css +++ b/src/styles/intro.css @@ -2,7 +2,7 @@ * OOjs UI v@VERSION * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * -- To view, visit https://gerrit.wikimedia.org/r/105500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I248154f8cae6543861172822cda8b10b9bbe0e15 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work around missing authors missing mail addresses - change (pywikibot/sf-export)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105496
Change subject: Work around missing authors missing mail addresses
..
Work around missing authors missing mail addresses
Change-Id: I12d782bcc3c62d74c08de7605bc4a94987bfbffd
---
M jira.py
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/sf-export
refs/changes/96/105496/1
diff --git a/jira.py b/jira.py
index 405b38a..37c6bbb 100644
--- a/jira.py
+++ b/jira.py
@@ -125,6 +125,8 @@
def getBZuser(email, name):
global users
+if not email:
+email = name + @invalid
if email in users:
return users[email]
@@ -178,7 +180,8 @@
maillist[fields['reporter']['emailAddress']] =
fields['reporter']['displayName']
for c in fields['comment']['comments']:
-maillist[c['author']['emailAddress']] = c['author']['displayName']
+if 'author' in c:
+maillist[c['author']['emailAddress']] = c['author']['displayName']
print Retrieving users from bugzilla...
@@ -254,8 +257,11 @@
natt = 0
for comment,renderedComment in zip(fields['comment']['comments'],
renderedFields['comment']['comments']):
ncs += 1
-cclist.add(getBZuser(comment['author']['emailAddress'],
comment['author']['displayName']))
-commenttext =
---
+if 'author' in comment:
+cclist.add(getBZuser(comment['author']['emailAddress'],
comment['author']['displayName']))
+else:
+comment['author'] = {'displayName': Anonymous, 'emailAddress':
'None'}
+commenttext =
u---
From: {f[author][displayName]} {f[author][emailAddress]}
Date: {f[created]:%a, %d %b %Y %T}
---
--
To view, visit https://gerrit.wikimedia.org/r/105496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12d782bcc3c62d74c08de7605bc4a94987bfbffd
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only post 'moved' messages on recent bugs - change (pywikibot/sf-export)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105498
Change subject: Only post 'moved' messages on recent bugs
..
Only post 'moved' messages on recent bugs
Change-Id: Ic74d84e875c725ea512072fb8f605a386f69ebd9
---
M jira.py
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/sf-export
refs/changes/98/105498/1
diff --git a/jira.py b/jira.py
index ab78020..cb3ba9e 100644
--- a/jira.py
+++ b/jira.py
@@ -344,6 +344,9 @@
print -- %i comments, %i attachments % (ncs, natt)
sys.stdout.flush()
+print Age: %i days % (abs(fields['updated'] - datetime.now()).days)
+recentBug = abs(fields['updated'] - datetime.now()).days 90
+
if saveMigration:
comment = This bug has been migrated to Bugzilla:
https://bugzilla.wikimedia.org/%i; % bug.bug_id
response = requests.post(issue['self'] + /transitions,
@@ -362,10 +365,11 @@
if response.status_code != 204: #ok
print WARNING: Cannot transition bug %s: %s % (issue['key'],
response.text)
-requests.post(issue['self'] + /comment,
-headers={content-type: application/json},
-data=json.dumps({'body': comment}),
-auth=('bugzilla-exporter', password)
-)
+if recentBug:
+requests.post(issue['self'] + /comment,
+headers={content-type: application/json},
+data=json.dumps({'body': comment}),
+auth=('bugzilla-exporter', password)
+)
--
To view, visit https://gerrit.wikimedia.org/r/105498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic74d84e875c725ea512072fb8f605a386f69ebd9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix check for existing bugs also import resolution - change (pywikibot/sf-export)
Merlijn van Deen has submitted this change and it was merged.
Change subject: fix check for existing bugs also import resolution
..
fix check for existing bugs also import resolution
Change-Id: Ibaa9c17330695da90fdff23b266e998e2250478e
---
M jira.py
1 file changed, 54 insertions(+), 10 deletions(-)
Approvals:
Merlijn van Deen: Verified; Looks good to me, approved
diff --git a/jira.py b/jira.py
index d43fb6a..75c30d2 100644
--- a/jira.py
+++ b/jira.py
@@ -51,7 +51,7 @@
saveMigration = True
skip_existing = True
-if True:
+if False:
base_url = http://192.168.1.103:8080/xmlrpc.cgi;
saveMigration = False
skip_existing = False
@@ -142,7 +142,7 @@
issues = get(
'https://jira.toolserver.org/rest/api/2/search',
params={
-'jql': 'project = %s AND status in (Open, In Progress, Reopened, In
Review, Assigned, Waiting for customer)' % project,
+'jql': 'project = %s' % project, # AND status in (Open, In Progress,
Reopened, In Review, Assigned, Waiting for customer)' % project,
'fields': 'self',
'maxResults': stepsize
}
@@ -179,14 +179,20 @@
f.close()
for issue in retrIssues:
-# check if issue is already on BZ
-existing_bugs = [bug.bug_id for bug in bz.query({short_desc: PYWP-16})]
-if existing_bugs and skip_existing:
-print Skipping + issue['key'] + + fields['summary'] + ;
already uploaded? Check bug ID %r % existing_bugs
-continue
fields = issue['fields']
renderedFields = issue['renderedFields']
+# check if issue is already on BZ
+existing_bugs = bz.query({short_desc: issue['key'] + })
+if existing_bugs and skip_existing:
+found = False
+for bug in existing_bugs:
+if (issue['key'] + ) in bug.summary:
+print Skipping + issue['key'] + + fields['summary'] +
; already uploaded? Check bug ID %i % bug.bug_id
+found = True
+break
+if found:
+continue
cclist = set()
if fields['assignee']:
cclist.add(getBZuser(fields['assignee']['emailAddress'],
fields['assignee']['displayName']))
@@ -197,6 +203,10 @@
print issue['key'] + + fields['summary'],
sys.stdout.flush()
+
+if not runAll:
+if raw_input().upper() == A:
+runAll = True
if not renderedFields['description']:
renderedFields['description'] = u''
@@ -219,6 +229,7 @@
params['bug_severity'] = fields['priority']['name']
params['summary'] = issue['key'] + + fields['summary']
params['description'] = description
+params['assigned_to'] = username # set assignee to the bug convertor
initially
bug = bz.createbug(**params)
print -- bz id , bug.bug_id,
@@ -264,6 +275,41 @@
if user:
update['cc_add'].append(user)
+if fields['status']:
+sn = fields['status']['name']
+if sn in [Open, Reopened, Unassigned, Accepted, Waiting for
customer]:
+update['status'] = NEW
+elif sn in [In Progress, In Review, Assigned]:
+update['status'] = ASSIGNED
+elif sn in [Resolved, Closed, Declined, Done, Aborted]:
+update['status'] = RESOLVED
+if 'assigned_to' not in update:
+update['assigned_to'] = '(none)'
+update['comment'] =
+This bug was imported as RESOLVED. The original assignee has therefore not been
+set, and the original reporters/responders have not been added as CC, to
+prevent bugspam.
+
+If you re-open this bug, please consider adding these people to the CC list:
+Original assignee: %s
+CC list: %s % (update['assigned_to'], ', '.join(update['cc_add']))
+del update['assigned_to'] # no need to assign a bug that has been
resolved
+del update['cc_add'] # also no need to add CCs
+
+if fields['resolution']:
+if 'status' in update and update['status'] == RESOLVED:
+rn = fields['resolution']['name']
+if rn in [Fixed, Answered]:
+update['resolution'] = FIXED
+elif rn in [Won't Fix, Declined, External/Upstream]:
+update['resolution'] = WONTFIX
+elif rn in [Incomplete, Cannot Reproduce]:
+update['resolution'] = WORKSFORME
+elif rn in [Duplicate]:
+update['resolution'] = DUPLICATE # these should not be
imported in the first place...
+elif rn in [Not a bug]:
+update['resolution'] = INVALID
+
bzupdate = bz.build_update(**update)
try:
bz.update_bugs(bug.bug_id, bzupdate)
@@ -301,6 +347,4 @@
auth=('bugzilla-exporter', password)
)
-if not runAll:
-if raw_input().upper() == A:
-runAll = True
+
--
To view, visit https://gerrit.wikimedia.org/r/105494
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Readable user dump, to be able to manually edit it - change (pywikibot/sf-export)
Merlijn van Deen has submitted this change and it was merged.
Change subject: Readable user dump, to be able to manually edit it
..
Readable user dump, to be able to manually edit it
Change-Id: I7a56e9fb7f4743fddcfcef1137736c3880a99651
---
M jira.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Verified; Looks good to me, approved
diff --git a/jira.py b/jira.py
index 37c6bbb..ab78020 100644
--- a/jira.py
+++ b/jira.py
@@ -193,7 +193,7 @@
print %s %s not found % (name, mail)
f = open('user-email-mapping.json', 'w')
-json.dump(users, f)
+json.dump(users, f, indent=4)
f.close()
for issue in retrIssues:
--
To view, visit https://gerrit.wikimedia.org/r/105497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a56e9fb7f4743fddcfcef1137736c3880a99651
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work around missing authors missing mail addresses - change (pywikibot/sf-export)
Merlijn van Deen has submitted this change and it was merged.
Change subject: Work around missing authors missing mail addresses
..
Work around missing authors missing mail addresses
Change-Id: I12d782bcc3c62d74c08de7605bc4a94987bfbffd
---
M jira.py
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Merlijn van Deen: Verified; Looks good to me, approved
diff --git a/jira.py b/jira.py
index 405b38a..37c6bbb 100644
--- a/jira.py
+++ b/jira.py
@@ -125,6 +125,8 @@
def getBZuser(email, name):
global users
+if not email:
+email = name + @invalid
if email in users:
return users[email]
@@ -178,7 +180,8 @@
maillist[fields['reporter']['emailAddress']] =
fields['reporter']['displayName']
for c in fields['comment']['comments']:
-maillist[c['author']['emailAddress']] = c['author']['displayName']
+if 'author' in c:
+maillist[c['author']['emailAddress']] = c['author']['displayName']
print Retrieving users from bugzilla...
@@ -254,8 +257,11 @@
natt = 0
for comment,renderedComment in zip(fields['comment']['comments'],
renderedFields['comment']['comments']):
ncs += 1
-cclist.add(getBZuser(comment['author']['emailAddress'],
comment['author']['displayName']))
-commenttext =
---
+if 'author' in comment:
+cclist.add(getBZuser(comment['author']['emailAddress'],
comment['author']['displayName']))
+else:
+comment['author'] = {'displayName': Anonymous, 'emailAddress':
'None'}
+commenttext =
u---
From: {f[author][displayName]} {f[author][emailAddress]}
Date: {f[created]:%a, %d %b %Y %T}
---
--
To view, visit https://gerrit.wikimedia.org/r/105496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12d782bcc3c62d74c08de7605bc4a94987bfbffd
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use command line parameters - change (pywikibot/sf-export)
Merlijn van Deen has submitted this change and it was merged.
Change subject: use command line parameters
..
use command line parameters
Change-Id: I223e8cb75b7ab3ac934301d6e4103414d42de171
---
M jira.py
1 file changed, 19 insertions(+), 4 deletions(-)
Approvals:
Merlijn van Deen: Verified; Looks good to me, approved
diff --git a/jira.py b/jira.py
index 75c30d2..405b38a 100644
--- a/jira.py
+++ b/jira.py
@@ -34,13 +34,27 @@
# iets met BugZilla nog
# JIRA config
-project = REPORTS # SET THIS!
stepsize = 1000
+
+if len(sys.argv) 3:
+print(Usage: {argv[0]} 'bugzilla component name within Tool Labs Tools'
'JIRA JQL query' [-importdoubles]
+
+-importdoubles can be used to double-import bugs, which is useful for
+ testing. Otherwise, bugs that already exist in Bugzilla
+ are skipped.
+
+Example:
+{argv[0]} 'DrTrigonBot - General' 'project = DRTRIGON'
+.format(argv=sys.argv))
+sys.exit(1)
+
+component = sys.argv[1]
+jql = sys.argv[2]
# BZ config
bug_defaults = {
'product': 'Tool Labs tools', # SET THIS!
-'component': 'tsreports', # SET THIS!
+'component': component, #Database Queries, # SET THIS!
'version': 'unspecified',
'blocked': '', # SET THIS! (to tracking bug or empty for no
tracking bug)
'op_sys': 'All',
@@ -49,7 +63,7 @@
base_url = https://bugzilla.wikimedia.org/xmlrpc.cgi;
saveMigration = True
-skip_existing = True
+skip_existing = -importdoubles not in sys.argv
if False:
base_url = http://192.168.1.103:8080/xmlrpc.cgi;
@@ -142,7 +156,7 @@
issues = get(
'https://jira.toolserver.org/rest/api/2/search',
params={
-'jql': 'project = %s' % project, # AND status in (Open, In Progress,
Reopened, In Review, Assigned, Waiting for customer)' % project,
+'jql': jql,
'fields': 'self',
'maxResults': stepsize
}
@@ -152,6 +166,7 @@
maillist = {}
retrIssues = []
+print Getting %i details... % len(issues)
for issue in issues:
issue = get(issue['self'] + ?expand=renderedFields)
retrIssues.append(issue)
--
To view, visit https://gerrit.wikimedia.org/r/105495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I223e8cb75b7ab3ac934301d6e4103414d42de171
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only post 'moved' messages on recent bugs - change (pywikibot/sf-export)
Merlijn van Deen has submitted this change and it was merged.
Change subject: Only post 'moved' messages on recent bugs
..
Only post 'moved' messages on recent bugs
Change-Id: Ic74d84e875c725ea512072fb8f605a386f69ebd9
---
M jira.py
1 file changed, 9 insertions(+), 5 deletions(-)
Approvals:
Merlijn van Deen: Verified; Looks good to me, approved
diff --git a/jira.py b/jira.py
index ab78020..cb3ba9e 100644
--- a/jira.py
+++ b/jira.py
@@ -344,6 +344,9 @@
print -- %i comments, %i attachments % (ncs, natt)
sys.stdout.flush()
+print Age: %i days % (abs(fields['updated'] - datetime.now()).days)
+recentBug = abs(fields['updated'] - datetime.now()).days 90
+
if saveMigration:
comment = This bug has been migrated to Bugzilla:
https://bugzilla.wikimedia.org/%i; % bug.bug_id
response = requests.post(issue['self'] + /transitions,
@@ -362,10 +365,11 @@
if response.status_code != 204: #ok
print WARNING: Cannot transition bug %s: %s % (issue['key'],
response.text)
-requests.post(issue['self'] + /comment,
-headers={content-type: application/json},
-data=json.dumps({'body': comment}),
-auth=('bugzilla-exporter', password)
-)
+if recentBug:
+requests.post(issue['self'] + /comment,
+headers={content-type: application/json},
+data=json.dumps({'body': comment}),
+auth=('bugzilla-exporter', password)
+)
--
To view, visit https://gerrit.wikimedia.org/r/105498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic74d84e875c725ea512072fb8f605a386f69ebd9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/sf-export
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update build headers for 2014 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Update build headers for 2014 .. Update build headers for 2014 Change-Id: I248154f8cae6543861172822cda8b10b9bbe0e15 --- M src/intro.js M src/styles/intro.css 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/src/intro.js b/src/intro.js index 52e6ff2..eb54d9c 100644 --- a/src/intro.js +++ b/src/intro.js @@ -2,7 +2,7 @@ * OOjs UI v@VERSION * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * diff --git a/src/styles/intro.css b/src/styles/intro.css index 06355ea..8ea8309 100644 --- a/src/styles/intro.css +++ b/src/styles/intro.css @@ -2,7 +2,7 @@ * OOjs UI v@VERSION * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * -- To view, visit https://gerrit.wikimedia.org/r/105500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I248154f8cae6543861172822cda8b10b9bbe0e15 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update build notice and licence file for 2014 - change (oojs/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update build notice and licence file for 2014 .. Update build notice and licence file for 2014 Change-Id: I77d12efa0e18f8b67f62e175936d82294f9f7a13 --- M LICENSE-MIT M src/intro.js 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/LICENSE-MIT b/LICENSE-MIT index b9916e7..da0c48f 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2013 OOjs Team and other contributors. +Copyright 2011-2014 OOjs Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/src/intro.js b/src/intro.js index 66c58d3..bfc00b9 100644 --- a/src/intro.js +++ b/src/intro.js @@ -2,7 +2,7 @@ * OOjs v@VERSION * https://www.mediawiki.org/wiki/OOjs * - * Copyright 2011-2013 OOjs Team and other contributors. + * Copyright 2011-2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * -- To view, visit https://gerrit.wikimedia.org/r/105499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77d12efa0e18f8b67f62e175936d82294f9f7a13 Gerrit-PatchSet: 1 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare for composer - change (mediawiki...InviteSignup)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105501
Change subject: Prepare for composer
..
Prepare for composer
Change-Id: I79aab0353a5f4a3f43e513591d4d18f75571884a
---
M InviteSignup.php
M InviteStore.php
M SpecialInviteSignup.php
A composer.json
4 files changed, 40 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InviteSignup
refs/changes/01/105501/1
diff --git a/InviteSignup.php b/InviteSignup.php
index 9bda0d9..ac6e3ac 100644
--- a/InviteSignup.php
+++ b/InviteSignup.php
@@ -8,10 +8,10 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2012-2013 Lost in Translations Inc.
- * @license GPL 2.0 or later
+ * @license GPL-2.0+
*/
-$wgExtensionCredits['specialpage'][] = array(
+$GLOBALS['wgExtensionCredits']['specialpage'][] = array(
'path' = __FILE__,
'name' = 'InviteSignup',
'version' = '2013-05-22',
@@ -21,20 +21,21 @@
);
$dir = __DIR__;
-$wgAutoloadClasses['InviteStore'] = $dir/InviteStore.php;
-$wgAutoloadClasses['SpecialInviteSignup'] = $dir/SpecialInviteSignup.php;
-$wgExtensionMessagesFiles['InviteSignupAlias'] = $dir/InviteSignup.alias.php;
-$wgExtensionMessagesFiles['InviteSignup'] = $dir/InviteSignup.i18n.php;
-$wgSpecialPages['InviteSignup'] = 'SpecialInviteSignup';
-$wgAvailableRights[] = 'invitesignup';
+$GLOBALS['wgAutoloadClasses']['InviteStore'] = $dir/InviteStore.php;
+$GLOBALS['wgAutoloadClasses']['SpecialInviteSignup'] =
$dir/SpecialInviteSignup.php;
+$GLOBALS['wgExtensionMessagesFiles']['InviteSignup'] =
$dir/InviteSignup.i18n.php;
+$GLOBALS['wgExtensionMessagesFiles']['InviteSignupAlias'] =
$dir/InviteSignup.alias.php;
+$GLOBALS['wgSpecialPages']['InviteSignup'] = 'SpecialInviteSignup';
+$GLOBALS['wgAvailableRights'][] = 'invitesignup';
-$wgInviteSignupHash = null;
+$GLOBALS['wgInviteSignupHash'] = null;
/**
* List of groups the invitee will be promoted automatically.
*/
-$wgISGroups = array();
+$GLOBALS['wgISGroups'] = array();
+global $wgHooks;
$wgHooks['BeforeInitialize'][] = function ( $title, $unused, $output,
$user, $request ) {
if ( !$title-isSpecialPage() ) {
return true;
diff --git a/InviteStore.php b/InviteStore.php
index 980a8a0..a50b92c 100644
--- a/InviteStore.php
+++ b/InviteStore.php
@@ -7,6 +7,7 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2013 Lost in Translations Inc.
+ * @license GPL-2.0+
*/
/**
diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php
index 576ec92..34b3585 100644
--- a/SpecialInviteSignup.php
+++ b/SpecialInviteSignup.php
@@ -7,6 +7,7 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2012-2013 Lost in Translations Inc.
+ * @license GPL-2.0+
*/
class SpecialInviteSignup extends SpecialPage {
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..fd8be01
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+ name: mediawiki/invite-signup,
+ type: mediawiki-extension,
+ description: Invite users to sign up,
+ keywords: [
+ MediaWiki
+ ],
+ homepage: https://www.mediawiki.org/wiki/Extension:InviteSignup;,
+ license: GPL-2.0+,
+ authors: [
+ {
+ name: Niklas Laxström,
+ email: niklas.laxst...@gmail.com,
+ role: Developer
+ }
+ ],
+ support: {
+ issues: https://bugzilla.wikimedia.org/;
+ },
+ require: {
+ php: =5.3.0,
+ composer/installers: =1.0.1
+ },
+ autoload: {
+ files: [InviteSignup.php]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/105501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79aab0353a5f4a3f43e513591d4d18f75571884a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare for composer - change (mediawiki...InviteSignup)
Nikerabbit has submitted this change and it was merged.
Change subject: Prepare for composer
..
Prepare for composer
Change-Id: I79aab0353a5f4a3f43e513591d4d18f75571884a
---
M InviteSignup.php
M InviteStore.php
M SpecialInviteSignup.php
A composer.json
4 files changed, 40 insertions(+), 10 deletions(-)
Approvals:
Nikerabbit: Verified; Looks good to me, approved
diff --git a/InviteSignup.php b/InviteSignup.php
index 9bda0d9..ac6e3ac 100644
--- a/InviteSignup.php
+++ b/InviteSignup.php
@@ -8,10 +8,10 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2012-2013 Lost in Translations Inc.
- * @license GPL 2.0 or later
+ * @license GPL-2.0+
*/
-$wgExtensionCredits['specialpage'][] = array(
+$GLOBALS['wgExtensionCredits']['specialpage'][] = array(
'path' = __FILE__,
'name' = 'InviteSignup',
'version' = '2013-05-22',
@@ -21,20 +21,21 @@
);
$dir = __DIR__;
-$wgAutoloadClasses['InviteStore'] = $dir/InviteStore.php;
-$wgAutoloadClasses['SpecialInviteSignup'] = $dir/SpecialInviteSignup.php;
-$wgExtensionMessagesFiles['InviteSignupAlias'] = $dir/InviteSignup.alias.php;
-$wgExtensionMessagesFiles['InviteSignup'] = $dir/InviteSignup.i18n.php;
-$wgSpecialPages['InviteSignup'] = 'SpecialInviteSignup';
-$wgAvailableRights[] = 'invitesignup';
+$GLOBALS['wgAutoloadClasses']['InviteStore'] = $dir/InviteStore.php;
+$GLOBALS['wgAutoloadClasses']['SpecialInviteSignup'] =
$dir/SpecialInviteSignup.php;
+$GLOBALS['wgExtensionMessagesFiles']['InviteSignup'] =
$dir/InviteSignup.i18n.php;
+$GLOBALS['wgExtensionMessagesFiles']['InviteSignupAlias'] =
$dir/InviteSignup.alias.php;
+$GLOBALS['wgSpecialPages']['InviteSignup'] = 'SpecialInviteSignup';
+$GLOBALS['wgAvailableRights'][] = 'invitesignup';
-$wgInviteSignupHash = null;
+$GLOBALS['wgInviteSignupHash'] = null;
/**
* List of groups the invitee will be promoted automatically.
*/
-$wgISGroups = array();
+$GLOBALS['wgISGroups'] = array();
+global $wgHooks;
$wgHooks['BeforeInitialize'][] = function ( $title, $unused, $output,
$user, $request ) {
if ( !$title-isSpecialPage() ) {
return true;
diff --git a/InviteStore.php b/InviteStore.php
index 980a8a0..a50b92c 100644
--- a/InviteStore.php
+++ b/InviteStore.php
@@ -7,6 +7,7 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2013 Lost in Translations Inc.
+ * @license GPL-2.0+
*/
/**
diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php
index 576ec92..34b3585 100644
--- a/SpecialInviteSignup.php
+++ b/SpecialInviteSignup.php
@@ -7,6 +7,7 @@
*
* @author Niklas Laxström
* @copyright Copyright © 2012-2013 Lost in Translations Inc.
+ * @license GPL-2.0+
*/
class SpecialInviteSignup extends SpecialPage {
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..fd8be01
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+ name: mediawiki/invite-signup,
+ type: mediawiki-extension,
+ description: Invite users to sign up,
+ keywords: [
+ MediaWiki
+ ],
+ homepage: https://www.mediawiki.org/wiki/Extension:InviteSignup;,
+ license: GPL-2.0+,
+ authors: [
+ {
+ name: Niklas Laxström,
+ email: niklas.laxst...@gmail.com,
+ role: Developer
+ }
+ ],
+ support: {
+ issues: https://bugzilla.wikimedia.org/;
+ },
+ require: {
+ php: =5.3.0,
+ composer/installers: =1.0.1
+ },
+ autoload: {
+ files: [InviteSignup.php]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/105501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79aab0353a5f4a3f43e513591d4d18f75571884a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare for composer - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/105503 Change subject: Prepare for composer .. Prepare for composer Bug: 49121 Change-Id: I7b391cc856ca4526951db409173deb0f1b955c4b --- M Resources.php M UniversalLanguageSelector.php A composer.json 3 files changed, 58 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/03/105503/1 diff --git a/Resources.php b/Resources.php index 723a3c8..4642721 100644 --- a/Resources.php +++ b/Resources.php @@ -3,7 +3,7 @@ * JavaScript and CSS resource definitions. * * @file - * @license GPL2+ + * @license GPL-2.0+ */ $resourcePaths = array( @@ -11,6 +11,7 @@ 'remoteExtPath' = 'UniversalLanguageSelector' ); +global $wgResourceModules; $wgResourceModules['ext.uls.languagenames'] = array( 'class' = 'ResourceLoaderULSModule' ); diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 84584c9..4c2048d 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -27,7 +27,7 @@ */ define( 'ULS_VERSION', '2013-12-31' ); -$wgExtensionCredits['other'][] = array( +$GLOBALS['wgExtensionCredits']['other'][] = array( 'path' = __FILE__, 'name' = 'UniversalLanguageSelector', 'version' = ULS_VERSION, @@ -54,7 +54,7 @@ * * The service should return jsonp that uses the supplied callback parameter. */ -$wgULSGeoService = true; +$GLOBALS['wgULSGeoService'] = true; /** * Enable language selection, input methods and webfonts for everyone, unless @@ -64,14 +64,14 @@ * use of other extensions. Language changing via cookie or setlang query * parameter is not possible. */ -$wgULSEnable = true; +$GLOBALS['wgULSEnable'] = true; /** * Equivalent to $wgULSEnable for anonymous users only. * * Does not have any effect if $wgULSEnable is false. */ -$wgULSEnableAnon = true; +$GLOBALS['wgULSEnableAnon'] = true; /** * Allow anonymous users to change language with cookie and setlang @@ -85,7 +85,7 @@ * * @since 2013.04 */ -$wgULSAnonCanChangeLanguage = true; +$GLOBALS['wgULSAnonCanChangeLanguage'] = true; /** * Try to use preferred interface language for anonymous users. @@ -96,19 +96,19 @@ * Does not have any effect if any of $wgULSEnable, $wgULSEnableAnon * or $wgULSAnonCanChangeLanguage is set to false. */ -$wgULSLanguageDetection = true; +$GLOBALS['wgULSLanguageDetection'] = true; /** * Disable the input methods feature for all users by default. Can still * be enabled manually by the user. */ -$wgULSIMEEnabled = true; +$GLOBALS['wgULSIMEEnabled'] = true; /** * Set whether webfont support is loaded within the mobile interface (via the * MobileFrontend extension). */ -$wgULSMobileWebfontsEnabled = false; +$GLOBALS['wgULSMobileWebfontsEnabled'] = false; /** * The location and the form of the language selection trigger. @@ -120,21 +120,21 @@ * * @since 2013.04 */ -$wgULSPosition = 'personal'; +$GLOBALS['wgULSPosition'] = 'personal'; /** * Whether to use EventLogging. The EventLogging extension must be installed * if this option is enabled. * @since 2013.06 */ -$wgULSEventLogging = false; +$GLOBALS['wgULSEventLogging'] = false; /** * Array of jQuery selectors of elements on which IME should be enabled. * * @since 2013.11 */ -$wgULSImeSelectors = array( +$GLOBALS['wgULSImeSelectors'] = array( 'input:not([type])', 'input[type=text]', 'input[type=search]', @@ -147,7 +147,7 @@ * * @since 2013.07 */ -$wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); +$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); /** * Array of jQuery selectors of elements on which webfonts must not be applied. @@ -155,7 +155,7 @@ * Autonym * @since 2013.09 */ -$wgULSNoWebfontsSelectors = array( '.autonym' ); +$GLOBALS['wgULSNoWebfontsSelectors'] = array( '.autonym' ); /** * Base path of ULS font repository. @@ -163,14 +163,14 @@ * relative to $wgExtensionAssetsPath. * @since 2013.10 */ -$wgULSFontRepositoryBasePath = false; +$GLOBALS['wgULSFontRepositoryBasePath'] = false; // Internationalization -$wgExtensionMessagesFiles['UniversalLanguageSelector'] = +$GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] = __DIR__ . '/UniversalLanguageSelector.i18n.php'; // Register auto load for the page class -$wgAutoloadClasses += array( +$GLOBALS['wgAutoloadClasses'] += array( 'UniversalLanguageSelectorHooks' = __DIR__ . '/UniversalLanguageSelector.hooks.php', 'ResourceLoaderULSModule' = __DIR__ . '/includes/ResourceLoaderULSModule.php', 'ResourceLoaderULSJsonMessageModule' = @@ -181,22 +181,22 @@ 'LanguageNameSearch' = __DIR__ . '/data/LanguageNameSearch.php', );
[MediaWiki-commits] [Gerrit] Composer: suggest does not take version, but description - change (mediawiki/core)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105504
Change subject: Composer: suggest does not take version, but description
..
Composer: suggest does not take version, but description
Change-Id: I06b4fc1b23ac35dda1ab69769d773c8ab8d9aaf1
---
M composer-example.json
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/04/105504/1
diff --git a/composer-example.json b/composer-example.json
index 6c4d37f..f6718e9 100644
--- a/composer-example.json
+++ b/composer-example.json
@@ -4,8 +4,8 @@
},
suggest: {
ext-fileinfo: *,
- ext-mbstring: *,
- ext-wikidiff2: *,
- ext-apc: *
+ ext-mbstring: Faster unicode handling,
+ ext-wikidiff2: Faster diff generation,
+ ext-apc: Speed up MediaWiki with opcode caching (before PHP
5.5)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/105504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06b4fc1b23ac35dda1ab69769d773c8ab8d9aaf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare for composer - change (mediawiki...Babel)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105505
Change subject: Prepare for composer
..
Prepare for composer
Bug: 49129
Change-Id: Ie59681585ae699d16ffd7622ed01403ea3e634bc
---
M Babel.php
A composer.json
2 files changed, 45 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/05/105505/1
diff --git a/Babel.php b/Babel.php
index 8a65b59..5b94e17 100644
--- a/Babel.php
+++ b/Babel.php
@@ -19,29 +19,29 @@
die( 'Invalid entry point.' );
}
-$wgExtensionCredits['parserhook'][] = array(
+$GLOBALS['wgExtensionCredits']['parserhook'][] = array(
'path' = __FILE__,
'name' = 'Babel',
- 'version' = '1.8.1',
+ 'version' = '1.8.2',
'author' = 'Robert Leverington',
'url' = 'https://www.mediawiki.org/wiki/Extension:Babel',
'descriptionmsg' = 'babel-desc',
);
-$wgHooks['ParserFirstCallInit'][] = 'BabelStatic::onParserFirstCallInit';
-$wgHooks['AbortNewAccount'][] = 'BabelAutoCreate::onAbortNewAccount';
+$GLOBALS['wgHooks']['ParserFirstCallInit'][] =
'BabelStatic::onParserFirstCallInit';
+$GLOBALS['wgHooks']['AbortNewAccount'][] =
'BabelAutoCreate::onAbortNewAccount';
$dir = __DIR__ . '/';
-$wgExtensionMessagesFiles['Babel'] = $dir . 'Babel.i18n.php';
-$wgExtensionMessagesFiles['BabelMagic'] = $dir . 'Babel.i18n.magic.php';
+$GLOBALS['wgExtensionMessagesFiles']['Babel'] = $dir . 'Babel.i18n.php';
+$GLOBALS['wgExtensionMessagesFiles']['BabelMagic'] = $dir .
'Babel.i18n.magic.php';
-$wgAutoloadClasses['Babel'] = $dir . 'Babel.class.php';
-$wgAutoloadClasses['BabelLanguageCodes'] = $dir .
'BabelLanguageCodes.class.php';
-$wgAutoloadClasses['BabelStatic'] = $dir . 'BabelStatic.class.php';
-$wgAutoloadClasses['BabelAutoCreate'] = $dir . 'BabelAutoCreate.class.php';
+$GLOBALS['wgAutoloadClasses']['Babel'] = $dir . 'Babel.class.php';
+$GLOBALS['wgAutoloadClasses']['BabelLanguageCodes'] = $dir .
'BabelLanguageCodes.class.php';
+$GLOBALS['wgAutoloadClasses']['BabelStatic'] = $dir . 'BabelStatic.class.php';
+$GLOBALS['wgAutoloadClasses']['BabelAutoCreate'] = $dir .
'BabelAutoCreate.class.php';
-$wgResourceModules['ext.babel'] = array(
+$GLOBALS['wgResourceModules']['ext.babel'] = array(
'styles' = 'resources/ext.babel.css',
'localBasePath' = __DIR__,
'remoteExtPath' = 'Babel',
@@ -49,12 +49,12 @@
// Configuration setttings.
// Language names and codes constant database files, the defaults should
suffice.
-$wgBabelLanguageCodesCdb = $dir . 'codes.cdb';
-$wgBabelLanguageNamesCdb = $dir . 'names.cdb';
+$GLOBALS['wgBabelLanguageCodesCdb'] = $dir . 'codes.cdb';
+$GLOBALS['wgBabelLanguageNamesCdb'] = $dir . 'names.cdb';
// Array of possible levels, and their category name - variables: %code%
%wikiname% %nativename%
// Set to false to disable categories for a particular level.
// Alphabetical levels should be in upper case.
-$wgBabelCategoryNames = array(
+$GLOBALS['wgBabelCategoryNames'] = array(
'0' = '%code%-0',
'1' = '%code%-1',
'2' = '%code%-2',
@@ -65,15 +65,15 @@
);
// Category name for the main (non-level) category of each language.
// Set to false to disable main category.
-$wgBabelMainCategory = '%code%';
+$GLOBALS['wgBabelMainCategory'] = '%code%';
// Default level.
-$wgBabelDefaultLevel = 'N';
+$GLOBALS['wgBabelDefaultLevel'] = 'N';
// Use the viewing user's language for babel box header's and footer's
// May fragment parser cache, but otherwise shouldn't cause problems
-$wgBabelUseUserLanguage = false;
+$GLOBALS['wgBabelUseUserLanguage'] = false;
// A boolean (true or false) indicating whether ISO 639-3 codes should be
// preferred over ISO 639-1 codes.
-$wgBabelPreferISO639_3 = false; // Not yet used.
+$GLOBALS['wgBabelPreferISO639_3'] = false; // Not yet used.
/* Other settings, to be made in-wiki:
MediaWiki:Babel-template
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..1bfbc36
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+ name: mediawiki/babel,
+ type: mediawiki-extension,
+ description: Users can easily indicate their language proficiency on
their user page,
+ keywords: [
+ MediaWiki,
+ Language
+ ],
+ homepage: https://www.mediawiki.org/wiki/Extension:Babel;,
+ license: GPL-2.0+,
+ authors: [
+ {
+ name: Robert Leverington,
+ role: Original developer
+ }
+ ],
+ support: {
+ issues: https://bugzilla.wikimedia.org/;,
+ irc: irc://irc.freenode.net/mediawiki-i18n,
+ },
+ require: {
+ composer/installers: =1.0.1
+ },
+ autoload: {
+ files: [Babel.php]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/105505
To
[MediaWiki-commits] [Gerrit] Make composer more descriptive - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105507
Change subject: Make composer more descriptive
..
Make composer more descriptive
Change-Id: Ia8b9acda6b8116ea093bb6ca8302c9b038f2b992
---
M composer.json
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/07/105507/1
diff --git a/composer.json b/composer.json
index 9759449..3847e67 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,16 @@
{
name: mediawiki/translate,
type: mediawiki-extension,
- description: Let your user translate any kind of text,
+ description: The only standard solution to translate any kind of
text with an avant-garde web interface within MediaWiki, including your
documentation and software,
keywords: [
MediaWiki,
Translation,
+ l10n,
+ i18n,
+ g11n,
+ m17n,
+ localization,
+ internationalization,
translatewiki.net
],
homepage: https://www.mediawiki.org/wiki/Extension:Translate;,
--
To view, visit https://gerrit.wikimedia.org/r/105507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8b9acda6b8116ea093bb6ca8302c9b038f2b992
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ULS and Babel to composer suggestions - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105508
Change subject: Add ULS and Babel to composer suggestions
..
Add ULS and Babel to composer suggestions
After Ie5968158 and I7b391cc8.
Change-Id: Id305ed65577c056b0ec8a8f66411d58f5ec8a9de
---
M composer.json
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/08/105508/1
diff --git a/composer.json b/composer.json
index 9759449..f6df7a9 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,10 @@
composer/installers: =1.0.1
},
suggest: {
- mediawiki/translation-notifications: Manage communication
with translators
+ mediawiki/babel: Users can easily indicate their language
proficiency on their user page,
+ mediawiki/translation-notifications: Manage communication
with translators,
+ mediawiki/universal-language-selector: The primary aim is to
allow users to select a language and configure its support i
+n an easy way. Main features are language selection, input methods and web
fonts.
},
autoload: {
files: [Translate.php]
--
To view, visit https://gerrit.wikimedia.org/r/105508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id305ed65577c056b0ec8a8f66411d58f5ec8a9de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct failure message when account is locked - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct failure message when account is locked
..
Correct failure message when account is locked
When the account is globally locked, CentralAuth will currently fail the
password check leading to a message Incorrect password entered. This
is misleading and causes unnecessary bug reports such as bug 53755 and
bug 57791.
CentralAuth should instead produce a message informing the user that
their account is globally locked, along the lines of 'login-userblocked'
used when $wgBlockDisablesLogin is set and the user is locally blocked.
Bug: 57866
Change-Id: I5674ed88a002cb9a0e0b09e040450f75906e058a
---
M CentralAuth.i18n.php
M CentralAuth.php
M CentralAuthHooks.php
3 files changed, 33 insertions(+), 0 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php
index 875c031..85c4a51 100644
--- a/CentralAuth.i18n.php
+++ b/CentralAuth.i18n.php
@@ -271,6 +271,7 @@
'centralauth-logout-no-others' = 'You have been automatically logged
out of other projects of {{int:Centralauth-groupname}}.',
'centralauth-hidden-blockreason' = 'globally hidden by $1 at $2 with
following reason: $3',
'centralauth-welcomecreation-msg' = '', # do not translate or
duplicate this message to other languages
+ 'centralauth-login-error-locked' = 'You cannot log in because your
account is globally locked.',
// Logging
'centralauth-log-name' = 'Global account log',
@@ -896,6 +897,8 @@
* $1 - username
* $2 - ...
* $3 - reason',
+ 'centralauth-login-error-locked' = Message displayed while login is
not possible because the acting user's account is locked. Parameters:
+* $1 - username,
'centralauth-log-name' = '{{doc-logpage}}',
'centralauth-log-entry-delete' = 'Parameters:
* $1 - username
diff --git a/CentralAuth.php b/CentralAuth.php
index 19ecfc7..82b498a 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -253,6 +253,7 @@
$wgHooks['AddNewAccount'][] = 'CentralAuthHooks::onAddNewAccount';
$wgHooks['GetPreferences'][] = 'CentralAuthHooks::onGetPreferences';
$wgHooks['AbortNewAccount'][] = 'CentralAuthHooks::onAbortNewAccount';
+$wgHooks['AbortLogin'][] = 'CentralAuthHooks::onAbortLogin';
$wgHooks['UserLoginComplete'][] = 'CentralAuthHooks::onUserLoginComplete';
$wgHooks['UserLoadFromSession'][] = 'CentralAuthHooks::onUserLoadFromSession';
$wgHooks['UserLogout'][] = 'CentralAuthHooks::onUserLogout';
diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index a0632c8..c2334e1 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
@@ -255,6 +255,35 @@
}
/**
+* @param User $user
+* @param string $pass
+* @param integer $retval
+* @param string $msg
+* @return bool
+*/
+ static function onAbortLogin( $user, $pass, $retval, $msg ) {
+ $centralUser = CentralAuthUser::getInstance( $user );
+ switch ( (string)$centralUser-canAuthenticate() ) {
+ case '1': // boolean true
+ return true;
+
+ case 'no user':
+ // If they're local, we still want to let them
log in. And if they
+ // don't exist, this hook wouldn't have even
been called.
+ return true;
+
+ case 'locked':
+ $msg = 'centralauth-login-error-locked';
+ $retval = LoginForm::USER_BLOCKED;
+ return false;
+
+ default:
+ throw new MWException( Unexpected result from
CentralAuthUser::canAuthenticate() );
+ }
+ return true;
+ }
+
+ /**
* Show a nicer error when the user account does not exist on the local
wiki, but
* does exist globally
* @param $users Array
--
To view, visit https://gerrit.wikimedia.org/r/98568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5674ed88a002cb9a0e0b09e040450f75906e058a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: PiRSquared17 pirsquare...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Add XFF support - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/105509 Change subject: dynamicproxy: Add XFF support .. dynamicproxy: Add XFF support Unconditionally sets X-Forwarded-For headers to all proxied backends. Change-Id: Icec16079d1b90b01cb7ecab85450cd8ef850c82f --- M modules/dynamicproxy/templates/proxy.conf 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/105509/1 diff --git a/modules/dynamicproxy/templates/proxy.conf b/modules/dynamicproxy/templates/proxy.conf index 7ae87bb..727d0df 100644 --- a/modules/dynamicproxy/templates/proxy.conf +++ b/modules/dynamicproxy/templates/proxy.conf @@ -68,5 +68,8 @@ proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; + +# Passes client's IP to the backend +proxy_set_header X-Forwarded-For $remote_addr; } } -- To view, visit https://gerrit.wikimedia.org/r/105509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icec16079d1b90b01cb7ecab85450cd8ef850c82f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed the details link if the user is already in details... - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed the details link if the user is already in details
page
..
Removed the details link if the user is already in details page
Removed the detailsLink creating code and assignment.
Cleaned Whitespace
Patch courtesy: Sakshi Bansal
Bug: 50808
Change-Id: I06a473550db79752aacb874f17f879f3b1ee1991
---
M special/SpecialAbuseLog.php
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 30f8443..96437c7 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -484,17 +484,11 @@
if ( self::canSeeDetails( $row-afl_filter, $filter_hidden ) ) {
$examineTitle = SpecialPage::getTitleFor(
'AbuseFilter', 'examine/log/' . $row-afl_id );
- $detailsLink = Linker::linkKnown(
- $this-getPageTitle($row-afl_id),
- $this-msg( 'abusefilter-log-detailslink'
)-escaped()
- );
$examineLink = Linker::link(
$examineTitle,
$this-msg( 'abusefilter-changeslist-examine'
)-parse(),
array()
);
-
- $actionLinks[] = $detailsLink;
$actionLinks[] = $examineLink;
if ($diffLink)
--
To view, visit https://gerrit.wikimedia.org/r/105164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06a473550db79752aacb874f17f879f3b1ee1991
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Sakshi sakshi.apr...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simlify prettyTimestamps - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105510
Change subject: Simlify prettyTimestamps
..
Simlify prettyTimestamps
Remove some 'wordy' messages, and just show absolute minutes, rather than
minutes rounded to 35, 40, etc
Change-Id: Ie5eb021edcff0d19a67a07a308f2c32e1fc81417
---
M MediaWikiChat.i18n.php
M MediaWikiChat.js
2 files changed, 4 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/10/105510/1
diff --git a/MediaWikiChat.i18n.php b/MediaWikiChat.i18n.php
index edc4c02..520a6aa 100644
--- a/MediaWikiChat.i18n.php
+++ b/MediaWikiChat.i18n.php
@@ -20,9 +20,6 @@
'chat-not-allowed' = 'You are not allowed to chat, try logging in
first',
'chat-just-now' = 'just now',
'chat-a-minute-ago' = 'a minute ago',
- 'chat-quarter-of-an-hour-ago' = 'quarter of an hour ago',
- 'chat-half-an-hour-ago' = 'half an hour ago',
- 'chat-an-hour-ago' = 'an hour ago',
'chat-minutes-ago' = '$1 minutes ago',
'chat-yesterday' = 'yesterday',
'chat-youve-been-kicked' = 'You have been kicked by $1. Refresh the
page to chat',
@@ -82,8 +79,6 @@
'chat-just-now' = 'Timestamps: shown when a message was sent in the
last 30 seconds',
'chat-a-minute-ago' = 'Timestamps: shown when the message was shown a
minute ago',
'chat-minutes-ago' = 'Timestamps: the message was sent $1 minutes ago',
- 'chat-half-an-hour-ago' = 'Timestamps: the message was sent half an
hour ago',
- 'chat-an-hour-ago' = 'Timestamps: the message was sent an hour ago',
'chat-yesterday' = 'Timestamps: the message was sent yesterday',
'chat-youve-been-kicked' = 'Shown to users who have been kicked from
the chat, $1 being the user who kicked them',
'chat-you-kicked' = 'Shown when the current user kicked the user $1',
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 38e4d75..9284fde 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -68,34 +68,10 @@
if ( diff 30 ) {
return mw.message( 'chat-just-now' ).text();
- } else if ( diff 90 ) {
+ } else if ( diff 2 * 60 ) {
return mw.message( 'chat-a-minute-ago' ).text();
- } else if ( diff 3 * 60 ) {
- return mw.message( 'chat-minutes-ago', 2 ).text();
- } else if ( diff 7 * 60 ) {
- return mw.message( 'chat-minutes-ago', 5 ).text();
- } else if ( diff 12 * 60 ) {
- return mw.message( 'chat-minutes-ago', 10 ).text();
- } else if ( diff 17 * 60 ) {
- return mw.message( 'chat-quarter-of-an-hour-ago'
).text();
- } else if ( diff 23 * 60 ) {
- return mw.message( 'chat-minutes-ago', 20 ).text();
- } else if ( diff 27 * 60 ) {
- return mw.message( 'chat-minutes-ago', 25 ).text();
- } else if ( diff 33 * 60 ) {
- return mw.message( 'chat-half-an-hour-ago' ).text();
- } else if ( diff 37 * 60 ) {
- return mw.message( 'chat-minutes-ago', 35 ).text();
- } else if ( diff 42 * 60 ) {
- return mw.message( 'chat-minutes-ago', 40 ).text();
- } else if ( diff 47 * 60 ) {
- return mw.message( 'chat-minutes-ago', 45 ).text();
- } else if ( diff 52 * 60 ) {
- return mw.message( 'chat-minutes-ago', 50 ).text();
- } else if ( diff 57 * 60 ) {
- return mw.message( 'chat-minutes-ago', 55 ).text();
- } else if ( diff 90 * 60 ) {
- return mw.message( 'chat-an-hour-ago' ).text();
+ } else if ( diff 60 * 60 ) {
+ return mw.message( 'chat-minutes-ago', Math.floor( diff
/ 60 ) ).text();
} else {
if ( dayNow == dayThen ) {
return MediaWikiChat.pad( dateThen.getHours(),
2 ) + ':' + MediaWikiChat.pad( dateThen.getMinutes(), 2 );
@@ -104,8 +80,7 @@
return mw.message( 'chat-yesterday'
).text().toLowerCase() + ', ' + MediaWikiChat.pad( dateThen.getHours(), 2 ) +
':' + MediaWikiChat.pad( dateThen.getMinutes(), 2 );
} else {
var day;
- var days = [ 'sunday', 'monday',
'tuesday', 'wednesday',
- 'thursday', 'friday',
'saturday', 'sunday' ];
+ var days = [ 'sunday', 'monday',
'tuesday', 'wednesday', 'thursday', 'friday', 'saturday',
[MediaWiki-commits] [Gerrit] Simlify prettyTimestamps - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Simlify prettyTimestamps
..
Simlify prettyTimestamps
Remove some 'wordy' messages, and just show absolute minutes, rather than
minutes rounded to 35, 40, etc
Change-Id: Ie5eb021edcff0d19a67a07a308f2c32e1fc81417
---
M MediaWikiChat.i18n.php
M MediaWikiChat.js
2 files changed, 4 insertions(+), 34 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.i18n.php b/MediaWikiChat.i18n.php
index edc4c02..520a6aa 100644
--- a/MediaWikiChat.i18n.php
+++ b/MediaWikiChat.i18n.php
@@ -20,9 +20,6 @@
'chat-not-allowed' = 'You are not allowed to chat, try logging in
first',
'chat-just-now' = 'just now',
'chat-a-minute-ago' = 'a minute ago',
- 'chat-quarter-of-an-hour-ago' = 'quarter of an hour ago',
- 'chat-half-an-hour-ago' = 'half an hour ago',
- 'chat-an-hour-ago' = 'an hour ago',
'chat-minutes-ago' = '$1 minutes ago',
'chat-yesterday' = 'yesterday',
'chat-youve-been-kicked' = 'You have been kicked by $1. Refresh the
page to chat',
@@ -82,8 +79,6 @@
'chat-just-now' = 'Timestamps: shown when a message was sent in the
last 30 seconds',
'chat-a-minute-ago' = 'Timestamps: shown when the message was shown a
minute ago',
'chat-minutes-ago' = 'Timestamps: the message was sent $1 minutes ago',
- 'chat-half-an-hour-ago' = 'Timestamps: the message was sent half an
hour ago',
- 'chat-an-hour-ago' = 'Timestamps: the message was sent an hour ago',
'chat-yesterday' = 'Timestamps: the message was sent yesterday',
'chat-youve-been-kicked' = 'Shown to users who have been kicked from
the chat, $1 being the user who kicked them',
'chat-you-kicked' = 'Shown when the current user kicked the user $1',
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 38e4d75..9284fde 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -68,34 +68,10 @@
if ( diff 30 ) {
return mw.message( 'chat-just-now' ).text();
- } else if ( diff 90 ) {
+ } else if ( diff 2 * 60 ) {
return mw.message( 'chat-a-minute-ago' ).text();
- } else if ( diff 3 * 60 ) {
- return mw.message( 'chat-minutes-ago', 2 ).text();
- } else if ( diff 7 * 60 ) {
- return mw.message( 'chat-minutes-ago', 5 ).text();
- } else if ( diff 12 * 60 ) {
- return mw.message( 'chat-minutes-ago', 10 ).text();
- } else if ( diff 17 * 60 ) {
- return mw.message( 'chat-quarter-of-an-hour-ago'
).text();
- } else if ( diff 23 * 60 ) {
- return mw.message( 'chat-minutes-ago', 20 ).text();
- } else if ( diff 27 * 60 ) {
- return mw.message( 'chat-minutes-ago', 25 ).text();
- } else if ( diff 33 * 60 ) {
- return mw.message( 'chat-half-an-hour-ago' ).text();
- } else if ( diff 37 * 60 ) {
- return mw.message( 'chat-minutes-ago', 35 ).text();
- } else if ( diff 42 * 60 ) {
- return mw.message( 'chat-minutes-ago', 40 ).text();
- } else if ( diff 47 * 60 ) {
- return mw.message( 'chat-minutes-ago', 45 ).text();
- } else if ( diff 52 * 60 ) {
- return mw.message( 'chat-minutes-ago', 50 ).text();
- } else if ( diff 57 * 60 ) {
- return mw.message( 'chat-minutes-ago', 55 ).text();
- } else if ( diff 90 * 60 ) {
- return mw.message( 'chat-an-hour-ago' ).text();
+ } else if ( diff 60 * 60 ) {
+ return mw.message( 'chat-minutes-ago', Math.floor( diff
/ 60 ) ).text();
} else {
if ( dayNow == dayThen ) {
return MediaWikiChat.pad( dateThen.getHours(),
2 ) + ':' + MediaWikiChat.pad( dateThen.getMinutes(), 2 );
@@ -104,8 +80,7 @@
return mw.message( 'chat-yesterday'
).text().toLowerCase() + ', ' + MediaWikiChat.pad( dateThen.getHours(), 2 ) +
':' + MediaWikiChat.pad( dateThen.getMinutes(), 2 );
} else {
var day;
- var days = [ 'sunday', 'monday',
'tuesday', 'wednesday',
- 'thursday', 'friday',
'saturday', 'sunday' ];
+ var days = [ 'sunday', 'monday',
'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday' ];
day = mw.message(
[MediaWiki-commits] [Gerrit] Fix ItemByTitleHelper site/title combinations - change (mediawiki...Wikibase)
Mushroom has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105511
Change subject: Fix ItemByTitleHelper site/title combinations
..
Fix ItemByTitleHelper site/title combinations
This patch fixes ItemByTitleHelper by allowing
requests with one title and multiple sites,
thereby partially restoring the old behavior.
Combinations of multiple titles and multiple
sites are still not allowed. Fixes bug 59676.
Change-Id: I34ae872ec2795ad4b3e064c78bbe5596e0dcfdd5
---
M repo/includes/api/ItemByTitleHelper.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/11/105511/1
diff --git a/repo/includes/api/ItemByTitleHelper.php
b/repo/includes/api/ItemByTitleHelper.php
index 6201e51..513a27c 100644
--- a/repo/includes/api/ItemByTitleHelper.php
+++ b/repo/includes/api/ItemByTitleHelper.php
@@ -82,9 +82,9 @@
}
// Restrict the crazy combinations of sites and titles that can
be used
- if( $numSites !== 1 $numSites !== $numTitles ) {
+ if ( $numSites !== 1 $numTitles !== 1 ) {
$this-throwUsageException(
- 'Must request one site or an equal number of
sites and titles',
+ 'Must request either multiple titles on one
site, or one title on multiple sites',
'params-illegal'
);
}
--
To view, visit https://gerrit.wikimedia.org/r/105511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34ae872ec2795ad4b3e064c78bbe5596e0dcfdd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Mushroom wikimushr...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Try to fix users not appearing - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105512
Change subject: Try to fix users not appearing
..
Try to fix users not appearing
This appears to be tricky problem, I do not anticipate this to be the
final patch for this, but it should help.
Brickimedia/brickimedia#157
Change-Id: Ic96fe42fbe3b4e57b40a8edcbece707668753c53
---
M MediaWikiChat.js
1 file changed, 35 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/12/105512/1
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 38e4d75..7296673 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -336,6 +336,7 @@
},
doUsers: function( newusers ) {
+ MediaWikiChat.newusers = newusers;
var allusers = MediaWikiChat.users.concat( newusers );
allusers = MediaWikiChat.unique( allusers );
@@ -366,56 +367,46 @@
var add = true;
- $( '#mwchat-users div' ).each( function( index ) {
- if ( $( this ).attr( 'data-id' ) == user.id ) {
- add = false;
- }
- }
- );
+ var html = 'div class=mwchat-useritem noshow data-unread=
data-name=' + user.name + ' data-id=' + userId + ' id=' + userE + '';
+ if ( mw.config.get( 'wgChatSocialAvatars' ) ) {
+ html += 'img src=' + user.avatar + ' /';
+ }
+ html += 'span class=mwchat-useritem-user';
+ html += user.name;
+ html += '/span';
+ if ( MediaWikiChat.amIMod ) {
+ html += 'a class=mwchat-useritem-blocklink href=' +
mw.config.get( 'wgArticlePath' ).replace( '$1', 'Special:UserRights/' +
user.name );
+ html += ' target=_blank' + mw.message( 'chat-block'
).text() + '/a';
+ }
+ if ( user.mod ) {
+ html += 'img src=' + mw.message(
'chat-mod-image').escaped() + ' height=16px alt= title=';
+ html += mw.message( 'user-is-a moderator' ).text() + '
/';
+ }
- if ( add ) {
+ html += ' span class=mwchat-useritem-pmlink
style=display:none';
+ html += mw.message( 'chat-private-message' ).text() + '/span';
- var html = 'div class=mwchat-useritem noshow
data-unread= data-name=' + user.name + ' data-id=' + userId + ' id=' +
userE + '';
- if ( mw.config.get( 'wgChatSocialAvatars' ) ) {
- html += 'img src=' + user.avatar + ' /';
- }
- html += 'span class=mwchat-useritem-user';
- html += user.name;
- html += '/span';
- if ( MediaWikiChat.amIMod ) {
- html += 'a class=mwchat-useritem-blocklink
href=' + mw.config.get( 'wgArticlePath' ).replace( '$1', 'Special:UserRights/'
+ user.name );
- html += ' target=_blank' + mw.message(
'chat-block' ).text() + '/a';
- }
- if ( user.mod ) {
- html += 'img src=' + mw.message(
'chat-mod-image').escaped() + ' height=16px alt= title=';
- html += mw.message( 'user-is-a moderator'
).text() + ' /';
- }
+ if ( !user.mod mw.config.get( 'wgChatKicks' ) ) {
+ html += 'a class=mwchat-useritem-kicklink
href=javascript:;';
+ html += mw.message( 'chat-kick' ).text() + '/a';
+ }
+ html += 'div class=mwchat-useritem-window
style=display:none;';
+ html += 'div class=mwchat-useritem-content/div';
+ html += 'input type=text placeholder=' + mw.message(
'chat-type-your-private-message' ).text() + ' /';
+ html += '/div';
+ html += '/div';
- html += ' span class=mwchat-useritem-pmlink
style=display:none';
- html += mw.message( 'chat-private-message' ).text() +
'/span';
+ $( '#mwchat-users' ).append( html );
+ $( '#mwchat-users #' + userE ).fadeIn();
+ $( '#mwchat-users #' + userE ).click( MediaWikiChat.clickUser );
- if ( !user.mod mw.config.get( 'wgChatKicks' ) ) {
- html += 'a class=mwchat-useritem-kicklink
href=javascript:;';
- html += mw.message( 'chat-kick' ).text() +
'/a';
- }
- html += 'div class=mwchat-useritem-window
style=display:none;';
- html += 'div
[MediaWiki-commits] [Gerrit] Try to fix users not appearing - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Try to fix users not appearing
..
Try to fix users not appearing
This appears to be tricky problem, I do not anticipate this to be the
final patch for this, but it should help.
Brickimedia/brickimedia#157
Change-Id: Ic96fe42fbe3b4e57b40a8edcbece707668753c53
---
M MediaWikiChat.js
1 file changed, 35 insertions(+), 44 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 38e4d75..7296673 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -336,6 +336,7 @@
},
doUsers: function( newusers ) {
+ MediaWikiChat.newusers = newusers;
var allusers = MediaWikiChat.users.concat( newusers );
allusers = MediaWikiChat.unique( allusers );
@@ -366,56 +367,46 @@
var add = true;
- $( '#mwchat-users div' ).each( function( index ) {
- if ( $( this ).attr( 'data-id' ) == user.id ) {
- add = false;
- }
- }
- );
+ var html = 'div class=mwchat-useritem noshow data-unread=
data-name=' + user.name + ' data-id=' + userId + ' id=' + userE + '';
+ if ( mw.config.get( 'wgChatSocialAvatars' ) ) {
+ html += 'img src=' + user.avatar + ' /';
+ }
+ html += 'span class=mwchat-useritem-user';
+ html += user.name;
+ html += '/span';
+ if ( MediaWikiChat.amIMod ) {
+ html += 'a class=mwchat-useritem-blocklink href=' +
mw.config.get( 'wgArticlePath' ).replace( '$1', 'Special:UserRights/' +
user.name );
+ html += ' target=_blank' + mw.message( 'chat-block'
).text() + '/a';
+ }
+ if ( user.mod ) {
+ html += 'img src=' + mw.message(
'chat-mod-image').escaped() + ' height=16px alt= title=';
+ html += mw.message( 'user-is-a moderator' ).text() + '
/';
+ }
- if ( add ) {
+ html += ' span class=mwchat-useritem-pmlink
style=display:none';
+ html += mw.message( 'chat-private-message' ).text() + '/span';
- var html = 'div class=mwchat-useritem noshow
data-unread= data-name=' + user.name + ' data-id=' + userId + ' id=' +
userE + '';
- if ( mw.config.get( 'wgChatSocialAvatars' ) ) {
- html += 'img src=' + user.avatar + ' /';
- }
- html += 'span class=mwchat-useritem-user';
- html += user.name;
- html += '/span';
- if ( MediaWikiChat.amIMod ) {
- html += 'a class=mwchat-useritem-blocklink
href=' + mw.config.get( 'wgArticlePath' ).replace( '$1', 'Special:UserRights/'
+ user.name );
- html += ' target=_blank' + mw.message(
'chat-block' ).text() + '/a';
- }
- if ( user.mod ) {
- html += 'img src=' + mw.message(
'chat-mod-image').escaped() + ' height=16px alt= title=';
- html += mw.message( 'user-is-a moderator'
).text() + ' /';
- }
+ if ( !user.mod mw.config.get( 'wgChatKicks' ) ) {
+ html += 'a class=mwchat-useritem-kicklink
href=javascript:;';
+ html += mw.message( 'chat-kick' ).text() + '/a';
+ }
+ html += 'div class=mwchat-useritem-window
style=display:none;';
+ html += 'div class=mwchat-useritem-content/div';
+ html += 'input type=text placeholder=' + mw.message(
'chat-type-your-private-message' ).text() + ' /';
+ html += '/div';
+ html += '/div';
- html += ' span class=mwchat-useritem-pmlink
style=display:none';
- html += mw.message( 'chat-private-message' ).text() +
'/span';
+ $( '#mwchat-users' ).append( html );
+ $( '#mwchat-users #' + userE ).fadeIn();
+ $( '#mwchat-users #' + userE ).click( MediaWikiChat.clickUser );
- if ( !user.mod mw.config.get( 'wgChatKicks' ) ) {
- html += 'a class=mwchat-useritem-kicklink
href=javascript:;';
- html += mw.message( 'chat-kick' ).text() +
'/a';
- }
- html += 'div class=mwchat-useritem-window
style=display:none;';
- html += 'div class=mwchat-useritem-content/div';
- html += 'input
[MediaWiki-commits] [Gerrit] Add support for miscellaneous proxy-specific settings. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105513
Change subject: Add support for miscellaneous proxy-specific settings.
..
Add support for miscellaneous proxy-specific settings.
This should allow us to fine-tune specific proxy behavior.
Change-Id: I2a17d59df2cc30f7d8455d4aecef43d2d5d76ba8
---
M modules/dynamicproxy/files/domainproxy.lua
M modules/dynamicproxy/templates/proxy.conf
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/105513/1
diff --git a/modules/dynamicproxy/files/domainproxy.lua
b/modules/dynamicproxy/files/domainproxy.lua
index e626712..9d58fae 100644
--- a/modules/dynamicproxy/files/domainproxy.lua
+++ b/modules/dynamicproxy/files/domainproxy.lua
@@ -11,10 +11,18 @@
local backend = red:srandmember('frontend:' .. frontend)
+local miscs = red:smembers('miscsettings:' .. frontend)
+
if backend == ngx.null then
-- Handle frontends wihout any configuration in them
ngx.exit(404)
end
+miscentries =
+for i = 1, miscs do
+miscentries .= miscs[i] . \n
+end
+
ngx.var.backend = backend
ngx.var.vhost = frontend
+ngx.var.miscsettings = miscentries
diff --git a/modules/dynamicproxy/templates/proxy.conf
b/modules/dynamicproxy/templates/proxy.conf
index 7ae87bb..ba02377 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -68,5 +68,7 @@
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
+
+ $misc_settings;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/105513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a17d59df2cc30f7d8455d4aecef43d2d5d76ba8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare for composer - change (mediawiki...LocalisationUpdate)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105514
Change subject: Prepare for composer
..
Prepare for composer
Bug: 49131
Change-Id: I6828a353a73449064485ad6975b559520a1c9f17
---
M LocalisationUpdate.class.php
M LocalisationUpdate.php
A composer.json
3 files changed, 53 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LocalisationUpdate
refs/changes/14/105514/1
diff --git a/LocalisationUpdate.class.php b/LocalisationUpdate.class.php
index 2462054..aa198d3 100644
--- a/LocalisationUpdate.class.php
+++ b/LocalisationUpdate.class.php
@@ -4,6 +4,7 @@
* Class for localization updates.
*
* @todo Refactor code to remove duplication
+ * @license GPL-2.0+
*/
class LocalisationUpdate {
diff --git a/LocalisationUpdate.php b/LocalisationUpdate.php
index f73304c..23cc086 100644
--- a/LocalisationUpdate.php
+++ b/LocalisationUpdate.php
@@ -9,7 +9,7 @@
* NOTE: If this variable and $wgCacheDirectory are both false, this extension
* WILL NOT WORK.
*/
-$wgLocalisationUpdateDirectory = false;
+$GLOBALS['wgLocalisationUpdateDirectory'] = false;
/**
* These should point to either an HTTP-accessible file or local file system.
@@ -17,28 +17,28 @@
* $3 and $4 are the same, respectively, but urlencoded for e.g. gitblit.
*/
-$wgLocalisationUpdateCoreURL =
https://git.wikimedia.org/raw/mediawiki%2Fcore.git/HEAD/$4;;
-$wgLocalisationUpdateExtensionURL =
+$GLOBALS['wgLocalisationUpdateCoreURL'] =
https://git.wikimedia.org/raw/mediawiki%2Fcore.git/HEAD/$4;;
+$GLOBALS['wgLocalisationUpdateExtensionURL'] =
https://git.wikimedia.org/raw/mediawiki%2Fextensions%2F$3.git/HEAD/$4;;
/// Deprecated
-$wgLocalisationUpdateSVNURL = false;
+$GLOBALS['wgLocalisationUpdateSVNURL'] = false;
-$wgLocalisationUpdateRetryAttempts = 5;
+$GLOBALS['wgLocalisationUpdateRetryAttempts'] = 5;
// Info about me!
-$wgExtensionCredits['other'][] = array(
+$GLOBALS['wgExtensionCredits']['other'][] = array(
'path' = __FILE__,
'name' = 'LocalisationUpdate',
'author' = array( 'Tom Maaswinkel', 'Niklas Laxström', 'Roan Kattouw'
),
- 'version' = '1.0',
+ 'version' = '1.0.1',
'url' = 'https://www.mediawiki.org/wiki/Extension:LocalisationUpdate',
'descriptionmsg' = 'localisationupdate-desc',
);
-$wgHooks['LocalisationCacheRecache'][] = 'LocalisationUpdate::onRecache';
+$GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'LocalisationUpdate::onRecache';
$dir = __DIR__ . '/';
-$wgExtensionMessagesFiles['LocalisationUpdate'] = $dir .
'LocalisationUpdate.i18n.php';
-$wgAutoloadClasses['LocalisationUpdate'] = $dir .
'LocalisationUpdate.class.php';
-$wgAutoloadClasses['QuickArrayReader'] = $dir . 'QuickArrayReader.php';
+$GLOBALS['wgExtensionMessagesFiles']['LocalisationUpdate'] = $dir .
'LocalisationUpdate.i18n.php';
+$GLOBALS['wgAutoloadClasses']['LocalisationUpdate'] = $dir .
'LocalisationUpdate.class.php';
+$GLOBALS['wgAutoloadClasses']['QuickArrayReader'] = $dir .
'QuickArrayReader.php';
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..6ae4e50
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,41 @@
+{
+ name: mediawiki/localisation-update,
+ type: mediawiki-extension,
+ description: MediaWiki extension to keep the localised messages as
up to date as possible.,
+ keywords: [
+ MediaWiki,
+ l10n,
+ localization,
+ ],
+ homepage:
https://www.mediawiki.org/wiki/Extension:LocalisationUpdate;,
+ license: [ GPL-2.0+ ],
+ authors: [
+ {
+ name: Tom Maaswinkel,
+ role: Original author
+ }
+ {
+ name: Niklas Laxström,
+ email: niklas.laxst...@gmail.com,
+ role: Lead nitpicker
+ },
+ ],
+ support: {
+ issues: https://bugzilla.wikimedia.org/;,
+ irc: irc://irc.freenode.net/mediawiki,
+ forum:
https://www.mediawiki.org/wiki/Extension_talk:LocalisationUpdate;,
+ wiki:
https://www.mediawiki.org/wiki/Extension:LocalisationUpdate;
+ },
+ require: {
+ php: =5.3.0,
+ composer/installers: =1.0.1
+ },
+ autoload: {
+ files: [LocalisationUpdate.php]
+ },
+ scripts: {
+ post-package-install: [
+ (crontab -l ; echo '0 3 * * 6 php $( realpath
update.php ) --quiet') | crontab -
+ ]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/105514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6828a353a73449064485ad6975b559520a1c9f17
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] fixing_redirects.py: ported to core - change (pywikibot/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105515
Change subject: fixing_redirects.py: ported to core
..
fixing_redirects.py: ported to core
Change-Id: I828fc744782c2d2ddb9afef78007eaceab0914a3
---
A fixing_redirects.py
1 file changed, 230 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/15/105515/1
diff --git a/fixing_redirects.py b/fixing_redirects.py
new file mode 100644
index 000..eb23e16
--- /dev/null
+++ b/fixing_redirects.py
@@ -0,0 +1,230 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+This script has the intention to correct all redirect
+links in featured pages or only one page of each wiki.
+
+Can be using with:
+params;
+
+-featured Run over featured pages
+
+Run fixing_redirects.py -help to see all the command-line
+options -file, -ref, -links, ...
+
+
+#
+# This script based on disambredir.py and solve_disambiguation.py
+#
+# (C) Pywikipedia team, 2004-2012
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+#
+import re
+import sys
+import pywikibot
+from pywikibot import pagegenerators
+from pywikibot import i18n
+
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+'params;': pagegenerators.parameterHelp,
+}
+
+featured_articles = {
+'ar': u'ويكيبيديا:مقالات مختارة',
+'cs': u'Wikipedie:Nejlepší články',
+'de': u'Wikipedia:Exzellente_Artikel',
+'en': u'Wikipedia:Featured_articles',
+'es': u'Wikipedia:Artículos_destacados',
+'fa': u'ویکیپدیا:نوشتارهای برگزیده',
+'fr': u'Wikipédia:Articles_de_qualité',
+'he': u'פורטל:ערכים_מומלצים',
+'is': u'Wikipedia:Úrvalsgreinar',
+'it': u'Wikipedia:Articoli_in_vetrina',
+'ja': u'Wikipedia:秀逸な記事',
+'nl': u'Wikipedia:Etalage',
+'nn': u'Wikipedia:Gode artiklar',
+'no': u'Wikipedia:Anbefalte artikler',
+'pl': u'Wikipedia:Artykuły_na_medal',
+'pt': u'Wikipedia:Os_melhores_artigos',
+'sv': u'Wikipedia:Utvalda_artiklar',
+'vi': u'Wikipedia:Bài_viết_chọn_lọc',
+'zh': u'Wikipedia:特色条目',
+}
+
+
+def firstcap(string):
+return string[0].upper()+string[1:]
+
+
+def treat(text, linkedPage, targetPage):
+
+Based on the method of the same name in solve_disambiguation.py
+
+mysite = pywikibot.getSite()
+linktrail = mysite.linktrail()
+
+# make a backup of the original text so we can show the changes later
+linkR =
re.compile(r'\[\[(?Ptitle[^\]\|#]*)(?Psection#[^\]\|]*)?(\|(?Plabel[^\]]*))?\]\](?Plinktrail'
+ linktrail + ')')
+curpos = 0
+# This loop will run until we have finished the current page
+while True:
+m = linkR.search(text, pos=curpos)
+if not m:
+break
+# Make sure that next time around we will not find this same hit.
+curpos = m.start() + 1
+# ignore interwiki links and links to sections of the same page
+if m.group('title').strip() == '' or \
+ mysite.isInterwikiLink(m.group('title')):
+continue
+else:
+actualLinkPage = pywikibot.Page(targetPage.site, m.group('title'))
+# Check whether the link found is to page.
+if actualLinkPage != linkedPage:
+continue
+
+choice = 'y'
+
+# The link looks like this:
+# [[page_title|link_text]]trailing_chars
+page_title = m.group('title')
+link_text = m.group('label')
+
+if not link_text:
+# or like this: [[page_title]]trailing_chars
+link_text = page_title
+if m.group('section') is None:
+section = ''
+else:
+section = m.group('section')
+trailing_chars = m.group('linktrail')
+if trailing_chars:
+link_text += trailing_chars
+
+if choice in uU:
+# unlink - we remove the section if there's any
+text = text[:m.start()] + link_text + text[m.end():]
+continue
+replaceit = choice in rR
+
+# remove preleading :
+if link_text[0] == ':':
+link_text = link_text[1:]
+if link_text[0].isupper():
+new_page_title = targetPage.title()
+else:
+new_page_title = targetPage.title()[0].lower() + \
+targetPage.title()[1:]
+
+# remove preleading :
+if new_page_title[0] == ':':
+new_page_title = new_page_title[1:]
+
+if replaceit and trailing_chars:
+newlink = [[%s%s]]%s % (new_page_title, section, trailing_chars)
+elif replaceit or (new_page_title == link_text and not section):
+newlink = [[%s]] % new_page_title
+# check if we can create a link with trailing characters instead of a
+# pipelink
+elif len(new_page_title) =
[MediaWiki-commits] [Gerrit] The kick button was being shown to non-mods - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105516
Change subject: The kick button was being shown to non-mods
..
The kick button was being shown to non-mods
A condition was missing. Added.
Change-Id: I7b9625c090e10a2f9603e400ea8b8e796fa0b45d
---
M MediaWikiChat.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/16/105516/1
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 6f17c7f..e62c184 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -361,7 +361,7 @@
html += ' span class=mwchat-useritem-pmlink
style=display:none';
html += mw.message( 'chat-private-message' ).text() + '/span';
- if ( !user.mod mw.config.get( 'wgChatKicks' ) ) {
+ if ( !user.mod mw.config.get( 'wgChatKicks' )
MediaWikiChat.amIMod ) {
html += 'a class=mwchat-useritem-kicklink
href=javascript:;';
html += mw.message( 'chat-kick' ).text() + '/a';
}
--
To view, visit https://gerrit.wikimedia.org/r/105516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b9625c090e10a2f9603e400ea8b8e796fa0b45d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: If94e056f8368e589f312ca99823ff5eeecdefe78 --- A COPYING A libs/spyc/COPYING 2 files changed, 367 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..e1df752 --- /dev/null +++ b/COPYING @@ -0,0 +1,346 @@ +The license text below applies to all files within this distribution, other +than those that are in a directory which contains files named LICENSE or +COPYING, or a subdirectory thereof. For those files, the license text contained in +said file overrides any license information contained in directories of smaller depth. +Alternative licenses are typically used for software that is provided by external +parties, and merely packaged with this software for convenience. + +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 their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made
[MediaWiki-commits] [Gerrit] Small tweaks to TUX on resize scroll events - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Small tweaks to TUX on resize scroll events
..
Small tweaks to TUX on resize scroll events
* Animate width changes with CSS transitions
* Use member variables instead of finding header and actions from DOM
* Use slightly larger delay to avoid small misplacements due to skin transitions
* Reflow header and actions both on scroll and resize
* Unset width when defloating so that the items get automatic width
Change-Id: Iadc9bcd0219a8e78a6011ffc209b663b18ec9da2
---
M resources/css/ext.translate.messagetable.css
M resources/css/ext.translate.special.translate.css
M resources/js/ext.translate.messagetable.js
3 files changed, 17 insertions(+), 16 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index 0ac7f3a..b38fd9f 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -188,6 +188,7 @@
line-height: 50px;
-webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
+ transition: width 250ms;
}
.tux-action-bar.floating {
diff --git a/resources/css/ext.translate.special.translate.css
b/resources/css/ext.translate.special.translate.css
index 36f14e7..b66023f 100644
--- a/resources/css/ext.translate.special.translate.css
+++ b/resources/css/ext.translate.special.translate.css
@@ -138,6 +138,7 @@
font-size: 14px;
margin: 0;
list-style: none;
+ transition: width 250ms;
}
.tux-messagetable-header.floating {
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index c2ec5f4..567b15b 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -89,6 +89,8 @@
this.mode = this.options.mode;
this.firstProofreadTipShown = false;
this.initialized = false;
+ this.$header = this.$container.siblings(
'.tux-messagetable-header' );
+ // Container is between these in the dom.
this.$loader = this.$container.siblings(
'.tux-messagetable-loader' );
this.$actionBar = this.$container.siblings( '.tux-action-bar' );
this.messages = [];
@@ -107,14 +109,13 @@
var messageTable = this,
$filterInput = this.$container.parent().find(
'.tux-message-filter-box' );
- $( window ).scroll( function () {
+ // Vector has transitions of 250ms which affect layout.
Let those finish.
+ $( window ).on( 'scroll resize', function () {
delay( function () {
messageTable.scroll();
- }, 200 );
+ }, 250 );
} ).resize( function () {
messageTable.resize();
- $( '.tux-messagetable-header' ).width( $(
'.tux-messagelist' ).width() );
- $( '.tux-action-bar' ).width( $(
'.tux-messagelist' ).width() );
} );
if ( mw.translate.isPlaceholderSupported( $filterInput
) ) {
@@ -708,8 +709,6 @@
*/
scroll: function () {
var $window,
- $tuxTableHeader,
- $tuxActionBar,
isActionBarFloating,
needsTableHeaderFloat, needsTableHeaderStick,
needsActionBarFloat, needsActionBarStick,
@@ -730,28 +729,28 @@
messageListWidth = this.$container.width();
// Header:
- $tuxTableHeader = $( '.tux-messagetable-header' );
- messageTableRelativePos = messageListTop -
$tuxTableHeader.height() - windowScrollTop;
+ messageTableRelativePos = messageListTop -
this.$header.height() - windowScrollTop;
needsTableHeaderFloat = messageTableRelativePos + 10
0;
needsTableHeaderStick = messageTableRelativePos - 10 =
0;
if ( needsTableHeaderFloat ) {
- $tuxTableHeader.addClass( 'floating' ).width(
messageListWidth );
+ this.$header.addClass( 'floating' ).width(
messageListWidth );
} else if ( needsTableHeaderStick ) {
- $tuxTableHeader.removeClass( 'floating' );
+ // Let the element change
[MediaWiki-commits] [Gerrit] document.selection is undefined in IE11 - change (mediawiki...WikiEditor)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105517
Change subject: document.selection is undefined in IE11
..
document.selection is undefined in IE11
IE11 replaced document.selection by window.getSelection, which breaks
dialogs in WikiEditor, because document.selection.createRange was
accessed without check. Inserting this check unbreaks the dialogs.
Bug: 57489
Change-Id: I70d49fb43bbf7602f43e9a8086ecd32027cb6d6f
---
M modules/jquery.wikiEditor.js
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/17/105517/1
diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js
index 460203f..bfcc73d 100644
--- a/modules/jquery.wikiEditor.js
+++ b/modules/jquery.wikiEditor.js
@@ -249,7 +249,7 @@
'oldDelayedHTML': null,
// The previous selection of the iframe, stored to detect
whether the selection has changed
'oldDelayedSel': null,
- // Saved selection state for IE
+ // Saved selection state for old IE (=10)
'savedSelection': null,
// Stack of states in { html: [string] } form
'history': [],
@@ -459,17 +459,17 @@
},
/**
-* Save text selection for IE
+* Save text selection for old IE (=10)
*/
saveSelection: function () {
- if ( $.client.profile().name === 'msie' ) {
+ if ( $.client.profile().name === 'msie'
document.selection document.selection.createRange ) {
context.$textarea.focus();
context.savedSelection =
document.selection.createRange();
}
},
/**
-* Restore text selection for IE
+* Restore text selection for old IE (=10)
*/
restoreSelection: function () {
if ( $.client.profile().name === 'msie'
context.savedSelection !== null ) {
--
To view, visit https://gerrit.wikimedia.org/r/105517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70d49fb43bbf7602f43e9a8086ecd32027cb6d6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid errors like TypeError: response.error is undefined - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid errors like TypeError: response.error is undefined
..
Avoid errors like TypeError: response.error is undefined
We *might* want to log these failures as they can be severe.
Change-Id: Ib53cd76c086c34244b4e9ced3072f3f036a92141
---
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.special.translationstash.js
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 1252974..cd92fa0 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -195,7 +195,7 @@
translateEditor.message.translation =
translation;
translateEditor.onSaveSuccess();
} ).fail( function ( errorCode, response ) {
- translateEditor.onSaveFail( response.error.info
);
+ translateEditor.onSaveFail( response.error
response.error.info || 'Unknown error' );
} );
},
diff --git a/resources/js/ext.translate.special.translationstash.js
b/resources/js/ext.translate.special.translationstash.js
index 9bf8e2b..b0ca96e 100644
--- a/resources/js/ext.translate.special.translationstash.js
+++ b/resources/js/ext.translate.special.translationstash.js
@@ -194,7 +194,9 @@
updateStats();
} ).fail( function ( errorCode, response ) {
$messageTable.empty().addClass( 'error' )
- .text( 'Error: ' + errorCode + ' - ' +
response.error.info );
+ .text( 'Error: ' + errorCode + ' - ' +
+ ( response.error
response.error.info || 'Unknown error' )
+ );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/103244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib53cd76c086c34244b4e9ced3072f3f036a92141
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixing_redirects.py: ported to core - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: fixing_redirects.py: ported to core
..
fixing_redirects.py: ported to core
The i18n file already existed, but I don't know if the remaining messages need
to be transferred to TranslateWiki as well.
Change-Id: I828fc744782c2d2ddb9afef78007eaceab0914a3
---
A scripts/fixing_redirects.py
1 file changed, 230 insertions(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py
new file mode 100644
index 000..c89d6db
--- /dev/null
+++ b/scripts/fixing_redirects.py
@@ -0,0 +1,230 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+This script has the intention to correct all redirect
+links in featured pages or only one page of each wiki.
+
+Can be using with:
+params;
+
+-featured Run over featured pages
+
+Run fixing_redirects.py -help to see all the command-line
+options -file, -ref, -links, ...
+
+
+#
+# This script based on disambredir.py and solve_disambiguation.py
+#
+# (C) Pywikipedia team, 2004-2012
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+#
+import re
+import sys
+import pywikibot
+from pywikibot import pagegenerators
+from pywikibot import i18n
+
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+'params;': pagegenerators.parameterHelp,
+}
+
+featured_articles = {
+'ar': u'ويكيبيديا:مقالات مختارة',
+'cs': u'Wikipedie:Nejlepší články',
+'de': u'Wikipedia:Exzellente_Artikel',
+'en': u'Wikipedia:Featured_articles',
+'es': u'Wikipedia:Artículos_destacados',
+'fa': u'ویکیپدیا:نوشتارهای برگزیده',
+'fr': u'Wikipédia:Articles_de_qualité',
+'he': u'פורטל:ערכים_מומלצים',
+'is': u'Wikipedia:Úrvalsgreinar',
+'it': u'Wikipedia:Articoli_in_vetrina',
+'ja': u'Wikipedia:秀逸な記事',
+'nl': u'Wikipedia:Etalage',
+'nn': u'Wikipedia:Gode artiklar',
+'no': u'Wikipedia:Anbefalte artikler',
+'pl': u'Wikipedia:Artykuły_na_medal',
+'pt': u'Wikipedia:Os_melhores_artigos',
+'sv': u'Wikipedia:Utvalda_artiklar',
+'vi': u'Wikipedia:Bài_viết_chọn_lọc',
+'zh': u'Wikipedia:特色条目',
+}
+
+
+def firstcap(string):
+return string[0].upper() + string[1:]
+
+
+def treat(text, linkedPage, targetPage):
+
+Based on the method of the same name in solve_disambiguation.py
+
+mysite = pywikibot.getSite()
+linktrail = mysite.linktrail()
+
+# make a backup of the original text so we can show the changes later
+linkR =
re.compile(r'\[\[(?Ptitle[^\]\|#]*)(?Psection#[^\]\|]*)?(\|(?Plabel[^\]]*))?\]\](?Plinktrail'
+ linktrail + ')')
+curpos = 0
+# This loop will run until we have finished the current page
+while True:
+m = linkR.search(text, pos=curpos)
+if not m:
+break
+# Make sure that next time around we will not find this same hit.
+curpos = m.start() + 1
+# ignore interwiki links and links to sections of the same page
+if m.group('title').strip() == '' or \
+ mysite.isInterwikiLink(m.group('title')):
+continue
+else:
+actualLinkPage = pywikibot.Page(targetPage.site, m.group('title'))
+# Check whether the link found is to page.
+if actualLinkPage != linkedPage:
+continue
+
+choice = 'y'
+
+# The link looks like this:
+# [[page_title|link_text]]trailing_chars
+page_title = m.group('title')
+link_text = m.group('label')
+
+if not link_text:
+# or like this: [[page_title]]trailing_chars
+link_text = page_title
+if m.group('section') is None:
+section = ''
+else:
+section = m.group('section')
+trailing_chars = m.group('linktrail')
+if trailing_chars:
+link_text += trailing_chars
+
+if choice in uU:
+# unlink - we remove the section if there's any
+text = text[:m.start()] + link_text + text[m.end():]
+continue
+replaceit = choice in rR
+
+# remove preleading :
+if link_text[0] == ':':
+link_text = link_text[1:]
+if link_text[0].isupper():
+new_page_title = targetPage.title()
+else:
+new_page_title = targetPage.title()[0].lower() + \
+targetPage.title()[1:]
+
+# remove preleading :
+if new_page_title[0] == ':':
+new_page_title = new_page_title[1:]
+
+if replaceit and trailing_chars:
+newlink = [[%s%s]]%s % (new_page_title, section, trailing_chars)
+elif replaceit or (new_page_title == link_text and not section):
+newlink = [[%s]] % new_page_title
+# check if we can
[MediaWiki-commits] [Gerrit] Send test email to blackhole.io - change (mediawiki...Translate)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/105518 Change subject: Send test email to blackhole.io .. Send test email to blackhole.io Change-Id: Ie3323447912e17b2a9357e44ff284bd116dee99d --- M specials/SpecialManageTranslatorSandbox.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/18/105518/1 diff --git a/specials/SpecialManageTranslatorSandbox.php b/specials/SpecialManageTranslatorSandbox.php index 509a63d..931025d 100644 --- a/specials/SpecialManageTranslatorSandbox.php +++ b/specials/SpecialManageTranslatorSandbox.php @@ -68,7 +68,7 @@ $userToDelete = User::newFromName( $name, false ); TranslateSandbox::deleteUser( $userToDelete, 'force' ); - $user = TranslateSandbox::addUser( $name, $prefix$i...@example.com, 'porkkana' ); + $user = TranslateSandbox::addUser( $name, $n...@blackhole.io, 'porkkana' ); $user-setOption( 'translate-sandbox', FormatJson::encode( array( @@ -102,7 +102,7 @@ // Another account for testing a translator to multiple languages TranslateSandbox::deleteUser( User::newFromName( 'Kissa', false ), 'force' ); - $polyglotUser = TranslateSandbox::addUser( 'Kissa', 'ki...@example.com', 'porkkana' ); + $polyglotUser = TranslateSandbox::addUser( 'Kissa', 'ki...@blackhole.io', 'porkkana' ); $polyglotUser-setOption( 'translate-sandbox', FormatJson::encode( array( -- To view, visit https://gerrit.wikimedia.org/r/105518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3323447912e17b2a9357e44ff284bd116dee99d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send test email to blackhole.io to avoid useless bounces - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Send test email to blackhole.io to avoid useless bounces .. Send test email to blackhole.io to avoid useless bounces Change-Id: Ie3323447912e17b2a9357e44ff284bd116dee99d --- M specials/SpecialManageTranslatorSandbox.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/specials/SpecialManageTranslatorSandbox.php b/specials/SpecialManageTranslatorSandbox.php index 509a63d..931025d 100644 --- a/specials/SpecialManageTranslatorSandbox.php +++ b/specials/SpecialManageTranslatorSandbox.php @@ -68,7 +68,7 @@ $userToDelete = User::newFromName( $name, false ); TranslateSandbox::deleteUser( $userToDelete, 'force' ); - $user = TranslateSandbox::addUser( $name, $prefix$i...@example.com, 'porkkana' ); + $user = TranslateSandbox::addUser( $name, $n...@blackhole.io, 'porkkana' ); $user-setOption( 'translate-sandbox', FormatJson::encode( array( @@ -102,7 +102,7 @@ // Another account for testing a translator to multiple languages TranslateSandbox::deleteUser( User::newFromName( 'Kissa', false ), 'force' ); - $polyglotUser = TranslateSandbox::addUser( 'Kissa', 'ki...@example.com', 'porkkana' ); + $polyglotUser = TranslateSandbox::addUser( 'Kissa', 'ki...@blackhole.io', 'porkkana' ); $polyglotUser-setOption( 'translate-sandbox', FormatJson::encode( array( -- To view, visit https://gerrit.wikimedia.org/r/105518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3323447912e17b2a9357e44ff284bd116dee99d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [InviteSignup] Convert to json i18n - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/105519 Change subject: [InviteSignup] Convert to json i18n .. [InviteSignup] Convert to json i18n Depends on If486bd9e9a506a23188740c6985c00c9fb6f8d51 Change-Id: I8bedcb540a2893acdcb2510ed2dbe99e33b7cfb9 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/19/105519/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index e4cf113..b57bdcc 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -745,6 +745,8 @@ Invite Signup descmsg = is-desc +format = json +file = InviteSignup/i18n/%CODE%.json aliasfile = InviteSignup/InviteSignup.alias.php JS Bread Crumbs -- To view, visit https://gerrit.wikimedia.org/r/105519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bedcb540a2893acdcb2510ed2dbe99e33b7cfb9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] Updated Ruby and RubyGems - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [browser test] Updated Ruby and RubyGems .. [browser test] Updated Ruby and RubyGems Also changed single quotes to double quotes. Bug: 56083 Bug: 57597 Change-Id: I9afea8053472d888e2484f155b5ed38034794742 --- M modules/ve-mw/test/browser/Gemfile M modules/ve-mw/test/browser/Gemfile.lock 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/Gemfile b/modules/ve-mw/test/browser/Gemfile index 84516e3..95c14fb 100755 --- a/modules/ve-mw/test/browser/Gemfile +++ b/modules/ve-mw/test/browser/Gemfile @@ -1,6 +1,6 @@ -#ruby=ruby-2.0.0-p247 +#ruby=ruby-2.1.0 #ruby-gemset=VisualEditor -source 'https://rubygems.org' +source https://rubygems.org; -gem 'mediawiki-selenium' +gem mediawiki-selenium diff --git a/modules/ve-mw/test/browser/Gemfile.lock b/modules/ve-mw/test/browser/Gemfile.lock index 473d9db..e6ba60a 100644 --- a/modules/ve-mw/test/browser/Gemfile.lock +++ b/modules/ve-mw/test/browser/Gemfile.lock @@ -21,7 +21,7 @@ multi_json (~ 1.3) i18n (0.6.9) json (1.8.1) -mediawiki-selenium (0.1.14) +mediawiki-selenium (0.1.15) cucumber json net-http-persistent @@ -31,7 +31,7 @@ syntax mime-types (2.0) multi_json (1.8.2) -multi_test (0.0.2) +multi_test (0.0.3) net-http-persistent (2.9) page-object (0.9.4) page_navigation (= 0.8) @@ -44,12 +44,12 @@ rspec-expectations (2.14.4) diff-lcs (= 1.1.3, 2.0) rubyzip (1.1.0) -selenium-webdriver (2.38.0) +selenium-webdriver (2.39.0) childprocess (= 0.2.5) multi_json (~ 1.0) rubyzip (~ 1.0) websocket (~ 1.0.4) -syntax (1.1.0) +syntax (1.2.0) watir-webdriver (0.6.4) selenium-webdriver (= 2.18.0) websocket (1.0.7) -- To view, visit https://gerrit.wikimedia.org/r/105407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9afea8053472d888e2484f155b5ed38034794742 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: Mayankmadan maddiema...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add dummy GENDER to the logentry message - change (mediawiki...DisableAccount)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105520
Change subject: Add dummy GENDER to the logentry message
..
Add dummy GENDER to the logentry message
Change-Id: I019832950369e4bb9693083593e8f82504912bb2
---
M DisableAccount.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DisableAccount
refs/changes/20/105520/1
diff --git a/DisableAccount.i18n.php b/DisableAccount.i18n.php
index e2348d2..73462d6 100644
--- a/DisableAccount.i18n.php
+++ b/DisableAccount.i18n.php
@@ -16,7 +16,7 @@
'disableaccount-mustconfirm' = 'You must confirm that you wish to
disable this account.',
'disableaccount-nosuchuser' = 'The user account $1 does not exist.',
'disableaccount-success' = 'The user account $1 has been permanently
disabled.',
- 'logentry-block-disableaccount' = 'disabled the account of [[$1]].',
+ 'logentry-block-disableaccount' = '{{GENDER:$2|disabled}} the account
of [[$1]].',
);
/** Message documentation (Message documentation)
--
To view, visit https://gerrit.wikimedia.org/r/105520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I019832950369e4bb9693083593e8f82504912bb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisableAccount
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [InviteSignup] Convert to json i18n - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [InviteSignup] Convert to json i18n .. [InviteSignup] Convert to json i18n Depends on If486bd9e9a506a23188740c6985c00c9fb6f8d51 Change-Id: I8bedcb540a2893acdcb2510ed2dbe99e33b7cfb9 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, but someone else must approve Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index e4cf113..b57bdcc 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -745,6 +745,8 @@ Invite Signup descmsg = is-desc +format = json +file = InviteSignup/i18n/%CODE%.json aliasfile = InviteSignup/InviteSignup.alias.php JS Bread Crumbs -- To view, visit https://gerrit.wikimedia.org/r/105519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bedcb540a2893acdcb2510ed2dbe99e33b7cfb9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename xml ids to use underscores - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/105521 Change subject: Rename xml ids to use underscores .. Rename xml ids to use underscores XML Files cannot have caps in them, so we must use underscore there. Since R.layout.* is just the names of the XML files, and they are all underscore separated, use underscore separation for ids too. Change-Id: I3eab7b2546a67ff5ec8886a0b710f398e2bc20a7 --- M wikipedia/res/layout/fragment_page.xml M wikipedia/res/layout/fragment_search.xml M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java M wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java 4 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/21/105521/1 diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index f7b146b..7217db7 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -5,20 +5,20 @@ android:layout_width=match_parent android:layout_height=match_parent ProgressBar -android:id=@+id/pageLoadProgress +android:id=@+id/page_load_progress android:layout_gravity=center android:layout_width=wrap_content android:layout_height=wrap_content android:indeterminate=true / org.wikimedia.wikipedia.ObservableWebView -android:id=@+id/pageWebView +android:id=@+id/page_web_view android:layout_width=match_parent android:layout_height=match_parent android:visibility=gone / LinearLayout -android:id=@+id/pageError +android:id=@+id/page_error android:layout_width=match_parent android:layout_height=wrap_content android:layout_gravity=center_vertical @@ -32,7 +32,7 @@ / Button -android:id=@+id/pageErrorRetry +android:id=@+id/page_error_retry android:text=@string/page_error_retry android:layout_gravity=center android:layout_width=wrap_content android:layout_height=wrap_content/ diff --git a/wikipedia/res/layout/fragment_search.xml b/wikipedia/res/layout/fragment_search.xml index 90ca9a8..8de05ca 100644 --- a/wikipedia/res/layout/fragment_search.xml +++ b/wikipedia/res/layout/fragment_search.xml @@ -12,12 +12,12 @@ android:layout_width=match_parent LinearLayout -android:id=@+id/searchBarIcon +android:id=@+id/search_bar_icon android:layout_width=wrap_content android:background=?android:attr/selectableItemBackground android:layout_height=wrap_content ImageView -android:id=@+id/searchDrawerIndicator +android:id=@+id/search_drawer_indicator android:layout_width=16dp android:layout_height=16dp android:layout_marginLeft=0dp @@ -45,7 +45,7 @@ android:layout_weight=1 EditText -android:id=@+id/searchTermText +android:id=@+id/search_term_text android:layout_width=match_parent android:layout_height=wrap_content android:hint=@string/search_hint @@ -55,7 +55,7 @@ android:singleLine=true / ProgressBar -android:id=@+id/searchProgress +android:id=@+id/search_progress android:layout_width=wrap_content android:layout_height=wrap_content android:layout_gravity=right|center_vertical|end @@ -65,7 +65,7 @@ / /FrameLayout ImageView -android:id=@+id/searchBarShowMenu +android:id=@+id/search_bar_show_menu android:layout_width=48dp android:layout_height=48dp android:padding=8dp @@ -77,7 +77,7 @@ View android:layout_width=match_parent android:layout_height=1dp android:background=@color/border / Button -android:id=@+id/searchNetworkError +android:id=@+id/search_network_error android:layout_width=match_parent android:layout_height=48dp android:gravity=center @@ -87,7 +87,7 @@ android:background=?android:attr/selectableItemBackground / ListView -android:id=@+id/searchResultsList +android:id=@+id/search_results_list android:layout_width=match_parent
[MediaWiki-commits] [Gerrit] api.PropertyGenerator: count queried items query and not onl... - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105522
Change subject: api.PropertyGenerator: count queried items query and not only
pages
..
api.PropertyGenerator: count queried items query and not only pages
Improvement of fix for:
https://sourceforge.net/support/tracker.php?aid=3569058
See also:
https://www.mediawiki.org/wiki/Special:Code/pywikipedia/10647
Change-Id: I80219732da947883f4b204c039d867996c26b37a
---
M pywikibot/data/api.py
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/22/105522/1
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 043cc52..73ceb33 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -711,7 +711,10 @@
self.normalized = {}
for item in resultdata:
yield self.result(item)
-count += 1
+if query-continue in self.data and self.continuekey in
item.keys():
+count += len(item[self.continuekey])
+else:
+count += 1
if self.limit 0 and count = self.limit:
return
if self.module == random and self.limit:
--
To view, visit https://gerrit.wikimedia.org/r/105522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80219732da947883f4b204c039d867996c26b37a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa mpaa.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove http/0.9 patch - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: remove http/0.9 patch .. remove http/0.9 patch Change-Id: Ic8f36ed4aac9cedcc5a5cef3337a77398d665d05 --- D debian/patches/0025-varnishd-http09.patch M debian/patches/series 2 files changed, 0 insertions(+), 14 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/debian/patches/0025-varnishd-http09.patch b/debian/patches/0025-varnishd-http09.patch deleted file mode 100644 index 254c4a6..000 --- a/debian/patches/0025-varnishd-http09.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/varnishd/cache_http.c b/bin/varnishd/cache_http.c -index 76b3f86..c96d29b 100644 a/bin/varnishd/cache_http.c -+++ b/bin/varnishd/cache_http.c -@@ -675,6 +675,8 @@ http_DissectRequest(struct sess *sp) - return (retval); - } - http_ProtoVer(hp); -+ if(hp-protover 10) -+ retval = 400; - return (retval); - } - diff --git a/debian/patches/series b/debian/patches/series index 218ea08..aeb6a37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,5 @@ 0010-varnishtest-rxbytes.patch 0020-filter-headers.patch 0020-varnishd-esi-gzip-fix.patch -0025-varnishd-http09.patch 0098-libvmod-netmapper-src.patch 0099-libvmod-netmapper-ac.patch -- To view, visit https://gerrit.wikimedia.org/r/105523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8f36ed4aac9cedcc5a5cef3337a77398d665d05 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove http/0.9 patch - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/105523 Change subject: remove http/0.9 patch .. remove http/0.9 patch Change-Id: Ic8f36ed4aac9cedcc5a5cef3337a77398d665d05 --- D debian/patches/0025-varnishd-http09.patch M debian/patches/series 2 files changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/23/105523/1 diff --git a/debian/patches/0025-varnishd-http09.patch b/debian/patches/0025-varnishd-http09.patch deleted file mode 100644 index 254c4a6..000 --- a/debian/patches/0025-varnishd-http09.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/varnishd/cache_http.c b/bin/varnishd/cache_http.c -index 76b3f86..c96d29b 100644 a/bin/varnishd/cache_http.c -+++ b/bin/varnishd/cache_http.c -@@ -675,6 +675,8 @@ http_DissectRequest(struct sess *sp) - return (retval); - } - http_ProtoVer(hp); -+ if(hp-protover 10) -+ retval = 400; - return (retval); - } - diff --git a/debian/patches/series b/debian/patches/series index 218ea08..aeb6a37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,5 @@ 0010-varnishtest-rxbytes.patch 0020-filter-headers.patch 0020-varnishd-esi-gzip-fix.patch -0025-varnishd-http09.patch 0098-libvmod-netmapper-src.patch 0099-libvmod-netmapper-ac.patch -- To view, visit https://gerrit.wikimedia.org/r/105523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8f36ed4aac9cedcc5a5cef3337a77398d665d05 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm27) precise; urgency=low - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: varnish (3.0.3plus~rc1-wm27) precise; urgency=low .. varnish (3.0.3plus~rc1-wm27) precise; urgency=low * Updated netmapper w/ new fixes * Removed HTTP/0.9 patch (for testing) -- Brandon Black bbl...@wikimedia.org Sun, 05 Jan 2014 00:51:12 + Change-Id: I6f0bbac933d890d1b8c4d42fef9b278b136f30a8 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 9543182..b410752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +varnish (3.0.3plus~rc1-wm27) precise; urgency=low + + * Updated netmapper w/ new fixes + * Removed HTTP/0.9 patch (for testing) + + -- Brandon Black bbl...@wikimedia.org Sun, 05 Jan 2014 00:51:12 + + varnish (3.0.3plus~rc1-wm25) precise; urgency=low * Fix HTTP/0.9 issue (return 400 on request) -- To view, visit https://gerrit.wikimedia.org/r/105524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f0bbac933d890d1b8c4d42fef9b278b136f30a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm27) precise; urgency=low - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/105524 Change subject: varnish (3.0.3plus~rc1-wm27) precise; urgency=low .. varnish (3.0.3plus~rc1-wm27) precise; urgency=low * Updated netmapper w/ new fixes * Removed HTTP/0.9 patch (for testing) -- Brandon Black bbl...@wikimedia.org Sun, 05 Jan 2014 00:51:12 + Change-Id: I6f0bbac933d890d1b8c4d42fef9b278b136f30a8 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/24/105524/1 diff --git a/debian/changelog b/debian/changelog index 9543182..b410752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +varnish (3.0.3plus~rc1-wm27) precise; urgency=low + + * Updated netmapper w/ new fixes + * Removed HTTP/0.9 patch (for testing) + + -- Brandon Black bbl...@wikimedia.org Sun, 05 Jan 2014 00:51:12 + + varnish (3.0.3plus~rc1-wm25) precise; urgency=low * Fix HTTP/0.9 issue (return 400 on request) -- To view, visit https://gerrit.wikimedia.org/r/105524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f0bbac933d890d1b8c4d42fef9b278b136f30a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] change list_item to li - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [browser test] change list_item to li .. [browser test] change list_item to li Both are valid, but using li is the convention. Change-Id: Ic6929a1c8508760d0228c78fa132e1b1d92680a2 --- M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jhall: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index 3a0b2fe..02cc054 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -57,7 +57,7 @@ span(:leftarrowclose, class: oo-ui-iconedElement-icon oo-ui-icon-previous, frame: frame) text_field(:link_textfield, index: 0, frame: frame) span(:another_save_page, class: oo-ui-labeledElement-label, text: Save page, frame: frame) -list_item(:template_list_item, text: S, frame: frame) +li(:template_list_item, text: S, frame: frame) div(:ve_link_ui, class: oo-ui-window-title, frame: frame) end -- To view, visit https://gerrit.wikimedia.org/r/105208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6929a1c8508760d0228c78fa132e1b1d92680a2 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal syntax error - change (mediawiki...InviteSignup)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/105525 Change subject: Fix fatal syntax error .. Fix fatal syntax error Change-Id: I0a531f7fca8d13f35ec513bcbed21318cc97c5e7 --- M InviteSignup.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InviteSignup refs/changes/25/105525/1 diff --git a/InviteSignup.php b/InviteSignup.php index 88b20d7..f2c13e9 100644 --- a/InviteSignup.php +++ b/InviteSignup.php @@ -23,7 +23,7 @@ $dir = __DIR__; $GLOBALS['wgAutoloadClasses']['InviteStore'] = $dir/InviteStore.php; $GLOBALS['wgAutoloadClasses']['SpecialInviteSignup'] = $dir/SpecialInviteSignup.php; -$GLOBALS['wgMessagesDirs']['InviteSignup'] = __DIR__ . /i18n'; +$GLOBALS['wgMessagesDirs']['InviteSignup'] = __DIR__ . '/i18n'; $GLOBALS['wgExtensionMessagesFiles']['InviteSignup'] = $dir/InviteSignup.i18n.php; $GLOBALS['wgExtensionMessagesFiles']['InviteSignupAlias'] = $dir/InviteSignup.alias.php; $GLOBALS['wgSpecialPages']['InviteSignup'] = 'SpecialInviteSignup'; -- To view, visit https://gerrit.wikimedia.org/r/105525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a531f7fca8d13f35ec513bcbed21318cc97c5e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/InviteSignup Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal syntax error - change (mediawiki...InviteSignup)
Nikerabbit has submitted this change and it was merged. Change subject: Fix fatal syntax error .. Fix fatal syntax error Change-Id: I0a531f7fca8d13f35ec513bcbed21318cc97c5e7 --- M InviteSignup.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Verified; Looks good to me, approved diff --git a/InviteSignup.php b/InviteSignup.php index 88b20d7..f2c13e9 100644 --- a/InviteSignup.php +++ b/InviteSignup.php @@ -23,7 +23,7 @@ $dir = __DIR__; $GLOBALS['wgAutoloadClasses']['InviteStore'] = $dir/InviteStore.php; $GLOBALS['wgAutoloadClasses']['SpecialInviteSignup'] = $dir/SpecialInviteSignup.php; -$GLOBALS['wgMessagesDirs']['InviteSignup'] = __DIR__ . /i18n'; +$GLOBALS['wgMessagesDirs']['InviteSignup'] = __DIR__ . '/i18n'; $GLOBALS['wgExtensionMessagesFiles']['InviteSignup'] = $dir/InviteSignup.i18n.php; $GLOBALS['wgExtensionMessagesFiles']['InviteSignupAlias'] = $dir/InviteSignup.alias.php; $GLOBALS['wgSpecialPages']['InviteSignup'] = 'SpecialInviteSignup'; -- To view, visit https://gerrit.wikimedia.org/r/105525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a531f7fca8d13f35ec513bcbed21318cc97c5e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/InviteSignup Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make logscale in reqerror graphs actually work - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: Make logscale in reqerror graphs actually work .. Make logscale in reqerror graphs actually work Also tweak graph titles. This fix depends on a graphite update which AFAIK already happened. 10 as log base: the yearly graph has values across 4 orders of magnitudes. Bug: 41754 Change-Id: Iae1c2b97f3f81e60c27a8af5cbd33f772576bbe3 --- M files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph M files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph M files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph M files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph 4 files changed, 10 insertions(+), 12 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph b/files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph index a948e1d..804c310 100644 --- a/files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph +++ b/files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph @@ -1,4 +1,4 @@ -title HTTP 4xx Responses/hour -1week +title HTTP 4xx Responses/hour -1year linewidth 2 linemode connected hide_legend false diff --git a/files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph b/files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph index d70206c..90af6ad 100644 --- a/files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph +++ b/files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph @@ -1,16 +1,15 @@ -title HTTP 5xx Responses/hour -1week +title HTTP 5xx Responses/hour -2month linewidth 2 +logbase 10 linemode connected hide_legend false from -2month field :a, :color = red, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))' field :b, :color = blue, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))' diff --git a/files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph b/files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph index c810a02..cf70ee3 100644 --- a/files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph +++ b/files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph @@ -1,4 +1,4 @@ -title HTTP 4xx Responses/hour -1week +title HTTP 4xx Responses/hour -2month linewidth 2 linemode connected hide_legend false diff --git a/files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph b/files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph index 81b0db5..d1c6a5d 100644 --- a/files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph +++ b/files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph @@ -1,16 +1,15 @@ -title HTTP 5xx Responses/hour -1week +title HTTP 5xx Responses/hour -1year linewidth 2 +logbase 10 linemode connected hide_legend false from -1year field :a, :color = red, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))' field :b, :color = blue, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))' -- To view, visit https://gerrit.wikimedia.org/r/101065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae1c2b97f3f81e60c27a8af5cbd33f772576bbe3 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: tweak letter case of site header - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105526
Change subject: gdash: tweak letter case of site header
..
gdash: tweak letter case of site header
'wmf stats' - 'WMF stats'
Change-Id: I2a84620af27553839288512a4745cafb4a050be4
---
M manifests/role/gdash.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/105526/1
diff --git a/manifests/role/gdash.pp b/manifests/role/gdash.pp
index 6b584af..6ea1d3c 100644
--- a/manifests/role/gdash.pp
+++ b/manifests/role/gdash.pp
@@ -8,7 +8,7 @@
graphite_host = 'https://graphite.wikimedia.org',
template_source = 'puppet:///files/graphite/gdash',
options = {
- title = 'wmf stats',
+ title = 'WMF stats',
graph_columns = 1,
graph_height = 500,
graph_width = 1024,
--
To view, visit https://gerrit.wikimedia.org/r/105526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a84620af27553839288512a4745cafb4a050be4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: tweak letter case of site header - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: gdash: tweak letter case of site header
..
gdash: tweak letter case of site header
'wmf stats' - 'WMF stats'
Change-Id: I2a84620af27553839288512a4745cafb4a050be4
---
M manifests/role/gdash.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/gdash.pp b/manifests/role/gdash.pp
index 6b584af..6ea1d3c 100644
--- a/manifests/role/gdash.pp
+++ b/manifests/role/gdash.pp
@@ -8,7 +8,7 @@
graphite_host = 'https://graphite.wikimedia.org',
template_source = 'puppet:///files/graphite/gdash',
options = {
- title = 'wmf stats',
+ title = 'WMF stats',
graph_columns = 1,
graph_height = 500,
graph_width = 1024,
--
To view, visit https://gerrit.wikimedia.org/r/105526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a84620af27553839288512a4745cafb4a050be4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also logbase 2 for the shorter reqerror graphs - change (operations/puppet)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105614 Change subject: Also logbase 2 for the shorter reqerror graphs .. Also logbase 2 for the shorter reqerror graphs Should be enough. Bug: 41754 Change-Id: I27a8c173825387a8f465180b2d8aac374485bc95 --- M files/graphite/gdash/dashboards/reqerror/1.5xx.graph M files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph M files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph 3 files changed, 9 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/105614/1 diff --git a/files/graphite/gdash/dashboards/reqerror/1.5xx.graph b/files/graphite/gdash/dashboards/reqerror/1.5xx.graph index 0e176ce..264b006 100644 --- a/files/graphite/gdash/dashboards/reqerror/1.5xx.graph +++ b/files/graphite/gdash/dashboards/reqerror/1.5xx.graph @@ -1,16 +1,15 @@ title HTTP 5xx Responses -8hours linewidth 2 +logbase 2 linemode connected hide_legend false from -8hours field :a, :color = red, :alias = none, - :data = 'cactiStyle(alias(reqstats.500,500 resp/min))', - :logbase = 10 + :data = 'cactiStyle(alias(reqstats.500,500 resp/min))' field :b, :color = blue, :alias = none, - :data = 'cactiStyle(alias(reqstats.5xx,5xx resp/min))', - :logbase = 10 + :data = 'cactiStyle(alias(reqstats.5xx,5xx resp/min))' diff --git a/files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph b/files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph index 8a4e74e..8a505b4 100644 --- a/files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph +++ b/files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph @@ -1,16 +1,15 @@ title HTTP 5xx Responses -1day linewidth 2 +logbase 2 linemode staircase hide_legend false from -1 day field :a, :color = blue, :alias = none, - :data = 'cactiStyle(alias(reqstats.5xx,5xx resp/min))', - :logbase = 10 + :data = 'cactiStyle(alias(reqstats.5xx,5xx resp/min))' field :b, :color = red, :alias = none, - :data = 'cactiStyle(alias(reqstats.500,500 resp/min))', - :logbase = 10 + :data = 'cactiStyle(alias(reqstats.500,500 resp/min))' diff --git a/files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph b/files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph index 2b0e8fa..5813884 100644 --- a/files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph +++ b/files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph @@ -1,16 +1,15 @@ title HTTP 5xx Responses/hour -1week linewidth 2 +logbase 2 linemode connected hide_legend false from -1 week field :a, :color = red, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.500,1h),500 resp/hour))' field :b, :color = blue, :alias = none, - :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))', - :logbase = 10 + :data = 'cactiStyle(alias(summarize(reqstats.5xx,1h),5xx resp/hour))' -- To view, visit https://gerrit.wikimedia.org/r/105614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27a8c173825387a8f465180b2d8aac374485bc95 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename xml ids to use underscores - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Rename xml ids to use underscores .. Rename xml ids to use underscores XML Files cannot have caps in them, so we must use underscore there. Since R.layout.* is just the names of the XML files, and they are all underscore separated, use underscore separation for ids too. Change-Id: I3eab7b2546a67ff5ec8886a0b710f398e2bc20a7 --- M wikipedia/res/layout/fragment_page.xml M wikipedia/res/layout/fragment_search.xml M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java M wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java 4 files changed, 22 insertions(+), 22 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index f7b146b..7217db7 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -5,20 +5,20 @@ android:layout_width=match_parent android:layout_height=match_parent ProgressBar -android:id=@+id/pageLoadProgress +android:id=@+id/page_load_progress android:layout_gravity=center android:layout_width=wrap_content android:layout_height=wrap_content android:indeterminate=true / org.wikimedia.wikipedia.ObservableWebView -android:id=@+id/pageWebView +android:id=@+id/page_web_view android:layout_width=match_parent android:layout_height=match_parent android:visibility=gone / LinearLayout -android:id=@+id/pageError +android:id=@+id/page_error android:layout_width=match_parent android:layout_height=wrap_content android:layout_gravity=center_vertical @@ -32,7 +32,7 @@ / Button -android:id=@+id/pageErrorRetry +android:id=@+id/page_error_retry android:text=@string/page_error_retry android:layout_gravity=center android:layout_width=wrap_content android:layout_height=wrap_content/ diff --git a/wikipedia/res/layout/fragment_search.xml b/wikipedia/res/layout/fragment_search.xml index 90ca9a8..8de05ca 100644 --- a/wikipedia/res/layout/fragment_search.xml +++ b/wikipedia/res/layout/fragment_search.xml @@ -12,12 +12,12 @@ android:layout_width=match_parent LinearLayout -android:id=@+id/searchBarIcon +android:id=@+id/search_bar_icon android:layout_width=wrap_content android:background=?android:attr/selectableItemBackground android:layout_height=wrap_content ImageView -android:id=@+id/searchDrawerIndicator +android:id=@+id/search_drawer_indicator android:layout_width=16dp android:layout_height=16dp android:layout_marginLeft=0dp @@ -45,7 +45,7 @@ android:layout_weight=1 EditText -android:id=@+id/searchTermText +android:id=@+id/search_term_text android:layout_width=match_parent android:layout_height=wrap_content android:hint=@string/search_hint @@ -55,7 +55,7 @@ android:singleLine=true / ProgressBar -android:id=@+id/searchProgress +android:id=@+id/search_progress android:layout_width=wrap_content android:layout_height=wrap_content android:layout_gravity=right|center_vertical|end @@ -65,7 +65,7 @@ / /FrameLayout ImageView -android:id=@+id/searchBarShowMenu +android:id=@+id/search_bar_show_menu android:layout_width=48dp android:layout_height=48dp android:padding=8dp @@ -77,7 +77,7 @@ View android:layout_width=match_parent android:layout_height=1dp android:background=@color/border / Button -android:id=@+id/searchNetworkError +android:id=@+id/search_network_error android:layout_width=match_parent android:layout_height=48dp android:gravity=center @@ -87,7 +87,7 @@ android:background=?android:attr/selectableItemBackground / ListView -android:id=@+id/searchResultsList +android:id=@+id/search_results_list android:layout_width=match_parent android:layout_height=wrap_content
[MediaWiki-commits] [Gerrit] Fix the plural form checker false positives for good - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105615
Change subject: Fix the plural form checker false positives for good
..
Fix the plural form checker false positives for good
Used the real MediaWiki here be dragons parser to get the actual
parameters given to the plural function. Yet again I was amazed
how versatile parser hooks are and dismayed that there is no good
documentation how to use SFH_OBJECT_ARGS. Normal parser function
would not do it, because I need raw text.
It was pretty easy to figure out how to use PPFrame-expand as it is
pretty much the only function available, and it only takes handful of
constans as parameter. Of course the constants are undocumented as well,
but PPFrame::RECOVER_ORIG sounded like it would return the raw text and
that seems to be teh case as well.
The trickiest part was how to have my own callback called when parser
find the plural magic word. Simply creating a new parser and attaching
my callback with setFunctionHook would not do it, as it would get
overridden by the core plural handler. I found a workaround by
explicitly calling firstCallInit on the parser before setting my
callback.
Calling PPFrame::expand without parameters nicely triggers my callbacks
again when there are plurals embedded inside plurals. The unit tests
are currently hard coding the order in which the plural calls are
processed (left to right, inner before outer). This seems okay price
to pay to not have to sort them in tests.
Final problem was to figure out why I didn't get any plural forms
after calling Parser::preprocess. It turned out to be a simple
mistake with the anonymous function declaration. It references the
$plurals variable with 'use', but of course modifications to that
inside the anonymous function are not visible to outside, unless
you pass it by reference.
Constructing a new parser for every check is going to be much
slower, but on the other hand it is likely not going to matter
unless one is mass-checking translations. We can cache the parser
later if performance turns out to be a problem.
Bug: 59241
Change-Id: Id5c3f40b801c5186f5cb2341e21eea7f0f694958
---
M MediaWikiMessageChecker.php
M tests/phpunit/MediaWikiMessageCheckerTest.php
2 files changed, 43 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/15/105615/1
diff --git a/MediaWikiMessageChecker.php b/MediaWikiMessageChecker.php
index 455e05f..c825ca9 100644
--- a/MediaWikiMessageChecker.php
+++ b/MediaWikiMessageChecker.php
@@ -233,44 +233,38 @@
* @return array[array]
*/
public static function getPluralForms( $translation ) {
+ // Stores the forms from plural invocations
$plurals = array();
- while ( true ) {
- $pos = stripos( $translation, '{{plural:' );
- if ( $pos === false ) {
- break;
- }
- $len = strlen( $translation );
- $stack = 0;
- for ( $i = $pos; $i $len; $i++ ) {
- if ( $translation[$i] === '{' ) {
- $stack++;
- } elseif ( $translation[$i] === '}' ) {
- $stack--;
- } elseif ( $stack 2 $translation[$i] ===
'|' ) {
- # These pipes belong to another thing,
ignore them
- $translation[$i] = '_';
- }
+ $cb = function ( $parser, $frame, $args ) use ( $plurals ) {
+ $forms = array();
- if ( $stack === 0 ) {
- // The string '{{PLURAL...' (without
closing }})
- $pluralString = substr( $translation,
$pos, $i - $pos - 1 );
- $forms = explode( '|', $pluralString );
- array_shift( $forms );
-
- // Remove this from the current string
to continue later
- $translation = substr( $translation, $i
);
-
- $plurals[] = $forms;
- break;
+ foreach ( $args as $index = $form ) {
+ // The first arg is the number, we skip it
+ if ( $index !== 0 ) {
+ // Collect the raw text
+ $forms[] = $frame-expand( $form,
PPFrame::RECOVER_ORIG );
+ // Expand the text to process embedded
plurals
+
[MediaWiki-commits] [Gerrit] Minor scap fixes - change (operations/puppet)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105616
Change subject: Minor scap fixes
..
Minor scap fixes
* Fixed dumb terminal warnings on CDB rebuild step
* Removed literal newline from timing message
Change-Id: Id829307f8e4daf400a850e9802440b0f0d533eb1
---
M files/scap/scap
M files/scap/scap-rebuild-cdbs
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/105616/1
diff --git a/files/scap/scap b/files/scap/scap
index 115ad5f..4ecdac9 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -112,7 +112,7 @@
SECS=$((DIFF%60))
printf -v HUMAN_DIFF %02dm %02ds $MINS $SECS
-echo scap completed in $HUMAN_DIFF.\n
+echo scap completed in $HUMAN_DIFF.
export DOLOGMSGNOLOG=
$BINDIR/dologmsg !log $USER finished scap${*:+: }$* (duration: $HUMAN_DIFF)
diff --git a/files/scap/scap-rebuild-cdbs b/files/scap/scap-rebuild-cdbs
index 0569aaf..01845b3 100755
--- a/files/scap/scap-rebuild-cdbs
+++ b/files/scap/scap-rebuild-cdbs
@@ -20,6 +20,6 @@
# Rebuild the CDB files from the JSON versions
# Regenerate the extension message file list for all active MediaWiki versions
for mwVerNum in ${mwVersions[@]}; do
- sudo -u mwdeploy $BINDIR/mergeCdbFileUpdates
--directory=$MW_COMMON/php-$mwVerNum/cache/l10n \
+ sudo -u mwdeploy TERM=$TERM $BINDIR/mergeCdbFileUpdates
--directory=$MW_COMMON/php-$mwVerNum/cache/l10n \
--trustmtime --threads=$THREADS
done
--
To view, visit https://gerrit.wikimedia.org/r/105616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id829307f8e4daf400a850e9802440b0f0d533eb1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add triggered filter id as parameter to messages - change (mediawiki...AbuseFilter)
Hoo man has submitted this change and it was merged.
Change subject: Add triggered filter id as parameter to messages
..
Add triggered filter id as parameter to messages
Bug: 50464
Change-Id: I82f1c7f021c8d95fe50fd4da4bc57a885084
---
M AbuseFilter.class.php
M AbuseFilter.i18n.php
2 files changed, 38 insertions(+), 24 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Checked
Objections:
Siebrand: There's a problem with this change, please improve
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index b067ed5..77deaa4 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -787,7 +787,8 @@
foreach ( $actions as $action = $info ) {
$newMsg = self::takeConsequenceAction(
$action, $info['parameters'], $title,
$vars,
-
self::$filters[$filter]-af_public_comments
+
self::$filters[$filter]-af_public_comments,
+ $filter
);
if ( $newMsg !== null ) {
@@ -1196,6 +1197,7 @@
* @param $title Title
* @param $vars AbuseFilterVariableHolder
* @param $rule_desc
+* @param $rule_number int|string
*
* @return array|null a message describing the action that was taken,
* or null if no action was taken. The message is given as an
array
@@ -1207,7 +1209,7 @@
*not accept Message objects to be added directly.
*/
public static function takeConsequenceAction( $action, $parameters,
$title,
- $vars, $rule_desc )
+ $vars, $rule_desc, $rule_number )
{
global $wgAbuseFilterCustomActionsHandlers, $wgRequest;
@@ -1216,12 +1218,13 @@
switch ( $action ) {
case 'disallow':
if ( strlen( $parameters[0] ) ) {
- $message = array( $parameters[0],
$rule_desc );
+ $message = array( $parameters[0],
$rule_desc, $rule_number );
} else {
// Generic message.
$message = array(
'abusefilter-disallowed',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
}
break;
@@ -1236,7 +1239,8 @@
$block-setBlocker( $filterUser );
$block-mReason = wfMessage(
'abusefilter-blockreason',
- $rule_desc
+ $rule_desc,
+ $rule_number
)-inContentLanguage()-text();
$block-isHardblock( false );
$block-isAutoblocking( true );
@@ -1266,13 +1270,14 @@
$log = new LogPage( 'block' );
$log-addEntry( 'block',
Title::makeTitle( NS_USER,
$wgUser-getName() ),
- wfMessage( 'abusefilter-blockreason',
$rule_desc )-inContentLanguage()-text(),
+ wfMessage( 'abusefilter-blockreason',
$rule_desc, $rule_number )-inContentLanguage()-text(),
$logParams, self::getFilterUser()
);
$message = array(
'abusefilter-blocked-display',
- $rule_desc
+ $rule_desc,
+ $rule_number
);
break;
case 'rangeblock':
@@ -1286,7 +1291,8 @@
$block-setBlocker( $filterUser );
$block-mReason = wfMessage(
'abusefilter-blockreason',
- $rule_desc
+ $rule_desc,
+ $rule_number
)-inContentLanguage()-text();
$block-isHardblock( false );
$block-prevents( 'createaccount', true );
@@ -1303,13
[MediaWiki-commits] [Gerrit] Support searching for multiple filter IDs - change (mediawiki...AbuseFilter)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105617
Change subject: Support searching for multiple filter IDs
..
Support searching for multiple filter IDs
Allow a comma-separated list of filter IDs to be entered on
Special:AbuseLog, returning all entries that were generated by any of the
given filters.
Change-Id: I170dc46ef51135fe711d0a76113d367033b67cc9
---
M special/SpecialAbuseLog.php
1 file changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/17/105617/1
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 96437c7..2a90f24 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -232,13 +232,17 @@
}
if ( $this-mSearchFilter ) {
- // if the filter is hidden, users who can't view
private filters should not be able to find log entries generated by it
- if ( !AbuseFilter::filterHidden( $this-mSearchFilter )
- || AbuseFilterView::canViewPrivate()
- || $this-getUser()-isAllowed(
'abusefilter-log-private' )
- ) {
- $conds['afl_filter'] = $this-mSearchFilter;
+ $searchFilters = explode( ',', $this-mSearchFilter );
+ // if a filter is hidden, users who can't view private
filters should not be able to find log entries generated by it
+ if( !AbuseFilterView::canViewPrivate()
+!$this-getUser()-isAllowed(
'abusefilter-log-private' ) ) {
+ foreach( $searchFilters as $index = $filter ) {
+ if ( AbuseFilter::filterHidden( $filter
) ) {
+ unset( $searchFilters[$index] );
+ }
+ }
}
+ $conds[] = 'afl_filter IN (' . wfGetDB( DB_SLAVE
)-makeList( $searchFilters ) . ')';
}
$searchTitle = Title::newFromText( $this-mSearchTitle );
--
To view, visit https://gerrit.wikimedia.org/r/105617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I170dc46ef51135fe711d0a76113d367033b67cc9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] +sidebar userscript - change (wikimedia...triagescripts)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105618
Change subject: +sidebar userscript
..
+sidebar userscript
Change-Id: I5cc7b104d0b5bb50b9fe122fbb93776bbaa04f65
---
A wikimedia-bugzilla-sidebar.user.js
1 file changed, 39 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/triagescripts
refs/changes/18/105618/1
diff --git a/wikimedia-bugzilla-sidebar.user.js
b/wikimedia-bugzilla-sidebar.user.js
new file mode 100644
index 000..0dad47d
--- /dev/null
+++ b/wikimedia-bugzilla-sidebar.user.js
@@ -0,0 +1,39 @@
+// ==UserScript==
+// @name WMF Bugzilla: add links to sidebar
+// @namespace http://arctus.nl
+// @version0.1
+// @description Adds direct bug creations urls browse project link to the
sidebar. Adapt this script to your needs!
+// @match https://bugzilla.wikimedia.org/*
+// @copyright 2014, Merlijn van Deen; MIT licensed
+// @requirehttps://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js
+// ==/UserScript==
+
+/* Configuration follows, and takes the form of
+ extraLinks['project/component name'] = 'https://direct url to bug creation'
+
+ You can find the url by opening the 'Report Bug' screen, setting relevant
+ values, and clicking the 'Remember values as bookmarkable template' button.
+ On that page, right-click the Bug entry template link, select Copy link
+ address and use that URL below.
+
+*/
+
+var extraLinks = {};
+extraLinks['pywikibot'] =
'https://bugzilla.wikimedia.org/enter_bug.cgi?assigned_to=Pywikipedia-bugs%40lists.wikimedia.orgattach_text=blocked=bug_file_loc=http%3A%2F%2Fbug_severity=normalbug_status=NEWcf_browser=---cf_platform=---comment=component=Generalcontenttypeentry=contenttypemethod=autodetectcontenttypeselection=text%2Fplaindata=dependson=description=form_name=enter_bugkeywords=maketemplate=Remember%20values%20as%20bookmarkable%20templateop_sys=Allproduct=Pywikibotrep_platform=Allshort_desc=target_milestone=---version=core%20%282.0%29';
+extraLinks['tsreports'] =
'https://bugzilla.wikimedia.org/enter_bug.cgi?assigned_to=valhallasw%40arctus.nlattach_text=blocked=bug_file_loc=http%3A%2F%2Fbug_severity=normalbug_status=NEWcf_browser=---cf_platform=---comment=component=tsreportscontenttypeentry=contenttypemethod=autodetectcontenttypeselection=text%2Fplaindata=dependson=description=form_name=enter_bugkeywords=maketemplate=Remember%20values%20as%20bookmarkable%20templateop_sys=Allproduct=Tool%20Labs%20toolsrep_platform=Allshort_desc=target_milestone=---version=unspecified';
+extraLinks['DBQ'] =
'https://bugzilla.wikimedia.org/enter_bug.cgi?assigned_to=wikibugs-l%40lists.wikimedia.orgattach_text=blocked=bug_file_loc=http%3A%2F%2Fbug_severity=normalbug_status=NEWcf_browser=---cf_platform=---comment=component=Database%20Queriescontenttypeentry=contenttypemethod=autodetectcontenttypeselection=text%2Fplaindata=dependson=description=form_name=enter_bugkeywords=maketemplate=Remember%20values%20as%20bookmarkable%20templateop_sys=Allproduct=Tool%20Labs%20toolsrep_platform=Allshort_desc=target_milestone=---version=unspecified';
+
+/* Code follows */
+document.jQuery = jQuery;
+
+/* Insert direct bug creation links */
+$('#panel a[href=enter_bug.cgi').parent().append('ul
id=specificBugCreationLinks/ul')
+
+for(var key in extraLinks) {
+ $(#specificBugCreationLinks).append(
+ liin + document.jQuery('a', {href:extraLinks[key],
text:key})[0].outerHTML + /li
+ );
+};
+
+/* Insert browse projects link */
+$('#panel a[href=enter_bug.cgi').parent().before('lia
href=describecomponents.cgiBrowse projects/a/li');
--
To view, visit https://gerrit.wikimedia.org/r/105618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cc7b104d0b5bb50b9fe122fbb93776bbaa04f65
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/triagescripts
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Add XFF support - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: dynamicproxy: Add XFF support .. dynamicproxy: Add XFF support Unconditionally sets X-Forwarded-For headers to all proxied backends. Change-Id: Icec16079d1b90b01cb7ecab85450cd8ef850c82f --- M modules/dynamicproxy/templates/proxy.conf 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dynamicproxy/templates/proxy.conf b/modules/dynamicproxy/templates/proxy.conf index 7ae87bb..727d0df 100644 --- a/modules/dynamicproxy/templates/proxy.conf +++ b/modules/dynamicproxy/templates/proxy.conf @@ -68,5 +68,8 @@ proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; + +# Passes client's IP to the backend +proxy_set_header X-Forwarded-For $remote_addr; } } -- To view, visit https://gerrit.wikimedia.org/r/105509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icec16079d1b90b01cb7ecab85450cd8ef850c82f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Page._getVersionHistory returns only a part of a history - change (pywikibot/compat)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105619
Change subject: Page._getVersionHistory returns only a part of a history
..
Page._getVersionHistory returns only a part of a history
https://bugzilla.wikimedia.org/show_bug.cgi?id=55160
Change-Id: I27db336c1853fe5ac9a9c0d8097b870fca2be1ca
---
M wikipedia.py
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/19/105619/1
diff --git a/wikipedia.py b/wikipedia.py
index b1e1a57..0d7cb5b 100644
--- a/wikipedia.py
+++ b/wikipedia.py
@@ -3277,9 +3277,12 @@
elements = params['rvprop'].split('|')
row = [values[e] for e in elements]
dataQ.append(tuple(row))
-if len(result['query']['pages'].values()[0]['revisions']
- ) revCount:
+
+pageidsDict = result['query']['pages'].values()[0]
+if (len(pageidsDict['revisions']) revCount and
+'query-continue' not in result):
thisHistoryDone = True
+
return dataQ
def _getVersionHistoryOld(self, getAll=False, skipFirst=False,
--
To view, visit https://gerrit.wikimedia.org/r/105619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27db336c1853fe5ac9a9c0d8097b870fca2be1ca
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Mpaa mpaa.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing qqq for csrf page - change (wikimedia/wikimania-scholarships)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105620
Change subject: Add missing qqq for csrf page
..
Add missing qqq for csrf page
Change-Id: Ib88ee906a89e841f41cbe565ae4c02970f50b69a
---
M data/i18n/qqq.json
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/20/105620/1
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 8328a16..f3b6837 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -209,5 +209,7 @@
review-view-notes: Input label, followed by multi-line text
box.\n{{Identical|Note}},
review-view-save: Form submission button.\n{{Identical|Save}},
page-of-pages: Paginated report page indicator. Parameters:\n* $1 -
current page number\n* $2 - total page count,
-no-results: Content for report with no results
-}
\ No newline at end of file
+no-results: Content for report with no results,
+csrf-heading: Header for cross site request forgery (CSRF) error page,
+csrf-message: Cross site request forgery (CSRF) error page body
+}
--
To view, visit https://gerrit.wikimedia.org/r/105620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib88ee906a89e841f41cbe565ae4c02970f50b69a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set dir and lang of insertables to the source messages' values - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Set dir and lang of insertables to the source messages' values
..
Set dir and lang of insertables to the source messages' values
Change-Id: I7254a1b17f104ba5f94da775043d1b5f0c86aeaa
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index eed5ce1..75bf452 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -420,11 +420,22 @@
addInsertables: function ( insertables ) {
var i,
count = insertables.length,
+ $sourceMessage = this.$editor.find(
'.sourcemessage' ),
$buttonArea = this.$editor.find(
'.tux-editor-insert-buttons' ),
$textarea = this.$editor.find(
'.tux-textarea-translation' );
for ( i = 0; i count; i++ ) {
+ // The dir and lang attributes must be set here,
+ // because the language of the insertables is
the language
+ // of the source message and not of the
translation.
+ // The direction may appear confusing, for
example,
+ // in tvar strings, which would appear with the
dollar sign
+ // on the wrong end.
$( 'button' )
+ .prop( {
+ dir: $sourceMessage.prop( 'dir'
),
+ lang: $sourceMessage.prop(
'lang' )
+ } )
.addClass( 'insertable
shortcut-activated' )
.text( insertables[i].display )
.data( 'iid', i )
--
To view, visit https://gerrit.wikimedia.org/r/105489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7254a1b17f104ba5f94da775043d1b5f0c86aeaa
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exclude toggle button of collapsible elements from user sele... - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105621
Change subject: Exclude toggle button of collapsible elements from user
selection
..
Exclude toggle button of collapsible elements from user selection
Bug: 34445
Change-Id: I4ee597aec10bfee4104efde92a9f6b03d1825408
---
M skins/common/shared.css
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/105621/1
diff --git a/skins/common/shared.css b/skins/common/shared.css
index b068915..3c2adcd 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -1184,6 +1184,7 @@
.mw-editsection,
.toctoggle,
+.mw-collapsible-toggle,
#jump-to-nav {
-moz-user-select: none;
-webkit-user-select: none;
--
To view, visit https://gerrit.wikimedia.org/r/105621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ee597aec10bfee4104efde92a9f6b03d1825408
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor scap fixes - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Minor scap fixes
..
Minor scap fixes
* Fixed dumb terminal warnings on CDB rebuild step
* Removed literal newline from timing message
Change-Id: Id829307f8e4daf400a850e9802440b0f0d533eb1
---
M files/scap/scap
M files/scap/scap-rebuild-cdbs
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/scap/scap b/files/scap/scap
index 115ad5f..4ecdac9 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -112,7 +112,7 @@
SECS=$((DIFF%60))
printf -v HUMAN_DIFF %02dm %02ds $MINS $SECS
-echo scap completed in $HUMAN_DIFF.\n
+echo scap completed in $HUMAN_DIFF.
export DOLOGMSGNOLOG=
$BINDIR/dologmsg !log $USER finished scap${*:+: }$* (duration: $HUMAN_DIFF)
diff --git a/files/scap/scap-rebuild-cdbs b/files/scap/scap-rebuild-cdbs
index 0569aaf..01845b3 100755
--- a/files/scap/scap-rebuild-cdbs
+++ b/files/scap/scap-rebuild-cdbs
@@ -20,6 +20,6 @@
# Rebuild the CDB files from the JSON versions
# Regenerate the extension message file list for all active MediaWiki versions
for mwVerNum in ${mwVersions[@]}; do
- sudo -u mwdeploy $BINDIR/mergeCdbFileUpdates
--directory=$MW_COMMON/php-$mwVerNum/cache/l10n \
+ sudo -u mwdeploy TERM=$TERM $BINDIR/mergeCdbFileUpdates
--directory=$MW_COMMON/php-$mwVerNum/cache/l10n \
--trustmtime --threads=$THREADS
done
--
To view, visit https://gerrit.wikimedia.org/r/105616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id829307f8e4daf400a850e9802440b0f0d533eb1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable more stuff on loginwiki and votewiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/105622 Change subject: Disable more stuff on loginwiki and votewiki .. Disable more stuff on loginwiki and votewiki Remove some values same as default Change-Id: I624133239d444c6487c6c1b677b1767df97eacb2 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/22/105622/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3c16c84..cea2c3e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9296,6 +9296,7 @@ 'wmgUseScore' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgScoreFileBackend' = array( @@ -9353,11 +9354,13 @@ 'wmgUseSpecialNuke' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseLabeledSectionTransclusion' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseQuiz' = array( @@ -9386,6 +9389,7 @@ 'wmgUseGadgets' = array( 'default' = true, // set 2007-12-17 by brion 'loginwiki' = false, + 'votewiki' = false, ), # @} end of EXTENSIONS @@ -9775,16 +9779,10 @@ 'wmgCentralAuthLoginWiki' = array( 'default' = 'loginwiki', - 'loginwiki' = 'loginwiki', - 'test2wiki' = 'loginwiki', - 'testwikidatawiki' = 'loginwiki', ), 'wmgCentralAuthSilentLogin' = array( 'default' = true, - 'loginwiki' = true, - 'test2wiki' = true, - 'testwikidatawiki' = true, ), 'wmgCentralAuthUseEventLogging' = array( @@ -11978,10 +11976,14 @@ ), 'wmgUseVips' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseApiSandbox' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseShortUrl' = array( @@ -12282,6 +12284,8 @@ 'wmgUseScribunto' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseSubpageSortkey' = array( @@ -12751,9 +12755,6 @@ 'wgSecureLogin' = array( 'default' = true, - 'loginwiki' = true, - 'mediawikiwiki' = true, - 'test2wiki' = true, ), 'wgRightsUrl' = array( -- To view, visit https://gerrit.wikimedia.org/r/105622 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I624133239d444c6487c6c1b677b1767df97eacb2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable more stuff on loginwiki and votewiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable more stuff on loginwiki and votewiki .. Disable more stuff on loginwiki and votewiki Remove some values same as default Change-Id: I624133239d444c6487c6c1b677b1767df97eacb2 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3c16c84..cea2c3e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9296,6 +9296,7 @@ 'wmgUseScore' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgScoreFileBackend' = array( @@ -9353,11 +9354,13 @@ 'wmgUseSpecialNuke' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseLabeledSectionTransclusion' = array( 'default' = true, 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseQuiz' = array( @@ -9386,6 +9389,7 @@ 'wmgUseGadgets' = array( 'default' = true, // set 2007-12-17 by brion 'loginwiki' = false, + 'votewiki' = false, ), # @} end of EXTENSIONS @@ -9775,16 +9779,10 @@ 'wmgCentralAuthLoginWiki' = array( 'default' = 'loginwiki', - 'loginwiki' = 'loginwiki', - 'test2wiki' = 'loginwiki', - 'testwikidatawiki' = 'loginwiki', ), 'wmgCentralAuthSilentLogin' = array( 'default' = true, - 'loginwiki' = true, - 'test2wiki' = true, - 'testwikidatawiki' = true, ), 'wmgCentralAuthUseEventLogging' = array( @@ -11978,10 +11976,14 @@ ), 'wmgUseVips' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseApiSandbox' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseShortUrl' = array( @@ -12282,6 +12284,8 @@ 'wmgUseScribunto' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseSubpageSortkey' = array( @@ -12751,9 +12755,6 @@ 'wgSecureLogin' = array( 'default' = true, - 'loginwiki' = true, - 'mediawikiwiki' = true, - 'test2wiki' = true, ), 'wgRightsUrl' = array( -- To view, visit https://gerrit.wikimedia.org/r/105622 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I624133239d444c6487c6c1b677b1767df97eacb2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixup CategoryTree - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105623
Change subject: Fixup CategoryTree
..
Fixup CategoryTree
Disable where necessary
Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 21 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/23/105623/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4380d4d..57e1f80 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -564,9 +564,10 @@
$wgMaxIfExistCount = 500; // obs
$wgExpensiveParserFunctionLimit = 500;
-// ref and references tags -ævar, 2005-12-23
-require( $IP . '/extensions/Cite/Cite.php' );
-require( $IP . '/extensions/Cite/SpecialCite.php' );
+if ( $wmgUseCite ) {
+ require( $IP . '/extensions/Cite/Cite.php' );
+ require( $IP . '/extensions/Cite/SpecialCite.php' );
+}
# Inputbox extension for searching or creating articles
include( $IP . '/extensions/InputBox/InputBox.php' );
@@ -599,10 +600,13 @@
// So enwiki's protection rights can be assigned to global groups
$wgAvailableRights[] = 'templateeditor';
-$wgUseAjax = true;
-$wgCategoryTreeDynamicTag = true;
-require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-$wgCategoryTreeDisableCache = false;
+if ( $wmgUseCategoryTree ) {
+ require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
+ $wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
+ $wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
+ $wgCategoryTreeCategoryPageOptions =
$wmgCategoryTreeCategoryPageOptions;
+ $wgCategoryTreeDisableCache = false;
+}
if ( $wmgUseProofreadPage ) {
include( $IP . '/extensions/ProofreadPage/ProofreadPage.php' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cea2c3e..44c6948 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9269,19 +9269,26 @@
# below seems to be for extensions
# EXTENSIONS @{
-'wgCategoryTreeDynamicTag' = array(
+'wmgUseCategoryTree' = array(
+'default' = true,
+'loginwiki' = false,
+'votewiki' = false,
+),
+
+'wmgCategoryTreeDynamicTag' = array(
'default' = true,
),
// CT_MODE_CATEGORIES = 0
// CT_MODE_PAGES = 10
// CT_MODE_ALL = 20
-'wgCategoryTreeCategoryPageMode' = array(
+'wmgCategoryTreeCategoryPageMode' = array(
'default' = 0,
'hewiki' = 10,
),
-'wgCategoryTreeCategoryPageOptions' = array(
+'wmgCategoryTreeCategoryPageOptions' = array(
+ 'default' = array( 'mode' = null, 'showcount' = true ),
'hewiki' = array( 'mode' = 10 /*CT_MODE_PAGES*/ ), # bug 11776
),
--
To view, visit https://gerrit.wikimedia.org/r/105623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixup CategoryTree config, disable where necessary - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixup CategoryTree config, disable where necessary
..
Fixup CategoryTree config, disable where necessary
Disable cite in a couple of places too
Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 28 insertions(+), 10 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4380d4d..57e1f80 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -564,9 +564,10 @@
$wgMaxIfExistCount = 500; // obs
$wgExpensiveParserFunctionLimit = 500;
-// ref and references tags -ævar, 2005-12-23
-require( $IP . '/extensions/Cite/Cite.php' );
-require( $IP . '/extensions/Cite/SpecialCite.php' );
+if ( $wmgUseCite ) {
+ require( $IP . '/extensions/Cite/Cite.php' );
+ require( $IP . '/extensions/Cite/SpecialCite.php' );
+}
# Inputbox extension for searching or creating articles
include( $IP . '/extensions/InputBox/InputBox.php' );
@@ -599,10 +600,13 @@
// So enwiki's protection rights can be assigned to global groups
$wgAvailableRights[] = 'templateeditor';
-$wgUseAjax = true;
-$wgCategoryTreeDynamicTag = true;
-require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-$wgCategoryTreeDisableCache = false;
+if ( $wmgUseCategoryTree ) {
+ require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
+ $wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
+ $wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
+ $wgCategoryTreeCategoryPageOptions =
$wmgCategoryTreeCategoryPageOptions;
+ $wgCategoryTreeDisableCache = false;
+}
if ( $wmgUseProofreadPage ) {
include( $IP . '/extensions/ProofreadPage/ProofreadPage.php' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cea2c3e..3b34ca9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9269,19 +9269,26 @@
# below seems to be for extensions
# EXTENSIONS @{
-'wgCategoryTreeDynamicTag' = array(
+'wmgUseCategoryTree' = array(
+'default' = true,
+'loginwiki' = false,
+'votewiki' = false,
+),
+
+'wmgCategoryTreeDynamicTag' = array(
'default' = true,
),
// CT_MODE_CATEGORIES = 0
// CT_MODE_PAGES = 10
// CT_MODE_ALL = 20
-'wgCategoryTreeCategoryPageMode' = array(
+'wmgCategoryTreeCategoryPageMode' = array(
'default' = 0,
'hewiki' = 10,
),
-'wgCategoryTreeCategoryPageOptions' = array(
+'wmgCategoryTreeCategoryPageOptions' = array(
+ 'default' = array( 'mode' = null, 'showcount' = true ),
'hewiki' = array( 'mode' = 10 /*CT_MODE_PAGES*/ ), # bug 11776
),
@@ -12707,6 +12714,13 @@
'wikidatawiki' = array( 'content' = 7, 'general' = 1 ),
),
+'wmgUseCite' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+
### End (roughly) of general extensions
// Apply blocks to IPs in XFF (bug 23343)
--
To view, visit https://gerrit.wikimedia.org/r/105623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable BetaFeatures on votewiki and loginwiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/105624 Change subject: Disable BetaFeatures on votewiki and loginwiki .. Disable BetaFeatures on votewiki and loginwiki Change-Id: Ie45a06c38c1215986c767f97f9611a8b7a39449f --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/105624/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3b34ca9..3e4b18d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10588,18 +10588,26 @@ 'wmgUseBetaFeatures' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseCommonsMetadata' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseMultimediaViewer' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseVectorBeta' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), // -- VisualEditor start -- -- To view, visit https://gerrit.wikimedia.org/r/105624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie45a06c38c1215986c767f97f9611a8b7a39449f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix php notice for special page in Special:Version - change (mediawiki...MapSources)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/105625 Change subject: Fix php notice for special page in Special:Version .. Fix php notice for special page in Special:Version Change-Id: I559ce1d1ea28aaf1ffe22d153accd7bc60f37a9e --- M MapSources.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MapSources refs/changes/25/105625/1 diff --git a/MapSources.php b/MapSources.php index acc047a..6a7feba 100644 --- a/MapSources.php +++ b/MapSources.php @@ -22,7 +22,7 @@ $wgAutoloadClasses['MapSourcesTransform'] = __DIR__ . '/MapSources_transform.php'; // special page -$wgSpecialPages['Mapsources'] = 'MapSourcesPage'; +$wgSpecialPages['MapSources'] = 'MapSourcesPage'; // parser hooks $wgHooks['ParserFirstCallInit'][] = 'MapSourcesHooks::parserHooks'; -- To view, visit https://gerrit.wikimedia.org/r/105625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I559ce1d1ea28aaf1ffe22d153accd7bc60f37a9e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MapSources Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable BetaFeatures on votewiki and loginwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable BetaFeatures on votewiki and loginwiki .. Disable BetaFeatures on votewiki and loginwiki Change-Id: Ie45a06c38c1215986c767f97f9611a8b7a39449f --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3b34ca9..3e4b18d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10588,18 +10588,26 @@ 'wmgUseBetaFeatures' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseCommonsMetadata' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseMultimediaViewer' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseVectorBeta' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), // -- VisualEditor start -- -- To view, visit https://gerrit.wikimedia.org/r/105624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie45a06c38c1215986c767f97f9611a8b7a39449f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add alias file for MapSources special page - change (mediawiki...MapSources)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/105626 Change subject: Add alias file for MapSources special page .. Add alias file for MapSources special page Change-Id: Iabc527535080b57350f177e925414d462715eafd --- A MapSources.i18n.alias.php M MapSources.php 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MapSources refs/changes/26/105626/1 diff --git a/MapSources.i18n.alias.php b/MapSources.i18n.alias.php new file mode 100644 index 000..486b1fa --- /dev/null +++ b/MapSources.i18n.alias.php @@ -0,0 +1,15 @@ +?php +/** + * Aliases for special pages of the MapSources extension + * + * @file + * @ingroup Extensions + */ +// @codingStandardsIgnoreFile + +$specialPageAliases = array(); + +/** English (English) */ +$specialPageAliases['en'] = array( + 'MapSources' = array( 'MapSources' ), +); diff --git a/MapSources.php b/MapSources.php index 6a7feba..4fc0ade 100644 --- a/MapSources.php +++ b/MapSources.php @@ -30,6 +30,7 @@ // extension magic words i18n $wgExtensionMessagesFiles['MapSources'] = __DIR__ . '/MapSources.i18n.php'; $wgExtensionMessagesFiles['MapSourcesMagic'] = __DIR__ . '/MapSources.i18n.magic.php'; +$wgExtensionMessagesFiles['MapSourcesAlias'] = $dir . '/MapSources.i18n.alias.php'; // credits $wgExtensionCredits['specialpage'][] = array( -- To view, visit https://gerrit.wikimedia.org/r/105626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabc527535080b57350f177e925414d462715eafd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MapSources Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable a handful more extensions form loginwiki and votewiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/105627 Change subject: Disable a handful more extensions form loginwiki and votewiki .. Disable a handful more extensions form loginwiki and votewiki Change-Id: I854ea451b59ca5ec4bd06fd725990d777f91f21d --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/27/105627/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3e4b18d..0abb9e9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11296,6 +11296,8 @@ 'wmgUseBabel' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgBabelCategoryNames' = array( 'default' = array( @@ -12017,6 +12019,8 @@ 'wmgUseFeaturedFeeds' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgFeaturedFeedsDefaults' = array( 'default' = array( @@ -12167,6 +12171,8 @@ # disable its API modules in CommonSettings.php or below 'wmgEnableGeoData' = array( 'default' = false, + 'loginwiki' = false, + 'votewiki' = false, 'wiki' = true, 'wikivoyage' = true, ), @@ -12599,10 +12605,14 @@ 'wmgUseTemplateSandbox' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUsePageImages' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseTorBlock' = array( @@ -12621,6 +12631,7 @@ 'wmgUseSecurePoll' = array( 'default' = true, + 'loginwiki' = false, ), 'wmgUseGlobalAbuseFilters' = array( -- To view, visit https://gerrit.wikimedia.org/r/105627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I854ea451b59ca5ec4bd06fd725990d777f91f21d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable a handful more extensions form loginwiki and votewiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable a handful more extensions form loginwiki and votewiki .. Disable a handful more extensions form loginwiki and votewiki Change-Id: I854ea451b59ca5ec4bd06fd725990d777f91f21d --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3e4b18d..0abb9e9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11296,6 +11296,8 @@ 'wmgUseBabel' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgBabelCategoryNames' = array( 'default' = array( @@ -12017,6 +12019,8 @@ 'wmgUseFeaturedFeeds' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgFeaturedFeedsDefaults' = array( 'default' = array( @@ -12167,6 +12171,8 @@ # disable its API modules in CommonSettings.php or below 'wmgEnableGeoData' = array( 'default' = false, + 'loginwiki' = false, + 'votewiki' = false, 'wiki' = true, 'wikivoyage' = true, ), @@ -12599,10 +12605,14 @@ 'wmgUseTemplateSandbox' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUsePageImages' = array( 'default' = true, + 'loginwiki' = false, + 'votewiki' = false, ), 'wmgUseTorBlock' = array( @@ -12621,6 +12631,7 @@ 'wmgUseSecurePoll' = array( 'default' = true, + 'loginwiki' = false, ), 'wmgUseGlobalAbuseFilters' = array( -- To view, visit https://gerrit.wikimedia.org/r/105627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I854ea451b59ca5ec4bd06fd725990d777f91f21d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable a few more extensions from VoteWiki and LoginWiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105628
Change subject: Disable a few more extensions from VoteWiki and LoginWiki
..
Disable a few more extensions from VoteWiki and LoginWiki
Change-Id: I23469a49a973281185a176f00c566d1d87385289
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 48 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/28/105628/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 57e1f80..33bdd36 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -569,21 +569,28 @@
require( $IP . '/extensions/Cite/SpecialCite.php' );
}
-# Inputbox extension for searching or creating articles
-include( $IP . '/extensions/InputBox/InputBox.php' );
-include( $IP . '/extensions/ImageMap/ImageMap.php' );
-include( $IP . '/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php' );
+if ( $wmgUseInputBox ) {
+ include( $IP . '/extensions/InputBox/InputBox.php' );
+}
-// Experimental side-by-side comparison extension for wikisource. enabled
brion 2006-01-13
+if ( $wmgUseImageMap ) {
+ include( $IP . '/extensions/ImageMap/ImageMap.php' );
+}
+
+if ( $wmgUseGeSHi ) {
+ include( $IP .
'/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php' );
+}
+
if ( $wmgUseDoubleWiki ) {
include( $IP . '/extensions/DoubleWiki/DoubleWiki.php' );
}
-# Poem
-include( $IP . '/extensions/Poem/Poem.php' );
+if ( $wmgUsePoem ) {
+ include( $IP . '/extensions/Poem/Poem.php' );
+}
-if ( $wgDBname == 'testwiki' ) {
+if ( $wgUseUnicodeConverter ) {
include( $IP . '/extensions/UnicodeConverter/UnicodeConverter.php' );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 0abb9e9..5c928b1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10330,6 +10330,8 @@
'wmgUsePdfHandler' = array (
'default' = true, // brion -- 2009-08-25
+ 'loginwiki' = false,
+ 'votewiki' = false,
),
'wmgUsabilityEnforce' = array(
@@ -10467,6 +10469,8 @@
'wmgUseMassMessage' = array(
'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
),
'wmgNamespacesToPostIn' = array(
@@ -12739,6 +12743,35 @@
'votewiki' = false,
),
+'wmgUsePoem' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseUnicodeConverter' = array(
+ 'default' = false,
+ 'testwiki' = true,
+),
+
+'wmgUseInputBox' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseImageMap' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseGeSHi' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
### End (roughly) of general extensions
--
To view, visit https://gerrit.wikimedia.org/r/105628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23469a49a973281185a176f00c566d1d87385289
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable a few more extensions from VoteWiki and LoginWiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Disable a few more extensions from VoteWiki and LoginWiki
..
Disable a few more extensions from VoteWiki and LoginWiki
Change-Id: I23469a49a973281185a176f00c566d1d87385289
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 48 insertions(+), 8 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 57e1f80..33bdd36 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -569,21 +569,28 @@
require( $IP . '/extensions/Cite/SpecialCite.php' );
}
-# Inputbox extension for searching or creating articles
-include( $IP . '/extensions/InputBox/InputBox.php' );
-include( $IP . '/extensions/ImageMap/ImageMap.php' );
-include( $IP . '/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php' );
+if ( $wmgUseInputBox ) {
+ include( $IP . '/extensions/InputBox/InputBox.php' );
+}
-// Experimental side-by-side comparison extension for wikisource. enabled
brion 2006-01-13
+if ( $wmgUseImageMap ) {
+ include( $IP . '/extensions/ImageMap/ImageMap.php' );
+}
+
+if ( $wmgUseGeSHi ) {
+ include( $IP .
'/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php' );
+}
+
if ( $wmgUseDoubleWiki ) {
include( $IP . '/extensions/DoubleWiki/DoubleWiki.php' );
}
-# Poem
-include( $IP . '/extensions/Poem/Poem.php' );
+if ( $wmgUsePoem ) {
+ include( $IP . '/extensions/Poem/Poem.php' );
+}
-if ( $wgDBname == 'testwiki' ) {
+if ( $wgUseUnicodeConverter ) {
include( $IP . '/extensions/UnicodeConverter/UnicodeConverter.php' );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 0abb9e9..5c928b1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10330,6 +10330,8 @@
'wmgUsePdfHandler' = array (
'default' = true, // brion -- 2009-08-25
+ 'loginwiki' = false,
+ 'votewiki' = false,
),
'wmgUsabilityEnforce' = array(
@@ -10467,6 +10469,8 @@
'wmgUseMassMessage' = array(
'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
),
'wmgNamespacesToPostIn' = array(
@@ -12739,6 +12743,35 @@
'votewiki' = false,
),
+'wmgUsePoem' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseUnicodeConverter' = array(
+ 'default' = false,
+ 'testwiki' = true,
+),
+
+'wmgUseInputBox' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseImageMap' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
+'wmgUseGeSHi' = array(
+ 'default' = true,
+ 'loginwiki' = false,
+ 'votewiki' = false,
+),
+
### End (roughly) of general extensions
--
To view, visit https://gerrit.wikimedia.org/r/105628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23469a49a973281185a176f00c566d1d87385289
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Special:Purge - change (mediawiki/core)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105629
Change subject: Add Special:Purge
..
Add Special:Purge
Add special page Special:Purge, which redirects Special:Purge/###
to ###?action=purge.
Bug: 59622
Change-Id: If532d06f600f22439912d20771907dfbe9354d1a
---
M includes/AutoLoader.php
M includes/SpecialPageFactory.php
A includes/specials/SpecialPurge.php
M languages/messages/MessagesEn.php
4 files changed, 45 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/105629/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index a9b0376..0ad8d38 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -988,6 +988,7 @@
'SpecialPrefixindex' = 'includes/specials/SpecialPrefixindex.php',
'SpecialProtectedpages' =
'includes/specials/SpecialProtectedpages.php',
'SpecialProtectedtitles' =
'includes/specials/SpecialProtectedtitles.php',
+ 'SpecialPurge' = 'includes/specials/SpecialPurge.php',
'SpecialRandomInCategory' =
'includes/specials/SpecialRandomInCategory.php',
'SpecialRandomredirect' =
'includes/specials/SpecialRandomredirect.php',
'SpecialRecentChanges' = 'includes/specials/SpecialRecentchanges.php',
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 18b8f0b..e57c16e 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -163,6 +163,7 @@
'Myuploads' = 'SpecialMyuploads',
'AllMyUploads' = 'SpecialAllMyUploads',
'PermanentLink' = 'SpecialPermanentLink',
+ 'Purge' = 'SpecialPurge',
'Redirect' = 'SpecialRedirect',
'Revisiondelete'= 'SpecialRevisionDelete',
'Specialpages' = 'SpecialSpecialpages',
diff --git a/includes/specials/SpecialPurge.php
b/includes/specials/SpecialPurge.php
new file mode 100644
index 000..767c76d
--- /dev/null
+++ b/includes/specials/SpecialPurge.php
@@ -0,0 +1,42 @@
+?php
+/**
+ * Redirect from Special:Purge/### to ###?action=purge.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * Redirect from Special:Purge/### to ###?action=purge.
+ *
+ * @ingroup SpecialPage
+ */
+class SpecialPurge extends RedirectSpecialArticle {
+ function __construct() {
+ parent::__construct( 'Purge' );
+ }
+
+ function getRedirect( $page ) {
+ $title = Title::newFromText( $page );
+ if( $title instanceof Title ) {
+ $this-mAddedRedirectParams['action'] = 'purge';
+ return $title;
+ }
+ throw new ErrorPageError( 'nopagetitle', 'nopagetext' );
+ }
+}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 04d7ced..19142f9 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -450,6 +450,7 @@
'Prefixindex' = array( 'PrefixIndex' ) ,
'Protectedpages'= array( 'ProtectedPages' ),
'Protectedtitles' = array( 'ProtectedTitles' ),
+ 'Purge' = array( 'Purge' ),
'Randompage'= array( 'Random', 'RandomPage' ),
'RandomInCategory' = array( 'RandomInCategory' ),
'Randomredirect'= array( 'RandomRedirect' ),
--
To view, visit https://gerrit.wikimedia.org/r/105629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If532d06f600f22439912d20771907dfbe9354d1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix NOTICE/typo - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105630
Change subject: Fix NOTICE/typo
..
Fix NOTICE/typo
Change-Id: I6b42517c2a18a74be11183ebcbf35703b59c9371
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/30/105630/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 33bdd36..fd02fa4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -590,7 +590,7 @@
include( $IP . '/extensions/Poem/Poem.php' );
}
-if ( $wgUseUnicodeConverter ) {
+if ( $wmgUseUnicodeConverter ) {
include( $IP . '/extensions/UnicodeConverter/UnicodeConverter.php' );
}
--
To view, visit https://gerrit.wikimedia.org/r/105630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b42517c2a18a74be11183ebcbf35703b59c9371
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add special page aliases - change (mediawiki...RandomRootPage)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/105631 Change subject: Add special page aliases .. Add special page aliases Change-Id: Ifa6e87206612bd4d88c5fac96c2acd19271839df --- A Randomrootpage.i18n.alias.php M Randomrootpage.php 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomRootPage refs/changes/31/105631/1 diff --git a/Randomrootpage.i18n.alias.php b/Randomrootpage.i18n.alias.php new file mode 100644 index 000..a5ff61f --- /dev/null +++ b/Randomrootpage.i18n.alias.php @@ -0,0 +1,15 @@ +?php +/** + * Aliases for special pages of the RandomRootpage extension + * + * @file + * @ingroup Extensions + */ +// @codingStandardsIgnoreFile + +$specialPageAliases = array(); + +/** English (English) */ +$specialPageAliases['en'] = array( + 'Randomrootpage' = array( 'RandomRootpage' ) +); diff --git a/Randomrootpage.php b/Randomrootpage.php index 1e631c8..3d105fa 100644 --- a/Randomrootpage.php +++ b/Randomrootpage.php @@ -24,6 +24,9 @@ $wgSpecialPageGroups['Randomrootpage'] = 'redirects'; $dir = dirname(__FILE__) . '/'; + $wgExtensionMessagesFiles['Randomrootpage'] = $dir . 'Randomrootpage.i18n.php'; +$wgExtensionMessagesFiles['RandomrootpageAlias'] = $dir . 'Randomrootpage.i18n.alias.php'; + $wgAutoloadClasses['SpecialRandomrootpage'] = $dir . 'Randomrootpage_body.php'; -- To view, visit https://gerrit.wikimedia.org/r/105631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa6e87206612bd4d88c5fac96c2acd19271839df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RandomRootPage Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [x] Yes to AJAX - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/105632 Change subject: [x] Yes to AJAX .. [x] Yes to AJAX Change-Id: I043b94277b832f4150c0828151650692773d4d09 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/32/105632/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5c928b1..03f9fb0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8985,10 +8985,6 @@ 'default' = 2000, ), -'wgUseAjax' = array( - 'default' = false, -), - 'wgEnableSidebarCache' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/105632 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I043b94277b832f4150c0828151650692773d4d09 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix NOTICE/typo - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix NOTICE/typo
..
Fix NOTICE/typo
Change-Id: I6b42517c2a18a74be11183ebcbf35703b59c9371
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 33bdd36..fd02fa4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -590,7 +590,7 @@
include( $IP . '/extensions/Poem/Poem.php' );
}
-if ( $wgUseUnicodeConverter ) {
+if ( $wmgUseUnicodeConverter ) {
include( $IP . '/extensions/UnicodeConverter/UnicodeConverter.php' );
}
--
To view, visit https://gerrit.wikimedia.org/r/105630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b42517c2a18a74be11183ebcbf35703b59c9371
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [x] Yes to AJAX - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: [x] Yes to AJAX .. [x] Yes to AJAX Change-Id: I043b94277b832f4150c0828151650692773d4d09 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5c928b1..03f9fb0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8985,10 +8985,6 @@ 'default' = 2000, ), -'wgUseAjax' = array( - 'default' = false, -), - 'wgEnableSidebarCache' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/105632 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I043b94277b832f4150c0828151650692773d4d09 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support the older youtubevideo ID/youtube syntax. - change (mediawiki...YouTube)
Jack Phoenix has submitted this change and it was merged.
Change subject: Support the older youtubevideo ID/youtube syntax.
..
Support the older youtubevideo ID/youtube syntax.
This is a follow-up to https://gerrit.wikimedia.org/r/#/c/101672/
Reported on the ShoutWiki Bugzilla:
http://bugzilla.shoutwiki.com/show_bug.cgi?id=249#c2
Change-Id: I8e2ae0d200e286de1478bf294cd02bc569b056a8
---
M YouTube.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Verified; Looks good to me, approved
diff --git a/YouTube.php b/YouTube.php
index 76cdc89..dc75957 100644
--- a/YouTube.php
+++ b/YouTube.php
@@ -71,8 +71,11 @@
// @see
http://linuxpanda.wordpress.com/2013/07/24/ultimate-best-regex-pattern-to-get-grab-parse-youtube-video-id-from-any-youtube-link-url/
$pattern =
'~(?:http|https|)(?::\/\/|)(?:www.|)(?:youtu\.be\/|youtube\.com(?:\/embed\/|\/v\/|\/watch\?v=|\/ytscreeningroom\?v=|\/feeds\/api\/videos\/|\/user\S*[^\w\-\s]|\S*[^\w\-\s]))([\w\-]{11})[a-z0-9;:@?%=+\/\$_.-]*~i';
$id = false;
+
if ( preg_match( $pattern, $url, $preg ) ) {
$id = $preg[1];
+ } elseif ( preg_match( '/([0-9A-Za-z_-]+)/', $url, $preg ) ) {
+ $id = $preg[1];
}
return $id;
--
To view, visit https://gerrit.wikimedia.org/r/105382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e2ae0d200e286de1478bf294cd02bc569b056a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/YouTube
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support the pixel unit (px) in height/width parameters, beca... - change (mediawiki...YouTube)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105633
Change subject: Support the pixel unit (px) in height/width parameters, because
apparently a lot of people use it there.
..
Support the pixel unit (px) in height/width parameters, because apparently
a lot of people use it there.
And apparently it was supported before I changed the settype()s to
filter_var()s.
Change-Id: Ia4b176a73601a1ab62cd949809e60c071f1f4676
---
M YouTube.php
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/YouTube
refs/changes/33/105633/1
diff --git a/YouTube.php b/YouTube.php
index dc75957..6bdbdfb 100644
--- a/YouTube.php
+++ b/YouTube.php
@@ -99,6 +99,19 @@
return '';
}
+ // Support the pixel unit (px) in height/width parameters, because
apparently
+ // a lot of people use it there.
+ // This way these parameters won't fail the filter_var() tests below if
the
+ // user-supplied values were like 450px or 200px or something instead of
+ // 450 or 200
+ if ( !empty( $argv['height'] ) ) {
+ $argv['height'] = str_replace( 'px', '', $argv['height'] );
+ }
+
+ if ( !empty( $argv['width'] ) ) {
+ $argv['width'] = str_replace( 'px', '', $argv['width'] );
+ }
+
// Which technology to use for embedding -- HTML5 or Flash Player?
if ( !empty( $argv['type'] ) strtolower( $argv['type'] ) == 'flash'
) {
$width = $width_max = 425;
--
To view, visit https://gerrit.wikimedia.org/r/105633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4b176a73601a1ab62cd949809e60c071f1f4676
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/YouTube
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support the pixel unit (px) in height/width parameters, beca... - change (mediawiki...YouTube)
Jack Phoenix has submitted this change and it was merged.
Change subject: Support the pixel unit (px) in height/width parameters, because
apparently a lot of people use it there.
..
Support the pixel unit (px) in height/width parameters, because apparently
a lot of people use it there.
And apparently it was supported before I changed the settype()s to
filter_var()s.
Change-Id: Ia4b176a73601a1ab62cd949809e60c071f1f4676
---
M YouTube.php
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Verified; Looks good to me, approved
diff --git a/YouTube.php b/YouTube.php
index dc75957..6bdbdfb 100644
--- a/YouTube.php
+++ b/YouTube.php
@@ -99,6 +99,19 @@
return '';
}
+ // Support the pixel unit (px) in height/width parameters, because
apparently
+ // a lot of people use it there.
+ // This way these parameters won't fail the filter_var() tests below if
the
+ // user-supplied values were like 450px or 200px or something instead of
+ // 450 or 200
+ if ( !empty( $argv['height'] ) ) {
+ $argv['height'] = str_replace( 'px', '', $argv['height'] );
+ }
+
+ if ( !empty( $argv['width'] ) ) {
+ $argv['width'] = str_replace( 'px', '', $argv['width'] );
+ }
+
// Which technology to use for embedding -- HTML5 or Flash Player?
if ( !empty( $argv['type'] ) strtolower( $argv['type'] ) == 'flash'
) {
$width = $width_max = 425;
--
To view, visit https://gerrit.wikimedia.org/r/105633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4b176a73601a1ab62cd949809e60c071f1f4676
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/YouTube
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 3.1 - fixed color picker and moved it to its own file. - change (mediawiki...FanBoxes)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105634
Change subject: Version 3.1 - fixed color picker and moved it to its own file.
..
Version 3.1 - fixed color picker and moved it to its own file.
Also various, miscellaneous fixes, such as:
* special page grouping updated to use the modern method (a getGroupName()
method in the special page class file instead of $wgSpecialPageGroups)
* fixed color picker image URLs not to load 'em from Yahoo's servers since
they're no longer there
* removed some $wgTitle usages
* documentation tweaks
Change-Id: Icb2429f5a478055483f0e48f9eed09062cf6258b
---
M FanBox.php
M FanBoxHooks.php
M FanBoxPage.php
M FanBoxesClass.php
M SpecialFanBoxes.php
M SpecialTopFanBoxes.php
M SpecialViewFanBoxes.php
A color-picker.js
8 files changed, 105 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/34/105634/1
diff --git a/FanBox.php b/FanBox.php
index 8c29312..7eec95d 100644
--- a/FanBox.php
+++ b/FanBox.php
@@ -6,12 +6,12 @@
*
* @file
* @ingroup Extensions
- * @version 3.0
+ * @version 3.1
* @author Aaron Wright aaron.wri...@gmail.com
* @author David Pean david.p...@gmail.com
* @author Robert Lefkowitz
* @author Jack Phoenix j...@countervandalism.net
- * @link http://www.mediawiki.org/wiki/Extension:FanBox Documentation
+ * @link https://www.mediawiki.org/wiki/Extension:FanBox Documentation
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
@@ -22,9 +22,9 @@
// Extension credits that show up on Special:Version
$wgExtensionCredits['other'][] = array(
'name' = 'FanBox',
- 'version' = '3.0',
+ 'version' = '3.1',
'author' = array( 'Aaron Wright', 'David Pean', 'Robert Lefkowitz',
'Jack Phoenix' ),
- 'url' = 'https://www.mediawiki.org/wiki/Extension:FanBox',
+ 'url' = 'https://www.mediawiki.org/wiki/Extension:FanBoxes',
'description' = 'A new way of creating and using userboxes, based on
special pages',
);
@@ -42,6 +42,12 @@
'position' = 'top' // available since r85616
);
+$wgResourceModules['ext.fanBoxes.colorpicker'] = array(
+ 'scripts' = 'color-picker.js',
+ 'localBasePath' = dirname( __FILE__ ),
+ 'remoteExtPath' = 'FanBoxes',
+);
+
// Global fantag namespace reference
if ( !defined( 'NS_FANTAG' ) ) {
define( 'NS_FANTAG', 600 );
@@ -55,6 +61,7 @@
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['FanBox'] = $dir . 'FanBox.i18n.php';
$wgExtensionMessagesFiles['FanBoxNamespaces'] = $dir . 'FanBox.namespaces.php';
+
$wgAutoloadClasses['FanBox'] = $dir . 'FanBoxClass.php';
$wgAutoloadClasses['SpecialFanBoxAjaxUpload'] = $dir . 'MiniAjaxUpload.php';
$wgAutoloadClasses['FanBoxAjaxUploadForm'] = $dir . 'MiniAjaxUpload.php';
@@ -65,14 +72,11 @@
$wgAutoloadClasses['TopFanBoxes'] = $dir . 'SpecialTopFanBoxes.php';
$wgAutoloadClasses['UserFanBoxes'] = $dir . 'FanBoxesClass.php';
$wgAutoloadClasses['ViewFanBoxes'] = $dir . 'SpecialViewFanBoxes.php';
+
$wgSpecialPages['FanBoxAjaxUpload'] = 'SpecialFanBoxAjaxUpload';
$wgSpecialPages['UserBoxes'] = 'FanBoxes';
$wgSpecialPages['TopUserboxes'] = 'TopFanBoxes';
$wgSpecialPages['ViewUserBoxes'] = 'ViewFanBoxes';
-// Special page groups for MW 1.13+
-$wgSpecialPageGroups['UserBoxes'] = 'users';
-$wgSpecialPageGroups['TopUserboxes'] = 'users';
-$wgSpecialPageGroups['ViewUserBoxes'] = 'users';
// API module
$wgAutoloadClasses['ApiFanBoxes'] = $dir . 'ApiFanBoxes.php';
diff --git a/FanBoxHooks.php b/FanBoxHooks.php
index 0407cb7..11c730c 100644
--- a/FanBoxHooks.php
+++ b/FanBoxHooks.php
@@ -1,6 +1,6 @@
?php
/**
- * FanBox extension's hooked function. All class methods are obviously public
+ * FanBox extension's hooked functions. All class methods are obviously public
* and static.
*
* @file
@@ -124,13 +124,12 @@
* Calls FanBoxPage instead of standard Article for pages in the
NS_FANTAG
* namespace.
*
-* @param $title Object: instance of Title
-* @param $article Object: instance of Article that we transform into an
-* instance of FanBoxPage
+* @param $title Title
+* @param $article Article|WikiPage|FanBoxPage
* @return Boolean: true
*/
public static function fantagFromTitle( $title, $article ) {
- global $wgRequest, $wgOut, $wgTitle, $wgSupressPageTitle,
$wgSupressPageCategories;
+ global $wgRequest, $wgOut, $wgSupressPageTitle;
if ( $title-getNamespace() == NS_FANTAG ) {
$wgSupressPageTitle = true;
@@ -146,11 +145,11 @@
$wgOut-redirect(
$addTitle-getFullURL( 'destName=' . $fan-getName() ) );
} else {
