[MediaWiki-commits] [Gerrit] Filter our zero-coverage updateState nodes - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Filter our zero-coverage updateState nodes
..
Filter our zero-coverage updateState nodes
Added filter for nodes being passed to update state event - this
ensures that nodes are not being included with zero-length coverage, a
side effect of how selectNodes handles the virtual boundaries of text
nodes.
Change-Id: I6362114b57469b1108da11f94dc345a2bcdfc7cd
---
M modules/ve/ui/ve.ui.Toolbar.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/ve.ui.Toolbar.js b/modules/ve/ui/ve.ui.Toolbar.js
index 24be5fd..3d44309 100644
--- a/modules/ve/ui/ve.ui.Toolbar.js
+++ b/modules/ve/ui/ve.ui.Toolbar.js
@@ -73,7 +73,9 @@
leafNodes = fragment.getLeafNodes();
for ( i = 0, len = leafNodes.length; i < len; i++ ) {
- nodes.push( leafNodes[i].node );
+ if ( len === 1 || !leafNodes[i].range ||
leafNodes[i].range.getLength() ) {
+ nodes.push( leafNodes[i].node );
+ }
}
this.emit( 'updateState', nodes, fragment.getAnnotations(),
fragment.getAnnotations( true ) );
};
--
To view, visit https://gerrit.wikimedia.org/r/58841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6362114b57469b1108da11f94dc345a2bcdfc7cd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TransactionProcessor: Fix offset bug - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: TransactionProcessor: Fix offset bug .. TransactionProcessor: Fix offset bug Use ve.BranchNode.getNodeFromOffset instead of ve.dm.Document.getNodeFromOffset so correct nodes will be retrieved to emit update events to. Change-Id: Iaf559f0424584a3dde065e548e403c4a53207312 --- M modules/ve/dm/ve.dm.TransactionProcessor.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve/dm/ve.dm.TransactionProcessor.js b/modules/ve/dm/ve.dm.TransactionProcessor.js index 40d3b79..5c66493 100644 --- a/modules/ve/dm/ve.dm.TransactionProcessor.js +++ b/modules/ve/dm/ve.dm.TransactionProcessor.js @@ -346,7 +346,7 @@ } this.synchronizer.pushAttributeChange( - this.document.getNodeFromOffset( this.cursor + 1 ), + this.document.documentNode.getNodeFromOffset( this.cursor + 1 ), op.key, from, to ); -- To view, visit https://gerrit.wikimedia.org/r/59005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf559f0424584a3dde065e548e403c4a53207312 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Inez Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hybridise MWTemplateNode - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Hybridise MWTemplateNode
..
Hybridise MWTemplateNode
* Create MWTemplateBlockNode & MWTemplateInlineNode (in ce and dm)
* Move Alien's 'isInline' code to ve.dm.Node.static.isHybridInline
* Move definition of ce.AlienBlock/InlineNode inside ce.Aline.js file
to match dm.AlienBlock/InlineNode and MWTemplate
* Duplicate AlienBlock/Inline styles for templates
* Create test case for inline templates
* Count test cases in ve.dm.Converter.test.js automatically
Change-Id: Id9bc7f049ea974dd5e7f8b7a66080939e0948bbd
---
M VisualEditor.php
M demos/ve/index.php
D modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
D modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
M modules/ve/ce/nodes/ve.ce.AlienNode.js
M modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/dm/nodes/ve.dm.AlienNode.js
M modules/ve/dm/nodes/ve.dm.MWTemplateNode.js
M modules/ve/dm/ve.dm.Converter.js
M modules/ve/dm/ve.dm.Node.js
M modules/ve/test/dm/ve.dm.Converter.test.js
M modules/ve/test/dm/ve.dm.example.js
M modules/ve/test/index.php
14 files changed, 247 insertions(+), 113 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 47305a9..2453d51 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -303,8 +303,6 @@
've/ce/nodes/ve.ce.GeneratedContentNode.js',
've/ce/nodes/ve.ce.AlienNode.js',
- 've/ce/nodes/ve.ce.AlienInlineNode.js',
- 've/ce/nodes/ve.ce.AlienBlockNode.js',
've/ce/nodes/ve.ce.BreakNode.js',
've/ce/nodes/ve.ce.CenterNode.js',
've/ce/nodes/ve.ce.DefinitionListItemNode.js',
diff --git a/demos/ve/index.php b/demos/ve/index.php
index d2d2906..57cd489 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -185,8 +185,6 @@
-
-
diff --git a/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
b/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
deleted file mode 100644
index e4cc7a0..000
--- a/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * VisualEditor ContentEditable AlienBlockNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * ContentEditable alien block node.
- *
- * @class
- * @extends ve.ce.AlienNode
- * @constructor
- * @param {ve.dm.AlienBlockNode} model Model to observe
- */
-ve.ce.AlienBlockNode = function VeCeAlienBlockNode( model ) {
- // Parent constructor
- ve.ce.AlienNode.call( this, model );
-
- // DOM Changes
- this.$.addClass( 've-ce-alienBlockNode' );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.ce.AlienBlockNode, ve.ce.AlienNode );
-
-/* Static Properties */
-
-ve.ce.AlienBlockNode.static.name = 'alienBlock';
-
-/* Registration */
-
-ve.ce.nodeFactory.register( ve.ce.AlienBlockNode );
diff --git a/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
b/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
deleted file mode 100644
index 588ec2c..000
--- a/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * VisualEditor ContentEditable AlienInlineNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * ContentEditable alien inline node.
- *
- * @class
- * @extends ve.ce.AlienNode
- * @constructor
- * @param {ve.dm.AlienInlineNode} model Model to observe
- */
-ve.ce.AlienInlineNode = function VeCeAlienInlineNode( model ) {
- // Parent constructor
- ve.ce.AlienNode.call( this, model );
-
- // DOM Changes
- this.$.addClass( 've-ce-alienInlineNode' );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.ce.AlienInlineNode, ve.ce.AlienNode );
-
-/* Static Properties */
-
-ve.ce.AlienInlineNode.static.name = 'alienInline';
-
-/* Registration */
-
-ve.ce.nodeFactory.register( ve.ce.AlienInlineNode );
diff --git a/modules/ve/ce/nodes/ve.ce.AlienNode.js
b/modules/ve/ce/nodes/ve.ce.AlienNode.js
index fa2b0da..b0705ea 100644
--- a/modules/ve/ce/nodes/ve.ce.AlienNode.js
+++ b/modules/ve/ce/nodes/ve.ce.AlienNode.js
@@ -9,6 +9,7 @@
* ContentEditable alien node.
*
* @class
+ * @abstract
* @extends ve.ce.GeneratedContentNode
* @constructor
* @param {ve.dm.AlienNode} model Model to observe
@@ -134,6 +135,58 @@
surface.$.unbind( '.phantoms' );
};
+/* Concrete subclasses */
+
+/**
+ * ContentEditable alien block node.
+ *
+ * @class
+ * @extends ve.ce.AlienNode
+ * @constructor
+ * @param {ve.dm.AlienBlockNode} model Model to observe
+ */
+ve.ce.AlienBlockNode = function
[MediaWiki-commits] [Gerrit] Fixing CN Banner Forcing - change (mediawiki...CentralNotice)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59065
Change subject: Fixing CN Banner Forcing
..
Fixing CN Banner Forcing
A nice regression bug was introduced where ?banner= forcing failed
to work. This fixes that problem. :p
Change-Id: I3f2903b3951cce5ce43e7ebd3037f35488e7d15a
---
M modules/ext.centralNotice.bannerController/bannerController.js
M special/SpecialBannerLoader.php
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/65/59065/1
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 6967c1c..414ad3f 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -47,7 +47,7 @@
campaign: campaign,
userlang: mw.config.get( 'wgUserLanguage' ),
db: mw.config.get( 'wgDBname' ),
- sitename: mw.config.get( 'wgSiteName' ),
+ project: mw.config.get( 'wgNoticeProject' ),
country: mw.centralNotice.data.country,
device: mw.config.get( 'wgMobileDeviceName',
'desktop' )
};
diff --git a/special/SpecialBannerLoader.php b/special/SpecialBannerLoader.php
index b34d6c9..52f08fc 100644
--- a/special/SpecialBannerLoader.php
+++ b/special/SpecialBannerLoader.php
@@ -27,11 +27,12 @@
try {
$this->getParams();
-
echo $this->getJsNotice( $this->bannerName );
+ } catch ( EmptyBannerException $e ) {
+ echo "insertBanner( false );";
} catch ( BannerLoaderException $e ) {
wfDebugLog( 'CentralNotice', $e->getMessage() );
- echo "insertBanner( false );";
+ echo "insertBanner( false /* due to internal exception
*/ );";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/59065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f2903b3951cce5ce43e7ebd3037f35488e7d15a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HTML Text Area Size can Be Overriden - change (mediawiki/core)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59063
Change subject: HTML Text Area Size can Be Overriden
..
HTML Text Area Size can Be Overriden
Allowing the default size to be overridden by derived classes.
Change-Id: I51e8bcba95c7b555f072329b01c6577115f246b3
---
M includes/HTMLForm.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/59063/1
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index ded861a..f37ef2e 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1621,16 +1621,19 @@
}
}
class HTMLTextAreaField extends HTMLFormField {
+ const DEFAULT_COLS = 80;
+ const DEFAULT_ROWS = 25;
+
function getCols() {
return isset( $this->mParams['cols'] )
? $this->mParams['cols']
- : 80;
+ : static::DEFAULT_COLS;
}
function getRows() {
return isset( $this->mParams['rows'] )
? $this->mParams['rows']
- : 25;
+ : static::DEFAULT_ROWS;
}
function getInputHTML( $value ) {
--
To view, visit https://gerrit.wikimedia.org/r/59063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51e8bcba95c7b555f072329b01c6577115f246b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mwalker
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hybridise MWTemplate nodes - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59062
Change subject: Hybridise MWTemplate nodes
..
Hybridise MWTemplate nodes
* Create MWTemplateBlockNode & MWTemplateInlineNode (in ce and dm)
* Move Alien's 'isInline' code to ve.dm.Node.static.isHybridInline
* Move definition of ce.AlienBlock/InlineNode inside ce.Aline.js file
to match dm.AlienBlock/InlineNode and MWTemplate
* Duplicate AlienBlock/Inline styles for templates
* Create test case for inline templates
* Count test cases in ve.dm.Converter.test.js automatically
Change-Id: Id9bc7f049ea974dd5e7f8b7a66080939e0948bbd
---
M VisualEditor.php
M demos/ve/index.php
D modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
D modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
M modules/ve/ce/nodes/ve.ce.AlienNode.js
M modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/dm/nodes/ve.dm.AlienNode.js
M modules/ve/dm/nodes/ve.dm.MWTemplateNode.js
M modules/ve/dm/ve.dm.Converter.js
M modules/ve/dm/ve.dm.Node.js
M modules/ve/test/dm/ve.dm.Converter.test.js
M modules/ve/test/dm/ve.dm.example.js
M modules/ve/test/index.php
14 files changed, 247 insertions(+), 113 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/62/59062/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 47305a9..2453d51 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -303,8 +303,6 @@
've/ce/nodes/ve.ce.GeneratedContentNode.js',
've/ce/nodes/ve.ce.AlienNode.js',
- 've/ce/nodes/ve.ce.AlienInlineNode.js',
- 've/ce/nodes/ve.ce.AlienBlockNode.js',
've/ce/nodes/ve.ce.BreakNode.js',
've/ce/nodes/ve.ce.CenterNode.js',
've/ce/nodes/ve.ce.DefinitionListItemNode.js',
diff --git a/demos/ve/index.php b/demos/ve/index.php
index d2d2906..57cd489 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -185,8 +185,6 @@
-
-
diff --git a/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
b/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
deleted file mode 100644
index e4cc7a0..000
--- a/modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * VisualEditor ContentEditable AlienBlockNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * ContentEditable alien block node.
- *
- * @class
- * @extends ve.ce.AlienNode
- * @constructor
- * @param {ve.dm.AlienBlockNode} model Model to observe
- */
-ve.ce.AlienBlockNode = function VeCeAlienBlockNode( model ) {
- // Parent constructor
- ve.ce.AlienNode.call( this, model );
-
- // DOM Changes
- this.$.addClass( 've-ce-alienBlockNode' );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.ce.AlienBlockNode, ve.ce.AlienNode );
-
-/* Static Properties */
-
-ve.ce.AlienBlockNode.static.name = 'alienBlock';
-
-/* Registration */
-
-ve.ce.nodeFactory.register( ve.ce.AlienBlockNode );
diff --git a/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
b/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
deleted file mode 100644
index 588ec2c..000
--- a/modules/ve/ce/nodes/ve.ce.AlienInlineNode.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * VisualEditor ContentEditable AlienInlineNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * ContentEditable alien inline node.
- *
- * @class
- * @extends ve.ce.AlienNode
- * @constructor
- * @param {ve.dm.AlienInlineNode} model Model to observe
- */
-ve.ce.AlienInlineNode = function VeCeAlienInlineNode( model ) {
- // Parent constructor
- ve.ce.AlienNode.call( this, model );
-
- // DOM Changes
- this.$.addClass( 've-ce-alienInlineNode' );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.ce.AlienInlineNode, ve.ce.AlienNode );
-
-/* Static Properties */
-
-ve.ce.AlienInlineNode.static.name = 'alienInline';
-
-/* Registration */
-
-ve.ce.nodeFactory.register( ve.ce.AlienInlineNode );
diff --git a/modules/ve/ce/nodes/ve.ce.AlienNode.js
b/modules/ve/ce/nodes/ve.ce.AlienNode.js
index fa2b0da..b0705ea 100644
--- a/modules/ve/ce/nodes/ve.ce.AlienNode.js
+++ b/modules/ve/ce/nodes/ve.ce.AlienNode.js
@@ -9,6 +9,7 @@
* ContentEditable alien node.
*
* @class
+ * @abstract
* @extends ve.ce.GeneratedContentNode
* @constructor
* @param {ve.dm.AlienNode} model Model to observe
@@ -134,6 +135,58 @@
surface.$.unbind( '.phantoms' );
};
+/* Concrete subclasses */
+
+/**
+ * ContentEditable alien block node.
+ *
+ * @class
+ * @extends ve.ce.AlienNode
+ * @constructor
+ * @param {ve.dm.AlienBlockNode
[MediaWiki-commits] [Gerrit] JSHint: Re-order jshintrc options to split common from proje... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: JSHint: Re-order jshintrc options to split common from project
settings
..
JSHint: Re-order jshintrc options to split common from project settings
There are certain options required by our coding conventions.
The others are specifically overriding it for core. Either
because we have certain code that needs laxing or because we
can be stricter.
Comments can be used in jshintrc since a while now. Though
they are invalid JSON, many parsers (including JSHint) allow
them for documentation purposes.
Change-Id: I43ace21208121e866900b2cbe1efbcebadd2946a
---
M .jshintrc
1 file changed, 21 insertions(+), 13 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index 7fa138d..c4e265a 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,15 +1,10 @@
{
- "predef": [
- "mediaWiki",
- "jQuery",
- "QUnit"
- ],
+ /* Common */
- "bitwise": true,
+ // Enforcing
"camelcase": true,
"curly": true,
"eqeqeq": true,
- "forin": false,
"immed": true,
"latedef": true,
"newcap": true,
@@ -17,18 +12,31 @@
"noempty": true,
"nonew": true,
"quotmark": "single",
- "regexp": false,
+ "trailing": true,
"undef": true,
"unused": true,
- "strict": false,
- "trailing": true,
+ // Legacy
+ "onevar": true,
+ /* Local */
+
+ // Enforcing
+ "bitwise": true,
+ "forin": false,
+ "regexp": false,
+ "strict": false,
+ // Relaxing
"laxbreak": true,
"smarttabs": true,
"multistr": true,
-
+ // Environment
"browser": true,
-
+ // Legacy
"nomen": true,
- "onevar": true
+
+ "predef": [
+ "mediaWiki",
+ "jQuery",
+ "QUnit"
+ ]
}
--
To view, visit https://gerrit.wikimedia.org/r/59026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43ace21208121e866900b2cbe1efbcebadd2946a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 44507) Change "permissions errors" message to "permissi... - change (mediawiki/core)
Mollywhite has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59060
Change subject: (bug 44507) Change "permissions errors" message to "permission
error"
..
(bug 44507) Change "permissions errors" message to "permission error"
This message typically only reports a single error.
Bug: 44507
Change-Id: I91848f98e59bddb4c33bb6ca4d5d9a2ebeeafada
---
M languages/messages/MessagesEn.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/59060/1
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index a38a39a..b08436c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1478,7 +1478,7 @@
'nocreate-loggedin'=> 'You do not have permission to create
new pages.',
'sectioneditnotsupported-title'=> 'Section editing not supported',
'sectioneditnotsupported-text' => 'Section editing is not supported in
this page.',
-'permissionserrors'=> 'Permissions errors',
+'permissionserrors'=> 'Permission error',
'permissionserrorstext'=> 'You do not have permission to do that,
for the following {{PLURAL:$1|reason|reasons}}:',
'permissionserrorstext-withaction' => 'You do not have permission to $2, for
the following {{PLURAL:$1|reason|reasons}}:',
'recreate-moveddeleted-warn' => "'''Warning: You are recreating a page
that was previously deleted.'''
--
To view, visit https://gerrit.wikimedia.org/r/59060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91848f98e59bddb4c33bb6ca4d5d9a2ebeeafada
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mollywhite
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Monitor MediaWiki fatals and exceptions in Ganglia - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59059
Change subject: Monitor MediaWiki fatals and exceptions in Ganglia
..
Monitor MediaWiki fatals and exceptions in Ganglia
This change extends the EventLogging Puppet module to configure Ganglia
monitoring of MediaWiki fatals and exceptions.
Change I1632a6b19 configured fluorine to forward MediaWiki fatals and
exceptions to vanadium via UDP port 8423. This change configures an
EventLogging UDP-to-ZMQ router that publishes the same stream using ZeroMQ on
TCP 8423. (ZeroMQ facilitates having multiple subscribers consume the stream;
UDP with SO_REUSEADDR does not work well with unicast.)
This change also sets up a metric gathering module that reports errors (broken
down by type) to Ganglia. Error types are detected using simple substring
matching.
Port 8423 is hard-coded in three places (twice in this change, once in
I1632a6b19), which is unfortunate. Instead of plopping static configuration
files in /etc/supervisor, the EventLogging Puppet module should declare
parametrized resource types for common patterns, like UDP-to-ZMQ forwarding.
I intend to do this sometime in the next month or two.
Change-Id: I55450783d018ed7fd7399ee5adf4305af156a59b
---
A modules/eventlogging/files/mwerrors.conf
A modules/eventlogging/files/mwerrors.py
A modules/eventlogging/files/mwerrors.pyconf
M modules/eventlogging/manifests/init.pp
A modules/eventlogging/manifests/mediawiki_errors.pp
5 files changed, 214 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/59059/1
diff --git a/modules/eventlogging/files/mwerrors.conf
b/modules/eventlogging/files/mwerrors.conf
new file mode 100644
index 000..2982121
--- /dev/null
+++ b/modules/eventlogging/files/mwerrors.conf
@@ -0,0 +1,10 @@
+; Supervisord configuration for 'mwerrors' Ganglia module.
+; Managed by Puppet: puppet:///files/eventlogging/mwerrors.conf
+; Forward MediaWiki fatals / exceptions to ZeroMQ
+
+[group:mwerrors]
+programs = udp2zmq_8423
+
+[program:udp2zmq_8423]
+command = udp2zmq 8423
+user = eventlogging
diff --git a/modules/eventlogging/files/mwerrors.py
b/modules/eventlogging/files/mwerrors.py
new file mode 100755
index 000..510956f
--- /dev/null
+++ b/modules/eventlogging/files/mwerrors.py
@@ -0,0 +1,122 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Gmond metric-gathering module for MediaWiki fatals and exceptions
+
+ Reads fatals / exceptions from a ZeroMQ publisher. MediaWiki logs to a file
+ or a UDP socket, so for this to work you will also need a UDP-to-ZMQ router.
+ See 'udp2zmq' in EventLogging.
+
+ When invoked by itself, runs a self-test.
+
+ Usage: mwerrors.py tcp://HOST:PORT
+
+ Written by Ori Livneh
+
+"""
+import sys
+reload(sys)
+sys.setdefaultencoding('utf8')
+
+import errno
+import threading
+import time
+
+import zmq
+
+
+patterns = (
+ # Substring to match # Metric # Metric title
+('Fatal error: Out of memory', 'oom','Out-of-memory
fatals'),
+('Fatal error: Maximum execution time', 'timelimit', 'Time limit
fatals'),
+('Fatal error:', 'fatal', 'Miscellaneous
fatals'),
+('Exception from', 'exception', 'Exceptions'),
+('Catchable fatal error','catchable', 'Catchable fatals'),
+('DatabaseBase->reportQueryError', 'query', 'Query errors'),
+)
+
+
+def count_errors(counter, endpoint):
+"""Count error types in error stream."""
+ctx = zmq.Context.instance()
+sock = ctx.socket(zmq.SUB)
+sock.connect(endpoint)
+sock.setsockopt(zmq.SUBSCRIBE, b'')
+
+while 1:
+try:
+line = sock.recv()
+for pattern, name, description in patterns:
+if pattern in line:
+counter[name] += 1
+break
+except zmq.ZMQError as e:
+# Calls interrupted by EINTR should be re-tried.
+if e.errno == errno.EINTR:
+continue
+raise
+
+
+def metric_init(params):
+"""
+Initialize; part of Gmond interface
+
+`params` is a dictionary of configuration options, generated by
+Ganglia out of values specified in the module's .pyconf file. It
+should contain an 'endpoint' key, specifying the address of the
+streaming endpoint. Example:
+
+param endpoint {
+value = 'tcp://127.0.0.1:8423'
+}
+
+"""
+endpoint = params['endpoint']
+counter = {name: 0 for pattern, name, description in patterns}
+
+thread = threading.Thread(target=count_errors, args=(counter, endpoint))
+thread.daemon = True
+thread.start()
+
+time.sleep(2)
+
+return [{
+'name': name,
+'value_type': 'uint',
+'format': '%d',
+'units': 'errors',
+'slope':
[MediaWiki-commits] [Gerrit] Apologies for the spam - change (qa/browsertests)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/59058 Change subject: Apologies for the spam .. Apologies for the spam Change-Id: I43a068bb085ce372c162a513d69a8258e6621ca7 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/58/59058/1 diff --git a/README.md b/README.md index 0650b25..9f4a0dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +Apologies for the spam, but I'm using this to test the PR -> Gerrit workflow, since the test repo isn't being replicated :( # Browser testing at WMF ## Environment -- To view, visit https://gerrit.wikimedia.org/r/59058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43a068bb085ce372c162a513d69a8258e6621ca7 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Decouple responsibility, move value factory out of ParserData - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59057
Change subject: Decouple responsibility, move value factory out of ParserData
..
Decouple responsibility, move value factory out of ParserData
Inject datavalue dependency instead of doing value factoring within
the ParserData class itself.
Former addPropertyValueString() was responsible for creating a value
object, error handling and attachement to the semantic container.
Splitting the task will help the refactoring of ParserExtensions
class.
Change-Id: I0811692033ec7b6f69e4e78efc25d3728dbf1a01
---
M includes/ParserData.php
M includes/SMW_DataValueFactory.php
M includes/parserhooks/SetParserFunction.php
A tests/phpunit/includes/DataValueFactoryTest.php
M tests/phpunit/includes/DiffDataTest.php
M tests/phpunit/includes/ParserDataTest.php
6 files changed, 210 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/57/59057/1
diff --git a/includes/ParserData.php b/includes/ParserData.php
index cad9e03..c4d2284 100644
--- a/includes/ParserData.php
+++ b/includes/ParserData.php
@@ -10,10 +10,10 @@
use MWException;
use SMWStore;
+use SMWDataValue;
use SMWDIWikiPage;
use SMWPropertyValue;
use SMWSemanticData;
-use SMWDataValueFactory;
use SMWDIProperty;
use SMWDIBlob;
use SMWDIBoolean;
@@ -326,42 +326,42 @@
}
/**
-* Add value string to the instantiated semanticData container
+* This method adds a data value to the semantic data container
+*
+* @par Example:
+* @code
+* $parserData = new SMW\ParserData(
+* $parser->getTitle(),
+* $parser->getOutput(),
+* $settings;
+* )
+*
+* $dataValue = SMWDataValueFactory::newPropertyValue( $userProperty,
$userValue )
+* $parserData->addPropertyValue( $dataValue )
+* @endcode
*
* @since 1.9
*
-* @param string $propertyName
-* @param string $valueString
-*
-* @throws MWException
+* @param SMWDataValue $dataValue
*/
- public function addPropertyValueString( $propertyName, $valueString ) {
- if ( !( $this->semanticData instanceof SMWSemanticData ) ) {
- throw new MWException( 'The semantic data container is
not initialized' );
- }
-
+ public function addPropertyValue( SMWDataValue $dataValue ) {
wfProfileIn( __METHOD__ );
- $propertyDv = SMWPropertyValue::makeUserProperty( $propertyName
);
- $propertyDi = $propertyDv->getDataItem();
-
- if ( $propertyDi instanceof \SMWDIProperty &&
!$propertyDi->isInverse() ) {
- $valueDv = SMWDataValueFactory::newPropertyObjectValue(
$propertyDi, $valueString,
- false, $this->semanticData->getSubject() );
- $this->semanticData->addPropertyObjectValue(
$propertyDi, $valueDv->getDataItem() );
-
- // Take note of the error for storage (do this here and
not in storage, thus avoiding duplicates).
- if ( !$valueDv->isValid() ) {
+ if ( $dataValue->getProperty() instanceof SMWDIProperty ) {
+ if ( !$dataValue->isValid() ) {
$this->semanticData->addPropertyObjectValue(
new SMWDIProperty(
SMWDIProperty::TYPE_ERROR ),
- $propertyDi->getDiWikiPage()
+
$dataValue->getProperty()->getDiWikiPage()
);
- $this->setError( $valueDv->getErrors() );
+ $this->setError( $dataValue->getErrors() );
+ } else {
+ $this->semanticData->addPropertyObjectValue(
+ $dataValue->getProperty(),
+ $dataValue->getDataItem()
+ );
}
- } else if ( $propertyDi instanceof \SMWDIProperty &&
$propertyDi->isInverse() ) {
- $this->setError( array( wfMessage( 'smw_noinvannot'
)->inContentLanguage()->text() ) );
} else {
- $this->setError( array( wfMessage(
'smw-property-name-invalid', $propertyName )->inContentLanguage()->text() ) );
+ $this->setError( $dataValue->getErrors() );
}
wfProfileOut( __METHOD__ );
diff --git a/includes/SMW_DataValueFactory.php
b/includes/SMW_DataValueFactory.php
index 9694d97..f34f20b 100644
--- a/includes/SMW_DataValueFactory.php
+++ b/includes/SMW_DataValueFactory.php
@@ -183,6 +183,62 @@
[MediaWiki-commits] [Gerrit] Add 'Has improper value for' test which not causes an exception - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add 'Has improper value for' test which not causes an exception
..
Add 'Has improper value for' test which not causes an exception
'Has improper value for' is language dep. therefore use
$diPropertyError = new \SMWDIProperty( \SMWDIProperty::TYPE_ERROR );
$diPropertyError->getLabel() for the right property label output.
Change-Id: I426944d451f9b9133e5cd26989c517790a38f096
---
M tests/phpunit/includes/SubobjectTest.php
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Mwjames: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/SubobjectTest.php
b/tests/phpunit/includes/SubobjectTest.php
index 8c8d57a..6281417 100644
--- a/tests/phpunit/includes/SubobjectTest.php
+++ b/tests/phpunit/includes/SubobjectTest.php
@@ -46,6 +46,7 @@
* @return array
*/
public function getDataProvider() {
+ $diPropertyError = new \SMWDIProperty(
\SMWDIProperty::TYPE_ERROR );
return array(
array(
// #0
@@ -137,6 +138,20 @@
)
),
+ // #6 Improper value for wikipage property will add an
'Has improper value for'
+ array(
+ 'Bar',
+ array(
+ 'identifier' => 'bar',
+ 'property' => array( 'Foo' => '' )
+ ),
+ array( // Expected results
+ 'name' => 'bar',
+ 'errors' => 1,
+ 'propertyLabel' => array(
$diPropertyError->getLabel(), 'Foo' ),
+ 'propertyValue' => 'Foo',
+ )
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/59056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I426944d451f9b9133e5cd26989c517790a38f096
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames
Gerrit-Reviewer: Mwjames
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 'Has improper value for' test which not causes an exception - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59056
Change subject: Add 'Has improper value for' test which not causes an exception
..
Add 'Has improper value for' test which not causes an exception
'Has improper value for' is language dep. therefore use
$diPropertyError = new \SMWDIProperty( \SMWDIProperty::TYPE_ERROR );
$diPropertyError->getLabel() for the right property label output.
Change-Id: I426944d451f9b9133e5cd26989c517790a38f096
---
M tests/phpunit/includes/SubobjectTest.php
1 file changed, 15 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/56/59056/1
diff --git a/tests/phpunit/includes/SubobjectTest.php
b/tests/phpunit/includes/SubobjectTest.php
index 8c8d57a..6281417 100644
--- a/tests/phpunit/includes/SubobjectTest.php
+++ b/tests/phpunit/includes/SubobjectTest.php
@@ -46,6 +46,7 @@
* @return array
*/
public function getDataProvider() {
+ $diPropertyError = new \SMWDIProperty(
\SMWDIProperty::TYPE_ERROR );
return array(
array(
// #0
@@ -137,6 +138,20 @@
)
),
+ // #6 Improper value for wikipage property will add an
'Has improper value for'
+ array(
+ 'Bar',
+ array(
+ 'identifier' => 'bar',
+ 'property' => array( 'Foo' => '' )
+ ),
+ array( // Expected results
+ 'name' => 'bar',
+ 'errors' => 1,
+ 'propertyLabel' => array(
$diPropertyError->getLabel(), 'Foo' ),
+ 'propertyValue' => 'Foo',
+ )
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/59056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I426944d451f9b9133e5cd26989c517790a38f096
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 47204) Remove zh-mo from $wgDisabledVariants for zhwiki - change (operations/mediawiki-config)
Liangent has uploaded a new change for review. https://gerrit.wikimedia.org/r/59055 Change subject: (bug 47204) Remove zh-mo from $wgDisabledVariants for zhwiki .. (bug 47204) Remove zh-mo from $wgDisabledVariants for zhwiki Bug: 47204 Change-Id: I5806a17d5eb0b9abc43e253eb6971048411b1f50 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/55/59055/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7ca6fe3..91bc66f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10204,7 +10204,7 @@ 'wgDisabledVariants' => array( 'default' => array(), - 'zhwiki' => array( 'zh-mo', 'zh-my' ), + 'zhwiki' => array( 'zh-my' ), 'zhwikibooks' => array( 'zh-mo', 'zh-my' ), 'zhwikinews' => array( 'zh-mo', 'zh-my' ), 'zhwikiquote' => array( 'zh-mo', 'zh-my' ), -- To view, visit https://gerrit.wikimedia.org/r/59055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5806a17d5eb0b9abc43e253eb6971048411b1f50 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Liangent ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround for Sandox not being enabled on beta.wmflabs.org - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/59054 Change subject: Workaround for Sandox not being enabled on beta.wmflabs.org .. Workaround for Sandox not being enabled on beta.wmflabs.org Bug: 47205 Change-Id: Ic87e6f035c18288acd0271f7e4caa0c98ce49423 --- M features/math.feature M features/step_definitions/math_steps.rb 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/54/59054/1 diff --git a/features/math.feature b/features/math.feature index ff335f7..0b250af 100644 --- a/features/math.feature +++ b/features/math.feature @@ -1,7 +1,8 @@ Feature: Math Scenario: Display simple math -Given I am editing My sandbox page +Given I am logged in + And I am editing page that does not exist When I type 3 + 2 And I click Preview Then My sandbox page should contain an img tag diff --git a/features/step_definitions/math_steps.rb b/features/step_definitions/math_steps.rb index 45759f0..1a8a1d4 100644 --- a/features/step_definitions/math_steps.rb +++ b/features/step_definitions/math_steps.rb @@ -1,6 +1,7 @@ -Given /^I am editing My sandbox page$/ do - visit(MainPage).my_sandbox +Given(/^I am editing page that does not exist$/) do + step 'I am at page that does not exist' + step 'I click link Create' end When /^I type (.+)$/ do |write_text| -- To view, visit https://gerrit.wikimedia.org/r/59054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic87e6f035c18288acd0271f7e4caa0c98ce49423 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Firefox 2 detection in wikibits - change (mediawiki/core)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59053
Change subject: Fix Firefox 2 detection in wikibits
..
Fix Firefox 2 detection in wikibits
Per default this will only affect Monobook slightly
as only that has a FF2Fixes.css which is invoked in
case wikibits detects the browser as Firefox 2.
But it might also have an impact on extensions and
other custom scripts relying on these globals.
Change-Id: Ib11c502233f879ba3ef0063ad871474165a1eb8d
---
M skins/common/wikibits.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/59053/1
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index c2c00db..3076811 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -24,7 +24,7 @@
// For accesskeys; note that FF3+ is included here!
window.is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC );
-window.ff2_bugs = /firefox\/2/.test( clientPC );
+window.ff2_bugs = /firefox\/2\./.test( clientPC );
// These aren't used here, but some custom scripts rely on them
window.is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1;
window.is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1;
--
To view, visit https://gerrit.wikimedia.org/r/59053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib11c502233f879ba3ef0063ad871474165a1eb8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add method Subobject::addPropertyObjectValue - change (mediawiki...SemanticMediaWiki)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59052
Change subject: Add method Subobject::addPropertyObjectValue
..
Add method Subobject::addPropertyObjectValue
This method takes data items for property and value and adds them to the
subobject.
Change-Id: I64ff773c95b35ab77531c830344503206c6e028a
---
M includes/Subobject.php
M tests/phpunit/includes/SubobjectTest.php
2 files changed, 77 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/52/59052/1
diff --git a/includes/Subobject.php b/includes/Subobject.php
index 8d8e655..65042ca 100644
--- a/includes/Subobject.php
+++ b/includes/Subobject.php
@@ -171,10 +171,32 @@
*
* @since 1.9
*
+* @param SMWDIProperty $propertyDi
+* @param SMWDataItem $valueDi
+*/
+ public function addPropertyObjectValue( \SMWDIProperty $propertyDi,
\SMWDataItem $valueDi ) {
+
+ if ( !( $this->semanticData instanceof SMWContainerSemanticData
) ) {
+ throw new MWException( 'The semantic data container is
not initialized' );
+ }
+
+ if ( !$propertyDi->isInverse() ) {
+ $this->semanticData->addPropertyObjectValue(
$propertyDi, $valueDi );
+ } else {
+ $this->errors[] = wfMessage( 'smw_noinvannot'
)->inContentLanguage()->text();
+ }
+ }
+
+ /**
+* Add property / value to the semantic data container
+*
+* @since 1.9
+*
* @param string $propertyName
* @param string $valueString
*/
public function addPropertyValue( $propertyName, $valueString ) {
+
if ( !( $this->semanticData instanceof SMWContainerSemanticData
) ) {
throw new MWException( 'The semantic data container is
not initialized' );
}
@@ -182,19 +204,20 @@
$propertyDv = SMWPropertyValue::makeUserProperty( $propertyName
);
$propertyDi = $propertyDv->getDataItem();
- if ( $propertyDi instanceof \SMWDIProperty &&
!$propertyDi->isInverse() ) {
- $valueDv = SMWDataValueFactory::newPropertyObjectValue(
$propertyDi, $valueString,
- false, $this->semanticData->getSubject() );
- $this->semanticData->addPropertyObjectValue(
$propertyDi, $valueDv->getDataItem() );
+ if ( $propertyDi instanceof \SMWDIProperty ) {
- // Take note of the error for storage (do this here and
not in storage, thus avoiding duplicates).
- if ( !$valueDv->isValid() ) {
- $this->semanticData->addPropertyObjectValue(
new SMWDIProperty( SMWDIProperty::TYPE_ERROR ),
- $propertyDi->getDiWikiPage() );
+ $valueDv = SMWDataValueFactory::newPropertyObjectValue(
$propertyDi, $valueString, false, $this->semanticData->getSubject() );
+
+ if ( $valueDv->isValid() ) {
+
+ $valueDi = $valueDv->getDataItem();
+ $this->addPropertyObjectValue( $propertyDi,
$valueDi );
+ } else {
+
+ // Take note of the error for storage (do this
here and not in storage, thus avoiding duplicates).
+ $this->semanticData->addPropertyObjectValue(
new SMWDIProperty( SMWDIProperty::TYPE_ERROR ), $propertyDi->getDiWikiPage() );
$this->errors = array_merge( $this->errors,
$valueDv->getErrors() );
}
- } else if ( $propertyDi instanceof \SMWDIProperty &&
$propertyDi->isInverse() ) {
- $this->errors[] = wfMessage( 'smw_noinvannot'
)->inContentLanguage()->text();
} else {
// FIXME Get message object
$this->errors[] = wfMessage(
'smw-property-name-invalid', $propertyName )->inContentLanguage()->text();
diff --git a/tests/phpunit/includes/SubobjectTest.php
b/tests/phpunit/includes/SubobjectTest.php
index 8c8d57a..be35caf 100644
--- a/tests/phpunit/includes/SubobjectTest.php
+++ b/tests/phpunit/includes/SubobjectTest.php
@@ -5,7 +5,9 @@
use SMW\Subobject;
use SMWDIWikiPage;
use SMWDataItem;
+use SMWPropertyValue;
use SMWDataValueFactory;
+use MWException;
use Title;
/**
@@ -137,6 +139,21 @@
)
),
+ // #6 Improper value for wikipage property will raise
error
+ array(
+ 'Foo',
+ array(
+ 'identifier' => 'bar'
[MediaWiki-commits] [Gerrit] Refactor to facilitate historical allocations - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59051
Change subject: Refactor to facilitate historical allocations
..
Refactor to facilitate historical allocations
BannerChooser filter and get operations are explicit
Change-Id: I2f3a0d89b30517294565231e60657bb25a456572
---
M api/ApiCentralNoticeAllocations.php
M includes/Banner.php
M includes/BannerChooser.php
M includes/Campaign.php
M special/SpecialBannerAllocation.php
M special/SpecialBannerRandom.php
M special/SpecialGlobalAllocation.php
7 files changed, 123 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/51/59051/1
diff --git a/api/ApiCentralNoticeAllocations.php
b/api/ApiCentralNoticeAllocations.php
index e37dcfc..e61fc86 100644
--- a/api/ApiCentralNoticeAllocations.php
+++ b/api/ApiCentralNoticeAllocations.php
@@ -45,7 +45,7 @@
// Get our language/project/country
$params = $this->extractRequestParams();
- $bannerList = static::getAllocationInformation(
+ $bannerList = static::getBannerAllocation(
$params['project'],
$params['country'],
$params['language'],
@@ -138,29 +138,44 @@
*
* @return array
*/
- public static function getAllocationInformation( $project, $country,
$language, $anonymous, $device, $bucket = null, $minimize = false ) {
+ public static function getBannerAllocation( $project, $country,
$language, $anonymous, $device, $bucket = null, $minimize = false ) {
+ self::sanitizeParams( $project, $country, $language,
$anonymous, $device, $bucket, $minimize );
+
+ $chooser = new BannerChooser();
+ $chooser->filter( $project, $language, $country, $anonymous,
$device, $bucket );
+ $banners = $chooser->getBanners();
+
+ if ( $minimize ) {
+ $banners = static::minimizeBanners( $banners );
+ }
+
+ return $banners;
+ }
+
+ // FIXME: this function is steeoopid
+ protected static function sanitizeParams( &$project, &$country,
&$language, &$anonymous, &$device, &$bucket, &$minimize ) {
$project = ApiCentralNoticeAllocations::sanitizeText(
$project,
- static::PROJECT_FILTER,
- static::DEFAULT_PROJECT
+ self::PROJECT_FILTER,
+ self::DEFAULT_PROJECT
);
$country = ApiCentralNoticeAllocations::sanitizeText(
$country,
- static::LOCATION_FILTER,
- static::DEFAULT_COUNTRY
+ self::LOCATION_FILTER,
+ self::DEFAULT_COUNTRY
);
$language = ApiCentralNoticeAllocations::sanitizeText(
$language,
- static::LANG_FILTER,
- static::DEFAULT_LANGUAGE
+ self::LANG_FILTER,
+ self::DEFAULT_LANGUAGE
);
$anonymous = ApiCentralNoticeAllocations::sanitizeText(
$anonymous,
- static::ANONYMOUS_FILTER,
- static::DEFAULT_ANONYMOUS
+ self::ANONYMOUS_FILTER,
+ self::DEFAULT_ANONYMOUS
);
$anonymous = ( $anonymous == 'true' );
@@ -172,20 +187,11 @@
$bucket = ApiCentralNoticeAllocations::sanitizeText(
$bucket,
- static::BUCKET_FILTER,
- static::DEFAULT_BUCKET
+ self::BUCKET_FILTER,
+ self::DEFAULT_BUCKET
);
$minimize = (boolean) $minimize;
-
- $chooser = new BannerChooser( $project, $language, $country,
$anonymous, $device, $bucket );
- $banners = $chooser->banners;
-
- if ( $minimize ) {
- $banners = static::minimizeBanners( $banners );
- }
-
- return $banners;
}
/**
diff --git a/includes/Banner.php b/includes/Banner.php
index 51d4ec7..bab30a4 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -341,13 +341,15 @@
),
__METHOD__
);
- $banner['display_anon'] = intval( $row->display_anon );
- $banner['display_account'] = intval( $row->display_account );
+ $banner['display_anon'] = (int) $row->display_anon;
+ $banner['display_account'] = (int) $row->display_account;
- $banner['fundraising'] = intval( $
[MediaWiki-commits] [Gerrit] Create a Special:UserById page redirecting to a user page gi... - change (mediawiki/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59050
Change subject: Create a Special:UserById page redirecting to a user page given
a numeric id.
..
Create a Special:UserById page redirecting to a user page given a numeric id.
The numeric User ID is stable across renames, and is therefore an
appropriate primary key for identifying the user associated with a given
revision. The Parsoid API would like to export semantic RDFa in its
DOM identifying the author of a revision by their userid, but in order
to do so requires a MW redirect from userid to the appropriate User page.
(A "permalink" for the user.) This patch adds that redirect, as
http://somewiki/Special:UserById/1234
(https://bugzilla.wikimedia.org/show_bug.cgi?id=45206 is the related
Parsoid feature.)
Change-Id: I91ac84d3323969aaee30ae44cd3b71fca4aa7073
---
M includes/AutoLoader.php
M includes/SpecialPageFactory.php
A includes/specials/SpecialUserbyid.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
5 files changed, 94 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/59050/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 88bb21b..e4bf0dd 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -973,6 +973,7 @@
'SpecialUpload' => 'includes/specials/SpecialUpload.php',
'SpecialUploadStash' => 'includes/specials/SpecialUploadStash.php',
'SpecialUploadStashTooLargeException' =>
'includes/specials/SpecialUploadStash.php',
+ 'SpecialUserbyid' => 'includes/specials/SpecialUserbyid.php',
'SpecialUserlogout' => 'includes/specials/SpecialUserlogout.php',
'SpecialVersion' => 'includes/specials/SpecialVersion.php',
'SpecialWatchlist' => 'includes/specials/SpecialWatchlist.php',
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index a53b901..605611b 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -101,6 +101,7 @@
'Listbots' => 'SpecialListBots',
'Userrights'=> 'UserrightsPage',
'EditWatchlist' => 'SpecialEditWatchlist',
+ 'Userbyid' => 'SpecialUserbyid',
// Recent changes and logs
'Newimages' => 'SpecialNewFiles',
diff --git a/includes/specials/SpecialUserbyid.php
b/includes/specials/SpecialUserbyid.php
new file mode 100644
index 000..e56b561
--- /dev/null
+++ b/includes/specials/SpecialUserbyid.php
@@ -0,0 +1,78 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * A special page that redirects to the User corresponding to a given
+ * numeric user id.
+ *
+ * @ingroup SpecialPage
+ */
+class SpecialUserbyid extends SpecialPage {
+
+ function __construct() {
+ parent::__construct( 'Userbyid' );
+ }
+
+ function execute( $par ) {
+ $this->setHeaders();
+ $this->outputHeader();
+
+ $request = $this->getRequest();
+ $userid = !is_null( $par ) ? $par : $request->getText( 'userid'
);
+ if ( ! is_numeric( $userid ) ) {
+ $this->showForm( $userid );
+ } else {
+ $username = User::whoIs( intval( $userid ) );
+ if ( ! $username ) {
+ $this->getOutput()->setStatusCode( 404 );
+ $this->showForm( $userid );
+ } else {
+ $userpage = Title::makeTitle( NS_USER,
$username );
+ $url = $userpage->getFullURL( '', false,
PROTO_CURRENT );
+ $this->getOutput()->redirect( $url );
+ }
+ }
+ }
+
+ /**
+* @param $title Title
+*/
+ function showForm( $userid ) {
+ global $wgScript;
+
+ $this->getOutput()->addHTML(
+ Html::openElement( 'form', array( 'method' => 'get',
'action' => $wgScript, 'id' => 'specialuserbyid' ) ) .
+ Html::openElement( 'fieldset' ) .
+ Html::element( 'legend', null, $this->msg( 'userbyid'
)->text() ) .
+ Html::hidden( 'title',
$this->getTitle()->getPrefixedText() ) .
+ Xml::inputLabel( $this->msg( 'userbyid-page' )->text(),
'userid', 'userid', 25, $userid ) . ' ' .
+ Xml::submitButton( $this->msg( 'userbyid-submit'
)->text() ) . "\n" .
+ Html::closeElement( 'fieldset' ) .
+ Html::closeElement( 'form' )
+ );
+ }
+
+ protected function getGroupName()
[MediaWiki-commits] [Gerrit] Add full stops to error messages, and add comments for grep - change (mediawiki...Configure)
Siebrand has submitted this change and it was merged.
Change subject: Add full stops to error messages, and add comments for grep
..
Add full stops to error messages, and add comments for grep
Change-Id: I6cee9c92f8b741d12428977a1013a2602463
---
M Configure.i18n.php
M specials/ConfigurationPage.php
2 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/Configure.i18n.php b/Configure.i18n.php
index 30d83b3..8c074b2 100644
--- a/Configure.i18n.php
+++ b/Configure.i18n.php
@@ -41,7 +41,7 @@
'configure-directory-not-writable'=> 'The directory used to store
the settings, $1, is not writable.
Please make it writable by PHP to use this extension.',
'configure-edit-old' => "'''Warning:''' you are
editing an old version of the configuration (as at $1).",
- 'configure-error' => 'The configuration could not
be saved',
+ 'configure-error' => 'The configuration could not
be saved.',
'configure-js-add'=> 'Add a new entry',
'configure-js-group-exists' => 'Error: the group already
exists.',
'configure-js-prompt-group' => 'Enter the name of the new
group:',
@@ -61,14 +61,14 @@
Please create it or change it to use this extension.',
'configure-no-old'=> 'No old version of the
configuration available.',
'configure-no-setup' => 'You have to call
efConfigureSetup() explicitly in your LocalSettings.php file to
use this extension.',
- 'configure-no-transwiki' => 'You are not allowed to change
settings in other wikis',
+ 'configure-no-transwiki' => 'You are not allowed to change
settings in other wikis.',
'configure-old' => 'Old versions',
'configure-old-versions' => 'List of old versions of the
configuration:',
- 'configure-old-not-available' => 'The old version of the
settings you requested, $1, is not available',
+ 'configure-old-not-available' => 'The old version of the
settings you requested, $1, is not available.',
'configure-old-changes' => 'changes',
'configure-old-summary' => '$1 by $2 $4 $3',
'configure-old-summary-datetime' => '$1',
- 'configure-saved' => 'The configuration has been
saved',
+ 'configure-saved' => 'The configuration has been
saved.',
'configure-backlink' => 'Return to form',
'configure-image-url-explanation' => 'Enter the URL to an image, or
the name of an image on this wiki (without the namespace). A preview will be
displayed when you leave the field.',
'configure-section-robots'=> 'Web crawlers',
@@ -148,7 +148,7 @@
'configure-view' => 'View',
'configure-view-all-versions' => 'Full list of versions',
'configure-view-default' => 'Default settings',
- 'configure-view-not-allowed' => 'You are not allowed to see
this setting',
+ 'configure-view-not-allowed' => 'You are not allowed to see
this setting.',
'configure-viewconfig-line' => '$1 $2 by $3 $5: $4',
'extensions' => 'Configure the extensions',
'right-configure' => 'Configure the wiki',
diff --git a/specials/ConfigurationPage.php b/specials/ConfigurationPage.php
index fe455fe..0d9f389 100644
--- a/specials/ConfigurationPage.php
+++ b/specials/ConfigurationPage.php
@@ -1379,6 +1379,9 @@
if ( $curOpt == $opt ) {
$opts['checked'] = 'checked';
}
+ // Give grep a chance to find the usages:
+ // configure-condition-operator-or,
configure-condition-operator-and,
+ // configure-condition-operator-xor,
configure-condition-operator-not
$row .= Html::input( $encId.'-opt-'.$desc, $desc,
'radio', $opts ) .
' ' . Html::element( 'label', array( 'for'
=> $encId.'-opt-'.$desc ), wfMessage( 'configure-condition-operator-'.$desc
)->text() );
}
@@ -1408,6 +1411,10 @@
$row .= Html::rawElement( 'tr', array(), Html::element( 'th',
array(), wfMessage( 'configure-condition-name' )->text() ) .
Html::element( 'th', array(), wfMessage(
'configure-condition-requirement' )->text() ) )."\n";
foreach ( $conds as $condName => $condType ) {
+ // Give grep a chance to find the usages:
+ // configure-condition-name-1,
configure-condition-name-2, conf
[MediaWiki-commits] [Gerrit] Spell-check: occured -> occurred - change (mediawiki...Wikibase)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/59049 Change subject: Spell-check: occured -> occurred .. Spell-check: occured -> occurred Change-Id: I31adcec2ca75a0bb93ac8d7ab1f5f18496b90b55 --- M client/WikibaseClient.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/49/59049/1 diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php index b0d18b8..c2a4654 100644 --- a/client/WikibaseClient.i18n.php +++ b/client/WikibaseClient.i18n.php @@ -38,7 +38,7 @@ 'wikibase-linkitem-addlinks' => 'Add links', 'wikibase-linkitem-alreadylinked' => 'The page you wanted to link with is already attached to an [$1 item] on the central data repository which links to $2 on this site. Items can only have one page per site attached. Please choose a different page to link with.', 'wikibase-linkitem-close' => 'Close dialog and reload page', - 'wikibase-linkitem-failure' => 'An unknown error occured while trying to link the given page.', + 'wikibase-linkitem-failure' => 'An unknown error occurred while trying to link the given page.', 'wikibase-linkitem-title' => 'Link with page', 'wikibase-linkitem-linkpage' => 'Link with page', 'wikibase-linkitem-selectlink' => 'Please select a site and a page you want to link this page with.', -- To view, visit https://gerrit.wikimedia.org/r/59049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31adcec2ca75a0bb93ac8d7ab1f5f18496b90b55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Spell-check: occured -> occurred - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged. Change subject: Spell-check: occured -> occurred .. Spell-check: occured -> occurred Change-Id: I3d8a216d79dc1919c24c221de984a6dfc95a6359 --- M ArticleFeedbackv5.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php index 257792f..184c5c8 100644 --- a/ArticleFeedbackv5.i18n.php +++ b/ArticleFeedbackv5.i18n.php @@ -271,7 +271,7 @@ 'articlefeedbackv5-invalid-log-update' => 'Log entry could not be updated', 'articlefeedbackv5-invalid-feedback-flag' => 'Invalid feedback flag', 'articlefeedbackv5-invalid-feedback-state' => 'Invalid feedback flag state', - 'articlefeedbackv5-feedback-reloaded-after-error' => 'An error ($1) has occured. The feedback has been reloaded to reflect its current state.', + 'articlefeedbackv5-feedback-reloaded-after-error' => 'An error ($1) has occurred. The feedback has been reloaded to reflect its current state.', 'articlefeedbackv5-go-to-article' => 'View page', 'articlefeedbackv5-discussion-page' => 'Talk', 'articlefeedbackv5-whats-this' => 'Help', -- To view, visit https://gerrit.wikimedia.org/r/59047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d8a216d79dc1919c24c221de984a6dfc95a6359 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Shirayuki Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Spell-check: occured -> occurred - change (mediawiki...FundraisingEmailUnsubscribe)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/59048 Change subject: Spell-check: occured -> occurred .. Spell-check: occured -> occurred Change-Id: Ie700d9445684f802196a8789e0fb5fbcb11060e2 --- M FundraiserUnsubscribe.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FundraisingEmailUnsubscribe refs/changes/48/59048/1 diff --git a/FundraiserUnsubscribe.i18n.php b/FundraiserUnsubscribe.i18n.php index 4ce3b61..188013e 100644 --- a/FundraiserUnsubscribe.i18n.php +++ b/FundraiserUnsubscribe.i18n.php @@ -17,7 +17,7 @@ 'fundraiserunsubscribe-submit' => 'Unsubscribe', 'fundraiserunsubscribe-cancel' => 'Cancel', - 'fundraiserunsubscribe-errormsg' => 'An error occured while attempting to process your request. Please contact [mailto:$1 $1].', + 'fundraiserunsubscribe-errormsg' => 'An error occurred while attempting to process your request. Please contact [mailto:$1 $1].', 'fundraiserunsubscribe-success' => 'You have successfully been removed from our mailing list.', 'fundraiserunsubscribe-sucesswarning' => 'Please allow up to four (4) days for the changes to take effect. We apologize for any emails you receive during this time. If you have any questions, please contact [mailto:$1 $1].', -- To view, visit https://gerrit.wikimedia.org/r/59048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie700d9445684f802196a8789e0fb5fbcb11060e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FundraisingEmailUnsubscribe Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused imports - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged. Change subject: Remove unused imports .. Remove unused imports Change-Id: Iafdf9a7c442075d804eb3668a549a5fbd055545d --- M client/includes/InterwikiSorter.php M lib/includes/InMemoryDataTypeLookup.php M lib/includes/modules/SitesModule.php M lib/tests/phpunit/ChangeNotificationJobTest.php M lib/tests/phpunit/EntityRetrievingDataTypeLookupTest.php M lib/tests/phpunit/SnakFormatterTest.php M lib/tests/phpunit/claim/ClaimDifferenceVisualizerTest.php M lib/tests/phpunit/store/WikiPageEntityLookupTest.php M repo/includes/PropertyView.php M repo/includes/api/SetClaim.php M repo/includes/store/sql/TermSearchKeyBuilder.php 11 files changed, 3 insertions(+), 12 deletions(-) Approvals: Jeroen De Dauw: Verified; Looks good to me, approved diff --git a/client/includes/InterwikiSorter.php b/client/includes/InterwikiSorter.php index f4955be..e8b1ec0 100644 --- a/client/includes/InterwikiSorter.php +++ b/client/includes/InterwikiSorter.php @@ -1,7 +1,6 @@ https://gerrit.wikimedia.org/r/58685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafdf9a7c442075d804eb3668a549a5fbd055545d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw Gerrit-Reviewer: Jeroen De Dauw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused imports - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Remove unused imports
..
Remove unused imports
Change-Id: I7524f52ce0615fcad17b778b65a2733dca12705f
---
M client/includes/parserhooks/PropertyParserFunction.php
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Jeroen De Dauw: Verified; Looks good to me, approved
diff --git a/client/includes/parserhooks/PropertyParserFunction.php
b/client/includes/parserhooks/PropertyParserFunction.php
index b842a20..f9ec47b 100644
--- a/client/includes/parserhooks/PropertyParserFunction.php
+++ b/client/includes/parserhooks/PropertyParserFunction.php
@@ -2,13 +2,8 @@
namespace Wikibase;
-use DataTypes\DataTypeFactory;
-use DataValues\DataValue;
-use ValueFormatters\ValueFormatter;
use Wikibase\Client\WikibaseClient;
-use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\TypedValueFormatter;
/**
* Handler of the {{#property}} parser function.
--
To view, visit https://gerrit.wikimedia.org/r/58683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7524f52ce0615fcad17b778b65a2733dca12705f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw
Gerrit-Reviewer: Jeroen De Dauw
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused import - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged. Change subject: Remove unused import .. Remove unused import Change-Id: Ieb0b3413a025d5f35583be4bac1e3be94e10f762 --- M client/includes/WikibaseClient.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jeroen De Dauw: Verified; Looks good to me, approved diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index 30ddbe4..f842839 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -12,7 +12,6 @@ use Wikibase\Lib\EntityIdLabelFormatter; use Wikibase\Lib\EntityIdParser; use Wikibase\Lib\EntityRetrievingDataTypeLookup; -use Wikibase\Lib\InMemoryDataTypeLookup; use Wikibase\Lib\PropertyDataTypeLookup; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\TypedValueFormatter; -- To view, visit https://gerrit.wikimedia.org/r/58682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb0b3413a025d5f35583be4bac1e3be94e10f762 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw Gerrit-Reviewer: Jeroen De Dauw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed since tag - change (mediawiki...Diff)
Jeroen De Dauw has submitted this change and it was merged. Change subject: Fixed since tag .. Fixed since tag Change-Id: I28801efaa30b105d962388b29f5e532c9760105c --- M includes/differ/CallbackListDiffer.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jeroen De Dauw: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/differ/CallbackListDiffer.php b/includes/differ/CallbackListDiffer.php index c01561a..78a570a 100644 --- a/includes/differ/CallbackListDiffer.php +++ b/includes/differ/CallbackListDiffer.php @@ -25,7 +25,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * - * @since 0.4 + * @since 0.5 * * @file * @ingroup Diff -- To view, visit https://gerrit.wikimedia.org/r/58677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28801efaa30b105d962388b29f5e532c9760105c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Diff Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw Gerrit-Reviewer: Aude Gerrit-Reviewer: Jeroen De Dauw Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Spell-check: occured -> occurred - change (mediawiki...ArticleFeedbackv5)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/59047 Change subject: Spell-check: occured -> occurred .. Spell-check: occured -> occurred Change-Id: I3d8a216d79dc1919c24c221de984a6dfc95a6359 --- M ArticleFeedbackv5.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/47/59047/1 diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php index 257792f..184c5c8 100644 --- a/ArticleFeedbackv5.i18n.php +++ b/ArticleFeedbackv5.i18n.php @@ -271,7 +271,7 @@ 'articlefeedbackv5-invalid-log-update' => 'Log entry could not be updated', 'articlefeedbackv5-invalid-feedback-flag' => 'Invalid feedback flag', 'articlefeedbackv5-invalid-feedback-state' => 'Invalid feedback flag state', - 'articlefeedbackv5-feedback-reloaded-after-error' => 'An error ($1) has occured. The feedback has been reloaded to reflect its current state.', + 'articlefeedbackv5-feedback-reloaded-after-error' => 'An error ($1) has occurred. The feedback has been reloaded to reflect its current state.', 'articlefeedbackv5-go-to-article' => 'View page', 'articlefeedbackv5-discussion-page' => 'Talk', 'articlefeedbackv5-whats-this' => 'Help', -- To view, visit https://gerrit.wikimedia.org/r/59047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d8a216d79dc1919c24c221de984a6dfc95a6359 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add quotes properly in the PostgreSQL - change (mediawiki/core)
Yosnoop has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59046
Change subject: Add quotes properly in the PostgreSQL
..
Add quotes properly in the PostgreSQL
Due to a change in PostgreSQL 9.2
http://wiki.postgresql.org/wiki/What's_new_in_PostgreSQL_9.2#Remove_hstore.27s_.3D.3E_operator
We have the following error in, e.g. "Contributions", pages:
A database query syntax error has occurred. This may indicate a bug in the
software. The last attempted database query was:
(SQL query hidden)
from within function "Block::newLoad". Database returned error "42883: ERROR:
operator does not exist: text <= integer LINE 1: ...(ipb_range_start LIKE '%' )
AND (ipb_range_start <= 0) AND ... ^ HINT: No operator matches the given name
and argument type(s). You might need to add explicit type casts. ".
Change-Id: I4a014d67d01c35bdac5aac4cc35a2f5f02cfc0d9
---
M includes/db/DatabasePostgres.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/59046/1
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 52fab13..17bde36 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1336,7 +1336,7 @@
if ( is_null( $s ) ) {
return 'NULL';
} elseif ( is_bool( $s ) ) {
- return intval( $s );
+ return "'" . intval( $s ) . "'";
} elseif ( $s instanceof Blob ) {
return "'" . $s->fetch( $s ) . "'";
}
--
To view, visit https://gerrit.wikimedia.org/r/59046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a014d67d01c35bdac5aac4cc35a2f5f02cfc0d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yosnoop
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n for the thousands marker - change (translatewiki)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59044
Change subject: i18n for the thousands marker
..
i18n for the thousands marker
"k" is understandable as a thousands marker in English and some
other languages, but not in all languages. Converted it into
a message.
This may make the string longer, so the font size of the number
is reduced.
Change-Id: I22d14521bd1f08f25c502652a3776fd009d93c4b
---
M MainPage/MainPage.i18n.php
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/specials/SpecialTwnMainPage.php
3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/44/59044/1
diff --git a/MainPage/MainPage.i18n.php b/MainPage/MainPage.i18n.php
index 31048fe..8b7cc1d 100644
--- a/MainPage/MainPage.i18n.php
+++ b/MainPage/MainPage.i18n.php
@@ -46,6 +46,8 @@
'twnmp-choose-languages-you-know' => 'Choose languages you know',
'twnmp-choose-another-language' => 'Choose another language...',
'twnmp-choose-fill-account-details' => 'Fill in your account details',
+
+ 'twnmp-stats-number-k' => '$1k',
);
/** English
@@ -105,6 +107,11 @@
'twnmp-choose-languages-you-know' => 'A heading to a list of
auto-detected languages.',
'twnmp-choose-another-language' => "A link to choose a language that
doesn't appear in the list.",
'twnmp-choose-fill-account-details' => 'A heading for the personal
details form.',
+
+ 'twnmp-stats-number-k' => '$1 is the number of the thousands of
messages or users on the site.
+It can be a fraction, for example "4.9".
+The message should be short, to fit in the box. If you have to translate it
and cannot make it short, notify [[Support]].
+If "k" is a good thousands marker in your language, do not translate this
message.',
);
/** Hebrew (עברית)
@@ -151,6 +158,8 @@
'twnmp-choose-languages-you-know' => 'השפה שלך',
'twnmp-choose-another-language' => 'בחירת שפה אחרת...',
'twnmp-choose-fill-account-details' => 'הפרטים שלך',
+
+ 'twnmp-stats-number-k' => '$1 אלף',
);
/** Dutch (Nederlands)
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index c5aabe1..a6d59f9 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -96,7 +96,7 @@
}
.stats-number {
- font-size: 50px;
+ font-size: 42px;
opacity: 0.9;
}
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index 9ec63d9..c25ff20 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -336,7 +336,7 @@
if ( $value > 1000 ) {
$digits = 3 - ceil( log( $value, 100 )
);
$value = number_format( $value / 1000,
$digits );
- $value = $lang->formatNum( $value ) .
'k'; // @todo needs proper i18n
+ $value = $this->msg(
'twnmp-stats-number-k', $value )->plain();
} else {
$value = $lang->formatNum( $value );
}
--
To view, visit https://gerrit.wikimedia.org/r/59044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22d14521bd1f08f25c502652a3776fd009d93c4b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweak: article -> page - change (mediawiki...Wikibase)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/59043 Change subject: Consistency tweak: article -> page .. Consistency tweak: article -> page Per Siebrand: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikibase-unconnectedpages-page/en Change-Id: Ibf09aa1d75cba219c5baa4fe22b4a9ffe0bb0de6 --- M client/WikibaseClient.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/43/59043/1 diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php index b0d18b8..cbca229 100644 --- a/client/WikibaseClient.i18n.php +++ b/client/WikibaseClient.i18n.php @@ -59,7 +59,7 @@ 'wikibase-error-invalid-entity-id' => 'The ID entered is unknown to the system. Please use a valid entity ID.', 'special-unconnectedpages' => 'Pages not connected to items', 'wikibase-unconnectedpages-legend' => 'Unconnected pages options', - 'wikibase-unconnectedpages-page' => 'Start result list with article:', + 'wikibase-unconnectedpages-page' => 'Start result list with page:', 'wikibase-unconnectedpages-submit' => 'Go', 'wikibase-unconnectedpages-invalid-language' => '"$1" is not a valid language code.', 'wikibase-unconnectedpages-page-warning' => 'The page title could not be used for the query and is ignored.', -- To view, visit https://gerrit.wikimedia.org/r/59043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf09aa1d75cba219c5baa4fe22b4a9ffe0bb0de6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweak: Use capital after colon for consistency. ... - change (mediawiki...Foxway)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/59042 Change subject: Consistency tweak: Use capital after colon for consistency. Use full stop at end of sentence. .. Consistency tweak: Use capital after colon for consistency. Use full stop at end of sentence. Per Siebrand https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Foxway-php-syntax-error-unexpected/en Change-Id: I110e636ffce960fc62f82653d246824fa1c4fa5b --- M Foxway.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway refs/changes/42/59042/1 diff --git a/Foxway.i18n.php b/Foxway.i18n.php index 1bc3005..a30b291 100644 --- a/Foxway.i18n.php +++ b/Foxway.i18n.php @@ -14,7 +14,7 @@ */ $messages['en'] = array( 'foxway-desc' => 'Allows to store an object-oriented data and implements its own runtime for PHP code on pages', - 'foxway-php-syntax-error-unexpected' => 'PHP parse error: syntax error, unexpected $1 in command line code on line $2' + 'foxway-php-syntax-error-unexpected' => 'PHP parse error: Syntax error, unexpected $1 in command line code on line $2.' ); /** Message documentation (Message documentation) -- To view, visit https://gerrit.wikimedia.org/r/59042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I110e636ffce960fc62f82653d246824fa1c4fa5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Foxway Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] stop generating branches jobs for mw extension - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: stop generating branches jobs for mw extension .. stop generating branches jobs for mw extension We do not yet use any regression checks for MediaWiki extensions so I am hereby removing the branches jobs beside the master one. We might use them later on when figure out how to tag whether an extension support a specific branch. Change-Id: I58841fb6e2dc33db5c75ec6600e8bd07e6da62c5 --- M mediawiki-extensions.yaml 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 812fe37..f3ca297 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -358,8 +358,10 @@ mwbranch: - master - - REL1_20 - - REL1_19 +# Commented out since they are not triggered for now. +# - REL1_21 +# - REL1_20 +# - REL1_19 jobs: - mwext-check-jobs -- To view, visit https://gerrit.wikimedia.org/r/59041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58841fb6e2dc33db5c75ec6600e8bd07e6da62c5 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] stop generating branches jobs for mw extension - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/59041 Change subject: stop generating branches jobs for mw extension .. stop generating branches jobs for mw extension We do not yet use any regression checks for MediaWiki extensions so I am hereby removing the branches jobs beside the master one. We might use them later on when figure out how to tag whether an extension support a specific branch. Change-Id: I58841fb6e2dc33db5c75ec6600e8bd07e6da62c5 --- M mediawiki-extensions.yaml 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/41/59041/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index f92c565..5aa7321 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -356,8 +356,10 @@ mwbranch: - master - - REL1_20 - - REL1_19 +# Commented out since they are not triggered for now. +# - REL1_21 +# - REL1_20 +# - REL1_19 jobs: - mwext-check-jobs -- To view, visit https://gerrit.wikimedia.org/r/59041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58841fb6e2dc33db5c75ec6600e8bd07e6da62c5 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff... - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 .. [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 Change-Id: I5dcecf06a76085a8d5265fd2d75d4d8c00e18b9e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 2277bfa..5df1e4b 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -554,7 +554,7 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page -Fundraiser Unsubscribe +Fundraising Email Unsubscribe file = FundraisingEmailUnsubscribe/FundraiserUnsubscribe.i18n.php Gadgets -- To view, visit https://gerrit.wikimedia.org/r/59040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5dcecf06a76085a8d5265fd2d75d4d8c00e18b9e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff... - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/59040 Change subject: [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 .. [FundraisingEmailUnsubscribe] Fix for I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 Change-Id: I5dcecf06a76085a8d5265fd2d75d4d8c00e18b9e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/40/59040/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 2277bfa..5df1e4b 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -554,7 +554,7 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page -Fundraiser Unsubscribe +Fundraising Email Unsubscribe file = FundraisingEmailUnsubscribe/FundraiserUnsubscribe.i18n.php Gadgets -- To view, visit https://gerrit.wikimedia.org/r/59040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dcecf06a76085a8d5265fd2d75d4d8c00e18b9e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed 'h' to 'hist' - change (mediawiki...Translate)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/59039 Change subject: Changed 'h' to 'hist' .. Changed 'h' to 'hist' The message translate-translations-history-short just just one letter in English. Some people complained that it's unclear, and it caused at least one incorrect translation. There's no reason to make it so short. Change-Id: Id4873354dd6151333a8718d6ff01736da8b35cc3 --- M Translate.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/39/59039/1 diff --git a/Translate.i18n.php b/Translate.i18n.php index 4a0a2c6..87aa9b7 100644 --- a/Translate.i18n.php +++ b/Translate.i18n.php @@ -222,7 +222,7 @@ 'translate-translations-messagename' => 'Name:', 'translate-translations-project' => 'Project:', 'translate-translations-including-no-param' => 'Please specify a valid message key in the subpage parameter', - 'translate-translations-history-short' => 'h', + 'translate-translations-history-short' => 'hist', # Special:LanguageStats 'languagestats' => 'Language statistics', -- To view, visit https://gerrit.wikimedia.org/r/59039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4873354dd6151333a8718d6ff01736da8b35cc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add full stops to error messages, and add comments for grep - change (mediawiki...Configure)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59038
Change subject: Add full stops to error messages, and add comments for grep
..
Add full stops to error messages, and add comments for grep
Change-Id: I6cee9c92f8b741d12428977a1013a2602463
---
M Configure.i18n.php
M specials/ConfigurationPage.php
2 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure
refs/changes/38/59038/1
diff --git a/Configure.i18n.php b/Configure.i18n.php
index 30d83b3..8c074b2 100644
--- a/Configure.i18n.php
+++ b/Configure.i18n.php
@@ -41,7 +41,7 @@
'configure-directory-not-writable'=> 'The directory used to store
the settings, $1, is not writable.
Please make it writable by PHP to use this extension.',
'configure-edit-old' => "'''Warning:''' you are
editing an old version of the configuration (as at $1).",
- 'configure-error' => 'The configuration could not
be saved',
+ 'configure-error' => 'The configuration could not
be saved.',
'configure-js-add'=> 'Add a new entry',
'configure-js-group-exists' => 'Error: the group already
exists.',
'configure-js-prompt-group' => 'Enter the name of the new
group:',
@@ -61,14 +61,14 @@
Please create it or change it to use this extension.',
'configure-no-old'=> 'No old version of the
configuration available.',
'configure-no-setup' => 'You have to call
efConfigureSetup() explicitly in your LocalSettings.php file to
use this extension.',
- 'configure-no-transwiki' => 'You are not allowed to change
settings in other wikis',
+ 'configure-no-transwiki' => 'You are not allowed to change
settings in other wikis.',
'configure-old' => 'Old versions',
'configure-old-versions' => 'List of old versions of the
configuration:',
- 'configure-old-not-available' => 'The old version of the
settings you requested, $1, is not available',
+ 'configure-old-not-available' => 'The old version of the
settings you requested, $1, is not available.',
'configure-old-changes' => 'changes',
'configure-old-summary' => '$1 by $2 $4 $3',
'configure-old-summary-datetime' => '$1',
- 'configure-saved' => 'The configuration has been
saved',
+ 'configure-saved' => 'The configuration has been
saved.',
'configure-backlink' => 'Return to form',
'configure-image-url-explanation' => 'Enter the URL to an image, or
the name of an image on this wiki (without the namespace). A preview will be
displayed when you leave the field.',
'configure-section-robots'=> 'Web crawlers',
@@ -148,7 +148,7 @@
'configure-view' => 'View',
'configure-view-all-versions' => 'Full list of versions',
'configure-view-default' => 'Default settings',
- 'configure-view-not-allowed' => 'You are not allowed to see
this setting',
+ 'configure-view-not-allowed' => 'You are not allowed to see
this setting.',
'configure-viewconfig-line' => '$1 $2 by $3 $5: $4',
'extensions' => 'Configure the extensions',
'right-configure' => 'Configure the wiki',
diff --git a/specials/ConfigurationPage.php b/specials/ConfigurationPage.php
index fe455fe..0d9f389 100644
--- a/specials/ConfigurationPage.php
+++ b/specials/ConfigurationPage.php
@@ -1379,6 +1379,9 @@
if ( $curOpt == $opt ) {
$opts['checked'] = 'checked';
}
+ // Give grep a chance to find the usages:
+ // configure-condition-operator-or,
configure-condition-operator-and,
+ // configure-condition-operator-xor,
configure-condition-operator-not
$row .= Html::input( $encId.'-opt-'.$desc, $desc,
'radio', $opts ) .
' ' . Html::element( 'label', array( 'for'
=> $encId.'-opt-'.$desc ), wfMessage( 'configure-condition-operator-'.$desc
)->text() );
}
@@ -1408,6 +1411,10 @@
$row .= Html::rawElement( 'tr', array(), Html::element( 'th',
array(), wfMessage( 'configure-condition-name' )->text() ) .
Html::element( 'th', array(), wfMessage(
'configure-condition-requirement' )->text() ) )."\n";
foreach ( $conds as $condName => $condType ) {
+ // Give grep a chance to find the usages:
+
[MediaWiki-commits] [Gerrit] [FundraisingEmailUnsubscribe] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [FundraisingEmailUnsubscribe] Register extension .. [FundraisingEmailUnsubscribe] Register extension 2nd try now that gitrview was fixed Change-Id: I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 94596cc..2277bfa 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -554,6 +554,9 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page +Fundraiser Unsubscribe +file = FundraisingEmailUnsubscribe/FundraiserUnsubscribe.i18n.php + Gadgets aliasfile = Gadgets/Gadgets.alias.php ignored = gadgets-definition -- To view, visit https://gerrit.wikimedia.org/r/59037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FundraisingEmailUnsubscribe] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/59037 Change subject: [FundraisingEmailUnsubscribe] Register extension .. [FundraisingEmailUnsubscribe] Register extension 2nd try now that gitrview was fixed Change-Id: I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/37/59037/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 94596cc..2277bfa 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -554,6 +554,9 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page +Fundraiser Unsubscribe +file = FundraisingEmailUnsubscribe/FundraiserUnsubscribe.i18n.php + Gadgets aliasfile = Gadgets/Gadgets.alias.php ignored = gadgets-definition -- To view, visit https://gerrit.wikimedia.org/r/59037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I844ef7f2367efcdacb3ff057fbc0d8f57db219a0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show the history menu item only if it exists - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59035
Change subject: Show the history menu item only if it exists
..
Show the history menu item only if it exists
If the message doesn't have a translation, the history link
leads to an empty page. Now it's hidden for untranslated message
and shown for translated messages.
Change-Id: I35cd21fa7d80d3ff75d1e651178ca08cfa91c9d9
---
M resources/js/ext.translate.editor.js
1 file changed, 28 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/35/59035/1
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index c21f091..39bbfca 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -150,6 +150,11 @@
// immediately move to the next message.
translateEditor.next();
+ // Now the message definitely has a history,
+ // so make sure the history menu item is shown
+ translateEditor.$editor.find( '.message-tools-history' )
+ .removeClass( 'hide' );
+
api.postWithEditToken( {
action: 'edit',
title: translateEditor.message.title,
@@ -250,7 +255,8 @@
},
createMessageTools: function () {
- var wgScript = mw.config.get( 'wgScript' ),
+ var $historyItem, $translationsItem,
+ wgScript = mw.config.get( 'wgScript' ),
historyUri = new mw.Uri(),
translationsUri = new mw.Uri();
@@ -259,31 +265,36 @@
title: this.message.title,
action: 'history'
};
+ $historyItem = $( '' )
+ .addClass( 'message-tools-history' +
+ ( ( this.message.translation === null )
? ' hide' : '' )
+ )
+ .append( $( '' )
+ .attr( {
+ href: historyUri.toString(),
+ target: '_blank'
+ } )
+ .text( mw.msg(
'tux-editor-message-tools-history' ) )
+ );
translationsUri.path = wgScript;
translationsUri.query = {
title: 'Special:Translations',
message: this.message.title.replace(
/\/[a-z\-]+$/, '' )
};
+ $translationsItem = $( '' )
+ .addClass( 'message-tools-translations' )
+ .append( $( '' )
+ .attr( {
+ href: translationsUri.toString(),
+ target: '_blank'
+ } )
+ .text( mw.msg(
'tux-editor-message-tools-translations' ) )
+ );
return $( '' )
.addClass( 'dropdown-menu
tux-message-tools-menu hide' )
- .append(
- $( '' ).append( $( '' )
- .attr( {
- href:
historyUri.toString(),
- target: '_blank'
- } )
- .text( mw.msg(
'tux-editor-message-tools-history' ) )
- ),
- $( '' ).append( $( '' )
- .attr( {
- href:
translationsUri.toString(),
- target: '_blank'
- } )
- .text( mw.msg(
'tux-editor-message-tools-translations' ) )
- )
- );
+ .append( $historyItem, $translationsItem );
},
prepareEditorColumn: function () {
--
To view, visit https://gerrit.wikimedia.org/r/59035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35cd21fa7d80d3ff75d1e651178ca08cfa91c9d9
Gerrit-PatchSet: 1
Gerri
[MediaWiki-commits] [Gerrit] noc: Add missing entries to createTxtFileSymlinks.sh - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/59033 Change subject: noc: Add missing entries to createTxtFileSymlinks.sh .. noc: Add missing entries to createTxtFileSymlinks.sh The apache-config and dblist files were still manually created. These are now tracked in createTxtFileSymlinks.sh as well to avoid links from going stale or being forgotten about. Also moved fc-list to not be exclusively in docroot/conf. Change-Id: I246a6e2b71a1b3bfac710666b40e1fc25acbfa05 --- M docroot/noc/conf/all.dblist M docroot/noc/conf/closed.dblist M docroot/noc/conf/deleted.dblist A docroot/noc/conf/fc-list M docroot/noc/conf/fishbowl.dblist M docroot/noc/conf/flaggedrevs.dblist M docroot/noc/conf/interwiki.cdb M docroot/noc/conf/large.dblist M docroot/noc/conf/medium.dblist M docroot/noc/conf/private.dblist M docroot/noc/conf/s1.dblist M docroot/noc/conf/s2.dblist M docroot/noc/conf/s3.dblist M docroot/noc/conf/s4.dblist M docroot/noc/conf/s5.dblist M docroot/noc/conf/s6.dblist M docroot/noc/conf/s7.dblist M docroot/noc/conf/small.dblist M docroot/noc/conf/special.dblist M docroot/noc/conf/trusted-xff.cdb M docroot/noc/conf/wikibooks.dblist M docroot/noc/conf/wikidataclient.dblist M docroot/noc/conf/wikimania.dblist M docroot/noc/conf/wikimedia.conf M docroot/noc/conf/wikimedia.dblist M docroot/noc/conf/wikinews.dblist M docroot/noc/conf/wikipedia.dblist M docroot/noc/conf/wikiquote.dblist M docroot/noc/conf/wikisource.dblist M docroot/noc/conf/wikiversity.dblist M docroot/noc/conf/wikivoyage.dblist M docroot/noc/conf/wiktionary.dblist M docroot/noc/createTxtFileSymlinks.sh R fc-list 34 files changed, 139 insertions(+), 89 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/33/59033/1 diff --git a/docroot/noc/conf/all.dblist b/docroot/noc/conf/all.dblist index 1531ce6..ea189b6 12 --- a/docroot/noc/conf/all.dblist +++ b/docroot/noc/conf/all.dblist @@ -1 +1 @@ -/home/wikipedia/common/all.dblist \ No newline at end of file +../../../all.dblist \ No newline at end of file diff --git a/docroot/noc/conf/closed.dblist b/docroot/noc/conf/closed.dblist index d7c56f9..1916239 12 --- a/docroot/noc/conf/closed.dblist +++ b/docroot/noc/conf/closed.dblist @@ -1 +1 @@ -/home/wikipedia/common/closed.dblist \ No newline at end of file +../../../closed.dblist \ No newline at end of file diff --git a/docroot/noc/conf/deleted.dblist b/docroot/noc/conf/deleted.dblist index 1b48c58..422eb6f 12 --- a/docroot/noc/conf/deleted.dblist +++ b/docroot/noc/conf/deleted.dblist @@ -1 +1 @@ -/home/wikipedia/common/deleted.dblist \ No newline at end of file +../../../deleted.dblist \ No newline at end of file diff --git a/docroot/noc/conf/fc-list b/docroot/noc/conf/fc-list new file mode 12 index 000..1700f9e --- /dev/null +++ b/docroot/noc/conf/fc-list @@ -0,0 +1 @@ +../../../fc-list \ No newline at end of file diff --git a/docroot/noc/conf/fishbowl.dblist b/docroot/noc/conf/fishbowl.dblist index eb8869e..e5974aa 12 --- a/docroot/noc/conf/fishbowl.dblist +++ b/docroot/noc/conf/fishbowl.dblist @@ -1 +1 @@ -/home/wikipedia/common/fishbowl.dblist \ No newline at end of file +../../../fishbowl.dblist \ No newline at end of file diff --git a/docroot/noc/conf/flaggedrevs.dblist b/docroot/noc/conf/flaggedrevs.dblist index a4ae926..8d9bee1 12 --- a/docroot/noc/conf/flaggedrevs.dblist +++ b/docroot/noc/conf/flaggedrevs.dblist @@ -1 +1 @@ -/home/wikipedia/common/flaggedrevs.dblist \ No newline at end of file +../../../flaggedrevs.dblist \ No newline at end of file diff --git a/docroot/noc/conf/interwiki.cdb b/docroot/noc/conf/interwiki.cdb index 2d45fb6..ded6d62 12 --- a/docroot/noc/conf/interwiki.cdb +++ b/docroot/noc/conf/interwiki.cdb @@ -1 +1 @@ -/home/wikipedia/common/wmf-config/interwiki.cdb \ No newline at end of file +../../../wmf-config/interwiki.cdb \ No newline at end of file diff --git a/docroot/noc/conf/large.dblist b/docroot/noc/conf/large.dblist index 2f5773b..0c7dd4b 12 --- a/docroot/noc/conf/large.dblist +++ b/docroot/noc/conf/large.dblist @@ -1 +1 @@ -/home/wikipedia/common/large.dblist \ No newline at end of file +../../../large.dblist \ No newline at end of file diff --git a/docroot/noc/conf/medium.dblist b/docroot/noc/conf/medium.dblist index 4179ca7..11154fa 12 --- a/docroot/noc/conf/medium.dblist +++ b/docroot/noc/conf/medium.dblist @@ -1 +1 @@ -/home/wikipedia/common/medium.dblist \ No newline at end of file +../../../medium.dblist \ No newline at end of file diff --git a/docroot/noc/conf/private.dblist b/docroot/noc/conf/private.dblist index c1769ef..1abe1c7 12 --- a/docroot/noc/conf/private.dblist +++ b/docroot/noc/conf/private.dblist @@ -1 +1 @@ -/home/wikipedia/common/private.dblist \ No newline at end of file +../../../private.dblist \ No newline at end of file diff --git a/docroot/noc/conf/s1.dblist b/docroot/noc/conf/s1.dblist index af59
[MediaWiki-commits] [Gerrit] noc: Refactor highlight.php to be simpler and less mo... - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59034
Change subject: noc: Refactor highlight.php to be simpler and less more
secure
..
noc: Refactor highlight.php to be simpler and less more secure
This is a second take at what I started 8 months ago (before this
was in versio control) and followed-up on in I2d8a2a0ca8 but was
partially reverted in Idcec674abd due to bug 47112.
The main point of this refactor was to not mix logic with
symlinks and auto-guessting path destinations. Instead glob the
whitelist (the conf directory with symlinks) and only use that.
This was successfully implemented, but when I cleaned it up in
I2d8a2a0ca8 I made a stupid typo of a variable name: The foreach
loop variable $viewFilename of $viewFilenames conflicted with
the equally-named variable outside the loop that was supposed to
represent the sanitised version that is considered safe and in
the whitelist. As a result bug 47112.
I've now re-implemented this (without the typo, obviously) and
made it even stricter by using the whitelist exclusively for any
resolution. Not just to filter the user input, but also to
open the file (by reading the symlink).
This completely gets rid the logic that tries to find the file
in /home/wikipedia/common, which is why previously a simple typo
could cause bug 47112.
Also picked more descriptive variable names.
Change-Id: I56b455ebb8e3e083bb6390e03e350b69b902bc64
---
M docroot/noc/conf/highlight.php
1 file changed, 48 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/34/59034/1
diff --git a/docroot/noc/conf/highlight.php b/docroot/noc/conf/highlight.php
index 05553be..4c68601 100644
--- a/docroot/noc/conf/highlight.php
+++ b/docroot/noc/conf/highlight.php
@@ -1,19 +1,29 @@
https://bugzilla.wikimedia.org/19253
$hlHtml = str_replace( '', "\t", $hlHtml ); //
convert 4 spaces to 1 tab character; bug #36576
} else {
- $hlHtml = htmlspecialchars( file_get_contents( __DIR__
. '/' . $srcFilename ) );
+ $hlHtml = htmlspecialchars( file_get_contents(
$selectedFilePath ) );
}
- } else {
- $hlHtml = 'Failed to read file. :(';
}
$hlHtml = "$hlHtml";
}
-$titleSrcFilename = htmlspecialchars( $srcFilename );
-$urlSrcFilename = htmlspecialchars( urlencode( $srcDir . $srcFilename ) );
-$urlViewFilename = htmlspecialchars( urlencode( $viewFilename ) );
+$selectedFileNameEsc = htmlspecialchars( $selectedFileName );
+$selectedFileRepoPathEsc = htmlspecialchars( $selectedFileRepoPath );
+$selectedFileViewRawUrlEsc = htmlspecialchars( $selectedFileViewRawUrl );
?>
-
-
+- Wikimedia configuration
files
+
+
-«
+«
-(https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=history;f=;hb=HEAD">version control • https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=blame;f=;hb=HEAD">blame • raw text)
+(https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=history;f=;hb=HEAD">version control • https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=blame;f=;hb=HEAD">blame • raw text)
--
To view, visit https://gerrit.wikimedia.org/r/59034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56b455ebb8e3e083bb6390e03e350b69b902bc64
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide dropdown-menus when clicking outside of them - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59032
Change subject: Hide dropdown-menus when clicking outside of them
..
Hide dropdown-menus when clicking outside of them
Follow up to I605147a0fabdfdad4e497ecc762c750f7ccdfeec
Change-Id: I9341bc03f3c0dc8384e84f4ec684b1b6a923b314
---
M resources/js/ext.translate.special.translate.js
M resources/js/ext.translate.workflowselector.js
2 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/32/59032/1
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 0c0075a..e7f0aa0 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -211,6 +211,13 @@
var $translateContainer, $hideTranslatedButton,
$controlOwnButton, $messageList,
targetLanguage, docLanguageAutonym, docLanguageCode,
ulsOptions, filter, uri;
+ // Hide the workflow selector when clicking outside of it
+ $( 'html' ).on( 'click', function ( e ) {
+ if ( !e.isDefaultPrevented() ) {
+ $( '.dropdown-menu' ).addClass( 'hide' );
+ }
+ } );
+
$messageList = $( '.tux-messagelist' );
if ( $messageList.length ) {
uri = new mw.Uri( window.location.href );
diff --git a/resources/js/ext.translate.workflowselector.js
b/resources/js/ext.translate.workflowselector.js
index 064f258..317774b 100644
--- a/resources/js/ext.translate.workflowselector.js
+++ b/resources/js/ext.translate.workflowselector.js
@@ -11,15 +11,6 @@
function WorkflowSelector( container ) {
this.$container = $( container );
-
- // Hide the workflow selector when clicking outside of it
- $( 'html' ).on( 'click', function ( e ) {
- if ( !e.isDefaultPrevented() ) {
- $( container )
- .find( '.tux-workflow-status-selector' )
- .addClass( 'hide' );
- }
- } );
}
WorkflowSelector.prototype = {
--
To view, visit https://gerrit.wikimedia.org/r/59032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9341bc03f3c0dc8384e84f4ec684b1b6a923b314
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't strip language code from the title - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59031
Change subject: Don't strip language code from the title
..
Don't strip language code from the title
It works without stripping, too.
Follow up to I605147a0fabdfdad4e497ecc762c750f7ccdfeec
Change-Id: Ia259b3ccc7c82d97067c0f95702f863b7e44c3fe
---
M resources/js/ext.translate.editor.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/31/59031/1
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index c21f091..08a4bde 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -263,7 +263,7 @@
translationsUri.path = wgScript;
translationsUri.query = {
title: 'Special:Translations',
- message: this.message.title.replace(
/\/[a-z\-]+$/, '' )
+ message: this.message.title
};
return $( '' )
--
To view, visit https://gerrit.wikimedia.org/r/59031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia259b3ccc7c82d97067c0f95702f863b7e44c3fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expand legend on Special:DispatchStats - change (mediawiki...Wikibase)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59030
Change subject: Expand legend on Special:DispatchStats
..
Expand legend on Special:DispatchStats
I suppose it's more efficient than explaining this to Wikipedias one by one.
Should be clear enough without repeating too many translations and
without explaining each and every cell in the tables.
Change-Id: I70a469c50d6bfba490abf0419fec0caefa6e8cd1
---
M repo/Wikibase.i18n.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/30/59030/1
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 7836632..fe6b42a 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -170,7 +170,9 @@
'wikibase-setentity-invalid-langcode' => 'The language identifier "$1"
is unknown. Please use a language identifier known to the system, such as
"en".',
'wikibase-setentity-invalid-id' => 'The ID "$1" is unknown to the
system. Please use a valid entity ID.',
'special-dispatchstats' => 'Change dispatch statistics',
- 'wikibase-dispatchstats-intro' => 'This page provides statistics about
change dispatching to the clients.',
+ 'wikibase-dispatchstats-intro' => 'This page provides statistics about
change dispatching to the clients.
+* "{{int:wikibase-dispatchstats-changes}}" shows the number and the date for
the oldest and the most recent items currently in the queue.
+* "{{int:wikibase-dispatchstats-stats}}" hints how much time is needed to
process the queue: it shows three recently processed items and, for each of
them, how many other items there are in the queue after them
("{{int:wikibase-dispatchstats-lag-num}}") and how long they waited in the
queue ("{{int:wikibase-dispatchstats-lag-time}}"); it then calculates the
average time they waited.',
'wikibase-dispatchstats-no-stats' => 'There are currently no statistics
available.',
'wikibase-dispatchstats-changes' => 'Change log statistics',
'wikibase-dispatchstats-stats' => 'Dispatch statistics',
--
To view, visit https://gerrit.wikimedia.org/r/59030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70a469c50d6bfba490abf0419fec0caefa6e8cd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Have ce's ctrl+arrow functionality use UnicodeJS library - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Have ce's ctrl+arrow functionality use UnicodeJS library
..
Have ce's ctrl+arrow functionality use UnicodeJS library
Change 57076 implemented the functionality required to skip
words in UnicodeJS. This change simply removes all the existing
code we had and replaces it with this implementation.
Bug: 46794
Change-Id: I6b2700d65476c4d34ba4a01a88382d7af8e736fb
---
M modules/ve/ce/ve.ce.Document.js
M modules/ve/dm/ve.dm.SurfaceFragment.js
2 files changed, 2 insertions(+), 88 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.Document.js b/modules/ve/ce/ve.ce.Document.js
index 78ea471..120571a 100644
--- a/modules/ve/ce/ve.ce.Document.js
+++ b/modules/ve/ce/ve.ce.Document.js
@@ -55,31 +55,6 @@
};
/**
- * Configuration for getSiblingWordBoundary method.
- */
-ve.ce.Document.static.siblingWordBoundaryConfig = {
- 'default' : {
- 'left' : {
- 'boundary' : { 'text' : true, 'space' : true },
- 'space' : { 'text' : true, 'boundary' : true }
- },
- 'right' : {
- 'boundary' : { 'text' : true, 'space' : true },
- 'space' : { 'text' : true, 'boundary' : true }
- }
- },
- 'ie' : {
- 'left' : {
- 'space' : { 'text' : true, 'boundary' : true }
- },
- 'right' : {
- 'text' : { 'space' : true },
- 'boundary' : { 'space' : true }
- }
- }
-};
-
-/**
* Get the nearest word boundary.
* This method is in CE instead of DM because its behaviour depends on the
browser (IE/non-IE) and
* that information is closer to view layer. (CE)
@@ -90,43 +65,8 @@
* @returns {number} Nearest word boundary
*/
ve.ce.Document.prototype.getSiblingWordBoundary = function ( offset, direction
) {
- var config = ve.ce.Document.static.siblingWordBoundaryConfig,
- pattern = ve.dm.SurfaceFragment.static.wordBoundaryPattern,
- data = this.model.data,
- i = direction > 0 ? offset : offset - 1,
- inc = direction > 0 ? 1 : -1,
- oneChar, prevType, nextType;
-
- if ( data.getData( i ) === undefined || data.isElementData( i ) ) {
- return this.getRelativeOffset( offset, direction, 'character' );
- } else {
- config = $.browser.msie ? config.ie : config.default;
- config = direction > 0 ? config.right : config.left;
- do {
- if ( data.isElementData( i ) ) {
- break;
- } else {
- oneChar = data.getCharacterData( i );
- if ( oneChar === ' ' ) {
- nextType = 'space';
- } else if ( pattern.test( oneChar ) ) {
- nextType = 'boundary';
- } else {
- nextType = 'text';
- }
- if ( prevType && prevType !== nextType ) {
- if ( config[prevType] && nextType in
config[prevType] ) {
- prevType = nextType;
- continue;
- } else {
- break;
- }
- }
- prevType = nextType;
- }
- } while ( data.getCharacterData( i += inc ) );
- return i + ( inc > 0 ? 0 : 1 );
- }
+ var dataString = new ve.dm.DataString( this.model.getData() );
+ return unicodeJS.wordbreak.moveBreakOffset( direction, dataString,
offset, true );
};
/**
diff --git a/modules/ve/dm/ve.dm.SurfaceFragment.js
b/modules/ve/dm/ve.dm.SurfaceFragment.js
index 9dae8c5..b8ab47d 100644
--- a/modules/ve/dm/ve.dm.SurfaceFragment.js
+++ b/modules/ve/dm/ve.dm.SurfaceFragment.js
@@ -51,32 +51,6 @@
*/
ve.dm.SurfaceFragment.static = {};
-/**
- * Pattern that matches anything that's not considered part of a word.
- *
- * This is a very loose definition, it includes some punctuation that can
occur around or inside of
- * a word. This may need to be added to for some locales and perhaps made to
be extendable for
- * better internationalization support.
- *
- * Allowed characters:
- * * Unicode 'letters' and 'numbers' categories
- * * Underscores and dashes: _, -
- * * Brackets and parenthesis: (), []
- * * Apostrophes and doubl
[MediaWiki-commits] [Gerrit] JSHint: Re-order jshintrc options to split common from proje... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: JSHint: Re-order jshintrc options to split common from project
settings
..
JSHint: Re-order jshintrc options to split common from project settings
Per I43ace21208 and https://www.mediawiki.org/wiki/CC/JS#Linting
Change-Id: I280d377071ca1244130cd976aeba11d2152ef923
---
M .jshintrc
1 file changed, 22 insertions(+), 14 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index 8dd47db..2356693 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,36 +1,44 @@
{
- "predef": [
- "ve",
- "unicodeJS",
- "QUnit"
- ],
+ /* Common */
- "bitwise": true,
+ // Enforcing
"camelcase": true,
"curly": true,
"eqeqeq": true,
- "forin": false,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
- "plusplus": false,
"quotmark": "single",
- "regexp": true,
+ "trailing": true,
"undef": true,
"unused": true,
- "strict": false,
- "trailing": true,
+ // Legacy
+ "onevar": true,
+ /* Local */
+
+ // Enforcing
+ "bitwise": true,
+ "forin": false,
+ "plusplus": false,
+ "regexp": true,
+ "strict": false,
+ // Relaxing
"es5": true,
"multistr": true,
"smarttabs": true,
-
+ // Environment
"browser": true,
"jquery": true,
-
+ // Legacy
"nomen": true,
- "onevar": true
+
+ "predef": [
+ "ve",
+ "unicodeJS",
+ "QUnit"
+ ]
}
--
To view, visit https://gerrit.wikimedia.org/r/59027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I280d377071ca1244130cd976aeba11d2152ef923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Trevor Parscal
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 and fix message documentation - change (mediawiki...RevisionCommentSupplement)
Burthsceh has submitted this change and it was merged.
Change subject: update and fix message documentation
..
update and fix message documentation
Change-Id: Ief59c604788a5cad441e3b847e122fab6bb536e7
---
M RevisionCommentSupplement.i18n.php
1 file changed, 90 insertions(+), 84 deletions(-)
Approvals:
Burthsceh: Verified; Looks good to me, approved
diff --git a/RevisionCommentSupplement.i18n.php
b/RevisionCommentSupplement.i18n.php
index 5aa3913..94f9c8e 100644
--- a/RevisionCommentSupplement.i18n.php
+++ b/RevisionCommentSupplement.i18n.php
@@ -153,87 +153,97 @@
'log-description-revisioncommentsupplement' => 'The description of all
public logs of Extension:RevisonCommentSupplement in [[Special:Log]].',
'logentry-revisioncommentsupplement-create' => 'A line of log entry in
[[Special:Log]].
*$1 are links of user page and user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
*$5 is {{msg-mw|revcs-log-nosupplement}}.
*$6 is the raw new supplementary comment, {{msg-mw|revcs-log-supplement}} or
{{msg-mw|revcs-log-nosupplement}}.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}',
'logentry-revisioncommentsupplement-create2' => 'A line of log entry in
[[Special:Log]].
*$1 are links of user page and user tool page(s).
-*$2 is username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should remove {{GENDER:$2|male}}.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}',
'logentry-revisioncommentsupplement-delete' => "A line of log entry in
[[Special:Log]].
*$1 are links of the user page (or the user contributions page,
Special:Contributions when the user doesn't log in), and the user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
*$5 is the raw old supplementary comment, {{msg-mw|revcs-log-supplement}} or
{{msg-mw|revcs-log-nosupplement}}.
*$6 is {{msg-mw|revcs-log-nosupplement}}.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}",
'logentry-revisioncommentsupplement-delete2' => "A line of log entry in
[[Special:Log]].
*$1 are links of the user page (or the user contributions page,
Special:Contributions when the user doesn't log in), and the user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}",
'logentry-revisioncommentsupplement-hidehistory' => 'A line of log
entry in [[Special:Log]].
-* $1 - links of the user page and the user tool(s) page
-* $2 - the username. You can use
{{GENDER:$2|male|female|unknown}}
-* $3 - a link of Special:RevisionCommentSupplement/$4 (edit page)
-* $4 - the revision id of the supplementary comment of a history entry
-* $5 - the old hidden flag of a history entry
-* $6 - the new hidden flag of a history entry
-* $7 - the history entry id of a history entry
-* $8 - the number of the history entry id. This must be 1. This is reserved.
-* $9 - description of change hidden flag. This is any one of the following
messages:
-**{{msg-mw|revcs-log-hidehistory-supplement-hidden}}
-**{{msg-mw|revcs-log-hidehistory-supplement-unhidden}}
-**{{msg-mw|revdelete-uname-hid}}
-**{{msg-mw|revdelete-uname-unhid}}
-**{{msg-mw|revcs-log-hidehistory-reason-hidden}}
-**{{msg-mw|revcs-log-hidehistory-reason-unhidden}}
-**{{msg-mw|revcs-log-hidehistory-restricted}}
-**{{msg-mw|revcs-log-hidehistory-unrestricted}}
-**{{msg-mw|revcs-log-hidehistory-row-hidden}}
-**{{msg-mw|revcs-log-hidehistory-row-unhidden}}
+This is like {{mw-msg|logentry-delete-event}} and
{{mw-msg|logentry-delete-revision}}.
+*$1 - links of the user page and the user tool(s) page
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
+*$3 - a link of Special:RevisionCommentSupplement/$4 (edit page)
+*$4 - the revision id of the
[MediaWiki-commits] [Gerrit] update and fix message documentation - change (mediawiki...RevisionCommentSupplement)
Burthsceh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59029
Change subject: update and fix message documentation
..
update and fix message documentation
Change-Id: Ief59c604788a5cad441e3b847e122fab6bb536e7
---
M RevisionCommentSupplement.i18n.php
1 file changed, 90 insertions(+), 84 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionCommentSupplement
refs/changes/29/59029/1
diff --git a/RevisionCommentSupplement.i18n.php
b/RevisionCommentSupplement.i18n.php
index 5aa3913..94f9c8e 100644
--- a/RevisionCommentSupplement.i18n.php
+++ b/RevisionCommentSupplement.i18n.php
@@ -153,87 +153,97 @@
'log-description-revisioncommentsupplement' => 'The description of all
public logs of Extension:RevisonCommentSupplement in [[Special:Log]].',
'logentry-revisioncommentsupplement-create' => 'A line of log entry in
[[Special:Log]].
*$1 are links of user page and user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
*$5 is {{msg-mw|revcs-log-nosupplement}}.
*$6 is the raw new supplementary comment, {{msg-mw|revcs-log-supplement}} or
{{msg-mw|revcs-log-nosupplement}}.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}',
'logentry-revisioncommentsupplement-create2' => 'A line of log entry in
[[Special:Log]].
*$1 are links of user page and user tool page(s).
-*$2 is username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should remove {{GENDER:$2|male}}.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}',
'logentry-revisioncommentsupplement-delete' => "A line of log entry in
[[Special:Log]].
*$1 are links of the user page (or the user contributions page,
Special:Contributions when the user doesn't log in), and the user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
*$5 is the raw old supplementary comment, {{msg-mw|revcs-log-supplement}} or
{{msg-mw|revcs-log-nosupplement}}.
*$6 is {{msg-mw|revcs-log-nosupplement}}.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}",
'logentry-revisioncommentsupplement-delete2' => "A line of log entry in
[[Special:Log]].
*$1 are links of the user page (or the user contributions page,
Special:Contributions when the user doesn't log in), and the user tool page(s).
-*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}.
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
*$3 is a link of Special:RevisionCommentSupplement/$4. (edit page)
*$4 is the revision id.
+*$7 is the history entry id of a history entry.
{{Related|Logentry-revcs}}",
'logentry-revisioncommentsupplement-hidehistory' => 'A line of log
entry in [[Special:Log]].
-* $1 - links of the user page and the user tool(s) page
-* $2 - the username. You can use
{{GENDER:$2|male|female|unknown}}
-* $3 - a link of Special:RevisionCommentSupplement/$4 (edit page)
-* $4 - the revision id of the supplementary comment of a history entry
-* $5 - the old hidden flag of a history entry
-* $6 - the new hidden flag of a history entry
-* $7 - the history entry id of a history entry
-* $8 - the number of the history entry id. This must be 1. This is reserved.
-* $9 - description of change hidden flag. This is any one of the following
messages:
-**{{msg-mw|revcs-log-hidehistory-supplement-hidden}}
-**{{msg-mw|revcs-log-hidehistory-supplement-unhidden}}
-**{{msg-mw|revdelete-uname-hid}}
-**{{msg-mw|revdelete-uname-unhid}}
-**{{msg-mw|revcs-log-hidehistory-reason-hidden}}
-**{{msg-mw|revcs-log-hidehistory-reason-unhidden}}
-**{{msg-mw|revcs-log-hidehistory-restricted}}
-**{{msg-mw|revcs-log-hidehistory-unrestricted}}
-**{{msg-mw|revcs-log-hidehistory-row-hidden}}
-**{{msg-mw|revcs-log-hidehistory-row-unhidden}}
+This is like {{mw-msg|logentry-delete-event}} and
{{mw-msg|logentry-delete-revision}}.
+*$1 - links of the user page and the user tool(s) page
+*$2 is the username. You can use
{{GENDER:$2|male|female|unknown}}. If you want parser to parse
fast, you should replace {{GENDER:$2|male}} to male.
+*$3 - a
[MediaWiki-commits] [Gerrit] Rename Args class to MwCodeUtilsArgs - change (mediawiki...code-utils)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59028
Change subject: Rename Args class to MwCodeUtilsArgs
..
Rename Args class to MwCodeUtilsArgs
To avoid conflicts in lint.php, since parsekit includes parent
environment when parsing.
Change-Id: I71c248745c645ed36ce1d261ba5a90310776e58c
---
R includes/MwCodeUtilsArgs.php
M stylize.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/code-utils
refs/changes/28/59028/1
diff --git a/includes/Args.php b/includes/MwCodeUtilsArgs.php
similarity index 98%
rename from includes/Args.php
rename to includes/MwCodeUtilsArgs.php
index d47d630..fd2f7f2 100644
--- a/includes/Args.php
+++ b/includes/MwCodeUtilsArgs.php
@@ -24,7 +24,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE
*/
-class Args {
+class MwCodeUtilsArgs {
public $flags;
public $args;
diff --git a/stylize.php b/stylize.php
index acaf40a..15786ea 100755
--- a/stylize.php
+++ b/stylize.php
@@ -10,7 +10,7 @@
* @file
*/
-require_once( __DIR__ . '/includes/Args.php' );
+require_once( __DIR__ . '/includes/MwCodeUtilsArgs.php' );
if ( php_sapi_name() != 'cli' ) {
echo "This script must be run from the command line\n";
@@ -20,7 +20,7 @@
array_shift( $argv );
if ( count( $argv ) ) {
- $args = new Args( $argv );
+ $args = new MwCodeUtilsArgs( $argv );
if ( $args->flag( 'help' ) ) {
echo "Usage: php stylize.php
[--backup|--help|--ignore=]
--
To view, visit https://gerrit.wikimedia.org/r/59028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71c248745c645ed36ce1d261ba5a90310776e58c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
