[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: DocumentSynchronizer: Simplify pushRebuild() API
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334974 )
Change subject: DocumentSynchronizer: Simplify pushRebuild() API
..
DocumentSynchronizer: Simplify pushRebuild() API
Instead of asking for an old range and a new range, ask
for a range (the old range) and a length change. This is
equivalent because the new range can be computed from the
old range, the adjustment, and the length change, which is
exactly how TransactionProcessor computed this argument anyway.
Change-Id: Ibca625ccd05add8d77e535ed8e3d0b1fb6ab5d77
---
M src/dm/ve.dm.DocumentSynchronizer.js
M src/dm/ve.dm.TransactionProcessor.js
2 files changed, 18 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/74/334974/1
diff --git a/src/dm/ve.dm.DocumentSynchronizer.js
b/src/dm/ve.dm.DocumentSynchronizer.js
index 1336f12..a3660eb 100644
--- a/src/dm/ve.dm.DocumentSynchronizer.js
+++ b/src/dm/ve.dm.DocumentSynchronizer.js
@@ -139,9 +139,9 @@
*/
ve.dm.DocumentSynchronizer.synchronizers.rebuild = function ( action ) {
var firstNode, parent, index, numNodes,
- // Find the nodes contained by oldRange
- adjustedOldRange = action.oldRange.translate( this.adjustment ),
- selection = this.document.selectNodes( adjustedOldRange,
'siblings' );
+ // Find the nodes contained by the range
+ adjustedRange = action.range.translate( this.adjustment ),
+ selection = this.document.selectNodes( adjustedRange,
'siblings' );
// If the document is empty, selection[0].node will be the document (so
no parent)
// but we won't get indexInNode either. Detect this and use index=0 in
that case.
@@ -158,11 +158,11 @@
numNodes = selection.length;
}
// Perform rebuild in tree
- this.document.rebuildNodes( parent, index, numNodes,
adjustedOldRange.from,
- action.newRange.getLength()
+ this.document.rebuildNodes( parent, index, numNodes, adjustedRange.from,
+ adjustedRange.getLength() + action.lengthChange
);
// Update adjustment
- this.adjustment += action.newRange.getLength() -
adjustedOldRange.getLength();
+ this.adjustment += action.lengthChange;
};
/* Methods */
@@ -253,17 +253,21 @@
* Add a rebuild action to the queue.
*
* When a range of data has been changed arbitrarily this can be used to drop
the nodes that
- * represented the original range and replace them with new nodes that
represent the new range.
+ * represented that range and replace them with new nodes that represent the
new data.
+ *
+ * This can also be used to build nodes for newly inserted data by passing in
+ * a zero-length range at the start of the new data, and setting lengthChange
to the length
+ * of the new data.
*
* @method
- * @param {ve.Range} oldRange Range of old nodes to be dropped
- * @param {ve.Range} newRange Range for new nodes to be built from
+ * @param {ve.Range} range Range of old nodes to be dropped
+ * @param {number} lengthChange Difference between the length of the new data
and the old data
*/
-ve.dm.DocumentSynchronizer.prototype.pushRebuild = function ( oldRange,
newRange ) {
+ve.dm.DocumentSynchronizer.prototype.pushRebuild = function ( range,
lengthChange ) {
this.actionQueue.push( {
type: 'rebuild',
- oldRange: oldRange,
- newRange: newRange
+ range: range,
+ lengthChange: lengthChange
} );
};
diff --git a/src/dm/ve.dm.TransactionProcessor.js
b/src/dm/ve.dm.TransactionProcessor.js
index 99616f9..dc2561e 100644
--- a/src/dm/ve.dm.TransactionProcessor.js
+++ b/src/dm/ve.dm.TransactionProcessor.js
@@ -581,10 +581,7 @@
selection[ 0 ].nodeOuterRange.start,
selection[ selection.length - 1
].nodeOuterRange.end
);
- this.synchronizer.pushRebuild( range,
- new ve.Range( range.start + this.adjustment,
- range.end + this.adjustment +
insert.length - remove.length )
- );
+ this.synchronizer.pushRebuild( range, insert.length -
remove.length );
}
// Advance the cursor
@@ -717,10 +714,7 @@
coveringRange = ve.Range.static.newCoveringRange(
affectedRanges );
this.synchronizer.pushRebuild(
coveringRange,
- new ve.Range(
- coveringRange.start + this.adjustment -
opAdjustment,
- coveringRange.end + this.adjustment
- )
+ opAdjustment
);
}
};
--
T
[MediaWiki-commits] [Gerrit] mediawiki...Moodle[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334886 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Removed old message keys, which seems to be a copy from another
extension
Change-Id: Ibcf28a09a11f22adda01aba7d03882379000691c
---
M Moodle.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/Moodle.php b/Moodle.php
index 6c83ecd..24dcf4c 100644
--- a/Moodle.php
+++ b/Moodle.php
@@ -38,7 +38,7 @@
'name' => 'Moodle',
'author' => 'Clancer',
'url' => 'https://www.mediawiki.org/wiki/Extension:Moodle',
- 'description' => 'Moodle integration',
+ 'descriptionmsg' => 'moodle-desc',
'version' => '0.2.0',
);
diff --git a/i18n/en.json b/i18n/en.json
index 5c3297f..f06d3a9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,5 @@
"@metadata": {
"authors": []
},
- "uploadwizard-desc": "Upload Wizard, a user-friendly tool for uploading
multimedia"
+ "moodle-desc": "Moodle integration"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f860def..b848177 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,5 +2,5 @@
"@metadata": {
"authors": []
},
-"uploadwizard-desc": "Description of extension. It refers to
[//blog.wikimedia.org/blog/2009/07/02/ford-foundation-awards-300k-grant-for-wikimedia-commons/
this event], i.e. the development was paid with this $300,000 grant."
+"moodle-desc":
"{{desc|name=Moodle|url=https://www.mediawiki.org/wiki/Extension:Moodle}}";
}
--
To view, visit https://gerrit.wikimedia.org/r/334886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcf28a09a11f22adda01aba7d03882379000691c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Moodle
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...PurgeClickThrough[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334892 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I92a028d6e1f03e20db69e3d7eed79598f7510c4d
---
M .gitignore
A Gruntfile.js
M PurgeClickThrough.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 46 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/PurgeClickThrough.php b/PurgeClickThrough.php
index 15210d0..4b9899b 100644
--- a/PurgeClickThrough.php
+++ b/PurgeClickThrough.php
@@ -14,11 +14,12 @@
'name' => 'PurgeClickThrough',
'version' => '0.1',
'author' => 'Brian Wolff',
- // Not for real users, so no point i18n-ing it.
- 'description' => 'Do not redirect ?action=purge pages, but instead have
a click through (for debugging purposes)',
+ 'descriptionmsg' => 'purgeclickthrough-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:PurgeClickThrough',
);
+$wgMessagesDirs['PurgeClickThrough'] = __DIR__ . '/i18n';
+
$wgActions['purge'] = 'PurgeClickThrough';
class PurgeClickThrough extends PurgeAction {
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..ad10921
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "purgeclickthrough-desc": "Do not redirect ?action=purge pages, but
instead have a click through (for debugging purposes)"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..4a24168
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "purgeclickthrough-desc":
"{{desc|name=PurgeClickThrough|url=https://www.mediawiki.org/wiki/Extension:PurgeClickThrough}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92a028d6e1f03e20db69e3d7eed79598f7510c4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PurgeClickThrough
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1073
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334973 ) Change subject: db-eqiad.php: Depool db1073 .. db-eqiad.php: Depool db1073 db1073 is going to be used to reclone db1072 Bug: T156226 Change-Id: I80223e60c6dc11784b3a628b50acaf273ddb7299 --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 57c27db..c0afe01 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,8 +100,8 @@ 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 50, # D1 2.8TB 160GB, api # 'db1072' => 0, # B2 2.8TB 160GB #maintenance T156166 - 'db1073' => 50, # D1 2.8TB 160GB, api - 'db1080' => 500, # A2 3.6TB 512GB +# 'db1073' => 50, # D1 2.8TB 160GB, api #T156226 going to reclone db1072 from this host + 'db1080' => 100, # A2 3.6TB 512GB, api #T156226 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], @@ -265,7 +265,7 @@ ], 'api' => [ 'db1066' => 1, - 'db1073' => 1, + 'db1080' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/334973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80223e60c6dc11784b3a628b50acaf273ddb7299 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NSFileRepo[REL1_27]: NSFileRepo: deliver images without a file repository e.g. Ma...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333170 )
Change subject: NSFileRepo: deliver images without a file repository e.g. Math
extension
..
NSFileRepo: deliver images without a file repository e.g. Math extension
Fixed issue from ERM5234
Needs merge to master
Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
---
A Gruntfile.js
M nsfr_img_auth.php
A package.json
3 files changed, 39 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ded4ed2
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,22 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ nsfilerepo: 'i18n/nsfilerepo',
+ imgauth: 'i18n/imgauth'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/nsfr_img_auth.php b/nsfr_img_auth.php
index 3ee839e..de9725c 100644
--- a/nsfr_img_auth.php
+++ b/nsfr_img_auth.php
@@ -154,8 +154,12 @@
if ( !$file->exists() || $file->isDeleted( File::DELETED_FILE )
) {
$file = wfFindFile( $name ); //Give other repos a
chance to handle this
if( !$file || !$file->exists() || $file->isDeleted(
File::DELETED_FILE ) ) {
- wfForbidden( 'img-auth-accessdenied',
'img-auth-nofile', $filename );
- return;
+
+ global $wgUploadDirectory;
+ if( !file_exists( $wgUploadDirectory.$path ) ) {
+ wfForbidden( 'img-auth-accessdenied',
'img-auth-nofile', $filename );
+ return;
+ }
}
}
}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/333170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1073
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334973 ) Change subject: db-eqiad.php: Depool db1073 .. db-eqiad.php: Depool db1073 db1073 is going to be used to reclone db1072 Bug: T156226 Change-Id: I80223e60c6dc11784b3a628b50acaf273ddb7299 --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/73/334973/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 57c27db..c0afe01 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,8 +100,8 @@ 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 50, # D1 2.8TB 160GB, api # 'db1072' => 0, # B2 2.8TB 160GB #maintenance T156166 - 'db1073' => 50, # D1 2.8TB 160GB, api - 'db1080' => 500, # A2 3.6TB 512GB +# 'db1073' => 50, # D1 2.8TB 160GB, api #T156226 going to reclone db1072 from this host + 'db1080' => 100, # A2 3.6TB 512GB, api #T156226 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], @@ -265,7 +265,7 @@ ], 'api' => [ 'db1066' => 1, - 'db1073' => 1, + 'db1080' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/334973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80223e60c6dc11784b3a628b50acaf273ddb7299 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SearchStats[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334894 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I58be3d783ce8907aaec64a18a58ad56a2f7f5c80
---
A .gitignore
A Gruntfile.js
M SearchStats.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/SearchStats.php b/SearchStats.php
index a91a2c3..0f8be6a 100644
--- a/SearchStats.php
+++ b/SearchStats.php
@@ -27,11 +27,13 @@
),
'version' => '0.1.0',
'url' => 'https://www.mediawiki.org/wiki/Extension:SearchStats',
- 'description' => 'Tracks internal searches to allow identifing
commonally seeked pages on the wiki.',
+ 'descriptionmsg' => 'searchstats-desc',
);
/* Setup */
+$wgMessagesDirs['SearchStats'] = __DIR__ . '/i18n';
+
// Autoload classes
$wgAutoloadClasses['SpecialSearchStats'] = __DIR__ .
'/SpecialSearchStats.php'; # Location of the SpecialSearchStats class (Tell
MediaWiki to load this file)
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..761b837
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "searchstats-desc": "Tracks internal searches to allow identifing
commonally seeked pages on the wiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..a797601
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "searchstats-desc": "{{desc|name=Search
Stats|url=https://www.mediawiki.org/wiki/Extension:SearchStats}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58be3d783ce8907aaec64a18a58ad56a2f7f5c80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SearchStats
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334773 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: I22b5bf347f2f985ef591adbbf8afd50e9f4fff09
---
M i18n/en.json
A i18n/qqq.json
M skin.json
3 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index adddf8e..c8eeddf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,7 @@
"@metadata": {
"authors": []
},
+ "truglass-desc": "A sleek, stylish, simplified skin",
"truglass-footertext": "",
"truglass-links": "{{SITENAME}} Links",
"truglass-welcome": "Welcome to {{SITENAME}}! Contribute something by
using the edit button above!"
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..39b2994
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "truglass-desc":
"{{desc|name=Truglass|url=https://www.mediawiki.org/wiki/Skin:Truglass}}";
+}
diff --git a/skin.json b/skin.json
index f1d68fa..3cc30ce 100644
--- a/skin.json
+++ b/skin.json
@@ -6,7 +6,7 @@
"Jack Phoenix"
],
"url": "https://www.mediawiki.org/wiki/Skin:Truglass";,
- "description": "A sleek, stylish, simplified skin",
+ "descriptionmsg": "truglass-desc",
"license-name": "GPL-2.0+",
"type": "skin",
"ConfigRegistry": {
--
To view, visit https://gerrit.wikimedia.org/r/334773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22b5bf347f2f985ef591adbbf8afd50e9f4fff09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: SamanthaNguyen
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] mediawiki...NumberOfWikis[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334712 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I6d13a435ec0282944b470c39632c8cf75d077b57
---
M .gitignore
A Gruntfile.js
M extension.json
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 48 insertions(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..bc7fca9
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ var conf = grunt.file.readJSON( 'extension.json' );
+ grunt.initConfig( {
+ banana: conf.MessagesDirs,
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/extension.json b/extension.json
index c54e75d..0daece1 100644
--- a/extension.json
+++ b/extension.json
@@ -5,8 +5,13 @@
"Jack Phoenix"
],
"url": "https://www.mediawiki.org/wiki/Extension:NumberOfWikis";,
- "description": "Adds {{NUMBEROFWIKIS}} magic word to
show the number of wikis on ShoutWiki",
+ "descriptionmsg": "numberofwikis-desc",
"type": "variable",
+ "MessagesDirs": {
+ "NumberOfWikis": [
+ "i18n"
+ ]
+ },
"ExtensionMessagesFiles": {
"NumberOfWikisMagic": "NumberOfWikis.i18n.magic.php"
},
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..6101df6
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "numberofwikis-desc": "Adds {{NUMBEROFWIKIS}} magic
word to show the number of wikis on ShoutWiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..72610af
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "numberofwikis-desc":
"{{desc|name=NumberOfWikis|url=https://www.mediawiki.org/wiki/Extension:NumberOfWikis}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d13a435ec0282944b470c39632c8cf75d077b57
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/NumberOfWikis
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PrivateDomains[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334702 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: I595f5abb8d33133d7d49808f91a1ca5b4d01098e
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 7765730..21471be 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:PrivateDomains";,
- "description": "Allows to restrict editing to users with a certain
e-mail address",
+ "descriptionmsg": "privatedomains-desc",
"type": "specialpage",
"SpecialPages": {
"PrivateDomains": "PrivateDomains"
diff --git a/i18n/en.json b/i18n/en.json
index 106d24b..1ce6af7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,7 @@
"Inez Korczyński "
]
},
+ "privatedomains-desc": "Allows to restrict editing to users with a
certain e-mail address",
"privatedomains-nomanageaccess": "You do not have enough rights to
manage the allowed private domains for this wiki.\nOnly wiki bureaucrats and
staff members have access.\n\nIf you are not logged in, you probably
[[Special:UserLogin|should]].",
"privatedomains": "Manage private domains",
"privatedomains-ifemailcontact": "Otherwise, please contact
[[Special:EmailUser/$1|$1]] if you have any questions.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1c6ed11..7b903ec 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,6 +6,7 @@
"Umherirrender"
]
},
+ "privatedomains-desc":
"{{desc|name=PrivateDomains|url=https://www.mediawiki.org/wiki/Extension:PrivateDomains}}";,
"privatedomains-nomanageaccess": "Unused at this time.",
"privatedomains": "{{doc-special|PrivateDomains}}",
"privatedomains-ifemailcontact": "Parameters:\n* $1 - username to be
contacted by email; supports GENDER\nSee also:\n*
{{msg-mw|privatedomains-emailadminlabel}} - label for \"email domain\" input
box",
--
To view, visit https://gerrit.wikimedia.org/r/334702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I595f5abb8d33133d7d49808f91a1ca5b4d01098e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PrivateDomains
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...BlueSpiceFoundation[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334707 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: I0d33504a3a24e9f42168b002998d3bb97eb9a6af
---
M extension.json
M i18n/core/en.json
M i18n/core/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/extension.json b/extension.json
index a02ada8..964283d 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
"[http://www.hallowelt.com Hallo Welt! GmbH]"
],
"url": "http://bluespice.com";,
- "description": "Makes MediaWiki enterprise ready.",
+ "descriptionmsg": "bluespicefoundation-desc",
"type": "other",
"ExtensionFunctions": [
"BsCoreHooks::setup"
diff --git a/i18n/core/en.json b/i18n/core/en.json
index b9c2bb5..68e1f2b 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -4,6 +4,7 @@
"Stephan Muggli "
]
},
+ "bluespicefoundation-desc": "Makes MediaWiki enterprise ready",
"bs-ns_main": "(Pages)",
"bs-ns_all": "(all)",
"bs-tab_navigation": "Navigation",
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index a11c380..e240f1e 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -9,6 +9,7 @@
"Umherirrender"
]
},
+ "bluespicefoundation-desc":
"{{desc|name=BlueSpiceFoundation|url=https://www.mediawiki.org/wiki/BlueSpice}}";,
"bs-ns_main": "Label used in namespace dropdown lists for
NS_MAIN.\n\nUsed in:\n* {{msg-mw|Bs-namespacemanager-willmove}}\n*
{{msg-mw|Bs-namespacemanager-willmovesuffix}}\n{{Identical|Page}}",
"bs-ns_all": "Label used in namespace dropdown lists for all
namespaces.\n{{Identical|All}}",
"bs-tab_navigation": "Label for \"nagivation\" tab in left
sidebar\n{{Identical|Navigation}}",
--
To view, visit https://gerrit.wikimedia.org/r/334707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d33504a3a24e9f42168b002998d3bb97eb9a6af
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Robert Vogel
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] mediawiki...StaffPowers[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334782 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: I0375b2868ae721c9e793453ccf98d09b64aa22ea
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 4845ecf..43a17f8 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:StaffPowers";,
- "description": "Applies staff powers, like unblockableness, superhuman
strength and general awesomeness to [[Special:ListUsers/staff|select users]]",
+ "descriptionmsg": "staffpowers-desc",
"type": "other",
"MessagesDirs": {
"StaffPowers": [
diff --git a/i18n/en.json b/i18n/en.json
index edf5c55..1bc6fc1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,7 @@
"Łukasz Garczewski (TOR) "
]
},
+ "staffpowers-desc": "Applies staff powers, like unblockableness,
superhuman strength and general awesomeness to [[Special:ListUsers/staff|select
users]]",
"staffpowers-ipblock-abort": "Blocking ShoutWiki staff is not possible.
Please use the [[Special:Contact|contact form]] to report any issues or
problems with our staff.",
"staffpowers-steward-block-abort": "Blocking stewards is not possible.
Please use the [[Special:Contact|contact form]] to report any issues or
problems with the wiki's stewards.",
"right-unblockable": "Cannot be blocked"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5780289..f70d17a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,6 +4,7 @@
"Lloffiwr"
]
},
+ "staffpowers-desc":
"{{desc|name=StaffPowers|url=https://www.mediawiki.org/wiki/Extension:StaffPowers}}";,
"staffpowers-ipblock-abort": "Do not translate (but do add additional
text if you like) [[Special:Contact'''|optional additional
text''']].",
"staffpowers-steward-block-abort": "Error message shown when blocking a
steward.",
"right-unblockable": "{{doc-right|unblockable}}"
--
To view, visit https://gerrit.wikimedia.org/r/334782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0375b2868ae721c9e793453ccf98d09b64aa22ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/StaffPowers
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...BlueSpiceExtensions[REL1_27]: BSReview: Added "delegated to" user to assessors #2833
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334972 )
Change subject: BSReview: Added "delegated to" user to assessors #2833
..
BSReview: Added "delegated to" user to assessors #2833
=> Needs cherry-pick to REL1_27
* Displayed the user, the review step was delegated to in review overview
* Appended the ridiculous getData() query
* Fixed the know bug: "Review Overviews displays empty brackets"
Change-Id: I196c08f636a1f6768785342f369df6141307ae1b
---
M Review/Review.class.php
M Review/includes/api/BSApiReviewOverviewStore.php
M Review/resources/BS.Review/OverviewPanel.js
3 files changed, 51 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 8b493e2..17d3cef 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -453,7 +453,7 @@
$tbl_page = $dbr->tableName( 'page' );
$tbl_user = $dbr->tableName( 'user' );
- $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, ';
+ $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, rs.revs_delegate_to AS revs_delegate_to,
';
switch ( $wgDBtype ) {
case 'postgres' : {
$sql .= "EXTRACT(EPOCH FROM
TO_TIMESTAMP(r.rev_enddate, 'MMDDHH24MISS')) AS endtimestamp,
TO_CHAR(TO_DATE(r.rev_startdate, 'MMDDHH24MISS'), 'DD.MM.') AS
startdate, ";
@@ -480,10 +480,10 @@
// if( intval($_GET['user']) )
if ( $iUserId ) { // <== getParam returns default
(false) if INT is expected and param is not numeric
//$sql.= 'AND (r.owner="'. $_GET['user'] .'" OR
"'. $_GET['user'] .'" IN (SELECT hrs.user_id FROM hw_review_steps AS hrs WHERE
hrs.review_id=r.id)) ';
- $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $iUserId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $iUserId . ' OR
hrs.revs_delegate_to = ' . $iUserId . '))) ';
}
} else {
- $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $wgUser->mId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $wgUser->mId . ' OR
hrs.revs_delegate_to = ' . $wgUser->mId . '))) ';
}
$sql .= 'ORDER BY r.rev_startdate DESC, rs.revs_sort_id';
@@ -515,17 +515,35 @@
$arrList[ $row[ 'rev_id' ] ][ 'total' ]
= isset( $arrList[ $row[ 'rev_id' ] ][ 'total' ] ) ? $arrList[ $row[ 'rev_id' ]
][ 'total' ] + 1 : 1;
break;
}
+ $row[ 'revs_delegate_to_real_name' ]
+ = $row[ 'revs_delegate_to_name' ]
+ = '';
+ if( !empty( $row[ 'revs_delegate_to' ] ) ) {
+ $oDelegateUser = User::newFromId(
+ (int)$row[ 'revs_delegate_to' ]
+ );
+ if( !$oDelegateUser->isAnon() ) {
+ $row[ 'revs_delegate_to_name' ] =
$oDelegateUser->getName();
+ $row[ 'revs_delegate_to_real_name' ]
+ = empty(
$oDelegateUser->getRealName() )
+ ? $oDelegateUser->getName()
+ : $oDelegateUser->getRealName()
+ ;
+ }
+ }
$arrList[ $row[ 'rev_id' ] ][ 'assessors' ][] = array(
'name' => $row[ 'user_name' ],
'real_name' => $row[ 'user_real_name' ],
'revs_status' => $row[ '
[MediaWiki-commits] [Gerrit] operations...linux44[master]: Record CVE ID fixed in earlier 4.4.x kernel
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334666 ) Change subject: Record CVE ID fixed in earlier 4.4.x kernel .. Record CVE ID fixed in earlier 4.4.x kernel Change-Id: If294cfa685e61483201d3d1a3a0f3844e7fc7001 --- M debian/changelog 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 0293a87..d27a1f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ - CVE-2017-2584 [129a72a0d3c8e139a04512325384fe5ac119e74d] - CVE-2017-2583 [33ab91103b3415e12457e3104f0e4517ce12d0f3] - CVE-2017-5549 [146cc8a17a3b4996f6805ee5c080e7101277c410] +- CVE-2016-9191 [93362fa47fe98b62e4a34ab408c4a418432e7939] * Update to 4.4.45: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.45 - CVE-2017-5551 [497de07d89c1410d76a15bec2bb41f24a2a89f31] -- To view, visit https://gerrit.wikimedia.org/r/334666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If294cfa685e61483201d3d1a3a0f3844e7fc7001 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/linux44 Gerrit-Branch: master Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSReview: Added "delegated to" user to assessors #2833
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334321 )
Change subject: BSReview: Added "delegated to" user to assessors #2833
..
BSReview: Added "delegated to" user to assessors #2833
=> Needs cherry-pick to REL1_27
* Displayed the user, the review step was delegated to in review overview
* Appended the ridiculous getData() query
* Fixed the know bug: "Review Overviews displays empty brackets"
Change-Id: I196c08f636a1f6768785342f369df6141307ae1b
---
M Review/Review.class.php
M Review/includes/api/BSApiReviewOverviewStore.php
M Review/resources/BS.Review/OverviewPanel.js
3 files changed, 51 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 8b493e2..17d3cef 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -453,7 +453,7 @@
$tbl_page = $dbr->tableName( 'page' );
$tbl_user = $dbr->tableName( 'user' );
- $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, ';
+ $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, rs.revs_delegate_to AS revs_delegate_to,
';
switch ( $wgDBtype ) {
case 'postgres' : {
$sql .= "EXTRACT(EPOCH FROM
TO_TIMESTAMP(r.rev_enddate, 'MMDDHH24MISS')) AS endtimestamp,
TO_CHAR(TO_DATE(r.rev_startdate, 'MMDDHH24MISS'), 'DD.MM.') AS
startdate, ";
@@ -480,10 +480,10 @@
// if( intval($_GET['user']) )
if ( $iUserId ) { // <== getParam returns default
(false) if INT is expected and param is not numeric
//$sql.= 'AND (r.owner="'. $_GET['user'] .'" OR
"'. $_GET['user'] .'" IN (SELECT hrs.user_id FROM hw_review_steps AS hrs WHERE
hrs.review_id=r.id)) ';
- $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $iUserId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $iUserId . ' OR
hrs.revs_delegate_to = ' . $iUserId . '))) ';
}
} else {
- $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $wgUser->mId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $wgUser->mId . ' OR
hrs.revs_delegate_to = ' . $wgUser->mId . '))) ';
}
$sql .= 'ORDER BY r.rev_startdate DESC, rs.revs_sort_id';
@@ -515,17 +515,35 @@
$arrList[ $row[ 'rev_id' ] ][ 'total' ]
= isset( $arrList[ $row[ 'rev_id' ] ][ 'total' ] ) ? $arrList[ $row[ 'rev_id' ]
][ 'total' ] + 1 : 1;
break;
}
+ $row[ 'revs_delegate_to_real_name' ]
+ = $row[ 'revs_delegate_to_name' ]
+ = '';
+ if( !empty( $row[ 'revs_delegate_to' ] ) ) {
+ $oDelegateUser = User::newFromId(
+ (int)$row[ 'revs_delegate_to' ]
+ );
+ if( !$oDelegateUser->isAnon() ) {
+ $row[ 'revs_delegate_to_name' ] =
$oDelegateUser->getName();
+ $row[ 'revs_delegate_to_real_name' ]
+ = empty(
$oDelegateUser->getRealName() )
+ ? $oDelegateUser->getName()
+ : $oDelegateUser->getRealName()
+ ;
+ }
+ }
$arrList[ $row[ 'rev_id' ] ][ 'assessors' ][] = array(
'name' => $row[ 'user_name' ],
'real_name' => $row[ 'user_real_name' ],
'revs_status' => $row[ '
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: BsBaseTemplate - getNavigationSidebar(): list items given in
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334971 )
Change subject: BsBaseTemplate - getNavigationSidebar(): list items given in
..
BsBaseTemplate - getNavigationSidebar(): list items given in
MediaWiki:Sidebar like "link|title|image" require title to be a message key.
This patch performs a check, wether title is a message key or not.
If not it is using the given string for output.
Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
---
M includes/skins/BsBaseTemplate.php
1 file changed, 18 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/BsBaseTemplate.php
b/includes/skins/BsBaseTemplate.php
index 82c7ce2..cb10384 100644
--- a/includes/skins/BsBaseTemplate.php
+++ b/includes/skins/BsBaseTemplate.php
@@ -405,17 +405,14 @@
$aOut[] = '';
- $sTitle =
htmlspecialchars($val['text']);
- $sText =
htmlspecialchars($val['text']);
+ $sTitle = $val['text'];
+ $sText = $val['text'];
$sHref =
htmlspecialchars($val['href']);
$sIcon = '';
if ( !empty( $aVal ) ) {
$oFile = wfFindFile(
$aVal[1] );
- if ( strpos( $lang =
$this->translator->translate( $aVal[0] ), "<" ) === false ) {
- $aVal[0] =
$lang;
- }
- $sTitle =
htmlspecialchars($aVal[0]);
- $sText =
htmlspecialchars($aVal[0]);
+ $sTitle = $aVal[0];
+ $sText = $aVal[0];
if ( is_object( $oFile
) && $oFile->exists() ) {
if (
BsExtensionManager::isContextActive( 'MW::SecureFileStore::Active' ) ) {
@@ -426,6 +423,20 @@
$sIcon = '';
}
}
+
+ $oTitleMsg = wfMessage( $sTitle
);
+ if( $oTitleMsg->exists() ) {
+ $sTitle =
$oTitleMsg->plain();
+ }
+
+ $oTextMsg = wfMessage( $sText );
+ if( $oTextMsg->exists() ) {
+ $sText =
$oTextMsg->plain();
+ }
+
+ $sTitle = htmlspecialchars(
$sTitle );
+ $sText = htmlspecialchars(
$sText );
+
$aOut[] = '';
$aOut[] = $sIcon;
$aOut[] = '' . $sText . '';
--
To view, visit https://gerrit.wikimedia.org/r/334971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSReview: Added "delegated to" user to assessors #2833
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334972 )
Change subject: BSReview: Added "delegated to" user to assessors #2833
..
BSReview: Added "delegated to" user to assessors #2833
=> Needs cherry-pick to REL1_27
* Displayed the user, the review step was delegated to in review overview
* Appended the ridiculous getData() query
* Fixed the know bug: "Review Overviews displays empty brackets"
Change-Id: I196c08f636a1f6768785342f369df6141307ae1b
---
M Review/Review.class.php
M Review/includes/api/BSApiReviewOverviewStore.php
M Review/resources/BS.Review/OverviewPanel.js
3 files changed, 51 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/72/334972/1
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 8b493e2..17d3cef 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -453,7 +453,7 @@
$tbl_page = $dbr->tableName( 'page' );
$tbl_user = $dbr->tableName( 'user' );
- $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, ';
+ $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title,
p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable,
r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name,
u2.user_real_name AS owner_real_name, rs.revs_delegate_to AS revs_delegate_to,
';
switch ( $wgDBtype ) {
case 'postgres' : {
$sql .= "EXTRACT(EPOCH FROM
TO_TIMESTAMP(r.rev_enddate, 'MMDDHH24MISS')) AS endtimestamp,
TO_CHAR(TO_DATE(r.rev_startdate, 'MMDDHH24MISS'), 'DD.MM.') AS
startdate, ";
@@ -480,10 +480,10 @@
// if( intval($_GET['user']) )
if ( $iUserId ) { // <== getParam returns default
(false) if INT is expected and param is not numeric
//$sql.= 'AND (r.owner="'. $_GET['user'] .'" OR
"'. $_GET['user'] .'" IN (SELECT hrs.user_id FROM hw_review_steps AS hrs WHERE
hrs.review_id=r.id)) ';
- $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $iUserId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $iUserId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $iUserId . ' OR
hrs.revs_delegate_to = ' . $iUserId . '))) ';
}
} else {
- $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND hrs.revs_user_id = ' . $wgUser->mId . ')) ';
+ $sql .= 'AND (r.rev_owner=' . $wgUser->mId . ' OR
EXISTS (SELECT 1 FROM ' . $tbl_step . ' AS hrs WHERE
hrs.revs_review_id=r.rev_id AND (hrs.revs_user_id = ' . $wgUser->mId . ' OR
hrs.revs_delegate_to = ' . $wgUser->mId . '))) ';
}
$sql .= 'ORDER BY r.rev_startdate DESC, rs.revs_sort_id';
@@ -515,17 +515,35 @@
$arrList[ $row[ 'rev_id' ] ][ 'total' ]
= isset( $arrList[ $row[ 'rev_id' ] ][ 'total' ] ) ? $arrList[ $row[ 'rev_id' ]
][ 'total' ] + 1 : 1;
break;
}
+ $row[ 'revs_delegate_to_real_name' ]
+ = $row[ 'revs_delegate_to_name' ]
+ = '';
+ if( !empty( $row[ 'revs_delegate_to' ] ) ) {
+ $oDelegateUser = User::newFromId(
+ (int)$row[ 'revs_delegate_to' ]
+ );
+ if( !$oDelegateUser->isAnon() ) {
+ $row[ 'revs_delegate_to_name' ] =
$oDelegateUser->getName();
+ $row[ 'revs_delegate_to_real_name' ]
+ = empty(
$oDelegateUser->getRealName() )
+ ? $oDelegateUser->getName()
+ : $oDelegateUser->getRealName()
+ ;
+ }
+ }
$arrList[ $row[ 'rev_id' ] ][ 'assessors' ][] = array(
'name' => $row[ 'user_name' ],
'real_name' => $row[ 'user_real_name' ],
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BsBaseTemplate - getNavigationSidebar(): list items given in
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334513 )
Change subject: BsBaseTemplate - getNavigationSidebar(): list items given in
..
BsBaseTemplate - getNavigationSidebar(): list items given in
MediaWiki:Sidebar like "link|title|image" require title to be a message key.
This patch performs a check, wether title is a message key or not.
If not it is using the given string for output.
Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
---
M includes/skins/BsBaseTemplate.php
1 file changed, 18 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/BsBaseTemplate.php
b/includes/skins/BsBaseTemplate.php
index 82c7ce2..cb10384 100644
--- a/includes/skins/BsBaseTemplate.php
+++ b/includes/skins/BsBaseTemplate.php
@@ -405,17 +405,14 @@
$aOut[] = '';
- $sTitle =
htmlspecialchars($val['text']);
- $sText =
htmlspecialchars($val['text']);
+ $sTitle = $val['text'];
+ $sText = $val['text'];
$sHref =
htmlspecialchars($val['href']);
$sIcon = '';
if ( !empty( $aVal ) ) {
$oFile = wfFindFile(
$aVal[1] );
- if ( strpos( $lang =
$this->translator->translate( $aVal[0] ), "<" ) === false ) {
- $aVal[0] =
$lang;
- }
- $sTitle =
htmlspecialchars($aVal[0]);
- $sText =
htmlspecialchars($aVal[0]);
+ $sTitle = $aVal[0];
+ $sText = $aVal[0];
if ( is_object( $oFile
) && $oFile->exists() ) {
if (
BsExtensionManager::isContextActive( 'MW::SecureFileStore::Active' ) ) {
@@ -426,6 +423,20 @@
$sIcon = '';
}
}
+
+ $oTitleMsg = wfMessage( $sTitle
);
+ if( $oTitleMsg->exists() ) {
+ $sTitle =
$oTitleMsg->plain();
+ }
+
+ $oTextMsg = wfMessage( $sText );
+ if( $oTextMsg->exists() ) {
+ $sText =
$oTextMsg->plain();
+ }
+
+ $sTitle = htmlspecialchars(
$sTitle );
+ $sText = htmlspecialchars(
$sText );
+
$aOut[] = '';
$aOut[] = $sIcon;
$aOut[] = '' . $sText . '';
--
To view, visit https://gerrit.wikimedia.org/r/334513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: BsBaseTemplate - getNavigationSidebar(): list items given in
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334971 )
Change subject: BsBaseTemplate - getNavigationSidebar(): list items given in
..
BsBaseTemplate - getNavigationSidebar(): list items given in
MediaWiki:Sidebar like "link|title|image" require title to be a message key.
This patch performs a check, wether title is a message key or not.
If not it is using the given string for output.
Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
---
M includes/skins/BsBaseTemplate.php
1 file changed, 18 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/71/334971/1
diff --git a/includes/skins/BsBaseTemplate.php
b/includes/skins/BsBaseTemplate.php
index 82c7ce2..cb10384 100644
--- a/includes/skins/BsBaseTemplate.php
+++ b/includes/skins/BsBaseTemplate.php
@@ -405,17 +405,14 @@
$aOut[] = '';
- $sTitle =
htmlspecialchars($val['text']);
- $sText =
htmlspecialchars($val['text']);
+ $sTitle = $val['text'];
+ $sText = $val['text'];
$sHref =
htmlspecialchars($val['href']);
$sIcon = '';
if ( !empty( $aVal ) ) {
$oFile = wfFindFile(
$aVal[1] );
- if ( strpos( $lang =
$this->translator->translate( $aVal[0] ), "<" ) === false ) {
- $aVal[0] =
$lang;
- }
- $sTitle =
htmlspecialchars($aVal[0]);
- $sText =
htmlspecialchars($aVal[0]);
+ $sTitle = $aVal[0];
+ $sText = $aVal[0];
if ( is_object( $oFile
) && $oFile->exists() ) {
if (
BsExtensionManager::isContextActive( 'MW::SecureFileStore::Active' ) ) {
@@ -426,6 +423,20 @@
$sIcon = '';
}
}
+
+ $oTitleMsg = wfMessage( $sTitle
);
+ if( $oTitleMsg->exists() ) {
+ $sTitle =
$oTitleMsg->plain();
+ }
+
+ $oTextMsg = wfMessage( $sText );
+ if( $oTextMsg->exists() ) {
+ $sText =
$oTextMsg->plain();
+ }
+
+ $sTitle = htmlspecialchars(
$sTitle );
+ $sText = htmlspecialchars(
$sText );
+
$aOut[] = '';
$aOut[] = $sIcon;
$aOut[] = '' . $sText . '';
--
To view, visit https://gerrit.wikimedia.org/r/334971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I602e7789984d2f30e7814461305b0f0a522e4753
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Add 'search_files' parameter to ExtendedSearch URL
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334969 )
Change subject: Add 'search_files' parameter to ExtendedSearch URL
..
Add 'search_files' parameter to ExtendedSearch URL
This check user settings for 'search_files' and adds that parameter to
TagCloudLink URL if needed
Needs cherry-picking to REL1_27 and master
Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
---
M ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
index 0354190..7192837 100644
--- a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
+++ b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
@@ -72,17 +72,21 @@
$aData = array();
$oSpecialPage = Title::makeTitle( NS_SPECIAL, 'ExtendedSearch' );
+$aSearchParams = array();
+if( BsConfig::get( 'MW::ExtendedSearch::SearchFiles' ) ) {
+ $aSearchParams['search_files'] = '1';
+}
foreach ( $oRes as $oRow ) {
$sNormalized = self::normalizeTerm( $oRow->stats_term );
-
+ $aSearchParams['q'] = $sNormalized;
if ( array_key_exists( $sNormalized, $aData ) ) {
$aData[$sNormalized]->count += $oRow->count;
} else {
$aData[$sNormalized] = (object) array(
'tagname' => $sNormalized,
'count' => $oRow->count,
- 'link' => $oSpecialPage->getLocalUrl( array( 'q' => $sNormalized ) )
+ 'link' => $oSpecialPage->getLocalUrl( $aSearchParams )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Add 'search_files' parameter to ExtendedSearch URL
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334970 )
Change subject: Add 'search_files' parameter to ExtendedSearch URL
..
Add 'search_files' parameter to ExtendedSearch URL
This check user settings for 'search_files' and adds that parameter to
TagCloudLink URL if needed
Needs cherry-picking to REL1_27 and master
Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
---
M ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
index 0354190..7192837 100644
--- a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
+++ b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
@@ -72,17 +72,21 @@
$aData = array();
$oSpecialPage = Title::makeTitle( NS_SPECIAL, 'ExtendedSearch' );
+$aSearchParams = array();
+if( BsConfig::get( 'MW::ExtendedSearch::SearchFiles' ) ) {
+ $aSearchParams['search_files'] = '1';
+}
foreach ( $oRes as $oRow ) {
$sNormalized = self::normalizeTerm( $oRow->stats_term );
-
+ $aSearchParams['q'] = $sNormalized;
if ( array_key_exists( $sNormalized, $aData ) ) {
$aData[$sNormalized]->count += $oRow->count;
} else {
$aData[$sNormalized] = (object) array(
'tagname' => $sNormalized,
'count' => $oRow->count,
- 'link' => $oSpecialPage->getLocalUrl( array( 'q' => $sNormalized ) )
+ 'link' => $oSpecialPage->getLocalUrl( $aSearchParams )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: Add 'search_files' parameter to ExtendedSearch URL
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334547 )
Change subject: Add 'search_files' parameter to ExtendedSearch URL
..
Add 'search_files' parameter to ExtendedSearch URL
This check user settings for 'search_files' and adds that parameter to
TagCloudLink URL if needed
Needs cherry-picking to REL1_27 and master
Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
---
M ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
index 0354190..7192837 100644
--- a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
+++ b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
@@ -72,17 +72,21 @@
$aData = array();
$oSpecialPage = Title::makeTitle( NS_SPECIAL, 'ExtendedSearch' );
+$aSearchParams = array();
+if( BsConfig::get( 'MW::ExtendedSearch::SearchFiles' ) ) {
+ $aSearchParams['search_files'] = '1';
+}
foreach ( $oRes as $oRow ) {
$sNormalized = self::normalizeTerm( $oRow->stats_term );
-
+ $aSearchParams['q'] = $sNormalized;
if ( array_key_exists( $sNormalized, $aData ) ) {
$aData[$sNormalized]->count += $oRow->count;
} else {
$aData[$sNormalized] = (object) array(
'tagname' => $sNormalized,
'count' => $oRow->count,
- 'link' => $oSpecialPage->getLocalUrl( array( 'q' => $sNormalized ) )
+ 'link' => $oSpecialPage->getLocalUrl( $aSearchParams )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: skin.icons.less: fix for custom icon position in left naviga...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334556 )
Change subject: skin.icons.less: fix for custom icon position in left navigation
..
skin.icons.less: fix for custom icon position in left navigation
Change-Id: I19efc1d39e0cec1b5328afd8a68175e2614f89a4
---
M resources/components/skin.icons.less
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/components/skin.icons.less
b/resources/components/skin.icons.less
index 23c07a9..79ca4ed 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -43,6 +43,7 @@
text-align: center;
font-size: 130%;
}
+
li > a {
display: block;
line-height: 22px;
@@ -55,10 +56,16 @@
.bs-nav-item-text {
line-height: 22px; /* Has to be lower than icon height.
Otherwise the text may break ugly */
}
+
a.feedlink{
padding-left: 15px;
line-height: 24px;
}
+
+ li > a .icon24.custom-icon,
+ li > a:hover .icon24.custom-icon{
+ background-position: 0 0;
+ }
}
li#n-mainpage span.icon24::before,
--
To view, visit https://gerrit.wikimedia.org/r/334556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19efc1d39e0cec1b5328afd8a68175e2614f89a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Add 'search_files' parameter to ExtendedSearch URL
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334970 )
Change subject: Add 'search_files' parameter to ExtendedSearch URL
..
Add 'search_files' parameter to ExtendedSearch URL
This check user settings for 'search_files' and adds that parameter to
TagCloudLink URL if needed
Needs cherry-picking to REL1_27 and master
Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
---
M ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/70/334970/1
diff --git
a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
index 0354190..7192837 100644
--- a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
+++ b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
@@ -72,17 +72,21 @@
$aData = array();
$oSpecialPage = Title::makeTitle( NS_SPECIAL, 'ExtendedSearch' );
+$aSearchParams = array();
+if( BsConfig::get( 'MW::ExtendedSearch::SearchFiles' ) ) {
+ $aSearchParams['search_files'] = '1';
+}
foreach ( $oRes as $oRow ) {
$sNormalized = self::normalizeTerm( $oRow->stats_term );
-
+ $aSearchParams['q'] = $sNormalized;
if ( array_key_exists( $sNormalized, $aData ) ) {
$aData[$sNormalized]->count += $oRow->count;
} else {
$aData[$sNormalized] = (object) array(
'tagname' => $sNormalized,
'count' => $oRow->count,
- 'link' => $oSpecialPage->getLocalUrl( array( 'q' => $sNormalized ) )
+ 'link' => $oSpecialPage->getLocalUrl( $aSearchParams )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Add 'search_files' parameter to ExtendedSearch URL
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334969 )
Change subject: Add 'search_files' parameter to ExtendedSearch URL
..
Add 'search_files' parameter to ExtendedSearch URL
This check user settings for 'search_files' and adds that parameter to
TagCloudLink URL if needed
Needs cherry-picking to REL1_27 and master
Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
---
M ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/69/334969/1
diff --git
a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
index 0354190..7192837 100644
--- a/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
+++ b/ExtendedSearch/includes/Handler/TagCloudSearchStatsHandler.class.php
@@ -72,17 +72,21 @@
$aData = array();
$oSpecialPage = Title::makeTitle( NS_SPECIAL, 'ExtendedSearch' );
+$aSearchParams = array();
+if( BsConfig::get( 'MW::ExtendedSearch::SearchFiles' ) ) {
+ $aSearchParams['search_files'] = '1';
+}
foreach ( $oRes as $oRow ) {
$sNormalized = self::normalizeTerm( $oRow->stats_term );
-
+ $aSearchParams['q'] = $sNormalized;
if ( array_key_exists( $sNormalized, $aData ) ) {
$aData[$sNormalized]->count += $oRow->count;
} else {
$aData[$sNormalized] = (object) array(
'tagname' => $sNormalized,
'count' => $oRow->count,
- 'link' => $oSpecialPage->getLocalUrl( array( 'q' => $sNormalized ) )
+ 'link' => $oSpecialPage->getLocalUrl( $aSearchParams )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icad14270c39cfe649630f3d457cc4f37d51f0b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[REL1_27]: skin.icons.less: fix for custom icon position in left naviga...
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334968 )
Change subject: skin.icons.less: fix for custom icon position in left navigation
..
skin.icons.less: fix for custom icon position in left navigation
Change-Id: I19efc1d39e0cec1b5328afd8a68175e2614f89a4
---
M resources/components/skin.icons.less
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/68/334968/1
diff --git a/resources/components/skin.icons.less
b/resources/components/skin.icons.less
index 23c07a9..79ca4ed 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -43,6 +43,7 @@
text-align: center;
font-size: 130%;
}
+
li > a {
display: block;
line-height: 22px;
@@ -55,10 +56,16 @@
.bs-nav-item-text {
line-height: 22px; /* Has to be lower than icon height.
Otherwise the text may break ugly */
}
+
a.feedlink{
padding-left: 15px;
line-height: 24px;
}
+
+ li > a .icon24.custom-icon,
+ li > a:hover .icon24.custom-icon{
+ background-position: 0 0;
+ }
}
li#n-mainpage span.icon24::before,
--
To view, visit https://gerrit.wikimedia.org/r/334968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19efc1d39e0cec1b5328afd8a68175e2614f89a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSUserSidebar: Added cache invalidation on possible user lan...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334967 )
Change subject: BSUserSidebar: Added cache invalidation on possible user
language change #4913
..
BSUserSidebar: Added cache invalidation on possible user language change #4913
Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
---
M UserSidebar/UserSidebar.class.php
M UserSidebar/extension.json
2 files changed, 36 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserSidebar/UserSidebar.class.php
b/UserSidebar/UserSidebar.class.php
index 97c280b..59e222c 100644
--- a/UserSidebar/UserSidebar.class.php
+++ b/UserSidebar/UserSidebar.class.php
@@ -498,4 +498,37 @@
return true;
}
+
+ /**
+* Hook handler for UserSaveSettings - invalidate widget caches
+* @param User $user
+* @return boolean
+*/
+ public static function onUserSaveSettings( $user ) {
+ $aKeys = [];
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'GlobalActionsWidgets',
+ $user->getName()
+ );
+
+ $oTitle = Title::makeTitle( NS_USER,
$user->getName().'/Sidebar' );
+ if( $oTitle->exists() ) {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'WidgetListHelper',
+ $oTitle->getPrefixedDBkey()
+ );
+ } else {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'UserSidebar',
+ $oTitle->getPrefixedDBkey()
+ );
+ }
+ foreach( $aKeys as $sKey ) {
+ BsCacheHelper::invalidateCache( $sKey );
+ }
+ return true;
+ }
}
\ No newline at end of file
diff --git a/UserSidebar/extension.json b/UserSidebar/extension.json
index dbbd29a..71e8caa 100644
--- a/UserSidebar/extension.json
+++ b/UserSidebar/extension.json
@@ -33,5 +33,8 @@
"localBasePath": "resources",
"remoteExtPath": "BlueSpiceExtensions/UserSidebar/resources"
},
+ "Hooks": {
+ "UserSaveSettings": "UserSidebar::onUserSaveSettings"
+ },
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/334967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Prefer descriptionmsg over description in extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334697 ) Change subject: Prefer descriptionmsg over description in extension.json .. Prefer descriptionmsg over description in extension.json Change-Id: I2a746b7f18d2b8e5158f51348cc747bb4829533d --- M UserManager/extension.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/UserManager/extension.json b/UserManager/extension.json index 99fc924..04c111b 100644 --- a/UserManager/extension.json +++ b/UserManager/extension.json @@ -8,7 +8,6 @@ ], "version": "2.27.1-alpha", "url": "https://www.mediawiki.org/wiki/Extension:UserManager";, - "description": "The user manager facilitates the user management", "descriptionmsg": "bs-usermanager-desc", "license-name": "GPL-2.0+", "type": "bluespice", -- To view, visit https://gerrit.wikimedia.org/r/334697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a746b7f18d2b8e5158f51348cc747bb4829533d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Dvogel hallowelt Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSUserSidebar: Added cache invalidation on possible user lan...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334557 )
Change subject: BSUserSidebar: Added cache invalidation on possible user
language change #4913
..
BSUserSidebar: Added cache invalidation on possible user language change #4913
Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
---
M UserSidebar/UserSidebar.class.php
M UserSidebar/extension.json
2 files changed, 36 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserSidebar/UserSidebar.class.php
b/UserSidebar/UserSidebar.class.php
index 97c280b..59e222c 100644
--- a/UserSidebar/UserSidebar.class.php
+++ b/UserSidebar/UserSidebar.class.php
@@ -498,4 +498,37 @@
return true;
}
+
+ /**
+* Hook handler for UserSaveSettings - invalidate widget caches
+* @param User $user
+* @return boolean
+*/
+ public static function onUserSaveSettings( $user ) {
+ $aKeys = [];
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'GlobalActionsWidgets',
+ $user->getName()
+ );
+
+ $oTitle = Title::makeTitle( NS_USER,
$user->getName().'/Sidebar' );
+ if( $oTitle->exists() ) {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'WidgetListHelper',
+ $oTitle->getPrefixedDBkey()
+ );
+ } else {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'UserSidebar',
+ $oTitle->getPrefixedDBkey()
+ );
+ }
+ foreach( $aKeys as $sKey ) {
+ BsCacheHelper::invalidateCache( $sKey );
+ }
+ return true;
+ }
}
\ No newline at end of file
diff --git a/UserSidebar/extension.json b/UserSidebar/extension.json
index 90e06b6..23c866b 100644
--- a/UserSidebar/extension.json
+++ b/UserSidebar/extension.json
@@ -33,5 +33,8 @@
"localBasePath": "resources",
"remoteExtPath": "BlueSpiceExtensions/UserSidebar/resources"
},
+ "Hooks": {
+ "UserSaveSettings": "UserSidebar::onUserSaveSettings"
+ },
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/334557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSUserSidebar: Added cache invalidation on possible user lan...
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334967 )
Change subject: BSUserSidebar: Added cache invalidation on possible user
language change #4913
..
BSUserSidebar: Added cache invalidation on possible user language change #4913
Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
---
M UserSidebar/UserSidebar.class.php
M UserSidebar/extension.json
2 files changed, 36 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/67/334967/1
diff --git a/UserSidebar/UserSidebar.class.php
b/UserSidebar/UserSidebar.class.php
index 97c280b..59e222c 100644
--- a/UserSidebar/UserSidebar.class.php
+++ b/UserSidebar/UserSidebar.class.php
@@ -498,4 +498,37 @@
return true;
}
+
+ /**
+* Hook handler for UserSaveSettings - invalidate widget caches
+* @param User $user
+* @return boolean
+*/
+ public static function onUserSaveSettings( $user ) {
+ $aKeys = [];
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'GlobalActionsWidgets',
+ $user->getName()
+ );
+
+ $oTitle = Title::makeTitle( NS_USER,
$user->getName().'/Sidebar' );
+ if( $oTitle->exists() ) {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'WidgetListHelper',
+ $oTitle->getPrefixedDBkey()
+ );
+ } else {
+ $aKeys[] = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'UserSidebar',
+ $oTitle->getPrefixedDBkey()
+ );
+ }
+ foreach( $aKeys as $sKey ) {
+ BsCacheHelper::invalidateCache( $sKey );
+ }
+ return true;
+ }
}
\ No newline at end of file
diff --git a/UserSidebar/extension.json b/UserSidebar/extension.json
index dbbd29a..71e8caa 100644
--- a/UserSidebar/extension.json
+++ b/UserSidebar/extension.json
@@ -33,5 +33,8 @@
"localBasePath": "resources",
"remoteExtPath": "BlueSpiceExtensions/UserSidebar/resources"
},
+ "Hooks": {
+ "UserSaveSettings": "UserSidebar::onUserSaveSettings"
+ },
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/334967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id716ade68dd783b31442bc9d4828df684ff70d48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Fix for upload error
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334966 )
Change subject: Fix for upload error
..
Fix for upload error
Seems that at this point, during the upload, File page (title) is created
but file itself is not yet available, causing wfFindFile to fail and
return false, causing later code to crash.
Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index e52a460..82bc414 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -394,7 +394,10 @@
//with the new categories
if ( $oTitle->getNamespace() === NS_FILE ) {
$oFile = wfFindFile( $oTitle );
-
+ if( !$oFile ) {
+ $oFile = LocalFile::newFromTitle(
$oTitle, RepoGroup::singleton()->getLocalRepo() );
+ if ( !$oFile ) return true;
+ }
//Unfortunately
BuildIndexMwSingleFile::indexCrawledDocuments
//checks if the file is already on the index.
If so it does not
//apply the update. To have our categories be
written to the
--
To view, visit https://gerrit.wikimedia.org/r/334966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: Fix for upload error
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334037 )
Change subject: Fix for upload error
..
Fix for upload error
Seems that at this point, during the upload, File page (title) is created
but file itself is not yet available, causing wfFindFile to fail and
return false, causing later code to crash.
Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index acd8060..6fd06f7 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -384,7 +384,10 @@
//with the new categories
if ( $oTitle->getNamespace() === NS_FILE ) {
$oFile = wfFindFile( $oTitle );
-
+ if( !$oFile ) {
+ $oFile = LocalFile::newFromTitle(
$oTitle, RepoGroup::singleton()->getLocalRepo() );
+ if ( !$oFile ) return true;
+ }
//Unfortunately
BuildIndexMwSingleFile::indexCrawledDocuments
//checks if the file is already on the index.
If so it does not
//apply the update. To have our categories be
written to the
--
To view, visit https://gerrit.wikimedia.org/r/334037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix for upload error
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334965 )
Change subject: Fix for upload error
..
Fix for upload error
Seems that at this point, during the upload, File page (title) is created
but file itself is not yet available, causing wfFindFile to fail and
return false, causing later code to crash.
Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index bbfd2f8..9297ece 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -431,7 +431,10 @@
//with the new categories
if ( $oTitle->getNamespace() === NS_FILE ) {
$oFile = wfFindFile( $oTitle );
-
+ if( !$oFile ) {
+ $oFile = LocalFile::newFromTitle(
$oTitle, RepoGroup::singleton()->getLocalRepo() );
+ if ( !$oFile ) return true;
+ }
//Unfortunately
BuildIndexMwSingleFile::indexCrawledDocuments
//checks if the file is already on the index.
If so it does not
//apply the update. To have our categories be
written to the
--
To view, visit https://gerrit.wikimedia.org/r/334965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Fix for upload error
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334966 )
Change subject: Fix for upload error
..
Fix for upload error
Seems that at this point, during the upload, File page (title) is created
but file itself is not yet available, causing wfFindFile to fail and
return false, causing later code to crash.
Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/66/334966/1
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index e52a460..82bc414 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -394,7 +394,10 @@
//with the new categories
if ( $oTitle->getNamespace() === NS_FILE ) {
$oFile = wfFindFile( $oTitle );
-
+ if( !$oFile ) {
+ $oFile = LocalFile::newFromTitle(
$oTitle, RepoGroup::singleton()->getLocalRepo() );
+ if ( !$oFile ) return true;
+ }
//Unfortunately
BuildIndexMwSingleFile::indexCrawledDocuments
//checks if the file is already on the index.
If so it does not
//apply the update. To have our categories be
written to the
--
To view, visit https://gerrit.wikimedia.org/r/334966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix for upload error
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334965 )
Change subject: Fix for upload error
..
Fix for upload error
Seems that at this point, during the upload, File page (title) is created
but file itself is not yet available, causing wfFindFile to fail and
return false, causing later code to crash.
Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/65/334965/1
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index bbfd2f8..9297ece 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -431,7 +431,10 @@
//with the new categories
if ( $oTitle->getNamespace() === NS_FILE ) {
$oFile = wfFindFile( $oTitle );
-
+ if( !$oFile ) {
+ $oFile = LocalFile::newFromTitle(
$oTitle, RepoGroup::singleton()->getLocalRepo() );
+ if ( !$oFile ) return true;
+ }
//Unfortunately
BuildIndexMwSingleFile::indexCrawledDocuments
//checks if the file is already on the index.
If so it does not
//apply the update. To have our categories be
written to the
--
To view, visit https://gerrit.wikimedia.org/r/334965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2d3f90b6382ade2a0dab4a43943ef18e445e028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: [WIP] Failing tests for TransactionProcessor/DocumentSynchro...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334964 )
Change subject: [WIP] Failing tests for
TransactionProcessor/DocumentSynchronizer bug
..
[WIP] Failing tests for TransactionProcessor/DocumentSynchronizer bug
When processing certain compound transactions, TP will issue
two rebuild requests to DS for ranges A and B, where A is
entirely contained within B. This breaks the requirement that
DS requests are sequential (because B.start < A.start) and also
causes TP to miscompute B's newRange, because A's adjustment is
incorrectly applied to A.start.
Change-Id: I34b4fe4407e139ab00ca5b97c444c8804e13d271
---
M tests/dm/ve.dm.TransactionProcessor.test.js
1 file changed, 59 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/64/334964/1
diff --git a/tests/dm/ve.dm.TransactionProcessor.test.js
b/tests/dm/ve.dm.TransactionProcessor.test.js
index a79ab81..6ccdb5a 100644
--- a/tests/dm/ve.dm.TransactionProcessor.test.js
+++ b/tests/dm/ve.dm.TransactionProcessor.test.js
@@ -331,6 +331,65 @@
data.splice( 3, 1 );
}
},
+ 'merging a nested element': {
+ calls: [
+ [ 'pushRetain', 47 ],
+ [ 'pushReplace', 47, 4, [] ]
+ ],
+ expected: function ( data ) {
+ data.splice( 47, 4 );
+ }
+ },
+ 'merging an element that also has a content insertion':
{
+ calls: [
+ [ 'pushRetain', 56 ],
+ [ 'pushReplace', 56, 0, [ 'x' ] ],
+ [ 'pushRetain', 1 ],
+ [ 'pushReplace', 57, 2, [] ]
+ ],
+ expected: function ( data ) {
+ data.splice( 57, 2 );
+ data.splice( 56, 0, [ 'x '] );
+ }
+ },
+ 'merging a nested element that also has a structural
insertion': {
+ calls: [
+ [ 'pushRetain', 45 ],
+ [ 'pushReplace', 45, 0, [ { type:
'paragraph' }, 'x', { type: '/paragraph' } ] ],
+ [ 'pushRetain', 2 ],
+ [ 'pushReplace', 47, 4, [] ]
+ ],
+ expected: function ( data ) {
+ data.splice( 47, 4 );
+ data.splice( 45, 0, { type: 'paragraph'
}, 'x', { type: '/paragraph' } );
+ }
+ },
+ 'merging the same element from both sides at once': {
+ data: [
+ { type: 'paragraph' },
+ 'a',
+ { type: '/paragraph' },
+ { type: 'paragraph' },
+ 'b',
+ { type: '/paragraph' },
+ { type: 'paragraph' },
+ 'c',
+ { type: '/paragraph' },
+ { type: 'paragraph' },
+ 'd',
+ { type: '/paragraph' }
+ ],
+ calls: [
+ [ 'pushRetain', 2 ],
+ [ 'pushReplace', 2, 2, [] ],
+ [ 'pushRetain', 1 ],
+ [ 'pushReplace', 5, 2, [] ]
+ ],
+ expected: function ( data ) {
+ data.splice( 5, 2 );
+ data.splice( 2, 2 );
+ }
+ },
'applying a link across an existing annotation
boundary': {
data: [
{ type: 'paragraph' },
--
To view, visit https://gerrit.wikimedia.org/r/334964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34b4fe4407e139ab00ca
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Improve NEWS file
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334963 ) Change subject: Improve NEWS file .. Improve NEWS file Closes: #852862 Change-Id: I40fd354e293f848e6bbc1b39c65fd0439692627f --- M debian/changelog M debian/mediawiki.NEWS 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/63/334963/1 diff --git a/debian/changelog b/debian/changelog index 7a3076c..9319d4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediawiki (1:1.27.1-4) UNRELEASED; urgency=medium + + * Improve NEWS file (Closes: #852862) + + -- Kunal Mehta Sun, 29 Jan 2017 21:28:59 -0800 + mediawiki (1:1.27.1-3) unstable; urgency=medium * Ensure mediawiki depends upon the same version of mediawiki-classes diff --git a/debian/mediawiki.NEWS b/debian/mediawiki.NEWS index 2cec23e..bbe3cd4 100644 --- a/debian/mediawiki.NEWS +++ b/debian/mediawiki.NEWS @@ -1,12 +1,21 @@ mediawiki (1:1.27.0-1) unstable; urgency=medium MediaWiki has been updated to the 1.27 upstream release branch, which -brings in about 6 years of upstream changes. Release notes may be found +brings in about 4 years of upstream changes. Release notes may be found in /usr/share/doc/mediawiki/RELEASE-NOTES-1.27 and /usr/share/doc/mediawiki/changelog. Please see the "Upgrading" section of README.debian and /usr/share/doc/mediawiki/UPGRADE for details on what manual steps need to be taken to upgrade. +Some highlights of new features: +* Improvements to the appearance and performance of diffs +* Better defaults for email notifications +* Performance improvements in client-side JavaScript +* Secure storage for passwords +* Improved patrolling and anti-spam features out of the box +* Additional language and internationalization support +* Common extensions are bundled and can be enabled from the installer + Note that the mediawiki-extensions* packages are no longer compatible with this version of MediaWiki, and are no longer supported. -- To view, visit https://gerrit.wikimedia.org/r/334963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40fd354e293f848e6bbc1b39c65fd0439692627f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Install mktorrent
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334962 ) Change subject: toollabs: Install mktorrent .. toollabs: Install mktorrent Bug: T155470 Change-Id: Id75acb5fb44724a9e1afd9dfd2c201c52fdd9bf0 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/62/334962/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 2082338..649ce59 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -294,6 +294,7 @@ 'mailutils', # T114073 'mdbtools',# T50805. 'melt',# T71365 +'mktorrent', # T155470 'openbabel', # T68995 'p7zip-full', # requested by Betacommand and danilo to decompress 7z files 'pdf2svg', # T70092. -- To view, visit https://gerrit.wikimedia.org/r/334962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id75acb5fb44724a9e1afd9dfd2c201c52fdd9bf0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update localization from upstream
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334960 ) Change subject: Update localization from upstream .. Update localization from upstream Updating to https://github.com/wikimedia/jquery.uls/commit/4582ec8d2db47fbc555d03c2a1b25e85ad8f881e Change-Id: If3d547220b78c249a7517fdf35af9cd45b976021 --- M lib/jquery.uls/i18n/ast.json M lib/jquery.uls/i18n/be-tarask.json M lib/jquery.uls/i18n/da.json M lib/jquery.uls/i18n/dty.json M lib/jquery.uls/i18n/el.json M lib/jquery.uls/i18n/gu.json M lib/jquery.uls/i18n/ia.json M lib/jquery.uls/i18n/io.json M lib/jquery.uls/i18n/ps.json M lib/jquery.uls/i18n/pt-br.json M lib/jquery.uls/i18n/zh-hant.json 11 files changed, 25 insertions(+), 15 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.uls/i18n/ast.json b/lib/jquery.uls/i18n/ast.json index 0edc9be..951de3d 100644 --- a/lib/jquery.uls/i18n/ast.json +++ b/lib/jquery.uls/i18n/ast.json @@ -17,5 +17,5 @@ "uls-common-languages": "Llingües suxeríes", "uls-no-results-suggestion-title": "Seique t'interese:", "uls-search-help": "Pues buscar pol nome de la llingua, nome del alfabetu, códigu ISO de la llingua o ver un área xeográfica.", - "uls-search-placeholder": "Guetar llingua" + "uls-search-placeholder": "Buscar una llingua" } diff --git a/lib/jquery.uls/i18n/be-tarask.json b/lib/jquery.uls/i18n/be-tarask.json index 091bf6c..5ed13c4 100644 --- a/lib/jquery.uls/i18n/be-tarask.json +++ b/lib/jquery.uls/i18n/be-tarask.json @@ -19,5 +19,5 @@ "uls-common-languages": "Прапанаваныя мовы", "uls-no-results-suggestion-title": "Магчыма, вас зацікавяць:", "uls-search-help": "Вы можаце шукаць паводле назвы мовы ці пісьменнасьці, а таксама паводле ISO-коду мовы, або выбраць рэгіён.", - "uls-search-placeholder": "Шукайце мову тут" + "uls-search-placeholder": "Пошук мовы" } diff --git a/lib/jquery.uls/i18n/da.json b/lib/jquery.uls/i18n/da.json index 3eb20e2..916a7e6 100644 --- a/lib/jquery.uls/i18n/da.json +++ b/lib/jquery.uls/i18n/da.json @@ -20,5 +20,5 @@ "uls-common-languages": "Foreslåede sprog", "uls-no-results-suggestion-title": "Du er måske interesseret i:", "uls-search-help": "Du kan søge på sprogets navn, skriftens navn eller sprogets ISO-kode, eller du kan bladre hen til sproget efter regionen.", - "uls-search-placeholder": "Sprogsøgning" + "uls-search-placeholder": "Søg efter et sprog" } diff --git a/lib/jquery.uls/i18n/dty.json b/lib/jquery.uls/i18n/dty.json index 32c528e..b6b1cda 100644 --- a/lib/jquery.uls/i18n/dty.json +++ b/lib/jquery.uls/i18n/dty.json @@ -18,5 +18,5 @@ "uls-common-languages": "सुझावित भाषाअन", "uls-no-results-suggestion-title": "तमलाई यैमी मन लाग्गसकन्छ:", "uls-search-help": "तम भषा: नाउँले, लिपिया नाउँले, भषा: ISO कोड खोजिसकन्छ: या क्षेत्रा आधारमी ब्राउज अरिसकन्छ:।", - "uls-search-placeholder": "भाषा खोज अर" + "uls-search-placeholder": "भाषा खिलाइ खोजी अरऽ" } diff --git a/lib/jquery.uls/i18n/el.json b/lib/jquery.uls/i18n/el.json index abab13f..9a964f5 100644 --- a/lib/jquery.uls/i18n/el.json +++ b/lib/jquery.uls/i18n/el.json @@ -19,5 +19,5 @@ "uls-common-languages": "Προτεινόμενες γλώσσες", "uls-no-results-suggestion-title": "Μπορεί να σας ενδιαφέρουν:", "uls-search-help": "Μπορείτε να ψάξετε κατά το όνομα της γλώσσας, τρόπο γραφής, κωδικό ISO της γλώσσας, ή να περιηγηθείτε ανά περιοχή.", - "uls-search-placeholder": "Αναζήτηση γλώσσας" + "uls-search-placeholder": "Αναζήτηση για γλώσσα" } diff --git a/lib/jquery.uls/i18n/gu.json b/lib/jquery.uls/i18n/gu.json index 6d73a76..04302b2 100644 --- a/lib/jquery.uls/i18n/gu.json +++ b/lib/jquery.uls/i18n/gu.json @@ -20,5 +20,5 @@ "uls-common-languages": "સૂચિત ભાષાઓ", "uls-no-results-suggestion-title": "તમને આમાં રસ હોઈ શકે છે:", "uls-search-help": "તમે ભાષા નામ, સ્ક્રિપ્ટ નામ, ભાષા ISO કોડ દ્વારા શોધ કરી શકો છે અથવા તમે પ્રદેશ દ્વારા શોધ કરી શકો છો.", - "uls-search-placeholder": "ભાષા શોધ" + "uls-search-placeholder": "ભાષા માટે શોધો" } diff --git a/lib/jquery.uls/i18n/ia.json b/lib/jquery.uls/i18n/ia.json index e57acf8..39ce93f 100644 --- a/lib/jquery.uls/i18n/ia.json +++ b/lib/jquery.uls/i18n/ia.json @@ -12,9 +12,10 @@ "uls-region-AS": "Asia", "uls-region-ME": "Medio oriente", "uls-region-PA": "Pacific", + "uls-region-all": "Tote le linguas", "uls-no-results-found": "Nulle resultato trovate", - "uls-common-languages": "Linguas commun", + "uls-common-languages": "Linguas suggerite", "uls-no-results-suggestion-title": "Tu pote esser interessate in:", - "uls-search-help": "Tu pote cercar per nomine de lingua, nomine de scriptura o codice ISO de lingua, o tu pote foliar per le regiones:", -
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Add reference to the mailing list in errors and depreca...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331419 )
Change subject: API: Add reference to the mailing list in errors and
deprecation warnings
..
API: Add reference to the mailing list in errors and deprecation warnings
This was suggested at a Developer Summit session as a way to get people
to know about the mailing list.
This also adds a hook so ApiFeatureUsage can mention itself in
deprecation warnings too.
Bug: T148855
Change-Id: I04a7cf89e87e48f6504803dd173e779017a205d0
---
M docs/hooks.txt
M includes/api/ApiBase.php
M includes/api/ApiMain.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
M tests/phpunit/includes/api/ApiMainTest.php
6 files changed, 30 insertions(+), 3 deletions(-)
Approvals:
Umherirrender: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 1da39cf..ec09ea9 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -365,6 +365,11 @@
* 1.27+: IApiMessage, or a key or key+parameters in ApiBase::$messageMap.
* Earlier: A key or key+parameters in ApiBase::$messageMap.
+'ApiDeprecationHelp': Add messages to the 'deprecation-help' warning generated
+from ApiBase::addDeprecation().
+&$msgs: Message[] Messages to include in the help. Multiple messages will be
+ joined with spaces.
+
'APIEditBeforeSave': DEPRECATED! Use EditFilterMergedContent instead.
Before saving a page with api.php?action=edit, after
processing request parameters. Return false to let the request fail, returning
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b8dd464..e249810 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1718,6 +1718,18 @@
$this->logFeatureUsage( $feature );
}
$this->addWarning( $msg, 'deprecation', $data );
+
+ // No real need to deduplicate here, ApiErrorFormatter does
that for
+ // us (assuming the hook is deterministic).
+ $msgs = [ $this->msg( 'api-usage-mailinglist-ref' ) ];
+ Hooks::run( 'ApiDeprecationHelp', [ &$msgs ] );
+ if ( count( $msgs ) > 1 ) {
+ $key = '$' . join( ' $', range( 1, count( $msgs ) ) );
+ $msg = ( new RawMessage( $key ) )->params( $msgs );
+ } else {
+ $msg = reset( $msgs );
+ }
+ $this->getMain()->addWarning( $msg, 'deprecation-help' );
}
/**
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 52f1d95..59227d9 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1109,7 +1109,11 @@
$result->addContentValue(
$path,
'docref',
- $this->msg( 'api-usage-docref', $link
)->inLanguage( $formatter->getLanguage() )->text()
+ trim(
+ $this->msg( 'api-usage-docref', $link
)->inLanguage( $formatter->getLanguage() )->text()
+ . ' '
+ . $this->msg(
'api-usage-mailinglist-ref' )->inLanguage( $formatter->getLanguage() )->text()
+ )
);
} else {
if ( $config->get( 'ShowExceptionDetails' ) ) {
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 8ac11d0..9e74beb 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -1795,6 +1795,7 @@
"api-feed-error-title": "Error ($1)",
"api-usage-docref": "See $1 for API usage.",
+ "api-usage-mailinglist-ref": "Subscribe to the mediawiki-api-announce
mailing list at
; for
notice of API deprecations and breaking changes.",
"api-exception-trace": "$1 at $2($3)\n$4",
"api-credits-header": "Credits",
"api-credits": "API developers:\n* Yuri Astrakhan (creator, lead
developer Sep 2006–Sep 2007)\n* Roan Kattouw (lead developer Sep 2007–2009)\n*
Victor Vasiliev\n* Bryan Tong Minh\n* Sam Reed\n* Brad Jorsch (lead developer
2013–present)\n\nPlease send your comments, suggestions and questions to
mediawiki-...@lists.wikimedia.org\nor file a bug report at
https://phabricator.wikimedia.org/.";
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 85e24e4..08e5437 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -1685,6 +1685,7 @@
"apiwarn-wgDebugAPI": "{{doc-apierror}}",
"api-feed-error-title": "Used as a feed item title when an error occurs
in action=feedwatchlist.\n\nParameters:\n* $1 - API error
code\n{{Identical
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Add reference to Special:ApiFeatureUsage to the 'deprecation...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331420 ) Change subject: Add reference to Special:ApiFeatureUsage to the 'deprecation-help' warning .. Add reference to Special:ApiFeatureUsage to the 'deprecation-help' warning This has no effect without I04a7cf89e, but doesn't break anything without it. Bug: T148855 Change-Id: I2d90c51bdd2e92c4a8f45ef701c32ce4ae15bf00 --- A ApiFeatureUsage.hooks.php M extension.json M i18n/en.json M i18n/qqq.json 4 files changed, 20 insertions(+), 3 deletions(-) Approvals: Umherirrender: Looks good to me, but someone else must approve Gergő Tisza: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiFeatureUsage.hooks.php b/ApiFeatureUsage.hooks.php new file mode 100644 index 000..6be4105 --- /dev/null +++ b/ApiFeatureUsage.hooks.php @@ -0,0 +1,11 @@ +https://gerrit.wikimedia.org/r/331420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d90c51bdd2e92c4a8f45ef701c32ce4ae15bf00 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApiFeatureUsage Gerrit-Branch: master Gerrit-Owner: Anomie Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: MassMessageJob: Log correctly when catching ApiUsageExceptions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332010 )
Change subject: MassMessageJob: Log correctly when catching ApiUsageExceptions
..
MassMessageJob: Log correctly when catching ApiUsageExceptions
Just log one error from the Status to match the behavior of the old
code.
Bug: T155274
Change-Id: I02131821f39ec2ad649d202264655af28067e62f
---
M includes/job/MassMessageJob.php
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/MassMessageJob.php b/includes/job/MassMessageJob.php
index 59e4fd7..3460891 100644
--- a/includes/job/MassMessageJob.php
+++ b/includes/job/MassMessageJob.php
@@ -319,10 +319,13 @@
}
}
// If the failure is not caused by an edit
conflict or if there
- // have been too many failures, log the error
and continue
+ // have been too many failures, log the (first)
error and continue
// execution. Otherwise retry the request.
if ( !$isEditConflict || $attemptCount >= 5 ) {
- $this->logLocalFailure( $errorCode );
+ foreach (
$e->getStatusValue()->getErrors() as $error ) {
+ $this->logLocalFailure(
ApiMessage::create( $error )->getApiCode() );
+ break;
+ }
break;
}
} catch ( UsageException $e ) {
--
To view, visit https://gerrit.wikimedia.org/r/332010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02131821f39ec2ad649d202264655af28067e62f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Anomie
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Wctaiwan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Migrate Thumbor role from upstart to systemd
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334002 )
Change subject: Migrate Thumbor role from upstart to systemd
..
Migrate Thumbor role from upstart to systemd
Bug: T154270
Change-Id: I4aff8987a948381a04633564e41fa52487d58c74
---
M Vagrantfile
M puppet/modules/apache/templates/ports.conf.erb
M puppet/modules/nginx
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/manifests/service.pp
M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
A puppet/modules/thumbor/templates/systemd/thumbor.erb
D puppet/modules/thumbor/templates/upstart.erb
A puppet/modules/wmflib/lib/puppet/parser/functions/os_version.rb
9 files changed, 174 insertions(+), 115 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index 82648c6..4f46cad 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -113,7 +113,7 @@
# end
config.vm.network :forwarded_port,
-guest: 80, host: settings[:http_port], host_ip: settings[:host_ip],
+guest: settings[:http_port], host: settings[:http_port], host_ip:
settings[:host_ip],
id: 'http'
config.vm.network :forwarded_port,
diff --git a/puppet/modules/apache/templates/ports.conf.erb
b/puppet/modules/apache/templates/ports.conf.erb
index 10b63e9..5bf7281 100644
--- a/puppet/modules/apache/templates/ports.conf.erb
+++ b/puppet/modules/apache/templates/ports.conf.erb
@@ -1,5 +1,2 @@
# This file is managed by Puppet.
-Listen 80
-<%- if @forwarded_port and @forwarded_port.to_s != "80" -%>
Listen <%= @forwarded_port %>
-<%- end -%>
diff --git a/puppet/modules/nginx b/puppet/modules/nginx
index 10a1e92..d41ab2c 16
--- a/puppet/modules/nginx
+++ b/puppet/modules/nginx
@@ -1 +1 @@
-Subproject commit 10a1e925fa707654102f39092b46a64c61710614
+Subproject commit d41ab2cc4dd560f1483247bf2e1487d77b7e451c
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index ea8f4d0..52d4fd9 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -29,47 +29,35 @@
$statsd_port,
$sentry_dsn_file,
) {
-require ::virtualenv
-# Needed by the venv, which clones a few git repos
-require ::git
+apt::pin { 'gifsicle-jessie-backports':
+package => 'gifsicle',
+pin => 'release n=jessie-backports',
+priority => 1000,
+}
-# jpegtran
-require_package('libjpeg-progs')
+apt::pin { 'python-tornado-jessie-backports':
+package => 'python-tornado',
+pin => 'release n=jessie-backports',
+priority => 1000,
+}
-# exiftool is needed by exif-optimizer
-require_package('libimage-exiftool-perl')
+apt::pin { 'python-pil-jessie-backports':
+package => 'python-pil',
+pin => 'release n=jessie-backports',
+priority => 1000,
+}
-# For Pillow
-require_package('libjpeg-dev')
+package { 'raven':
+provider => 'pip',
+}
-# For GIF engine
-require_package('gifsicle')
+package { 'python-thumbor-wikimedia':
+notify => Exec['stop-and-disable-default-thumbor-service']
+}
-# For Video engine
-require_package('ffmpeg')
-
-# For XCF engine
-require_package('xcftools')
-
-# For DjVu engine
-require_package('libdjvulibre-dev')
-require_package('cython')
-
-# For Ghostscript engine (PDF)
-require_package('ghostscript')
-
-# For pycurl, a dependency of thumbor
-require_package('libcurl4-gnutls-dev')
-
-# For Mediawiki's IM/RSVG SVG support
-require_package('librsvg2-bin')
-
-# For Mediawiki's DJVU support
-require_package('djvulibre-bin')
-require_package('netpbm')
-
-# For lxml, a dependency of thumbor-plugins
-require_package('libxml2-dev', 'libxslt1-dev')
+exec { 'stop-and-disable-default-thumbor-service':
+command => '/bin/systemctl stop thumbor'
+}
require_package('firejail')
@@ -88,42 +76,18 @@
}
file { '/etc/firejail/thumbor.profile':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0444',
-source => 'puppet:///modules/thumbor/thumbor.profile',
+ensure => present,
+owner => 'root',
+group => 'root',
+mode=> '0444',
+source => 'puppet:///modules/thumbor/thumbor.profile',
+require => Package['firejail'],
}
-virtualenv::environment { $deploy_dir:
-ensure => present,
-packages => [
-'pgi',
-'raven',
-'python-swiftclient',
-'pympler',
-'git+git://github.com/gi11es/thumbor.git',
-'git+git://github.com/thumbor-community/core',
-
'git+https://phabricator.wikimedia.org/diffusion/THMBREXT/thumbor-plugins
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Lint fix for Vagrantfile
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334961 )
Change subject: Lint fix for Vagrantfile
..
Lint fix for Vagrantfile
Change-Id: Ib7090203f3d04fb952beeb88b7b719aaa8aeb7d1
---
M Vagrantfile
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index 051da69..82648c6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -35,11 +35,11 @@
# T156380: Check to see if the legacy gem version of the plugin is installed
if Vagrant.has_plugin?('mediawiki-vagrant')
-raise <<-EOS
+ raise <<-EOS
-The deprecated mediawiki-vagrant plugin is installed.
-Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
-EOS
+ The deprecated mediawiki-vagrant plugin is installed.
+ Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+ EOS
end
mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
--
To view, visit https://gerrit.wikimedia.org/r/334961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7090203f3d04fb952beeb88b7b719aaa8aeb7d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Lint fix for Vagrantfile
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334961 )
Change subject: Lint fix for Vagrantfile
..
Lint fix for Vagrantfile
Change-Id: Ib7090203f3d04fb952beeb88b7b719aaa8aeb7d1
---
M Vagrantfile
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/61/334961/1
diff --git a/Vagrantfile b/Vagrantfile
index 051da69..82648c6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -35,11 +35,11 @@
# T156380: Check to see if the legacy gem version of the plugin is installed
if Vagrant.has_plugin?('mediawiki-vagrant')
-raise <<-EOS
+ raise <<-EOS
-The deprecated mediawiki-vagrant plugin is installed.
-Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
-EOS
+ The deprecated mediawiki-vagrant plugin is installed.
+ Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+ EOS
end
mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
--
To view, visit https://gerrit.wikimedia.org/r/334961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7090203f3d04fb952beeb88b7b719aaa8aeb7d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update localization from upstream
Amire80 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334960 ) Change subject: Update localization from upstream .. Update localization from upstream Updating to https://github.com/wikimedia/jquery.uls/commit/4582ec8d2db47fbc555d03c2a1b25e85ad8f881e Change-Id: If3d547220b78c249a7517fdf35af9cd45b976021 --- M lib/jquery.uls/i18n/ast.json M lib/jquery.uls/i18n/be-tarask.json M lib/jquery.uls/i18n/da.json M lib/jquery.uls/i18n/dty.json M lib/jquery.uls/i18n/el.json M lib/jquery.uls/i18n/gu.json M lib/jquery.uls/i18n/ia.json M lib/jquery.uls/i18n/io.json M lib/jquery.uls/i18n/ps.json M lib/jquery.uls/i18n/pt-br.json M lib/jquery.uls/i18n/zh-hant.json 11 files changed, 25 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/60/334960/1 diff --git a/lib/jquery.uls/i18n/ast.json b/lib/jquery.uls/i18n/ast.json index 0edc9be..951de3d 100644 --- a/lib/jquery.uls/i18n/ast.json +++ b/lib/jquery.uls/i18n/ast.json @@ -17,5 +17,5 @@ "uls-common-languages": "Llingües suxeríes", "uls-no-results-suggestion-title": "Seique t'interese:", "uls-search-help": "Pues buscar pol nome de la llingua, nome del alfabetu, códigu ISO de la llingua o ver un área xeográfica.", - "uls-search-placeholder": "Guetar llingua" + "uls-search-placeholder": "Buscar una llingua" } diff --git a/lib/jquery.uls/i18n/be-tarask.json b/lib/jquery.uls/i18n/be-tarask.json index 091bf6c..5ed13c4 100644 --- a/lib/jquery.uls/i18n/be-tarask.json +++ b/lib/jquery.uls/i18n/be-tarask.json @@ -19,5 +19,5 @@ "uls-common-languages": "Прапанаваныя мовы", "uls-no-results-suggestion-title": "Магчыма, вас зацікавяць:", "uls-search-help": "Вы можаце шукаць паводле назвы мовы ці пісьменнасьці, а таксама паводле ISO-коду мовы, або выбраць рэгіён.", - "uls-search-placeholder": "Шукайце мову тут" + "uls-search-placeholder": "Пошук мовы" } diff --git a/lib/jquery.uls/i18n/da.json b/lib/jquery.uls/i18n/da.json index 3eb20e2..916a7e6 100644 --- a/lib/jquery.uls/i18n/da.json +++ b/lib/jquery.uls/i18n/da.json @@ -20,5 +20,5 @@ "uls-common-languages": "Foreslåede sprog", "uls-no-results-suggestion-title": "Du er måske interesseret i:", "uls-search-help": "Du kan søge på sprogets navn, skriftens navn eller sprogets ISO-kode, eller du kan bladre hen til sproget efter regionen.", - "uls-search-placeholder": "Sprogsøgning" + "uls-search-placeholder": "Søg efter et sprog" } diff --git a/lib/jquery.uls/i18n/dty.json b/lib/jquery.uls/i18n/dty.json index 32c528e..b6b1cda 100644 --- a/lib/jquery.uls/i18n/dty.json +++ b/lib/jquery.uls/i18n/dty.json @@ -18,5 +18,5 @@ "uls-common-languages": "सुझावित भाषाअन", "uls-no-results-suggestion-title": "तमलाई यैमी मन लाग्गसकन्छ:", "uls-search-help": "तम भषा: नाउँले, लिपिया नाउँले, भषा: ISO कोड खोजिसकन्छ: या क्षेत्रा आधारमी ब्राउज अरिसकन्छ:।", - "uls-search-placeholder": "भाषा खोज अर" + "uls-search-placeholder": "भाषा खिलाइ खोजी अरऽ" } diff --git a/lib/jquery.uls/i18n/el.json b/lib/jquery.uls/i18n/el.json index abab13f..9a964f5 100644 --- a/lib/jquery.uls/i18n/el.json +++ b/lib/jquery.uls/i18n/el.json @@ -19,5 +19,5 @@ "uls-common-languages": "Προτεινόμενες γλώσσες", "uls-no-results-suggestion-title": "Μπορεί να σας ενδιαφέρουν:", "uls-search-help": "Μπορείτε να ψάξετε κατά το όνομα της γλώσσας, τρόπο γραφής, κωδικό ISO της γλώσσας, ή να περιηγηθείτε ανά περιοχή.", - "uls-search-placeholder": "Αναζήτηση γλώσσας" + "uls-search-placeholder": "Αναζήτηση για γλώσσα" } diff --git a/lib/jquery.uls/i18n/gu.json b/lib/jquery.uls/i18n/gu.json index 6d73a76..04302b2 100644 --- a/lib/jquery.uls/i18n/gu.json +++ b/lib/jquery.uls/i18n/gu.json @@ -20,5 +20,5 @@ "uls-common-languages": "સૂચિત ભાષાઓ", "uls-no-results-suggestion-title": "તમને આમાં રસ હોઈ શકે છે:", "uls-search-help": "તમે ભાષા નામ, સ્ક્રિપ્ટ નામ, ભાષા ISO કોડ દ્વારા શોધ કરી શકો છે અથવા તમે પ્રદેશ દ્વારા શોધ કરી શકો છો.", - "uls-search-placeholder": "ભાષા શોધ" + "uls-search-placeholder": "ભાષા માટે શોધો" } diff --git a/lib/jquery.uls/i18n/ia.json b/lib/jquery.uls/i18n/ia.json index e57acf8..39ce93f 100644 --- a/lib/jquery.uls/i18n/ia.json +++ b/lib/jquery.uls/i18n/ia.json @@ -12,9 +12,10 @@ "uls-region-AS": "Asia", "uls-region-ME": "Medio oriente", "uls-region-PA": "Pacific", + "uls-region-all": "Tote le linguas", "uls-no-results-found": "Nulle resultato trovate", - "uls-common-languages": "Linguas commun", + "uls-common-languages": "Linguas suggerite", "uls-no-results-suggestion-title": "Tu pote esser interessate in:", - "uls-search-help": "Tu pote cercar per nomine de lingua, nomine de scriptura o codice ISO de lingua, o tu pote folia
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [WIP] Set Coordinate globe via item
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334912 )
Change subject: [WIP] Set Coordinate globe via item
..
[WIP] Set Coordinate globe via item
Allow globe to be set via a PageItem (in addition to its entity
url). Also renames this parameter to clarify it's use.
Change-Id: Idbf79a42720aca30be9a61aaf3b497f53ed87490
---
M pywikibot/__init__.py
M tests/wikibase_edit_tests.py
2 files changed, 31 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/12/334912/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index d37403e..d747b11 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -234,8 +234,9 @@
_items = ('lat', 'lon', 'globe')
+@deprecate_arg('entity', 'globe_item')
def __init__(self, lat, lon, alt=None, precision=None, globe='earth',
- typ="", name="", dim=None, site=None, entity=''):
+ typ="", name="", dim=None, site=None, globe_item=None):
"""
Represent a geo coordinate.
@@ -256,8 +257,9 @@
@type dim: int
@param site: The Wikibase site
@type site: pywikibot.site.DataSite
-@param entity: The URL entity of a Wikibase item
-@type entity: str
+@param globe_item: A Wikibase item for the globe, or the URL entity of
+ this Wikibase item.
+@type globe_item: pywikibot.ItemPage or str
"""
self.lat = lat
self.lon = lon
@@ -266,7 +268,7 @@
if globe:
globe = globe.lower()
self.globe = globe
-self._entity = entity
+self._entity = globe_item
self.type = typ
self.name = name
self._dim = dim
@@ -274,6 +276,9 @@
self.site = Site().data_repository()
else:
self.site = site
+
+if isinstance(globe_item, ItemPage):
+self._entity = globe_item.concept_url()
@property
def entity(self):
@@ -325,7 +330,7 @@
return cls(data['latitude'], data['longitude'],
data['altitude'], data['precision'],
- globe, site=site, entity=data['globe'])
+ globe, site=site, globe_item=data['globe'])
@property
def precision(self):
diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py
index 621146b..d419749 100644
--- a/tests/wikibase_edit_tests.py
+++ b/tests/wikibase_edit_tests.py
@@ -239,6 +239,27 @@
claim = item.claims['P271'][0]
self.assertEqual(claim.getTarget(), target)
+def test_Coordinate_edit(self):
+"""Attempt adding a Coordinate with globe set via item."""
+testsite = self.get_repo()
+item = self._clean_item(testsite, 'P20480')
+
+# Make sure the wiki supports wikibase-conceptbaseuri
+if MediaWikiVersion(testsite.version()) <
MediaWikiVersion('1.29.0-wmf.2'):
+raise unittest.SkipTest('Wiki version must be 1.29.0-wmf.2 or '
+'newer to support unbound uncertainties.')
+
+# set new claim
+claim = pywikibot.page.Claim(testsite, 'P20480',
datatype='globe-coordinate')
+target = pywikibot.Coordinate(site=testsite, lat=12.0, lon=13.0,
globe_item=item)
+claim.setTarget(target)
+item.addClaim(claim)
+
+# confirm new claim
+item.get(force=True)
+claim = item.claims['P20480'][0]
+self.assertEqual(claim.getTarget(), target)
+
def test_WbQuantity_edit_unbound(self):
"""Attempt adding a quantity with unbound errors."""
# Clean the slate in preparation for test.
--
To view, visit https://gerrit.wikimedia.org/r/334912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbf79a42720aca30be9a61aaf3b497f53ed87490
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix tags not being set in Special:Block
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334664 )
Change subject: Fix tags not being set in Special:Block
..
Fix tags not being set in Special:Block
Currently, a PHP error is thrown when tags are not set
in Special:Block on line 832. This patch fixes this
by adding an extra isset() check to see if the tags
variable is set.
Bug: T156486
Change-Id: Ib8722bffbcac5953263ded41eceb3d389d0932f0
---
M includes/specials/SpecialBlock.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Anomie: Looks good to me, approved
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 93cb377..c18ae0e 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -829,7 +829,7 @@
$logEntry->setRelations( [ 'ipb_id' => $blockIds ] );
$logId = $logEntry->insert();
- if ( count( $data['Tags'] ) ) {
+ if ( !empty( $data['Tags'] ) ) {
$logEntry->setTags( $data['Tags'] );
}
--
To view, visit https://gerrit.wikimedia.org/r/334664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8722bffbcac5953263ded41eceb3d389d0932f0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MtDu
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: MtDu
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up Id00817d05: Correct mistaken handling of forced re...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334205 )
Change subject: Follow-up Id00817d05: Correct mistaken handling of forced
replacements
..
Follow-up Id00817d05: Correct mistaken handling of forced replacements
Change-Id: I348899e0a467f9e8bd4fc95abba0218ada5963b5
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 35 insertions(+), 24 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/elements/ve.ui.DiffElement.js
b/src/ui/elements/ve.ui.DiffElement.js
index 63b6e24..2075de1 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -223,31 +223,42 @@
subTreeRootNodeData = this.oldDoc.getData(
subTreeRootNode.node.getOuterRange() );
subTreeRootNodeData[ 0 ] = this.addClassesToNode(
subTreeRootNodeData[ 0 ], this.oldDoc, 'remove' );
- // Find the node that corresponds to the "previous node" of
this node. The
- // "previous node" is either:
- // - the rightmost left sibling that corresponds to a node in
the new document
- // - or if there isn't one, then this node's parent (which must
correspond to
- // a node in the new document, or this node would have been
marked already
- // processed)
- siblingNodes = subTreeRootNode.parent.children;
- for ( i = 0, ilen = siblingNodes.length; i < ilen; i++ ) {
- if ( siblingNodes[ i ].index === nodeIndex ) {
- break;
- } else {
- oldPreviousNodeIndex = siblingNodes[ i ].index;
- newPreviousNodeIndex =
correspondingNodes.oldToNew[ oldPreviousNodeIndex ] || newPreviousNodeIndex;
+ // If this node is a child of the document node, then it won't
have a "previous
+ // node" (see below), in which case, insert it just before its
corresponding
+ // node in the new document.
+ if ( subTreeRootNode.index === 0 ) {
+ insertIndex = newNodes[ correspondingNodes.oldToNew[ 0
] ]
+ .node.getOuterRange().from - nodeRange.from;
+ } else {
+
+ // Find the node that corresponds to the "previous
node" of this node. The
+ // "previous node" is either:
+ // - the rightmost left sibling that corresponds to a
node in the new document
+ // - or if there isn't one, then this node's parent
(which must correspond to
+ // a node in the new document, or this node would have
been marked already
+ // processed)
+ siblingNodes = subTreeRootNode.parent.children;
+ for ( i = 0, ilen = siblingNodes.length; i < ilen; i++
) {
+ if ( siblingNodes[ i ].index === nodeIndex ) {
+ break;
+ } else {
+ oldPreviousNodeIndex = siblingNodes[ i
].index;
+ newPreviousNodeIndex =
correspondingNodes.oldToNew[ oldPreviousNodeIndex ] || newPreviousNodeIndex;
+ }
}
+
+ // If previous node was found among siblings, insert
the removed subtree just
+ // after its corresponding node in the new document.
Otherwise insert the
+ // removed subtree just inside its parent node's
corresponding node.
+ if ( newPreviousNodeIndex ) {
+ insertIndex = newNodes[ newPreviousNodeIndex
].node.getRange().to - nodeRange.from;
+ } else {
+ newPreviousNodeIndex =
correspondingNodes.oldToNew[ subTreeRootNode.parent.index ];
+ insertIndex = newNodes[ newPreviousNodeIndex
].node.getRange().from - nodeRange.from;
+ }
+
}
- // If previous node was found among siblings, insert the
removed subtree just
- // after its corresponding node in the new document. Otherwise
insert the
- // removed subtree just inside its parent node's corresponding
node.
- if ( newPreviousNodeIndex ) {
- insertIndex = newNodes[ newPreviousNodeIndex
].node.getRange().to - nodeRange.from;
- } else {
- newPreviousNodeIndex = correspondingNodes.oldToNew[
subTreeRootNode.parent.index ];
- insertIndex = newNodes[ newPreviousNodeIndex
].node.getRange().from - nodeRange.from;
[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334785 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: Id5563a29ca4f95dc0450ccde16503b94ea42dcf6
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 95279c8..531d96e 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:Video";,
- "description": "Allows new Video namespace for embeddable media on
supported sites",
+ "descriptionmsg": "video-desc",
"type": "other",
"SpecialPages": {
"AddVideo": "AddVideo",
diff --git a/i18n/en.json b/i18n/en.json
index 208923b..cf98030 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,7 @@
"David Pean "
]
},
+ "video-desc": "Allows new Video namespace for embeddable media on
supported sites",
"addvideo": "Add video",
"newvideos": "New videos",
"video-upload-new-version": "Upload a new version of this video",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b114782..1515001 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,6 +4,7 @@
"John Du Hart "
]
},
+"video-desc":
"{{desc|name=Video|url=https://www.mediawiki.org/wiki/Extension:Video}}";,
"video-upload-new-version": "Like
[[MediaWiki:Uploadnewversion-linktext]], but \"file\" changed to \"video\".",
"video-newvideos-showfrom": "Like [[MediaWiki:Sp-newimages-showfrom]],
but \"file\" changed to \"video\".",
"video-newvideos-list-text": "Like [[MediaWiki:Imagelisttext]], but
\"file\" changed to \"video\".",
--
To view, visit https://gerrit.wikimedia.org/r/334785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5563a29ca4f95dc0450ccde16503b94ea42dcf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...BlueSpiceCategoryManager[master]: Use existing description message in extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334703 ) Change subject: Use existing description message in extension.json .. Use existing description message in extension.json Change-Id: I17b64f8fc349e4a0a5e4e249fa35be44e01fbef3 --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index bdc5f1c..feed87c 100644 --- a/extension.json +++ b/extension.json @@ -5,7 +5,7 @@ "Dejan Savuljesku" ], "url": "https://www.mediawiki.org/wiki/Extension:BlueSpiceCategoryManager";, - "description": "This extension offers a special page for category administration, based on BlueSpiceFoundation.", + "descriptionmsg": "bluespicecategorymanager-desc", "version": "2.27.1-alpha", "license-name": "GPL-2.0+", "type": "bluespice", -- To view, visit https://gerrit.wikimedia.org/r/334703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17b64f8fc349e4a0a5e4e249fa35be44e01fbef3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceCategoryManager Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Dvogel hallowelt Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Robert Vogel 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] mediawiki...Schulenburg[master]: Remove description from extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334761 )
Change subject: Remove description from extension.json
..
Remove description from extension.json
The description is to short to be helpful on [[Special:Version]]
Change-Id: Ice25b6cf3956513f6a5168921c906f8a3337d06e
---
M skin.json
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skin.json b/skin.json
index d05373e..37c57c6 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,6 @@
{
"name": "Schulenburg",
"author": "Tim Starling",
- "description": "Schulenburg",
"url": "https://www.mediawiki.org/wiki/Skin:Schulenburg";,
"type": "skin",
"ValidSkinNames": {
--
To view, visit https://gerrit.wikimedia.org/r/334761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice25b6cf3956513f6a5168921c906f8a3337d06e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Schulenburg
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...ShoutWikiAPI[master]: Use existing description message in extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334779 )
Change subject: Use existing description message in extension.json
..
Use existing description message in extension.json
Change-Id: I73ccd1bb54d7915a4c9b7cadb64df1f3b4139465
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index e44140a..641f2b2 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"license-name": "CC0-1.0",
"url": "https://www.mediawiki.org/wiki/Extension:ShoutWiki_API";,
- "description": "A collection of ShoutWiki-specific API modules",
+ "descriptionmsg": "shoutwikiapi-desc",
"type": "other",
"MessagesDirs": {
"ShoutWikiAPI": [
--
To view, visit https://gerrit.wikimedia.org/r/334779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73ccd1bb54d7915a4c9b7cadb64df1f3b4139465
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ShoutWikiAPI
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Raimond Spekking
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] mediawiki...QuizGame[master]: [WIP] Move inline styles to stylesheet in QuizGame
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334910 )
Change subject: [WIP] Move inline styles to stylesheet in QuizGame
..
[WIP] Move inline styles to stylesheet in QuizGame
Bug: T147258
Change-Id: I6b8400364f1e3ea145d102503148c3b11ec66223
---
M QuestionGameHome.body.php
M questiongame.css
2 files changed, 46 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuizGame
refs/changes/10/334910/1
diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index d5f78c0..5a11668 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -430,7 +430,7 @@
$output = '
-
+
' .
@@ -623,7 +623,7 @@
$pictag = '' . $thumbtag . '
-
+
{$choice['text']}" .
$incorrectMsg . $correctMsg .
'';
- $answers .= "
+ $answers .= "
{$choice['percent']}%
";
@@ -1115,7 +1115,7 @@
{$imageTag}
" .
$this->msg( 'quizgame-js-loading' )->text() . "
-
+
{$answers}
@@ -1184,7 +1184,7 @@
$answerColor = 'red';
$answerColorNumber = '2';
}
- $output .= "
+ $output .= "
{$choice['text']}
@@ -1268,7 +1268,7 @@
-
+
";
@@ -1418,8 +1418,8 @@
' . $this->msg(
'quizgame-create-write-question' )->text() . '
' . $this->msg(
'quizgame-create-write-answers' )->text() . '
- ' . $this->msg(
'quizgame-create-check-correct' )->text() . '
- ';
+ ' .
$this->msg( 'quizgame-create-check-correct' )->text() . '
+ ';
// the span#this-is-the-welcome-page element is an epic hack
for JS
// because I can't think of a better way to detect where we are
and JS
// needs to know if it's on the welcome page or not because
there is a
@@ -1428,7 +1428,7 @@
for( $x = 1; $x <= $max_answers; $x++ ) {
$output .= " 2 ) ? ' style="display:none;"' : '' )
. ">
+ ( ( $x > 2 ) ? '' : '' ) . ">
{$x}.
@@ -1441,7 +1441,7 @@
- ' .
+ ' .
$this->msg( 'quizgame-create-add-picture'
)->text() . '
@@ -1453,8 +1453,7 @@
-
-
+
diff --git a/questiongame.css b/questiongame.css
index 47f2294..6822d5a 100644
--- a/questiongame.css
+++ b/questiongame.css
@@ -239,6 +239,7 @@
.quizgame-answers {
font-size: 16px;
font-weight: bold;
+ display: none;
}
.quizgame-answers ul {
@@ -365,6 +366,10 @@
margin-top: 5px;
}
+.hiddendiv {
+ display: none;
+}
+
.edit-menu-quiz-game {
float: right;
margin: -3px 0px 0px 10px;
@@ -434,10 +439,18 @@
margin: 20px 0px 15px 0px !important;
}
-h1.write-answer {
+.write-answer {
color: #33;
font-size: 16px;
margin: 20px 0px 10px 0px !important;
+}
+
+.quizgame-create-check-correct {
+ margin: 10px 0 0 0;
+}
+
+#this-is-the-welcome-page {
+ display: none;
}
.quizgame-answer-number {
@@ -449,6 +462,7 @@
.quizgame-answer {
margin: 10px 0px 10px 0px;
+ display:none;
}
.a
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove .join( '|' ) for API parameters
Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334909 )
Change subject: Remove .join( '|' ) for API parameters
..
Remove .join( '|' ) for API parameters
mw.Api automatically joins parameters which are from type array.
Change-Id: Ic56ec9936a6ac4dcfe575341c064f4dae40ffbca
---
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/ext.cx.translationlist.js
M modules/publish/ext.cx.publish.js
M modules/tools/ext.cx.tools.categories.js
M modules/tools/ext.cx.tools.link.js
M modules/widgets/pageselector/ext.cx.pageselector.js
6 files changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/09/334909/1
diff --git a/modules/dashboard/ext.cx.suggestionlist.js
b/modules/dashboard/ext.cx.suggestionlist.js
index 526467b..15faf79 100644
--- a/modules/dashboard/ext.cx.suggestionlist.js
+++ b/modules/dashboard/ext.cx.suggestionlist.js
@@ -291,8 +291,8 @@
CXSuggestionList.prototype.getPageDetails = function ( language, titles
) {
return this.siteMapper.getApi( language ).get( {
action: 'query',
- titles: titles.join( '|' ),
- prop: [ 'pageimages', 'pageterms' ].join( '|' ),
+ titles: titles,
+ prop: [ 'pageimages', 'pageterms' ],
piprop: 'thumbnail',
pilimit: 50, // maximum
pithumbsize: 100,
diff --git a/modules/dashboard/ext.cx.translationlist.js
b/modules/dashboard/ext.cx.translationlist.js
index a1868c1..ec3e459 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -123,7 +123,7 @@
CXTranslationList.prototype.getLinkImages = function ( language, titles
) {
return this.siteMapper.getApi( language ).get( {
action: 'query',
- titles: titles.join( '|' ),
+ titles: titles,
prop: 'pageimages',
piprop: 'thumbnail',
pilimit: 50, // maximum
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index 7eda0ff..47da28d 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -40,7 +40,7 @@
to: mw.cx.targetLanguage,
sourcetitle: mw.cx.sourceTitle,
html: EasyDeflate.deflate( self.getContent() ),
- categories: this.getCategories().join( '|' )
+ categories: this.getCategories()
} );
return this.checkTargetTitle( this.targetTitle ).then( function
( title ) {
diff --git a/modules/tools/ext.cx.tools.categories.js
b/modules/tools/ext.cx.tools.categories.js
index ab7a7db..db3a06a 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -560,7 +560,7 @@
this.siteMapper.getApi( mw.cx.sourceLanguage ).post( {
action: 'query',
- titles: categoryTitles.join( '|' ),
+ titles: categoryTitles,
prop: 'langlinks',
lllang: this.siteMapper.getWikiDomainCode( language ),
lllimit: 100,
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index 4dff768..74831f8 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -74,7 +74,7 @@
mw.cx.siteMapper.getApi( apiLanguage ).get( {
action: 'query',
- titles: titles.join( '|' ),
+ titles: titles,
prop: 'langlinks',
lllimit: titles.length, // TODO: Default is 10 and max
is 500. Do we need more than 500?
lllang: mw.cx.siteMapper.getWikiDomainCode( language ),
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.js
b/modules/widgets/pageselector/ext.cx.pageselector.js
index 7d4d06d..8988a72 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.js
+++ b/modules/widgets/pageselector/ext.cx.pageselector.js
@@ -59,7 +59,7 @@
generator: 'prefixsearch',
gpssearch: input,
gpslimit: 10,
- prop: [ 'pageimages', 'pageterms' ].join( '|' ),
+ prop: [ 'pageimages', 'pageterms' ],
piprop: 'thumbnail',
pithumbsize: 50,
pilimit: 10,
--
To view, visit https://gerrit.wikimedia.org/r/334909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Support adding units to WbQuantity through ItemPage or entit...
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334908 )
Change subject: Support adding units to WbQuantity through ItemPage or entity
url
..
Support adding units to WbQuantity through ItemPage or entity url
This is be backwards compatible so either ItemPages or entity
urls may be provided as units.
Provided urls are not validated (outside of limiting it to the
http(s) protocols) since items need not be in the same repo as the
claim.
Note that the internal representation of WbQuantity changes somewhat
(unit='1' -> unit=None), since '1' encodes "no unit" in Wikibase.
This commit replaces the following two:
Icdcfed92df7734d5162c432a2c6d3d00a1526491
Ibc05165841df8c1ef3108a55dc53bfcbe09da35d
Bug: T143594
Change-Id: I0ef7249d7a8f31ab62aa57d4f661062e889d9585
---
M pywikibot/__init__.py
M tests/wikibase_edit_tests.py
M tests/wikibase_tests.py
3 files changed, 96 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/08/334908/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 42b93ec..679eca9 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -256,7 +256,7 @@
@type dim: int
@param site: The Wikibase site
@type site: pywikibot.site.DataSite
-@param entity: The URL entity of a Wikibase item
+@param entity: The URL entity of a Wikibase item for the globe
@type entity: str
"""
self.lat = lat
@@ -651,7 +651,9 @@
@param amount: number representing this quantity
@type amount: string or Decimal. Other types are accepted, and
converted
via str to Decimal.
-@param unit: not used (only unit-less quantities are supported)
+@param unit: the Wikibase item for the unit or the URL entity of this
+ Wikibase item.
+@type unit: pywikibot.ItemPage, str or None
@param error: the uncertainty of the amount (e.g. ±1)
@type error: same as amount, or tuple of two values, where the first
value is
the upper error and the second is the lower error value.
@@ -660,11 +662,17 @@
"""
if amount is None:
raise ValueError('no amount given')
-if unit is None:
-unit = '1'
self.amount = self._todecimal(amount)
self.unit = unit
+self._entity = None
+
+# also allow entity urls to be provided via unit parameter
+if unit and not isinstance(unit, ItemPage):
+if unit.split('://')[0] in ('http', 'https'):
+self._entity = unit
+else:
+raise ValueError("'unit' must be an ItemPage or entity url.")
if error is None and not self._require_errors(site):
self.upperBound = self.lowerBound = None
@@ -680,6 +688,14 @@
self.upperBound = self.amount + upperError
self.lowerBound = self.amount - lowerError
+@property
+def entity(self):
+if self._entity:
+return self._entity
+if self.unit:
+return self.unit.concept_url()
+return '1'
+
def toWikibase(self):
"""
Convert the data to a JSON object for the Wikibase API.
@@ -690,7 +706,7 @@
json = {'amount': self._fromdecimal(self.amount),
'upperBound': self._fromdecimal(self.upperBound),
'lowerBound': self._fromdecimal(self.lowerBound),
-'unit': self.unit
+'unit': self.entity
}
return json
@@ -709,7 +725,11 @@
error = None
if (upperBound and lowerBound) or cls._require_errors(site):
error = (upperBound - amount, amount - lowerBound)
-return cls(amount, wb['unit'], error, site)
+if wb['unit'] == '1':
+unit = None
+else:
+unit = wb['unit']
+return cls(amount, unit, error, site)
class WbMonolingualText(_WbRepresentation):
diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py
index 621146b..3a24239 100644
--- a/tests/wikibase_edit_tests.py
+++ b/tests/wikibase_edit_tests.py
@@ -224,7 +224,7 @@
def test_WbMonolingualText_edit(self):
"""Attempt adding a monolingual text with valid input."""
-# Clean the slate in preparation for test."""
+# Clean the slate in preparation for test.
testsite = self.get_repo()
item = self._clean_item(testsite, 'P271')
@@ -245,7 +245,7 @@
testsite = self.get_repo()
item = self._clean_item(testsite, 'P69')
-# Make sure the wiki supports wikibase-conceptbaseuri
+# Make sure the wiki supports unbound uncertainties
if MediaWikiVersion(testsite.version()) <
MediaWikiVersion('1.29.0-wmf.2'):
raise unittest.SkipTest('Wiki version mus
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (139bdf7)
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/309472 )
Change subject: Update VE core submodule to master (139bdf7)
..
Update VE core submodule to master (139bdf7)
New changes:
d79138b Overwrite selected content when pasting via DataTransferItem
3c4737f Ensure clipboard is never empty text
3b1339e Create dummy platform and target for tests
4d63c8e Pass text as string to insertDocument when detected as plain text
Local change:
Remove VE standalone module
Flow used to use it, but not anymore. Going forward no one should
be using it in MW.
Bug: T154020
Bug: T156302
Bug: T156498
Depends-On: I078c244ef524669da477a43f9b37c847252e5ad7
Change-Id: Ifc4be16269f819890f2dcdddbbdebf9694ad2868
---
M VisualEditor.hooks.php
M extension.json
M lib/ve
M modules/ve-mw/tests/ve.test.utils.js
4 files changed, 5 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 450e91a..d421409 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -868,7 +868,6 @@
'modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js',
'modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.test.js',
// VisualEditor initialization Tests
- 'lib/ve/tests/init/ve.init.Platform.test.js',
'modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js',
// IME tests
'lib/ve/tests/ce/ve.ce.TestRunner.js',
@@ -911,7 +910,6 @@
],
'dependencies' => [
'unicodejs',
- 'ext.visualEditor.standalone',
'ext.visualEditor.core',
'ext.visualEditor.mwcore',
'ext.visualEditor.mwformatting',
diff --git a/extension.json b/extension.json
index 5eecc46..5aa0764 100644
--- a/extension.json
+++ b/extension.json
@@ -545,22 +545,6 @@
"mobile"
]
},
- "ext.visualEditor.standalone": {
- "scripts": [
- "lib/ve/src/init/sa/ve.init.sa.js",
- "lib/ve/src/init/sa/ve.init.sa.Platform.js",
- "lib/ve/src/init/sa/ve.init.sa.Target.js",
- "lib/ve/src/init/sa/ve.init.sa.DesktopTarget.js"
- ],
- "styles": [
- "lib/ve/src/init/sa/styles/ve.init.sa.css"
- ],
- "dependencies": [
- "ext.visualEditor.base",
- "jquery.i18n",
- "jquery.uls.data"
- ]
- },
"ext.visualEditor.data": {
"class": "VisualEditorDataModule"
},
diff --git a/lib/ve b/lib/ve
index e5dffec..139bdf7 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit e5dffec5406693126f13b2de8c57c99ee8d73162
+Subproject commit 139bdf7add8149c9506f4b1eeaf5553e2eb8afeb
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index d4ccb20..3b94f5e 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -12,9 +12,9 @@
// Prevent the target from setting up the surface immediately
ve.init.platform.initialized = $.Deferred();
- // HACK: MW targets are async and heavy, use an SA target but
- // override the global registration
- target = new ve.init.sa.Target();
+ // HACK: MW targets are async and heavy, use a DummyTarget
+ // but override the global registration
+ target = new ve.test.utils.DummyTarget();
mwTarget = new ve.init.mw.ArticleTarget();
$( '#qunit-fixture' ).append( target.$element );
@@ -22,8 +22,7 @@
ve.init.platform.initialized.resolve();
mwTarget = null;
- target.addSurface( doc );
- return target.surface;
+ return target.addSurface( doc );
};
// Unregister MW override nodes.
--
To view, visit https://gerrit.wikimedia.org/r/309472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc4be16269f819890f2dcdddbbdebf9694ad2868
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Revi
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Actually import the new translations in Special:ImportTransl...
Nemo bis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334907 )
Change subject: Actually import the new translations in
Special:ImportTranslations
..
Actually import the new translations in Special:ImportTranslations
Also document the function a bit more.
Change-Id: I176ea790506edc610cf74ea88842358820569b7f
---
M utils/MessageWebImporter.php
1 file changed, 33 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/07/334907/1
diff --git a/utils/MessageWebImporter.php b/utils/MessageWebImporter.php
index 455a961..86fd883 100644
--- a/utils/MessageWebImporter.php
+++ b/utils/MessageWebImporter.php
@@ -191,15 +191,17 @@
$this->out->addHTML( $this->doHeader() );
- // Determine changes
+ // If we are allowed to process messages, potentially return
true
$alldone = $process;
+
+ // Determine changes for each message.
$changed = array();
foreach ( $messages as $key => $value ) {
$fuzzy = $old = null;
if ( isset( $collection[$key] ) ) {
- // This returns null for if no existing
translation
+ // This returns null if no existing translation
is found
$old = $collection[$key]->translation();
}
@@ -209,34 +211,53 @@
}
if ( $old === null ) {
+ // The translation is new (and hopefully for an
existing
+ // message key): import it
+ $message = self::doAction(
+ 'import',
+ $group,
+ $key,
+ $code,
+ $value
+ );
+
+ // Show the user that we imported the new
translation
$para = '' .
htmlspecialchars( $key ) . '';
$name = $context->msg(
'translate-manage-import-new' )->rawParams( $para )
->escaped();
$text =
TranslateUtils::convertWhiteSpaceToHTML( $value );
$changed[] = self::makeSectionElement( $name,
'new', $text );
} else {
+ // Prepare the presentation of the changed
translation
$oldContent = ContentHandler::makeContent(
$old, $diff->getTitle() );
$newContent = ContentHandler::makeContent(
$value, $diff->getTitle() );
-
$diff->setContent( $oldContent, $newContent );
-
$text = $diff->getDiff( '', '' );
+
+ // This is a changed translation. Note it for
the next steps.
$type = 'changed';
+ // Get the user instructions for the current
message,
+ // submitted together with the form
$action = $context->getRequest()
->getVal( self::escapeNameForPHP(
"action-$type-$key" ) );
if ( $process ) {
if ( !count( $changed ) ) {
+ // Initialise the HTML list
showing the changes performed
$changed[] = '';
}
if ( $action === null ) {
+ // We have been told to process
the messages, but not
+ // what to do with this one.
Tell the user.
$message = $context->msg(
'translate-manage-inconsistent',
wfEscapeWikiText(
"action-$type-$key" )
)->parse();
$changed[] =
"$message";
+
+ // Also stop any further
processing for the other messages.
$process = false;
} else {
// Check processing time
@@ -244,6 +265,8 @@
$this->time =
wfTimestamp();
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (139bdf7)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334906 ) Change subject: Update VE core submodule to master (139bdf7) .. Update VE core submodule to master (139bdf7) New changes: d79138b Overwrite selected content when pasting via DataTransferItem 3c4737f Ensure clipboard is never empty text 3b1339e Create dummy platform and target for tests 4d63c8e Pass text as string to insertDocument when detected as plain text Bug: T154020 Bug: T156302 Bug: T156498 Change-Id: I39858af8ae527d319a25f55f02fd06f4c0a2 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/06/334906/1 diff --git a/lib/ve b/lib/ve index e5dffec..139bdf7 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit e5dffec5406693126f13b2de8c57c99ee8d73162 +Subproject commit 139bdf7add8149c9506f4b1eeaf5553e2eb8afeb -- To view, visit https://gerrit.wikimedia.org/r/334906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39858af8ae527d319a25f55f02fd06f4c0a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectWidget: Allow OptionWidget subclasses to provide custo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334858 )
Change subject: SelectWidget: Allow OptionWidget subclasses to provide custom
match text
..
SelectWidget: Allow OptionWidget subclasses to provide custom match text
Move the label extraction code into OptionWidget, and allow it to
be overridden.
Change-Id: Ia7a2b00fbcb0d559294f64792fc9818aa654f7a0
---
M src/widgets/OptionWidget.js
M src/widgets/SelectWidget.js
2 files changed, 18 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/widgets/OptionWidget.js b/src/widgets/OptionWidget.js
index 8c56c0b..0b11517 100644
--- a/src/widgets/OptionWidget.js
+++ b/src/widgets/OptionWidget.js
@@ -182,3 +182,16 @@
}
return this;
};
+
+/**
+ * Get text to match search strings against.
+ *
+ * The default implementation returns the label text, but subclasses
+ * can override this to provide more complex behavior.
+ *
+ * @return {string|boolean} String to match search string against
+ */
+OO.ui.OptionWidget.prototype.getMatchText = function () {
+ var label = this.getLabel();
+ return typeof label === 'string' ? label : this.$label.text();
+};
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index c822556..444a63e 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -442,7 +442,7 @@
* @protected
* @param {string} s String to match against items
* @param {boolean} [exact=false] Only accept exact matches
- * @return {Function} function ( OO.ui.OptionItem ) => boolean
+ * @return {Function} function ( OO.ui.OptionWidget ) => boolean
*/
OO.ui.SelectWidget.prototype.getItemMatcher = function ( s, exact ) {
var re;
@@ -457,14 +457,11 @@
}
re = new RegExp( re, 'i' );
return function ( item ) {
- var l = item.getLabel();
- if ( typeof l !== 'string' ) {
- l = item.$label.text();
+ var matchText = item.getMatchText();
+ if ( matchText.normalize ) {
+ matchText = matchText.normalize();
}
- if ( l.normalize ) {
- l = l.normalize();
- }
- return re.test( l );
+ return re.test( matchText );
};
};
--
To view, visit https://gerrit.wikimedia.org/r/334858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7a2b00fbcb0d559294f64792fc9818aa654f7a0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add release notes for recent language fallback changes
Nemo bis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334905 ) Change subject: Add release notes for recent language fallback changes .. Add release notes for recent language fallback changes Change-Id: I5dfba8eeca45a77c7c67091615c742a8b96bd202 --- M RELEASE-NOTES-1.29 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/05/334905/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 883729b..8fa29c1 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -134,7 +134,8 @@ Some configurations (such as date formats and gender namespaces) have also been updated when using the fallback language's configuration was inadequate. The new or reinstated language fallbacks are (after cs ↔ sk in 1.28): - hsb ↔ dsb, io → eo, mdf → ru, pnt → el, roa-tara → it. + ca ↔ oc; hsb ↔ dsb; io → eo; mdf → ru; pnt → el; roa-tara → it; rup → ro; + sh → bs, sr-el, hr. No fallback for Ukrainian * (T39314) The fallback from Ukrainian to Russian was removed. The Ukrainian -- To view, visit https://gerrit.wikimedia.org/r/334905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dfba8eeca45a77c7c67091615c742a8b96bd202 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] VisualEditor/VisualEditor[master]: Pass text as string to insertDocument when detected as plain...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334852 )
Change subject: Pass text as string to insertDocument when detected as plain
text
..
Pass text as string to insertDocument when detected as plain text
Bug: T156498
Change-Id: Ia6d46ccabd2994b9d719296d9b28f1ee5a908741
---
M src/dm/ve.dm.SourceSurfaceFragment.js
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/dm/ve.dm.SourceSurfaceFragment.js
b/src/dm/ve.dm.SourceSurfaceFragment.js
index ec7609c..f2dc285 100644
--- a/src/dm/ve.dm.SourceSurfaceFragment.js
+++ b/src/dm/ve.dm.SourceSurfaceFragment.js
@@ -120,10 +120,15 @@
// Pass `annotate` as `ignoreCoveringAnnotations`. If matching the
target annotation (plain text) strip covering annotations.
if ( doc.data.isPlainText( newDocRange, false, [ 'paragraph' ],
annotate ) ) {
- return
ve.dm.SourceSurfaceFragment.super.prototype.insertContent.call( this,
doc.data.getDataSlice( newDocRange ).map( function ( element ) {
- // Remove any text annotations, as we have determined
them to be covering
- return Array.isArray( element ) ? element[ 0 ] :
element;
- } ) );
+ return
ve.dm.SourceSurfaceFragment.super.prototype.insertContent.call(
+ this,
+ doc.data.getDataSlice( newDocRange ).map( function (
element ) {
+ // Remove any text annotations, as we have
determined them to be covering
+ return Array.isArray( element ) ? element[ 0 ]
: element;
+ } )
+ // Re-join as string so that newline splitting
logic is triggered
+ .join( '' )
+ );
}
this.convertToSource( doc )
--
To view, visit https://gerrit.wikimedia.org/r/334852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d46ccabd2994b9d719296d9b28f1ee5a908741
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Overwrite selected content when pasting via DataTransferItem
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334681 )
Change subject: Overwrite selected content when pasting via DataTransferItem
..
Overwrite selected content when pasting via DataTransferItem
Bug: T154020
Change-Id: I3085516a76bb8324c2029d826a045f99fa5c7f1b
---
M src/ce/ve.ce.Surface.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 0b3025b..080c279 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2336,7 +2336,8 @@
targetFragment = targetFragment || this.getModel().getFragment();
function insert( docOrData ) {
- var resultFragment = targetFragment.collapseToEnd();
+ // For non-paste transfers, don't overwrite the selection
+ var resultFragment = !isPaste ? targetFragment.collapseToEnd()
: targetFragment;
if ( docOrData instanceof ve.dm.Document ) {
resultFragment.insertDocument( docOrData );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/334681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3085516a76bb8324c2029d826a045f99fa5c7f1b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Ensure clipboard is never empty text
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334682 )
Change subject: Ensure clipboard is never empty text
..
Ensure clipboard is never empty text
In most extensions we ensure this isn't the case, but
put in a fallback to ensure copied content always contains
at least an nbsp.
Bug: T156302
Change-Id: I864e8d156b3b7558db85573a560e1b3285b7aa47
---
M src/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 0b3025b..0905e41 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1624,6 +1624,12 @@
// by adding a dummy class, which we can remove after paste.
this.$pasteTarget.find( 'span' ).addClass( 've-pasteProtect' );
+ // When paste has no text content browsers do extreme noramlization...
+ if ( this.$pasteTarget.text() === '' ) {
+ // ...so put nbsp's in empty leaves
+ this.$pasteTarget.find( '*:not( :has( * ) )' ).html( ' ' );
+ }
+
// href absolutization either doesn't occur (because we copy HTML to
the clipboard
// directly with clipboardData#setData) or it resolves against the
wrong document
// (window.document instead of ve.dm.Document#getHtmlDocument) so do it
manually
--
To view, visit https://gerrit.wikimedia.org/r/334682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I864e8d156b3b7558db85573a560e1b3285b7aa47
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [IMPR] some improvements vor vandalism closing bot
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334904 )
Change subject: [IMPR] some improvements vor vandalism closing bot
..
[IMPR] some improvements vor vandalism closing bot
- re.I for isIn function
- exceptionfor ValueError in userIsExperienced method
- use caseInsensitive for replaceExcept changing vmHead to replace
lowercased IP6 user entries
- enlarge timeout for rc_listener
- fix some misspelling errors
- some tests added
This should solve
https://de.wikipedia.org/w/index.php?title=Benutzer_Diskussion:Xqt&oldid=162107310#fehlende_.22erl..22-Markierung
Change-Id: I89c8f943f625a993d8036fbf3969a52440dc62a5
---
M tests/vandalism_tests.py
M vandalism.py
2 files changed, 47 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/tests/vandalism_tests.py b/tests/vandalism_tests.py
index 0b9d1ef..98e68d1 100644
--- a/tests/vandalism_tests.py
+++ b/tests/vandalism_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Test vandalism modules."""
#
-# (C) xqt, 2015-2016
+# (C) xqt, 2015-2017
#
# Distributed under the terms of the MIT license.
#
@@ -9,10 +9,12 @@
__version__ = '$Id$'
+import re
+
import unittest
from tests import utils # noqa
-from vandalism import getAccuser
+from vandalism import getAccuser, isIn
class TestVandalismMethods(unittest.TestCase):
@@ -33,23 +35,23 @@
'11:46, 15. Nov. 2011 (CET) baz'),
('xqt', '2011 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[Benutzerin:xqt|Xqt]]) '
+'foo [[Benutzerin:xqt|Xqt]] bar '
'11:46, 15. Nov. 2012 (CET) baz'),
('xqt', '2012 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[benutzerin:xqt|xqt]]) '
+'foo bar [[benutzerin:xqt|xqt]] '
'11:46, 15. Nov. 2013 (CET) baz'),
('xqt', '2013 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[benutzerin:xqt|xqt]]) '
+'foo bar [[benutzerin:xqt|xqt]] '
'11:46, 15. Mai 2014 (CEST)'),
('xqt', '2014 Mai 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[user:Xqt|xqt]]) '
+'foo bar [[user:Xqt|xqt]] '
'11:46, 15. Apr. 2015 (CEST) baz'),
('Xqt', '2015 Apr 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[User_talk:xqt|Xqt]]) '
+'foo bar [[User_talk:xqt|Xqt]] '
'11:46, 15. Nov. 2016 (CEST)'),
('xqt', '2016 Nov 15 11:46'))
self.assertEqual(getAccuser(
@@ -61,6 +63,31 @@
'11:46, 15. Nov. 2018 (CET) baz'),
('xqt', '2018 Nov 15 11:46'))
+def test_vmHeadlineRegEx(self): # flake8: disable=N802
+"""Test vmHeadlineRegEx."""
+self.assertIsNotNone(isIn('== [[Benutzer:Xqt1]] ==',
+ re.escape('Xqt1')))
+self.assertIsNotNone(isIn('== [[Benutzer:xqt2]] ==',
+ re.escape('Xqt2')))
+self.assertIsNotNone(isIn('== [[Benutzerin:Xqt3]] ==',
+ re.escape('Xqt3')))
+self.assertIsNotNone(isIn('== [[User:Xqt4]] ==',
+ re.escape('Xqt4')))
+self.assertIsNotNone(isIn('== [[user:Xqt5]] ==',
+ re.escape('Xqt5')))
+self.assertIsNotNone(isIn('== [[user:Xqt5]] ==',
+ re.escape('Xqt5')))
+self.assertIsNotNone(isIn('== [[Benutzer:77.7.117.89]] ==',
+ re.escape('77.7.117.89')))
+self.assertIsNotNone(isIn('== [[Benutzer:77.7.117.89]] ==',
+ re.escape('77.7.117.89')))
+self.assertIsNotNone(isIn(
+'== [[Benutzer:2003:D3:83C0:CB00:45F1:1850:1E89:1E22]] ==',
+re.escape('2003:D3:83C0:CB00:45F1:1850:1E89:1E22')))
+self.assertIsNotNone(isIn(
+'== [[Benutzer:2003:d3:83c0:cb00:45f1:1850:1e89:1e22]] ==',
+re.escape('2003:D3:83C0:CB00:45F1:1850:1E89:1E22')))
+
if __name__ == '__main__':
try:
diff --git a/vandalism.py b/vandalism.py
index bcdf62f..fb238b7 100644
--- a/vandalism.py
+++ b/vandalism.py
@@ -10,7 +10,7 @@
"""
#
# (C) Euku, 2009-2013
-# (C) xqt, 2013-2016
+# (C) xqt, 2013-2017
#
from __future__ import absolute_import, print_function, unicode_literals
@@ -55,7 +55,8 @@
def isIn(text, regex):
"""Search regex in text."""
-return re.search(regex, text, re.UNICODE)
+# re.IGNORECASE to enable lowercased IP
+return re.search(regex, text, re.UNICODE | re.IGNORECASE)
def search(text, regex):
@@ -66,10 +67,10 @@
def divideIntoSlices(rawText):
"""
-Anlalyze text.
+Analyze text.
Analyze the whole text to get the intro, the headlines and
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Create dummy platform and target for tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334724 )
Change subject: Create dummy platform and target for tests
..
Create dummy platform and target for tests
Change-Id: I078c244ef524669da477a43f9b37c847252e5ad7
---
M build/modules.json
M tests/index.html
D tests/init/ve.init.Platform.test.js
M tests/init/ve.init.sa.Platform.test.js
M tests/ve.test.utils.js
5 files changed, 107 insertions(+), 87 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/build/modules.json b/build/modules.json
index 3f1f64c..28c7629 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -693,7 +693,6 @@
"tests/ce/ve.ce.LeafNode.test.js",
"tests/ce/nodes/ve.ce.TextNode.test.js",
"tests/ce/nodes/ve.ce.TableNode.test.js",
- "tests/init/ve.init.Platform.test.js",
"tests/init/ve.init.sa.Platform.test.js",
"tests/ui/ve.ui.DataTransferHandlerFactory.test.js",
"tests/ui/ve.ui.Trigger.test.js",
diff --git a/tests/index.html b/tests/index.html
index bed485d..28f7b36 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -494,7 +494,6 @@
-
diff --git a/tests/init/ve.init.Platform.test.js
b/tests/init/ve.init.Platform.test.js
deleted file mode 100644
index 5bdcf36..000
--- a/tests/init/ve.init.Platform.test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
- * VisualEditor initialization tests.
- *
- * @copyright 2011-2017 VisualEditor Team and others; see
http://ve.mit-license.org
- */
-
-QUnit.module( 've.init.Platform' );
-
-QUnit.asyncTest( 'messages', 4, function ( assert ) {
- var platform = ve.init.platform;
-
- platform.getInitializedPromise().done( function () {
- QUnit.start();
- assert.ok(
- /^?$/.test( platform.getMessage(
'platformtest-foo' ) ),
- 'return plain key as fallback, possibly wrapped in
brackets'
- );
-
- platform.addMessages( {
- 'platformtest-foo': 'Foo & Bar by!',
- 'platformtest-lorem': 'Lorem <&> Ipsum: $1'
- } );
-
- assert.strictEqual(
- platform.getMessage( 'platformtest-foo' ),
- 'Foo & Bar by!',
- 'return plain message'
- );
-
- assert.strictEqual(
- platform.getMessage( 'platformtest-lorem', 10 ),
- 'Lorem <&> Ipsum: 10',
- 'return plain message with $# replacements'
- );
-
- assert.ok(
- /^?$/.test( platform.getMessage(
'platformtest-quux' ) ),
- 'return plain key as fallback, possibly wrapped in
brackets (after set up)'
- );
- } );
-} );
-
-QUnit.asyncTest( 'parsedMessage', 3, function ( assert ) {
- var platform = ve.init.platform;
-
- platform.getInitializedPromise().done( function () {
- QUnit.start();
- assert.ok(
- /^(<)?platformtest-quux(>)?$/.test(
platform.getParsedMessage( 'platformtest-quux' ) ),
- 'any brackets in fallbacks are HTML-escaped'
- );
-
- platform.addMessages( {
- 'platformtest-foo': 'Foo & Bar by!',
- 'platformtest-lorem': 'Lorem <&> Ipsum: $1'
- } );
-
- platform.addParsedMessages( {
- 'platformtest-foo': 'Foo '
- } );
-
- assert.strictEqual(
- platform.getParsedMessage( 'platformtest-foo' ),
- 'Foo ',
- 'prefer value from parsedMessage store'
- );
-
- assert.strictEqual(
- platform.getParsedMessage( 'platformtest-lorem', 10 ),
- 'Lorem <&> Ipsum: $1',
- 'fall back to html-escaped version of plain message, no
$# replacements'
- );
- } );
-} );
diff --git a/tests/init/ve.init.sa.Platform.test.js
b/tests/init/ve.init.sa.Platform.test.js
index ae8f87e..ec78099 100644
--- a/tests/init/ve.init.sa.Platform.test.js
+++ b/tests/init/ve.init.sa.Platform.test.js
@@ -62,3 +62,70 @@
'multiple values persist'
);
} );
+
+QUnit.asyncTest( 'messages', 4, function ( assert ) {
+ var platform = new ve.init.sa.Platform();
+
+ platform.getInitializedPromise().done( function () {
+ QUnit.start();
+ assert.ok(
+ /^?$/.
[MediaWiki-commits] [Gerrit] pywikibot...xqbot[master]: [IMPR] some improvements vor vandalism closing bot
Xqt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334904 )
Change subject: [IMPR] some improvements vor vandalism closing bot
..
[IMPR] some improvements vor vandalism closing bot
- re.I for isIn function
- exceptionfor ValueError in userIsExperienced method
- use caseInsensitive for replaceExcept changing vmHead to replace
lowercased IP6 user entries
- enlarge timeout for rc_listener
- fix some misspelling errors
- some tests added
This should solve
https://de.wikipedia.org/w/index.php?title=Benutzer_Diskussion:Xqt&oldid=162107310#fehlende_.22erl..22-Markierung
Change-Id: I89c8f943f625a993d8036fbf3969a52440dc62a5
---
M tests/vandalism_tests.py
M vandalism.py
2 files changed, 46 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot
refs/changes/04/334904/1
diff --git a/tests/vandalism_tests.py b/tests/vandalism_tests.py
index 0b9d1ef..4e5ffb8 100644
--- a/tests/vandalism_tests.py
+++ b/tests/vandalism_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Test vandalism modules."""
#
-# (C) xqt, 2015-2016
+# (C) xqt, 2015-2017
#
# Distributed under the terms of the MIT license.
#
@@ -9,10 +9,12 @@
__version__ = '$Id$'
+import re
+
import unittest
from tests import utils # noqa
-from vandalism import getAccuser
+from vandalism import getAccuser, vmHeadlineRegEx, isIn
class TestVandalismMethods(unittest.TestCase):
@@ -33,23 +35,23 @@
'11:46, 15. Nov. 2011 (CET) baz'),
('xqt', '2011 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[Benutzerin:xqt|Xqt]]) '
+'foo [[Benutzerin:xqt|Xqt]] bar '
'11:46, 15. Nov. 2012 (CET) baz'),
('xqt', '2012 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[benutzerin:xqt|xqt]]) '
+'foo bar [[benutzerin:xqt|xqt]] '
'11:46, 15. Nov. 2013 (CET) baz'),
('xqt', '2013 Nov 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[benutzerin:xqt|xqt]]) '
+'foo bar [[benutzerin:xqt|xqt]] '
'11:46, 15. Mai 2014 (CEST)'),
('xqt', '2014 Mai 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[user:Xqt|xqt]]) '
+'foo bar [[user:Xqt|xqt]] '
'11:46, 15. Apr. 2015 (CEST) baz'),
('Xqt', '2015 Apr 15 11:46'))
self.assertEqual(getAccuser(
-'foo bar ([[User_talk:xqt|Xqt]]) '
+'foo bar [[User_talk:xqt|Xqt]] '
'11:46, 15. Nov. 2016 (CEST)'),
('xqt', '2016 Nov 15 11:46'))
self.assertEqual(getAccuser(
@@ -61,6 +63,31 @@
'11:46, 15. Nov. 2018 (CET) baz'),
('xqt', '2018 Nov 15 11:46'))
+def test_vmHeadlineRegEx(self):
+"""Test vmHeadlineRegEx."""
+self.assertIsNotNone(isIn('== [[Benutzer:Xqt1]] ==',
+ re.escape('Xqt1')))
+self.assertIsNotNone(isIn('== [[Benutzer:xqt2]] ==',
+ re.escape('Xqt2')))
+self.assertIsNotNone(isIn('== [[Benutzerin:Xqt3]] ==',
+ re.escape('Xqt3')))
+self.assertIsNotNone(isIn('== [[User:Xqt4]] ==',
+ re.escape('Xqt4')))
+self.assertIsNotNone(isIn('== [[user:Xqt5]] ==',
+ re.escape('Xqt5')))
+self.assertIsNotNone(isIn('== [[user:Xqt5]] ==',
+ re.escape('Xqt5')))
+self.assertIsNotNone(isIn('== [[Benutzer:77.7.117.89]] ==',
+ re.escape('77.7.117.89')))
+self.assertIsNotNone(isIn('== [[Benutzer:77.7.117.89]] ==',
+ re.escape('77.7.117.89')))
+self.assertIsNotNone(isIn(
+'== [[Benutzer:2003:D3:83C0:CB00:45F1:1850:1E89:1E22]] ==',
+re.escape('2003:D3:83C0:CB00:45F1:1850:1E89:1E22')))
+self.assertIsNotNone(isIn(
+'== [[Benutzer:2003:d3:83c0:cb00:45f1:1850:1e89:1e22]] ==',
+re.escape('2003:D3:83C0:CB00:45F1:1850:1E89:1E22')))
+
if __name__ == '__main__':
try:
diff --git a/vandalism.py b/vandalism.py
index bcdf62f..f20ad71 100644
--- a/vandalism.py
+++ b/vandalism.py
@@ -10,7 +10,7 @@
"""
#
# (C) Euku, 2009-2013
-# (C) xqt, 2013-2016
+# (C) xqt, 2013-2017
#
from __future__ import absolute_import, print_function, unicode_literals
@@ -55,7 +55,8 @@
def isIn(text, regex):
"""Search regex in text."""
-return re.search(regex, text, re.UNICODE)
+# re.IGNORECASE to enable lowercased IP
+return re.search(regex, text, re.UNICODE | re.IGNORECASE)
def search(text, regex):
@@ -66,10 +67,10 @@
def divideIntoSlices(rawText):
"""
-Anlalyze text.
+Analyze text.
Analyze the whole text to get the intro, the headlines and t
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Move description from extension.json to message file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334885 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: Ic86bd840fdaa76c228f3833b38fdd7f02ea39196
---
M MediaWikiAuth.php
M i18n/en.json
A i18n/qqq.json
3 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/MediaWikiAuth.php b/MediaWikiAuth.php
index 6b34cd7..85af864 100644
--- a/MediaWikiAuth.php
+++ b/MediaWikiAuth.php
@@ -42,7 +42,7 @@
'author' => array( 'Laurence Parry', 'Jack Phoenix', 'Kim Schoonover',
'Ryan Schmidt' ),
'version' => '0.8.1',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiAuth',
- 'description' => 'Authenticates against and imports logins from an
external MediaWiki instance',
+ 'descriptionmsg' => 'mwa-desc',
);
# Stuff
diff --git a/i18n/en.json b/i18n/en.json
index 4c42374..ca69c7f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,7 @@
"Laurence \"GreenReaper\" Parry"
]
},
+ "mwa-desc": "Authenticates against and imports logins from an external
MediaWiki instance",
"mwa-autocreate-blocked": "Automatic account creation is blocked for
this IP on the remote wiki.",
"mwa-error-unknown": "Unknown error when logging in to the remote
wiki.",
"mwa-error-wrong-token": "A login token submission error occurred.
Please retry, and contact an administrator if this fails.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..ec21f3e
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "mwa-desc":
"{{desc|name=MediaWikiAuth|url=https://www.mediawiki.org/wiki/Extension:MediaWikiAuth}}";
+}
--
To view, visit https://gerrit.wikimedia.org/r/334885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic86bd840fdaa76c228f3833b38fdd7f02ea39196
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Raimond Spekking
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] mediawiki/core[master]: Avoid using deprecated ScopedCallback alias
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334903 ) Change subject: Avoid using deprecated ScopedCallback alias .. Avoid using deprecated ScopedCallback alias Change-Id: Ica8a066c3f28adc710ee11919c07dd188144beb5 --- M includes/libs/objectcache/WANObjectCacheReaper.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/334903/1 diff --git a/includes/libs/objectcache/WANObjectCacheReaper.php b/includes/libs/objectcache/WANObjectCacheReaper.php index 62e4536..956a3a9 100644 --- a/includes/libs/objectcache/WANObjectCacheReaper.php +++ b/includes/libs/objectcache/WANObjectCacheReaper.php @@ -23,6 +23,7 @@ use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; +use Wikimedia\ScopedCallback; /** * Class for scanning through chronological, log-structured data or change logs -- To view, visit https://gerrit.wikimedia.org/r/334903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica8a066c3f28adc710ee11919c07dd188144beb5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Refactor MockRepositoryTest to fix all type warnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334650 )
Change subject: Refactor MockRepositoryTest to fix all type warnings
..
Refactor MockRepositoryTest to fix all type warnings
My PHPStorm was complaining about this code a lot because it was calling
getFingerprint() on entity objects it did not know anything about. This
is one of the very few remaining places that contained such bad assumptions.
Change-Id: Idf3997143f4b84c23cbd4b1e07f05c0868187ee1
---
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
2 files changed, 147 insertions(+), 172 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index 94aefaf..664f59c 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -362,7 +362,7 @@
/**
* Fetches the entities with provided ids and returns them.
* The result array contains the prefixed entity ids as keys.
-* The values are either an Entity or null, if there is no entity with
the associated id.
+* The values are either an EntityDocument or null, if there is no
entity with the associated id.
*
* The revisions can be specified as an array holding an integer
element for each
* id in the $entityIds array or false for latest. If all should be
latest, false
@@ -370,7 +370,7 @@
*
* @param EntityId[] $entityIds
*
-* @return EntityDocument|null[]
+* @return EntityDocument[]|null[]
*/
public function getEntities( array $entityIds ) {
$entities = array();
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 17c1698..35fcc74 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -2,9 +2,7 @@
namespace Wikibase\Lib\Tests;
-use MWException;
use User;
-use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -86,13 +84,13 @@
$item = $this->repo->getEntity( $itemId );
$this->assertNotNull( $item, 'Entity ' . $itemId );
$this->assertInstanceOf( Item::class, $item, 'Entity ' .
$itemId );
- $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
- $this->assertEquals( 'bar', $item->getFingerprint()->getLabel(
'de' )->getText() );
+ $this->assertEquals( 'foo', $item->getLabels()->getByLanguage(
'en' )->getText() );
+ $this->assertEquals( 'bar', $item->getLabels()->getByLanguage(
'de' )->getText() );
// test we can't mess with entities in the repo
$item->setLabel( 'en', 'STRANGE' );
$item = $this->repo->getEntity( $itemId );
- $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
+ $this->assertEquals( 'foo', $item->getLabels()->getByLanguage(
'en' )->getText() );
// test latest prop
$prop = $this->repo->getEntity( $propId );
@@ -168,8 +166,6 @@
}
public function provideGetLinks() {
- $cases = array();
-
$a = new Item( new ItemId( 'Q1' ) );
$a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
$a->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Bar' );
@@ -178,122 +174,118 @@
$b->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Bar' );
$b->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Xoo' );
- $items = array( $a, $b );
+ $items = [ $a, $b ];
- // #0: all -
- $cases[] = array( $items,
- array(), // items
- array(), // sites
- array(), // pages
- array( // expected
- array( 'enwiki', 'Foo', 1 ),
- array( 'dewiki', 'Bar', 1 ),
- array( 'enwiki', 'Bar', 2 ),
- array( 'dewiki', 'Xoo', 2 ),
- )
- );
-
- // #1: mismatch -
- $cases[] = array( $items,
- array(), // items
- array( 'enwiki' ), // sites
- array( 'Xoo' ), // pages
- array() // expected
- );
-
- // #2: by item -
- $cases[] = array( $items,
- array( 1 ), // items
- array(), // sites
-
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove unused code from ChangeOpTestMockProvider
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334541 )
Change subject: Remove unused code from ChangeOpTestMockProvider
..
Remove unused code from ChangeOpTestMockProvider
Change-Id: Ia459217495423c0bb1b66c9124665730dfe04dc1
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
1 file changed, 0 insertions(+), 51 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 36c4e13..3d759ad 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -26,7 +26,6 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementGuid;
-use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\Repo\DataTypeValidatorFactory;
use Wikibase\Repo\Store\SiteLinkConflictLookup;
@@ -273,56 +272,6 @@
->method( 'parse' )
->will( PHPUnit_Framework_TestCase::returnValue( $guid
) );
return $mock;
- }
-
- public function detectLabelConflictsForEntity( FingerprintProvider
$entity ) {
- foreach ( $entity->getFingerprint()->getLabels()->toTextArray()
as $lang => $label ) {
- if ( $label === 'DUPE' ) {
- return Result::newError( array(
- Error::newError(
- 'found conflicting terms',
- 'label',
- 'label-conflict',
- array(
- 'label',
- $lang,
- $label,
- 'P666'
- )
- )
- ) );
- }
- }
-
- return Result::newSuccess();
- }
-
- public function detectLabelDescriptionConflictsForEntity(
FingerprintProvider $entity ) {
- foreach ( $entity->getFingerprint()->getLabels()->toTextArray()
as $lang => $label ) {
- if ( !$entity->getFingerprint()->hasDescription( $lang
) ) {
- continue;
- }
-
- $description =
$entity->getFingerprint()->getDescription( $lang )->getText();
-
- if ( $label === 'DUPE' && $description === 'DUPE' ) {
- return Result::newError( array(
- Error::newError(
- 'found conflicting terms',
- 'label',
-
'label-with-description-conflict',
- array(
- 'label',
- $lang,
- $label,
- 'Q666'
- )
- )
- ) );
- }
- }
-
- return Result::newSuccess();
}
public function detectLabelConflicts(
--
To view, visit https://gerrit.wikimedia.org/r/334541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia459217495423c0bb1b66c9124665730dfe04dc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-01-29T10:00:01+0000
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334870 )
Change subject: New Wikidata Build - 2017-01-29T10:00:01+
..
New Wikidata Build - 2017-01-29T10:00:01+
Change-Id: I763fa949f1850675c2b1f869131c38c0b3f49966
---
M composer.lock
M extensions/Wikibase/client/i18n/bn.json
M extensions/Wikibase/client/i18n/sl.json
M extensions/Wikibase/repo/i18n/ar.json
M extensions/Wikibase/repo/i18n/ast.json
M extensions/Wikibase/repo/i18n/bn.json
M extensions/Wikibase/repo/i18n/da.json
M extensions/Wikibase/repo/i18n/tl.json
M extensions/Wikibase/repo/i18n/zh-hans.json
A extensions/Wikidata.org/i18n/el.json
M vendor/composer/installed.json
11 files changed, 34 insertions(+), 16 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 22953e8..ff76a4b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -941,7 +941,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
-"reference": "1fbcb41de7d9b4eef710b296a6698cabe401a550"
+"reference": "429dac7e49034812c6885c658b82f61efaf7244a"
},
"require": {
"php": ">=5.3.0"
@@ -985,7 +985,7 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
},
-"time": "2017-01-23 21:52:01"
+"time": "2017-01-28 21:57:59"
},
{
"name": "wikibase/constraints",
@@ -1606,12 +1606,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "5c39fd44085adf7797e5084a7754b7631c2f2e1b"
+"reference": "2059ec5d87a447bcdd413eafb8dfdedd55b668a2"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5c39fd44085adf7797e5084a7754b7631c2f2e1b";,
-"reference": "5c39fd44085adf7797e5084a7754b7631c2f2e1b",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2059ec5d87a447bcdd413eafb8dfdedd55b668a2";,
+"reference": "2059ec5d87a447bcdd413eafb8dfdedd55b668a2",
"shasum": ""
},
"require": {
@@ -1686,7 +1686,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2017-01-27 16:09:49"
+"time": "2017-01-28 21:57:16"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/bn.json
b/extensions/Wikibase/client/i18n/bn.json
index cf83e35..a440107 100644
--- a/extensions/Wikibase/client/i18n/bn.json
+++ b/extensions/Wikibase/client/i18n/bn.json
@@ -6,7 +6,8 @@
"Leemon2010",
"Sankarshan",
"Aftabuzzaman",
- "আজিজ"
+ "আজিজ",
+ "Elias Ahmmad"
]
},
"wikibase-client-desc": "উইকিবেজ এক্সটেনশনের জন্য গ্রাহক",
@@ -85,5 +86,6 @@
"notification-header-page-connection": "$3 পাতাটি একটি
{{WBREPONAME}} আইটেমের সাথে {{GENDER:$2|সংযুক্ত হয়েছে}}।",
"notification-bundle-header-page-connection": "$3 ও
{{PLURAL:$4|আরেকটি পাতা|আরও $4টি পাতা|100=আরও ৯৯+টি পাতা}} {{WBREPONAME}}
উপাদানের সাথে {{GENDER:$2|সংযুক্ত হয়েছে}}।",
"notification-link-text-view-item": "আইটেম {{GENDER:$1|দেখুন}}",
- "notification-subject-page-connection": "{{SITENAME}}-এ আপনার
{{GENDER:$3|তৈরি করা}} একটি পাতা {{WBREPONAME}} আইটেমের সাথে
{{GENDER:$2|সংযুক্ত হয়েছে}}।"
+ "notification-subject-page-connection": "{{SITENAME}}-এ আপনার
{{GENDER:$3|তৈরি করা}} একটি পাতা {{WBREPONAME}} আইটেমের সাথে
{{GENDER:$2|সংযুক্ত হয়েছে}}।",
+ "unresolved-property-category": "অমীমাংসিত বৈশিষ্ট্য সহযোগে পেজ"
}
diff --git a/extensions/Wikibase/client/i18n/sl.json
b/extensions/Wikibase/client/i18n/sl.json
index 774b35c..ec859b1 100644
--- a/extensions/Wikibase/client/i18n/sl.json
+++ b/extensions/Wikibase/client/i18n/sl.json
@@ -43,7 +43,7 @@
"wikibase-rc-hide-wikidata-show": "Prikaži",
"wikibase-rc-show-wikidata-pref": "Pokaži urejanja
{{GRAMMAR:rodilnik|{{WBREPONAME v zadnjih spremembah",
"wikibase-rc-wikibase-edit-letter": "P",
- "wikibase-rc-wikibase-edit-title": "urejanje v
{{GRAMMAR:mestnik|{{WBREPONAME",
+ "wikibase-rc-wikibase-edit-title": "urejanje v
[[Wikipodatki|Wikipodatkih]]",
"wikibase-replicationnote": "Spremembe se bodo na vseh wikijih morda
prikazale šele po več minutah.",
"wikibase-watchlist-show-changes-pref": "Pokaži urejanja
{{GRAMMAR
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Unregister archived USERNAME
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334902 ) Change subject: Unregister archived USERNAME .. Unregister archived USERNAME Per T146243 Change-Id: I5d6d1321209aaa0bab5dd8fdf7dca76bdc8819c7 --- M .gitmodules D USERNAME 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/02/334902/2 diff --git a/.gitmodules b/.gitmodules index c138a78..020a9b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2674,10 +2674,6 @@ path = URNames url = https://gerrit.wikimedia.org/r/mediawiki/extensions/URNames branch = . -[submodule "USERNAME"] - path = USERNAME - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/USERNAME - branch = . [submodule "UnCaptcha"] path = UnCaptcha url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnCaptcha diff --git a/USERNAME b/USERNAME deleted file mode 16 index b872936..000 --- a/USERNAME +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b872936b889c8fd9085f7bf79c0933f7fb002f57 -- To view, visit https://gerrit.wikimedia.org/r/334902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d6d1321209aaa0bab5dd8fdf7dca76bdc8819c7 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [USERNAME] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334901 ) Change subject: [USERNAME] Add npm job .. [USERNAME] Add npm job Needed for I9107801433fae7c959502e9bba21f226e911773d Change-Id: I1fbe0d72221c3332d3d00b5553e4904ea17aa426 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/01/334901/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..9f265e6 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7194,6 +7194,7 @@ - name: mediawiki/extensions/USERNAME template: - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/UserPageEditProtection template: -- To view, visit https://gerrit.wikimedia.org/r/334901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fbe0d72221c3332d3d00b5553e4904ea17aa426 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...USERNAME[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334900 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I9107801433fae7c959502e9bba21f226e911773d
---
A .gitignore
A Gruntfile.js
M USERNAME.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 45 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/USERNAME
refs/changes/00/334900/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/USERNAME.php b/USERNAME.php
index 72d019a..d110e84 100644
--- a/USERNAME.php
+++ b/USERNAME.php
@@ -4,11 +4,12 @@
'name' => 'USERNAME',
'author' => 'UltrasonicNXT/Adam Carter',
'version' => '1.1',
- 'description' => 'Adds an USERNAME magic word',
+ 'descriptionmsg' => 'username-desc',
'url' => 'https://github.com/Brickimedia/USERNAME',
);
-$wgExtensionMessagesFiles['USERNAME'] = __DIR__ . '/USERNAME.i18n.magic.php';
+$wgMessagesDirs['USERNAME'] = __DIR__ . '/i18n';
+$wgExtensionMessagesFiles['USERNAMEMagic'] = __DIR__ .
'/USERNAME.i18n.magic.php';
$wgAutoloadClasses['USERNAME'] = __DIR__ . '/USERNAME.hooks.php';
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..26323f7
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "username-desc": "Adds an USERNAME magic word"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..5126b2d
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "username-desc": "{{desc|name=USERNAME}}"
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9107801433fae7c959502e9bba21f226e911773d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/USERNAME
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SemanticPageMaker] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334899 ) Change subject: [SemanticPageMaker] Add npm job .. [SemanticPageMaker] Add npm job Needed for Ib750b899b6b9a5ed2908f5f0102f69ade7f35ed9 Change-Id: Ie3ce4f8efa19658611b8c681c0135123e3c33a0d --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/99/334899/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..fb00088 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8255,6 +8255,7 @@ - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticPageSeries template: -- To view, visit https://gerrit.wikimedia.org/r/334899 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3ce4f8efa19658611b8c681c0135123e3c33a0d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageMaker[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334898 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: Ib750b899b6b9a5ed2908f5f0102f69ade7f35ed9
---
M .gitignore
A Gruntfile.js
A i18n/en.json
A i18n/qqq.json
M includes/SPM_Initialize.php
A package.json
6 files changed, 48 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker
refs/changes/98/334898/1
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..7e8e83e
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "semanticpagemaker-desc": "Easy Wiki page editor for wiki user"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..bad4380
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "semanticpagemaker-desc": "{{desc|name=SemanticPageMaker}}"
+}
diff --git a/includes/SPM_Initialize.php b/includes/SPM_Initialize.php
index e2846a6..5364d6b 100644
--- a/includes/SPM_Initialize.php
+++ b/includes/SPM_Initialize.php
@@ -84,13 +84,15 @@
*/
function wgSPMSetupExtension() {
global $wgSPMIP, $wgHooks, $wgExtensionCredits, $wgAvailableRights;
- global $wgAutoloadClasses, $wgSpecialPages;
+ global $wgAutoloadClasses, $wgSpecialPages, $wgMessagesDirs;
smwfSPMInitMessages();
if ( !defined( 'WOM_VERSION' ) ) {
echo wfMessage( 'spm_error_nowom' )->escaped();
die;
}
+
+ $wgMessagesDirs['SemanticPageMaker'] = __DIR__ . '/../i18n';
$wgAutoloadClasses['SPMProcessor'] = $wgSPMIP .
'/includes/SPM_Processor.php';
@@ -152,9 +154,9 @@
// Register Credits
$wgExtensionCredits['parserhook'][] = array(
'name' => 'Semantic Page Maker Extension (formerly pulished as
Wiki Editors Extension)', 'version' => SPM_VERSION,
- 'author' => "Ning Hu, Justin Zhang,
[http://smwforum.ontoprise.com/smwforum/index.php/Jesse_Wang Jesse Wang],
sponsored by [http://projecthalo.com Project Halo], [http://www.vulcan.com
Vulcan Inc.]",
+ 'author' => array( 'Ning Hu', 'Justin Zhang',
'[http://smwforum.ontoprise.com/smwforum/index.php/Jesse_Wang Jesse Wang]',
'sponsored by [http://projecthalo.com Project Halo]', '[http://www.vulcan.com
Vulcan Inc.]',
'url' => 'http://wiking.vulcan.com/dev',
- 'description' => 'Easy Wiki page editor for wiki user.'
);
+ 'descriptionmsg' => 'semanticpagemaker-desc' );
return true;
}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib750b899b6b9a5ed2908f5f0102f69ade7f35ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SemanticLinks] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334897 ) Change subject: [SemanticLinks] Add npm job .. [SemanticLinks] Add npm job Needed for Ie81b3fb1ba14156031fa3ffa1997ffeb316a32db Change-Id: I2d13521802f63270df0c4916b23ec0fa9cb52571 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/97/334897/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..78ceecf 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8243,6 +8243,7 @@ - name: mediawiki/extensions/SemanticLinks template: - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SemanticMediaWiki template: -- To view, visit https://gerrit.wikimedia.org/r/334897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d13521802f63270df0c4916b23ec0fa9cb52571 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticLinks[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334896 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: Ie81b3fb1ba14156031fa3ffa1997ffeb316a32db
---
A .gitignore
A Gruntfile.js
M VisualEditorLinkTyping.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 45 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticLinks
refs/changes/96/334896/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/VisualEditorLinkTyping.php b/VisualEditorLinkTyping.php
index 09e8a1e..d2fafb1 100644
--- a/VisualEditorLinkTyping.php
+++ b/VisualEditorLinkTyping.php
@@ -14,9 +14,11 @@
'author' => array('Diffeo'),
'version' => '0.3.0',
'url' => 'http://diffeo.com/',
- 'description' => 'Link typing for use with VisualEditor and Semantic
MediaWiki',
+ 'descriptionmsg' => 'semanticlinks-desc',
);
+$wgMessagesDirs['SemanticLinks'] = __DIR__ . '/i18n';
+
$wgResourceModules['ext.VELinkTyping'] = array(
'scripts' => 'modules/VELinkTyping.js',
'styles' => 'modules/VELinkTyping.css',
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..5255b78
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "semanticlinks-desc": "Link typing for use with VisualEditor and
Semantic MediaWiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..1fc25f7
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "semanticlinks-desc": "{{desc|name=SemanticLinks}}"
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie81b3fb1ba14156031fa3ffa1997ffeb316a32db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticLinks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SearchStats] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334895 ) Change subject: [SearchStats] Add npm job .. [SearchStats] Add npm job Needed for I58be3d783ce8907aaec64a18a58ad56a2f7f5c80 Change-Id: I33301f3784b4e32262f74ec943f2c8a1c19b8a10 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/95/334895/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..9e1f64b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6608,6 +6608,7 @@ template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/SelectCategory template: -- To view, visit https://gerrit.wikimedia.org/r/334895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33301f3784b4e32262f74ec943f2c8a1c19b8a10 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SearchStats[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334894 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I58be3d783ce8907aaec64a18a58ad56a2f7f5c80
---
A .gitignore
A Gruntfile.js
M SearchStats.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 45 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SearchStats
refs/changes/94/334894/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/SearchStats.php b/SearchStats.php
index a91a2c3..0f8be6a 100644
--- a/SearchStats.php
+++ b/SearchStats.php
@@ -27,11 +27,13 @@
),
'version' => '0.1.0',
'url' => 'https://www.mediawiki.org/wiki/Extension:SearchStats',
- 'description' => 'Tracks internal searches to allow identifing
commonally seeked pages on the wiki.',
+ 'descriptionmsg' => 'searchstats-desc',
);
/* Setup */
+$wgMessagesDirs['SearchStats'] = __DIR__ . '/i18n';
+
// Autoload classes
$wgAutoloadClasses['SpecialSearchStats'] = __DIR__ .
'/SpecialSearchStats.php'; # Location of the SpecialSearchStats class (Tell
MediaWiki to load this file)
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..761b837
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "searchstats-desc": "Tracks internal searches to allow identifing
commonally seeked pages on the wiki"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..a797601
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "searchstats-desc": "{{desc|name=Search
Stats|url=https://www.mediawiki.org/wiki/Extension:SearchStats}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58be3d783ce8907aaec64a18a58ad56a2f7f5c80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SearchStats
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [PurgeClickThrough] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334893 ) Change subject: [PurgeClickThrough] Add npm job .. [PurgeClickThrough] Add npm job Needed for I92a028d6e1f03e20db69e3d7eed79598f7510c4d Change-Id: I2cdaf641f0f52fc915161eb4369dd507b67fb270 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/93/334893/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..2597d1c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6338,6 +6338,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/Push template: -- To view, visit https://gerrit.wikimedia.org/r/334893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cdaf641f0f52fc915161eb4369dd507b67fb270 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PurgeClickThrough[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334892 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I92a028d6e1f03e20db69e3d7eed79598f7510c4d
---
M .gitignore
A Gruntfile.js
M PurgeClickThrough.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 46 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PurgeClickThrough
refs/changes/92/334892/1
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/PurgeClickThrough.php b/PurgeClickThrough.php
index 15210d0..4b9899b 100644
--- a/PurgeClickThrough.php
+++ b/PurgeClickThrough.php
@@ -14,11 +14,12 @@
'name' => 'PurgeClickThrough',
'version' => '0.1',
'author' => 'Brian Wolff',
- // Not for real users, so no point i18n-ing it.
- 'description' => 'Do not redirect ?action=purge pages, but instead have
a click through (for debugging purposes)',
+ 'descriptionmsg' => 'purgeclickthrough-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:PurgeClickThrough',
);
+$wgMessagesDirs['PurgeClickThrough'] = __DIR__ . '/i18n';
+
$wgActions['purge'] = 'PurgeClickThrough';
class PurgeClickThrough extends PurgeAction {
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..ad10921
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "purgeclickthrough-desc": "Do not redirect ?action=purge pages, but
instead have a click through (for debugging purposes)"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..4a24168
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "purgeclickthrough-desc":
"{{desc|name=PurgeClickThrough|url=https://www.mediawiki.org/wiki/Extension:PurgeClickThrough}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92a028d6e1f03e20db69e3d7eed79598f7510c4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PurgeClickThrough
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [PhpHighlight] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334891 ) Change subject: [PhpHighlight] Add npm job .. [PhpHighlight] Add npm job Needed for I448d05a7ea8fbf3336a7442d510a4a83e8b27aa8 Change-Id: I9f2b3594591ab8b17f0646590408aaf188f917ac --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/91/334891/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..7715037 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6235,6 +6235,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/PhpTagsMaps template: -- To view, visit https://gerrit.wikimedia.org/r/334891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f2b3594591ab8b17f0646590408aaf188f917ac Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PhpHighlight[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334890 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I448d05a7ea8fbf3336a7442d510a4a83e8b27aa8
---
M .gitignore
A Gruntfile.js
M PhpHighlight.php
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 46 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpHighlight
refs/changes/90/334890/1
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/PhpHighlight.php b/PhpHighlight.php
index 9faff95..e382bdf 100644
--- a/PhpHighlight.php
+++ b/PhpHighlight.php
@@ -14,9 +14,11 @@
'name' => 'PHP highlight',
'url' => 'https://www.mediawiki.org/wiki/Extension:PhpHighlight',
'author' => 'Alexandre Emsenhuber',
- 'description' => 'Adds a tag to use the PHP
syntax highlighter',
+ 'descriptionmsg' => 'phphighlight-desc',
);
+$wgMessagesDirs['PhpHighlight'] = __DIR__ . '/i18n';
+
$wgHooks['ParserFirstCallInit'][] = 'efSetPhp';
function efSetPhp( &$parser ){
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..ca07262
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "phphighlight-desc": "Adds a tag to use the
PHP syntax highlighter"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..53a4ed8
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "phphighlight-desc": "{{desc|name=PHP
highlight|url=https://www.mediawiki.org/wiki/Extension:PhpHighlight}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I448d05a7ea8fbf3336a7442d510a4a83e8b27aa8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpHighlight
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [D3Loader] Add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334889 ) Change subject: [D3Loader] Add npm job .. [D3Loader] Add npm job Needed for I0ba1167bc347c6fd83a8503ad82212afd05e181e Change-Id: Id448815003a4734607114357acf05f1a818e5402 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/89/334889/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4d30149..af6224d 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3321,6 +3321,7 @@ template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/Dashiki template: -- To view, visit https://gerrit.wikimedia.org/r/334889 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id448815003a4734607114357acf05f1a818e5402 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...D3Loader[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334888 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Added i18n files and banana check
Change-Id: I0ba1167bc347c6fd83a8503ad82212afd05e181e
---
A .gitignore
M D3Loader.php
A Gruntfile.js
A i18n/en.json
A i18n/qqq.json
A package.json
6 files changed, 45 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/D3Loader
refs/changes/88/334888/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/D3Loader.php b/D3Loader.php
index 441f1a3..589eea0 100644
--- a/D3Loader.php
+++ b/D3Loader.php
@@ -34,10 +34,12 @@
'name' => 'D3Loader',
'author' => 'Leonid Verhovskij',
'url' => 'https://www.mediawiki.org/wiki/Extension:D3Loader',
- 'description' => 'This Extension simply load D3.js to make it available
for other extensions',
+ 'descriptionmsg' => 'd3loader-desc',
'version' => 1.0
);
+$wgMessagesDirs['D3Loader'] = __DIR__ . '/i18n';
+
$myResourceTemplate = array(
'localBasePath' => __DIR__ . '/resources',
'remoteExtPath' => 'D3Loader/resources',
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..c535683
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "d3loader-desc": "This Extension simply load D3.js to make it available
for other extensions"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..bbfb56d
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "d3loader-desc":
"{{desc|name=D3Loader|url=https://www.mediawiki.org/wiki/Extension:D3Loader}}";
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/334888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ba1167bc347c6fd83a8503ad82212afd05e181e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/D3Loader
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ShoutWikiAds[master]: Use existing description message in extension.json
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334887 ) Change subject: Use existing description message in extension.json .. Use existing description message in extension.json Add $wgMessagesDirs to load the message files Change-Id: Ia0aa5c7af6296b3778dd6868a4e0daf4836df6b7 --- M ShoutWikiAds.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds refs/changes/87/334887/1 diff --git a/ShoutWikiAds.php b/ShoutWikiAds.php index ece932a..596b047 100644 --- a/ShoutWikiAds.php +++ b/ShoutWikiAds.php @@ -16,10 +16,12 @@ 'name' => 'ShoutWiki Ads', 'version' => '0.4.3', 'author' => 'Jack Phoenix', - 'description' => 'Delicious advertisements for everyone!', + 'descriptionmsg' => 'shoutwikiads-desc', 'url' => 'https://www.mediawiki.org/wiki/Extension:ShoutWiki_Ads', ); +$wgMessagesDirs['ShoutWikiAds'] = __DIR__ . '/i18n'; + // Autoload the class so that we can actually use its functions $wgAutoloadClasses['ShoutWikiAds'] = __DIR__ . '/ShoutWikiAds.class.php'; -- To view, visit https://gerrit.wikimedia.org/r/334887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0aa5c7af6296b3778dd6868a4e0daf4836df6b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ShoutWikiAds Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Moodle[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334886 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Removed old message keys, which seems to be a copy from another
extension
Change-Id: Ibcf28a09a11f22adda01aba7d03882379000691c
---
M Moodle.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Moodle
refs/changes/86/334886/1
diff --git a/Moodle.php b/Moodle.php
index 6c83ecd..24dcf4c 100644
--- a/Moodle.php
+++ b/Moodle.php
@@ -38,7 +38,7 @@
'name' => 'Moodle',
'author' => 'Clancer',
'url' => 'https://www.mediawiki.org/wiki/Extension:Moodle',
- 'description' => 'Moodle integration',
+ 'descriptionmsg' => 'moodle-desc',
'version' => '0.2.0',
);
diff --git a/i18n/en.json b/i18n/en.json
index 5c3297f..f06d3a9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,5 @@
"@metadata": {
"authors": []
},
- "uploadwizard-desc": "Upload Wizard, a user-friendly tool for uploading
multimedia"
+ "moodle-desc": "Moodle integration"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f860def..b848177 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,5 +2,5 @@
"@metadata": {
"authors": []
},
-"uploadwizard-desc": "Description of extension. It refers to
[//blog.wikimedia.org/blog/2009/07/02/ford-foundation-awards-300k-grant-for-wikimedia-commons/
this event], i.e. the development was paid with this $300,000 grant."
+"moodle-desc":
"{{desc|name=Moodle|url=https://www.mediawiki.org/wiki/Extension:Moodle}}";
}
--
To view, visit https://gerrit.wikimedia.org/r/334886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcf28a09a11f22adda01aba7d03882379000691c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Moodle
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Restore images used by the search box
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334884 )
Change subject: Restore images used by the search box
..
Restore images used by the search box
Also added comments into the main PHP file for future reference.
This is a partial revert of I6a70c9377e7018c465a7cb636e00974ec9b8e04e.
Change-Id: I7971d27c7bad3d87b2034d6d4910ed6df0a90464
---
M Truglass.skin.php
A truglass/searchleftcap.gif
A truglass/searchleftcap_rtl.gif
A truglass/searchrightcap.gif
A truglass/searchrightcap_rtl.gif
5 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Truglass.skin.php b/Truglass.skin.php
index 0d6079c..a7e68e5 100644
--- a/Truglass.skin.php
+++ b/Truglass.skin.php
@@ -8,7 +8,7 @@
* @author Elliott Franklin Cable
* @author Jack Phoenix
* @copyright Copyright © Elliott Franklin Cable
- * @copyright Copyright © 2009-2016 Jack Phoenix
+ * @copyright Copyright © 2009-2017 Jack Phoenix
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
@@ -268,6 +268,9 @@
function searchBox() {
global $wgLang;
+ // For grep: the following images are used here:
+ // searchleftcap.gif, searchleftcap_rtl.gif, searchrightcap.gif,
+ // searchrightcap_rtl.gif
?>
diff --git a/truglass/searchleftcap.gif b/truglass/searchleftcap.gif
new file mode 100644
index 000..e5ed00c
--- /dev/null
+++ b/truglass/searchleftcap.gif
Binary files differ
diff --git a/truglass/searchleftcap_rtl.gif b/truglass/searchleftcap_rtl.gif
new file mode 100644
index 000..c9f1b99
--- /dev/null
+++ b/truglass/searchleftcap_rtl.gif
Binary files differ
diff --git a/truglass/searchrightcap.gif b/truglass/searchrightcap.gif
new file mode 100644
index 000..85c800e
--- /dev/null
+++ b/truglass/searchrightcap.gif
Binary files differ
diff --git a/truglass/searchrightcap_rtl.gif b/truglass/searchrightcap_rtl.gif
new file mode 100644
index 000..b7747d8
--- /dev/null
+++ b/truglass/searchrightcap_rtl.gif
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/334884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7971d27c7bad3d87b2034d6d4910ed6df0a90464
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Move description from extension.json to message file
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334885 )
Change subject: Move description from extension.json to message file
..
Move description from extension.json to message file
Change-Id: Ic86bd840fdaa76c228f3833b38fdd7f02ea39196
---
M MediaWikiAuth.php
M i18n/en.json
A i18n/qqq.json
3 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth
refs/changes/85/334885/1
diff --git a/MediaWikiAuth.php b/MediaWikiAuth.php
index 6b34cd7..85af864 100644
--- a/MediaWikiAuth.php
+++ b/MediaWikiAuth.php
@@ -42,7 +42,7 @@
'author' => array( 'Laurence Parry', 'Jack Phoenix', 'Kim Schoonover',
'Ryan Schmidt' ),
'version' => '0.8.1',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiAuth',
- 'description' => 'Authenticates against and imports logins from an
external MediaWiki instance',
+ 'descriptionmsg' => 'mwa-desc',
);
# Stuff
diff --git a/i18n/en.json b/i18n/en.json
index 4c42374..ca69c7f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,7 @@
"Laurence \"GreenReaper\" Parry"
]
},
+ "mwa-desc": "Authenticates against and imports logins from an external
MediaWiki instance",
"mwa-autocreate-blocked": "Automatic account creation is blocked for
this IP on the remote wiki.",
"mwa-error-unknown": "Unknown error when logging in to the remote
wiki.",
"mwa-error-wrong-token": "A login token submission error occurred.
Please retry, and contact an administrator if this fails.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..ec21f3e
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": {},
+ "mwa-desc":
"{{desc|name=MediaWikiAuth|url=https://www.mediawiki.org/wiki/Extension:MediaWikiAuth}}";
+}
--
To view, visit https://gerrit.wikimedia.org/r/334885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic86bd840fdaa76c228f3833b38fdd7f02ea39196
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Restore images used by the search box
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334884 )
Change subject: Restore images used by the search box
..
Restore images used by the search box
Also added comments into the main PHP file for future reference.
This is a partial revert of I6a70c9377e7018c465a7cb636e00974ec9b8e04e.
Change-Id: I7971d27c7bad3d87b2034d6d4910ed6df0a90464
---
M Truglass.skin.php
A truglass/searchleftcap.gif
A truglass/searchleftcap_rtl.gif
A truglass/searchrightcap.gif
A truglass/searchrightcap_rtl.gif
5 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass
refs/changes/84/334884/1
diff --git a/Truglass.skin.php b/Truglass.skin.php
index 0d6079c..a7e68e5 100644
--- a/Truglass.skin.php
+++ b/Truglass.skin.php
@@ -8,7 +8,7 @@
* @author Elliott Franklin Cable
* @author Jack Phoenix
* @copyright Copyright © Elliott Franklin Cable
- * @copyright Copyright © 2009-2016 Jack Phoenix
+ * @copyright Copyright © 2009-2017 Jack Phoenix
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
@@ -268,6 +268,9 @@
function searchBox() {
global $wgLang;
+ // For grep: the following images are used here:
+ // searchleftcap.gif, searchleftcap_rtl.gif, searchrightcap.gif,
+ // searchrightcap_rtl.gif
?>
diff --git a/truglass/searchleftcap.gif b/truglass/searchleftcap.gif
new file mode 100644
index 000..e5ed00c
--- /dev/null
+++ b/truglass/searchleftcap.gif
Binary files differ
diff --git a/truglass/searchleftcap_rtl.gif b/truglass/searchleftcap_rtl.gif
new file mode 100644
index 000..c9f1b99
--- /dev/null
+++ b/truglass/searchleftcap_rtl.gif
Binary files differ
diff --git a/truglass/searchrightcap.gif b/truglass/searchrightcap.gif
new file mode 100644
index 000..85c800e
--- /dev/null
+++ b/truglass/searchrightcap.gif
Binary files differ
diff --git a/truglass/searchrightcap_rtl.gif b/truglass/searchrightcap_rtl.gif
new file mode 100644
index 000..b7747d8
--- /dev/null
+++ b/truglass/searchrightcap_rtl.gif
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/334884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7971d27c7bad3d87b2034d6d4910ed6df0a90464
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Set additionalProperties to false for requires in extension....
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334883 )
Change subject: Set additionalProperties to false for requires in
extension.json schema
..
Set additionalProperties to false for requires in extension.json schema
VersionChecker is using a switch with a exception in the default path,
which makes it very unhappy to see additional properties.
Change-Id: Ief84497de6b2fa2d2715fc713088bee66c21fdc0
---
M docs/extension.schema.v2.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/83/334883/1
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index a5543d1..b7ee1a7 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -56,6 +56,7 @@
"requires": {
"type": "object",
"description": "Indicates what versions of MediaWiki
core or extensions are required. This syntax may be extended in the future, for
example to check dependencies between other services.",
+ "additionalProperties": false,
"properties": {
"MediaWiki": {
"type": "string",
--
To view, visit https://gerrit.wikimedia.org/r/334883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief84497de6b2fa2d2715fc713088bee66c21fdc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Challenge[master]: Organize and cleanup CSS per coding conventions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334862 )
Change subject: Organize and cleanup CSS per coding conventions
..
Organize and cleanup CSS per coding conventions
Bug: T154051
Change-Id: Idcf8f8a0c1b4b2dbbe93067217fdd7997634648e
---
M extension.json
M resources/css/ext.challenge.history.css
M resources/css/ext.challenge.standings.css
M resources/css/ext.challenge.user.css
M resources/css/ext.challenge.view.css
5 files changed, 35 insertions(+), 34 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 57863b8..4d551b9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Challenge",
- "version": "1.2",
+ "version": "1.3",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/resources/css/ext.challenge.history.css
b/resources/css/ext.challenge.history.css
index 8a70d49..566184c 100644
--- a/resources/css/ext.challenge.history.css
+++ b/resources/css/ext.challenge.history.css
@@ -3,21 +3,21 @@
}
.challenge-nav {
+ width: 740px;
padding-bottom: 25px;
- width: 740;
}
.challenge-history-table {
- border-collapse: collapse; /* cellspacing=0 equivalent */
border: 0;
- padding: 3px;
+ border-collapse: collapse;
width: 830px;
+ padding: 3px;
}
.challenge-history-header {
- color: #66;
+ color: #666;
font-size: 12px;
- font-weight: 800;
+ font-weight: 700;
padding-right: 5px;
}
@@ -26,10 +26,10 @@
}
.challenge-data {
- border-bottom: 1px solid #ee;
+ border-bottom: 1px solid #eee;
font-size: 11px;
- padding: 5px;
vertical-align: top;
+ padding: 5px;
}
.challenge-data img {
@@ -49,6 +49,6 @@
}
.challenge-link a {
- font-weight: 800;
font-size: 15px;
-}
\ No newline at end of file
+ font-weight: 700;
+}
diff --git a/resources/css/ext.challenge.standings.css
b/resources/css/ext.challenge.standings.css
index fa88f7a..80b5558 100644
--- a/resources/css/ext.challenge.standings.css
+++ b/resources/css/ext.challenge.standings.css
@@ -6,15 +6,15 @@
.challenge-standings-title {
font-size: 12px;
- font-weight: 800;
+ font-weight: 700;
padding-right: 5px;
}
.challenge-standings {
- border-bottom: 1px solid #ee;
+ border-bottom: 1px solid #eee;
font-size: 11px;
- padding: 5px;
vertical-align: top;
+ padding: 5px;
}
.challenge-standings img {
@@ -28,4 +28,4 @@
.challenge-standings-history-link {
font-size: 13px;
font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/resources/css/ext.challenge.user.css
b/resources/css/ext.challenge.user.css
index 1e62a87..6e925b5 100644
--- a/resources/css/ext.challenge.user.css
+++ b/resources/css/ext.challenge.user.css
@@ -3,7 +3,7 @@
}
.challenge-user-title {
- color: #78BA5D;
+ color: #78ba5d;
font-size: 15px;
font-weight: 800;
padding-bottom: 4px;
@@ -14,7 +14,7 @@
}
.challenge-label {
- color: #66;
+ color: #666;
}
.challenge-user-info {
@@ -23,15 +23,16 @@
}
.challenge-info {
- border: 1px solid #cc;
+ border: 1px solid #ccc;
float: right;
- padding: 5px;
width: 200px;
+ padding: 5px;
+
}
.challenge-user-top a {
font-size: 12px;
- font-weight: 800;
+ font-weight: 700;
text-decoration: none;
}
@@ -45,5 +46,5 @@
}
.challenge-user-or {
- margin: 10px 0px 10px 0px;
-}
\ No newline at end of file
+ margin: 10px 0;
+}
diff --git a/resources/css/ext.challenge.view.css
b/resources/css/ext.challenge.view.css
index fd0abbf..2fe64df 100644
--- a/resources/css/ext.challenge.view.css
+++ b/resources/css/ext.challenge.view.css
@@ -1,14 +1,14 @@
.challenge-main-table {
- background-color: #ee;
- border: 1px solid #cc;
- border-collapse: collapse; /* cellspacing=0 equivalent */
+ background-color: #eee;
+ border: 1px solid #ccc;
+ border-collapse: collapse;
padding: 8px;
}
.challenge-title {
- color: #78BA5D;
+ color: #78ba5d;
font-size: 15px;
- font-weight: 800;
+ font-weight: 700;
padding-bottom: 10px;
}
@@ -18,13 +18,13 @@
.challenge-user-link {
font-size: 14px;
- font-weight: 800;
+ font-weight: 700;
}
.challenge-status-text {
- color: #66;
+ color: #666;
font-size: 14px;
- font-weight: 800;
+ font-weight: 700;
}
.challenge-form {
@@ -34,22 +34,22 @@
/* Admin-only link for cancelling the challenge */
a.challenge-admin-cancel-link {
- color: #99;
+ color: #990;
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove calls to getFingerprint from tests where not necesarry
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334549 )
Change subject: Remove calls to getFingerprint from tests where not necesarry
..
Remove calls to getFingerprint from tests where not necesarry
Change-Id: Iddb5355b50a4f5ec2ec342523c84c12fb6bc2621
---
M
client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
M repo/tests/phpunit/includes/Actions/EditEntityActionTest.php
M repo/tests/phpunit/includes/Api/ResultBuilderTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/Search/Elastic/Fields/LabelCountFieldTest.php
10 files changed, 109 insertions(+), 118 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
index 6e2605d..26e8bf0 100644
---
a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
+++
b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
@@ -148,7 +148,7 @@
*/
private function createTestItem( ItemId $id, array $labels, array
$statements = null, array $siteLinks = null ) {
$item = new Item( $id );
- $item->getFingerprint()->setDescription( 'de', 'Description of
' . $id->getSerialization() );
+ $item->setDescription( 'de', 'Description of ' .
$id->getSerialization() );
foreach ( $labels as $lang => $label ) {
$item->setLabel( $lang, $label );
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 17c1698..f3b53aa 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -86,13 +86,13 @@
$item = $this->repo->getEntity( $itemId );
$this->assertNotNull( $item, 'Entity ' . $itemId );
$this->assertInstanceOf( Item::class, $item, 'Entity ' .
$itemId );
- $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
- $this->assertEquals( 'bar', $item->getFingerprint()->getLabel(
'de' )->getText() );
+ $this->assertEquals( 'foo', $item->getLabels()->getByLanguage(
'en' )->getText() );
+ $this->assertEquals( 'bar', $item->getLabels()->getByLanguage(
'de' )->getText() );
// test we can't mess with entities in the repo
$item->setLabel( 'en', 'STRANGE' );
$item = $this->repo->getEntity( $itemId );
- $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
+ $this->assertEquals( 'foo', $item->getLabels()->getByLanguage(
'en' )->getText() );
// test latest prop
$prop = $this->repo->getEntity( $propId );
diff --git a/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
b/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
index 6b583bd..8a1f0f7 100644
--- a/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
+++ b/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
@@ -59,11 +59,7 @@
$this->setExpectedException( ParameterAssertionException::class
);
new TermSqlIndex(
new StringNormalizer(),
- new EntityIdComposer( [
- 'item' => function( $repositoryName,
$uniquePart ) {
- return new ItemId( 'Q' . $uniquePart );
- },
- ] ),
+ new EntityIdComposer( [] ),
false,
$repositoryName
);
@@ -87,15 +83,12 @@
}
public function termProvider() {
- $argLists = array();
-
- $argLists[] = array( 'en', 'FoO', 'fOo', true );
- $argLists[] = array( 'ru', 'Берлин', 'берлин', true );
-
- $argLists[] = array( 'en', 'FoO', 'bar', false );
- $argLists[] = array( 'ru', 'Берлин', 'бе55585рлин', false );
-
- return $argLists;
+ return [
+ [ 'en', 'FoO', 'fOo', true ],
+ [ 'ru', 'Берлин', 'берлин', true ],
+ [ 'en', 'FoO', 'bar', false ],
+ [ 'ru', 'Берлин', 'бе55585рлин', false ],
+ ];
}
/**
@@ -112,12 +105,13 @@
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Refactor DB query tests for SpecialContribs
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334880 )
Change subject: Refactor DB query tests for SpecialContribs
..
Refactor DB query tests for SpecialContribs
Change-Id: I50b8a196388bab654ee3e7477e7829238bcfb7b0
---
M tests/phpunit/includes/HooksTest.php
1 file changed, 39 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/80/334880/1
diff --git a/tests/phpunit/includes/HooksTest.php
b/tests/phpunit/includes/HooksTest.php
index cc455e8..e37887c 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -480,30 +480,7 @@
$this->assertSame( [], $classes );
}
- public function testOnContribsGetQueryInfo() {
- $cp = $this->getMockBuilder( ContribsPager::class )
- ->disableOriginalConstructor()
- ->getMock();
-
- $cp->expects( $this->any() )
- ->method( 'getUser' )
- ->will( $this->returnValue( $this->user ) );
-
- $cp->expects( $this->any() )
- ->method( 'getContext' )
- ->will( $this->returnValue( $this->context ) );
-
- $query = [
- 'tables' => [],
- 'fields' => [],
- 'conds' => [],
- 'options' => [],
- 'join_conds' => [],
- ];
- ORES\Hooks::onContribsGetQueryInfo(
- $cp,
- $query
- );
+ public function onContribsGetQueryInfoProvider() {
$expected = [
'tables' => [
'ores_damaging_mdl' => 'ores_model',
@@ -515,28 +492,45 @@
],
'conds' => [],
'join_conds' => [
- 'ores_damaging_mdl' => [ 'LEFT JOIN',
-[
-
'ores_damaging_mdl.oresm_is_current' => 1,
-
'ores_damaging_mdl.oresm_name' => 'damaging'
-]
+ 'ores_damaging_mdl' => [
+ 'LEFT JOIN',
+ [
+
'ores_damaging_mdl.oresm_is_current' => 1,
+ 'ores_damaging_mdl.oresm_name'
=> 'damaging'
+ ]
],
- 'ores_damaging_cls' => [ 'LEFT JOIN',
-[
-
'ores_damaging_cls.oresc_model = ores_damaging_mdl.oresm_id',
-'rev_id =
ores_damaging_cls.oresc_rev',
-
'ores_damaging_cls.oresc_class' => 1
-]
+ 'ores_damaging_cls' => [
+ 'LEFT JOIN',
+ [
+ 'ores_damaging_cls.oresc_model
= ores_damaging_mdl.oresm_id',
+ 'rev_id =
ores_damaging_cls.oresc_rev',
+ 'ores_damaging_cls.oresc_class'
=> 1
+ ]
]
],
];
- $this->assertSame( $expected['tables'], $query['tables'] );
- $this->assertSame( $expected['fields'], $query['fields'] );
- $this->assertSame( $expected['conds'], $query['conds'] );
- $this->assertSame( $expected['join_conds'],
$query['join_conds'] );
+
+ $expectedDamaging = $expected;
+ $expectedDamaging['conds'] = [
'ores_damaging_cls.oresc_probability > \'0.7\'' ];
+
+ $res = [
+ 'all' => [
+ $expected,
+ false
+ ],
+ 'damaging only' => [
+ $expectedDamaging,
+ true,
+ ]
+ ];
+
+ return $res;
}
- public function testOnContribsGetQueryInfoOnlyDamaging() {
+ /**
+* @dataProvider onContribsGetQueryInfoProvider
+*/
+ public function testOnContribsGetQueryInfo( array $
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Use interoperable "m:" interwiki prefix instead of "meta:"
Nemo bis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334879 ) Change subject: Use interoperable "m:" interwiki prefix instead of "meta:" .. Use interoperable "m:" interwiki prefix instead of "meta:" Bug: T156582 Change-Id: Ibe76188c357ce7953ed055a530ea4b444c2a6b2f --- M i18n/af.json M i18n/an.json M i18n/ar.json M i18n/arz.json M i18n/as.json M i18n/ast.json M i18n/awa.json M i18n/azb.json M i18n/ba.json M i18n/bcc.json M i18n/bcl.json M i18n/be-tarask.json M i18n/bg.json M i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/ce.json M i18n/cs.json M i18n/cy.json M i18n/da.json M i18n/de-formal.json M i18n/de.json M i18n/diq.json M i18n/dsb.json M i18n/el.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/et.json M i18n/fa.json M i18n/fi.json M i18n/fo.json M i18n/fr.json M i18n/frp.json M i18n/gl.json M i18n/gsw.json M i18n/gu.json M i18n/he.json M i18n/hi.json M i18n/hif-latn.json M i18n/hr.json M i18n/hsb.json M i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/ilo.json M i18n/is.json M i18n/it.json M i18n/ja.json M i18n/jv.json M i18n/ka.json M i18n/kk-arab.json M i18n/kk-cyrl.json M i18n/kk-latn.json M i18n/ko.json M i18n/ksh.json M i18n/lb.json M i18n/li.json M i18n/lij.json M i18n/lki.json M i18n/lrc.json M i18n/lt.json M i18n/lv.json M i18n/map-bms.json M i18n/min.json M i18n/mk.json M i18n/ml.json M i18n/mn.json M i18n/mr.json M i18n/ms.json M i18n/mt.json M i18n/nap.json M i18n/nb.json M i18n/nds.json M i18n/ne.json M i18n/nl-informal.json M i18n/nl.json M i18n/nn.json M i18n/oc.json M i18n/or.json M i18n/pl.json M i18n/pms.json M i18n/pnb.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/qu.json M i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/rue.json M i18n/sa.json M i18n/sah.json M i18n/sco.json M i18n/shn.json M i18n/si.json M i18n/sk.json M i18n/sl.json M i18n/sq.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/stq.json M i18n/su.json M i18n/sv.json M i18n/te.json M i18n/tg-cyrl.json M i18n/tg-latn.json M i18n/th.json M i18n/tk.json M i18n/tl.json M i18n/tr.json M i18n/tt-cyrl.json M i18n/ug-arab.json M i18n/uk.json M i18n/vec.json M i18n/vi.json M i18n/vo.json M i18n/yi.json M i18n/yue.json M i18n/zh-hans.json M i18n/zh-hant.json 122 files changed, 265 insertions(+), 265 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/79/334879/1 -- To view, visit https://gerrit.wikimedia.org/r/334879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe76188c357ce7953ed055a530ea4b444c2a6b2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth 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] mediawiki...Wikibase[master]: Simplify error reporter mocks in StatementModificationHelper...
Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334878 )
Change subject: Simplify error reporter mocks in StatementModificationHelperTest
..
Simplify error reporter mocks in StatementModificationHelperTest
Thanks Jakob for the idea!
Change-Id: I09c1594f6664ed1c7196c24324aa3952847cffa6
---
M repo/tests/phpunit/includes/Api/StatementModificationHelperTest.php
1 file changed, 14 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/334878/1
diff --git
a/repo/tests/phpunit/includes/Api/StatementModificationHelperTest.php
b/repo/tests/phpunit/includes/Api/StatementModificationHelperTest.php
index 088ace9..0ee109e 100644
--- a/repo/tests/phpunit/includes/Api/StatementModificationHelperTest.php
+++ b/repo/tests/phpunit/includes/Api/StatementModificationHelperTest.php
@@ -1,11 +1,11 @@
newApiErrorReporter();
$helper = $this->getNewInstance( $errorReporter );
- try {
- $helper->getEntityIdFromString( $invalidEntityIdString
);
- $this->fail( 'Expected exception was not thrown' );
- } catch ( ApiUsageException $ex ) {
- $this->assertMessage( 'invalid-entity-id', $ex );
- }
+ $this->setExpectedException( RuntimeException::class,
'invalid-entity-id' );
+ $helper->getEntityIdFromString( $invalidEntityIdString );
}
public function testCreateSummary() {
@@ -95,12 +91,8 @@
$errorReporter = $this->newApiErrorReporter();
$helper = $this->getNewInstance( $errorReporter );
- try {
- $helper->getStatementFromEntity( 'foo', $entity );
- $this->fail( 'Expected exception was not thrown' );
- } catch ( ApiUsageException $ex ) {
- $this->assertMessage( 'no-such-claim', $ex );
- }
+ $this->setExpectedException( RuntimeException::class,
'no-such-claim' );
+ $helper->getStatementFromEntity( 'foo', $entity );
}
public function
testGetStatementFromEntity_reportsErrorForUnknownStatementGuid() {
@@ -108,12 +100,8 @@
$errorReporter = $this->newApiErrorReporter();
$helper = $this->getNewInstance( $errorReporter );
- try {
- $helper->getStatementFromEntity( 'unknown', $entity );
- $this->fail( 'Expected exception was not thrown' );
- } catch ( ApiUsageException $ex ) {
- $this->assertMessage( 'no-such-claim', $ex );
- }
+ $this->setExpectedException( RuntimeException::class,
'no-such-claim' );
+ $helper->getStatementFromEntity( 'unknown', $entity );
}
public function testApplyChangeOp_validatesAndAppliesChangeOp() {
@@ -142,12 +130,8 @@
$changeOp->expects( $this->never() )
->method( 'apply' );
- try {
- $helper->applyChangeOp( $changeOp, new Item() );
- $this->fail( 'Expected exception was not thrown' );
- } catch ( ApiUsageException $ex ) {
- $this->assertMessage( 'modification-failed', $ex );
- }
+ $this->setExpectedException( RuntimeException::class,
'modification-failed' );
+ $helper->applyChangeOp( $changeOp, new Item() );
}
public function testApplyChangeOp_reportsErrorWhenApplyFails() {
@@ -162,12 +146,8 @@
$changeOp->method( 'apply' )
->will( $this->throwException( new ChangeOpException()
) );
- try {
- $helper->applyChangeOp( $changeOp, new Item() );
- $this->fail( 'Expected exception was not thrown' );
- } catch ( ApiUsageException $ex ) {
- $this->assertMessage( 'modification-failed', $ex );
- }
+ $this->setExpectedException( RuntimeException::class,
'modification-failed' );
+ $helper->applyChangeOp( $changeOp, new Item() );
}
/**
@@ -196,23 +176,15 @@
$errorReporter->method( 'dieException' )
->will( $this->returnCallback( function ( $exception,
$message ) {
- throw new ApiUsageException( null,
StatusValue::newFatal( $message ) );
+ throw new RuntimeException( $message );
} ) );
$errorReporter->method( 'dieError' )
->will( $this->returnCallback( function ( $description,
$message ) {
- throw new ApiUsageException( null
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Do not use deprecated methods
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334853 )
Change subject: Do not use deprecated methods
..
Do not use deprecated methods
Bug: T156565
Change-Id: If9a0b229c22855054442cf0ede4cee1119629961
---
M classes/Thread.php
M classes/Threads.php
M import/import-parsed-discussions.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/classes/Thread.php b/classes/Thread.php
index f5e12c9..6ffccc7 100644
--- a/classes/Thread.php
+++ b/classes/Thread.php
@@ -440,7 +440,7 @@
$traceTitle = Threads::newThreadTitle( $this->subject(), new
Article( $oldTitle, 0 ) );
$redirectArticle = new Article( $traceTitle, 0 );
- $redirectArticle->doEditContent(
+ $redirectArticle->getPage()->doEditContent(
ContentHandler::makeContent( $redirectText, $traceTitle
),
$reason,
EDIT_NEW | EDIT_SUPPRESS_RC
diff --git a/classes/Threads.php b/classes/Threads.php
index ef609ee..8727b7d 100644
--- a/classes/Threads.php
+++ b/classes/Threads.php
@@ -63,7 +63,7 @@
if ( !$talkpage->exists() ) {
try {
- $talkpage->doEditContent(
+ $talkpage->getPage()->doEditContent(
ContentHandler::makeContent( "",
$talkpage->getTitle() ),
wfMessage(
'lqt_talkpage_autocreate_summary' )->inContentLanguage()->text(),
EDIT_NEW | EDIT_SUPPRESS_RC
diff --git a/import/import-parsed-discussions.php
b/import/import-parsed-discussions.php
index c670007..ece03a7 100644
--- a/import/import-parsed-discussions.php
+++ b/import/import-parsed-discussions.php
@@ -79,7 +79,7 @@
$root = new Article( $title, 0 );
- $root->doEditContent(
+ $root->getPage()->doEditContent(
ContentHandler::makeContent( $info['content'], $title ),
'Imported from JSON',
EDIT_NEW,
--
To view, visit https://gerrit.wikimedia.org/r/334853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9a0b229c22855054442cf0ede4cee1119629961
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Add user preference to allow setting a default uploader name
Pmlineditor has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334877 )
Change subject: Add user preference to allow setting a default uploader name
..
Add user preference to allow setting a default uploader name
Added user preference to set a default name to use for own works.
Defaults to username if left blank.
Bug: T154154
Change-Id: I81d1d8fbe39245fa3850f2a09f0dcd3a08945c30
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
M resources/mw.UploadWizardDeedOwnWork.js
4 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/77/334877/1
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index d611e45..b625429 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -57,6 +57,12 @@
];
}
+ $preferences['upwiz_licensename'] = [
+ 'type' => 'text',
+ 'label-message' => 'mwe-upwiz-prefs-license-name',
+ 'section' => 'uploads/upwiz-licensing'
+ ];
+
if ( UploadWizardConfig::getSetting( 'enableLicensePreference'
) ) {
$licenseConfig = UploadWizardConfig::getSetting(
'licenses' );
diff --git a/i18n/en.json b/i18n/en.json
index 8c52a40..ca03ebc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -325,6 +325,7 @@
"mwe-upwiz-prefs-def-license-def": "Use whatever the default is",
"mwe-upwiz-prefs-def-license-custom": "Custom default license",
"mwe-upwiz-prefs-def-license-custom-help": "This field is only used if
you choose the last option above.",
+ "mwe-upwiz-prefs-license-name": "Default name for licensing",
"mwe-upwiz-prefs-license-own": "Own work - $1",
"mwe-upwiz-prefs-license-thirdparty": "Someone else's work - $1",
"mwe-upwiz-prefs-chunked": "Chunked uploads for files over $1 in Upload
Wizard - Increases maximum file upload size from $2 to $3",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dddf81d..bf3214a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -351,6 +351,7 @@
"mwe-upwiz-prefs-def-license-def": "Radio button option",
"mwe-upwiz-prefs-def-license-custom": "Label of preference used to
input wikitext for custom license, if selected.",
"mwe-upwiz-prefs-def-license-custom-help": "Additional label of
preference used to input wikitext for custom license, if selected. The text of
'last option above' is {{msg-mw|mwe-upwiz-license-custom}}",
+ "mwe-upwiz-prefs-license-name": "Label of preference used to input
default name to use for licensing own work.",
"mwe-upwiz-prefs-license-own": "Parameters:\n* $1 - license message.
e.g. {{msg-mw|Mwe-upwiz-license-cc-by-sa-3.0}}\nSee also:\n*
{{msg-mw|Mwe-upwiz-prefs-license-thirdparty}}",
"mwe-upwiz-prefs-license-thirdparty": "Parameters:\n* $1 - license
message. e.g. {{msg-mw|Mwe-upwiz-license-cc-by-sa-3.0}}\nSee also:\n*
{{msg-mw|Mwe-upwiz-prefs-license-own}}",
"mwe-upwiz-prefs-chunked": "Preference that enables chunked uploading.
Parameters:\n* $1 - size of each chunk, as configured on this wiki\n* $2 -
maximum upload size without preference\n* $3 - maximum upload size with
preference enabled",
diff --git a/resources/mw.UploadWizardDeedOwnWork.js
b/resources/mw.UploadWizardDeedOwnWork.js
index 9a1d118..2302244 100644
--- a/resources/mw.UploadWizardDeedOwnWork.js
+++ b/resources/mw.UploadWizardDeedOwnWork.js
@@ -28,10 +28,16 @@
uploadCount = uploadCount || 1;
+ var prefAuthName = mw.user.options.get( 'upwiz_licensename' );
+
+ if ( !prefAuthName ) {
+ prefAuthName = mw.config.get( 'wgUserName' );
+ }
+
deed.authorInput = new OO.ui.TextInputWidget( {
name: 'author',
title: mw.message( 'mwe-upwiz-tooltip-sign' ).text(),
- value: mw.config.get( 'wgUserName' ),
+ value: prefAuthName,
classes: [ 'mwe-upwiz-sign' ]
} );
deed.fakeAuthorInput = new OO.ui.TextInputWidget( {
--
To view, visit https://gerrit.wikimedia.org/r/334877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81d1d8fbe39245fa3850f2a09f0dcd3a08945c30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Pmlineditor
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
