[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Remove unnecessary selector in CheckboxIn...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371600 )
Change subject: WikimediaUI theme: Remove unnecessary selector in
CheckboxInputWidget
..
WikimediaUI theme: Remove unnecessary selector in CheckboxInputWidget
Removing unnecessary `:disabled:hover + span` selector in
CheckboxInputWidget, which was introduced in I96daa17d5451.
Change-Id: Iee293016bc75e4fab63cfa25ebcffd0d7007f7c1
---
M src/themes/wikimediaui/widgets.less
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/wikimediaui/widgets.less
b/src/themes/wikimediaui/widgets.less
index 64160af..1e7daa3 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -380,10 +380,6 @@
background-color:
@background-color-filled--disabled;
border-color: @border-color-base--disabled;
}
- &:hover + span {
- background-color:
@background-color-filled--disabled;
- border-color: @border-color-base--disabled;
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/371600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee293016bc75e4fab63cfa25ebcffd0d7007f7c1
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Prtksxna
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...SimpleChanges[master]: Fix for bug in $wgSimpleChangesOnlyLatest handling with Medi...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372099 )
Change subject: Fix for bug in $wgSimpleChangesOnlyLatest handling with
MediaWiki 1.29
..
Fix for bug in $wgSimpleChangesOnlyLatest handling with MediaWiki 1.29
* See bug report here: https://www.mediawiki.org/wiki/Topic:Tv1tm9gz02bn1we9
* Fix is simply inserting our code later in the query building
Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
---
M SpecialSimpleChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
tosfos: Looks good to me, approved
diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 0c41802..3ba26bb 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -14,12 +14,11 @@
*
* @inheritdoc
*/
- protected function buildQuery( &$tables, &$fields, &$conds,
- &$query_options, &$join_conds, FormOptions $opts ) {
+ protected function runMainQueryHook( &$tables, &$fields, &$conds,
&$query_options, &$join_conds,
+ $opts
+ ) {
global $wgContentNamespaces,
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
-
- parent::buildQuery( $tables, $fields, $conds, $query_options,
$join_conds, $opts );
# don't count log entries toward limit of number of changes
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -45,6 +44,8 @@
$join_conds['page'] = array( 'LEFT JOIN',
'rc_cur_id=page_id' );
}
}
+
+ return parent::runMainQueryHook( $tables, $fields, $conds,
$query_options, $join_conds, $opts );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/372099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: master
Gerrit-Owner: tosfos
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: tosfos
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleChanges[master]: Fix for bug in $wgSimpleChangesOnlyLatest handling with Medi...
tosfos has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372099 )
Change subject: Fix for bug in $wgSimpleChangesOnlyLatest handling with
MediaWiki 1.29
..
Fix for bug in $wgSimpleChangesOnlyLatest handling with MediaWiki 1.29
* See bug report here: https://www.mediawiki.org/wiki/Topic:Tv1tm9gz02bn1we9
* Fix is simply inserting our code later in the query building
Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
---
M SpecialSimpleChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SimpleChanges
refs/changes/99/372099/1
diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 0c41802..3ba26bb 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -14,12 +14,11 @@
*
* @inheritdoc
*/
- protected function buildQuery( &$tables, &$fields, &$conds,
- &$query_options, &$join_conds, FormOptions $opts ) {
+ protected function runMainQueryHook( &$tables, &$fields, &$conds,
&$query_options, &$join_conds,
+ $opts
+ ) {
global $wgContentNamespaces,
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
-
- parent::buildQuery( $tables, $fields, $conds, $query_options,
$join_conds, $opts );
# don't count log entries toward limit of number of changes
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -45,6 +44,8 @@
$join_conds['page'] = array( 'LEFT JOIN',
'rc_cur_id=page_id' );
}
}
+
+ return parent::runMainQueryHook( $tables, $fields, $conds,
$query_options, $join_conds, $opts );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/372099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: master
Gerrit-Owner: tosfos
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Add test for parseSpokenWikipedia
BearND has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372098 )
Change subject: Hygiene: Add test for parseSpokenWikipedia
..
Hygiene: Add test for parseSpokenWikipedia
Change-Id: I12be89b0fea646863558aa5c7b64844456364055
---
A test/lib/parseProperty/parse-spoken-wikipedia-test.js
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/98/372098/1
diff --git a/test/lib/parseProperty/parse-spoken-wikipedia-test.js
b/test/lib/parseProperty/parse-spoken-wikipedia-test.js
new file mode 100644
index 000..cffdb23
--- /dev/null
+++ b/test/lib/parseProperty/parse-spoken-wikipedia-test.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const fs = require('fs');
+const domino = require('domino');
+const assert = require('../../utils/assert.js');
+const parseProp = require('../../../lib/parseProperty');
+const html = fs.readFileSync(`${__dirname}/../bill-clinton.html`, 'utf-8');
+
+describe('lib:parseSpokenWikipedia', () => {
+it('Parsed spoken Wikipedia should have correct number of
page.spoken.files', () => {
+const doc = domino.createDocument(html);
+const page = {};
+parseProp.parseSpokenWikipedia(doc, page);
+assert.deepEqual(page.spoken.files.length, 1);
+assert.deepEqual(page.spoken.files[0], 'File:Bill Clinton (spoken
article).ogg');
+});
+});
+
--
To view, visit https://gerrit.wikimedia.org/r/372098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12be89b0fea646863558aa5c7b64844456364055
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[wmf/1.30.0-wmf.14]: Type-hint SpoofUser::batchRecord() for IDatabase
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372097 ) Change subject: Type-hint SpoofUser::batchRecord() for IDatabase .. Type-hint SpoofUser::batchRecord() for IDatabase While normal AntiSpoof will only pass in Database objects, CentralAuth extends SpoofUser and passes in DBConnRef objects, so use the common interface of IDatabase. Bug: T173394 Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 (cherry picked from commit 7f9e08341957f93671faaa1ef4795f2fbeaa5655) --- M SpoofUser.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof refs/changes/97/372097/1 diff --git a/SpoofUser.php b/SpoofUser.php index 8938a23..f1e8222 100644 --- a/SpoofUser.php +++ b/SpoofUser.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/372097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof Gerrit-Branch: wmf/1.30.0-wmf.14 Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Type-hint SpoofUser::batchRecord() for IDatabase
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372095 ) Change subject: Type-hint SpoofUser::batchRecord() for IDatabase .. Type-hint SpoofUser::batchRecord() for IDatabase While normal AntiSpoof will only pass in Database objects, CentralAuth extends SpoofUser and passes in DBConnRef objects, so use the common interface of IDatabase. Bug: T173394 Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 --- M SpoofUser.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/SpoofUser.php b/SpoofUser.php index 8938a23..f1e8222 100644 --- a/SpoofUser.php +++ b/SpoofUser.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/372095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Krinkle Gerrit-Reviewer: MaxSem 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...CentralAuth[master]: Use namespaced IDatabase in documentation
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372096 ) Change subject: Use namespaced IDatabase in documentation .. Use namespaced IDatabase in documentation Change-Id: Ieeb78b2db41caa81308e8b8b29cb833fe6023339 --- M AntiSpoof/CentralAuthSpoofUser.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/96/372096/1 diff --git a/AntiSpoof/CentralAuthSpoofUser.php b/AntiSpoof/CentralAuthSpoofUser.php index 96a0e04..51d0f96 100644 --- a/AntiSpoof/CentralAuthSpoofUser.php +++ b/AntiSpoof/CentralAuthSpoofUser.php @@ -1,5 +1,7 @@ https://gerrit.wikimedia.org/r/372096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieeb78b2db41caa81308e8b8b29cb833fe6023339 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth 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] mediawiki...AntiSpoof[master]: Type-hint SpoofUser::batchRecord() for IDatabase
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372095 ) Change subject: Type-hint SpoofUser::batchRecord() for IDatabase .. Type-hint SpoofUser::batchRecord() for IDatabase While normal AntiSpoof will only pass in Database objects, CentralAuth extends SpoofUser and passes in DBConnRef objects, so use the common interface of IDatabase. Bug: T173394 Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 --- M SpoofUser.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof refs/changes/95/372095/1 diff --git a/SpoofUser.php b/SpoofUser.php index 8938a23..f1e8222 100644 --- a/SpoofUser.php +++ b/SpoofUser.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/372095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I831d27ea15ae457467033d19136992b5c79c23d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof 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] pywikibot/core[master]: [IMPR] translate welcome text only once
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369866 )
Change subject: [IMPR] translate welcome text only once
..
[IMPR] translate welcome text only once
Change-Id: I8913e261c89dcfe158620505241de9e360279c03
---
M scripts/welcome.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/welcome.py b/scripts/welcome.py
index 6496438..c59d916 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -441,7 +441,9 @@
if site_netext is None:
raise KeyError(
'welcome.py is not localized for site {0} in netext dict.'
-''.format(self.site))
+.format(self.site))
+else:
+self.welcome_text = site_netext
def badNameFilter(self, name, force=False):
"""Check for bad names."""
@@ -742,7 +744,7 @@
if self.badNameFilter(users.username):
self.reportBadAccount(users.username)
continue
-welcome_text = i18n.translate(self.site, netext)
+welcome_text = self.welcome_text
if globalvar.randomSign:
if self.site.family.name != 'wikinews':
welcome_text = (welcome_text
--
To view, visit https://gerrit.wikimedia.org/r/369866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8913e261c89dcfe158620505241de9e360279c03
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Mpaa
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]: Use version 0.5.0 of eslint-config-wikimedia
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371758 )
Change subject: Use version 0.5.0 of eslint-config-wikimedia
..
Use version 0.5.0 of eslint-config-wikimedia
Change-Id: I488cf4c83d15b0d7635265db378a4619d61a8da4
---
M package.json
M src/dm/annotations/ve.dm.LinkAnnotation.js
M src/dm/ve.dm.VisualDiff.js
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 93a5d26..710379c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
}
],
"devDependencies": {
-"eslint-config-wikimedia": "0.4.0",
+"eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.6.0",
"grunt-contrib-clean": "1.1.0",
diff --git a/src/dm/annotations/ve.dm.LinkAnnotation.js
b/src/dm/annotations/ve.dm.LinkAnnotation.js
index 4e47227..50cb1c6 100644
--- a/src/dm/annotations/ve.dm.LinkAnnotation.js
+++ b/src/dm/annotations/ve.dm.LinkAnnotation.js
@@ -93,7 +93,7 @@
/**
* Get the fragment / hash for the current href
*
- * @returns {string|null} The fragment, or null if none is present
+ * @return {string|null} The fragment, or null if none is present
*/
ve.dm.LinkAnnotation.prototype.getFragment = function () {
var href = this.getHref(),
diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 5248160..8c9b564 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -45,7 +45,7 @@
* Get the children of the document that are not internal list nodes
*
* @param {ve.dm.Node} docNode The document node
- * @returns {Array} The children of the document node
+ * @return {Array} The children of the document node
*/
ve.dm.VisualDiff.prototype.getDocChildren = function ( docNode ) {
var i, ilen,
@@ -98,7 +98,7 @@
*
* @param {Array} oldRootChildren Children of the old root node
* @param {Array} newRootChildren Children of the new root node
- * @returns {Object} Object containing diff information
+ * @return {Object} Object containing diff information
*/
ve.dm.VisualDiff.prototype.computeDiff = function ( oldRootChildren,
newRootChildren ) {
var i, ilen, j, jlen,
--
To view, visit https://gerrit.wikimedia.org/r/371758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I488cf4c83d15b0d7635265db378a4619d61a8da4
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Divec
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [PEP8] Keep line length beneath 80 chars
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369669 )
Change subject: [PEP8] Keep line length beneath 80 chars
..
[PEP8] Keep line length beneath 80 chars
Change-Id: I2fc59f971ed4b2418a135ad79be6573472825644
---
M scripts/pagefromfile.py
M scripts/patrol.py
M scripts/redirect.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/table2wiki.py
M scripts/welcome.py
7 files changed, 51 insertions(+), 35 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index f4e9341..36fb613 100755
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -165,15 +165,15 @@
else:
above, below = pagecontents, contents
comment = comment_bottom
-pywikibot.output('Page {0} already exists, appending on
{1}!'.format(
- title, self.getOption('append')[0]))
+pywikibot.output('Page {0} already exists, appending on {1}!'
+ .format(title, self.getOption('append')[0]))
contents = above + separator + below
elif self.getOption('force'):
pywikibot.output(u"Page %s already exists, ***overwriting!"
% title)
comment = comment_force
else:
-pywikibot.output(u"Page %s already exists, not adding!" %
title)
+pywikibot.output('Page %s already exists, not adding!' % title)
return
else:
if self.getOption('autosummary'):
diff --git a/scripts/patrol.py b/scripts/patrol.py
index 14c24a7..bc3bdc9 100755
--- a/scripts/patrol.py
+++ b/scripts/patrol.py
@@ -183,7 +183,7 @@
for item in pagelist:
if pywikibot.config.verbose_output:
-pywikibot.output(u'checking against whitelist item = %s' %
item)
+pywikibot.output('checking against whitelist item = %s' % item)
if isinstance(item, LinkedPagesRule):
if pywikibot.config.verbose_output:
@@ -252,13 +252,14 @@
if not user or current_user == user:
if self.is_wikisource_author_page(page):
if pywikibot.config.verbose_output:
-pywikibot.output(u'Whitelist author: %s' %
page)
+pywikibot.output('Whitelist author: %s' % page)
page = LinkedPagesRule(page)
else:
if pywikibot.config.verbose_output:
pywikibot.output(u'Whitelist page: %s' % page)
if pywikibot.config.verbose_output:
-pywikibot.output('Adding
{0}:{1}'.format(current_user, page))
+pywikibot.output('Adding {0}:{1}'
+ .format(current_user, page))
whitelist[current_user].append(page)
elif pywikibot.config.verbose_output:
pywikibot.output(u'Discarding whitelist page for '
@@ -340,7 +341,8 @@
if self.getOption('ask'):
choice = pywikibot.input_yn(
-u'Do you want to mark page as patrolled?',
automatic_quit=False)
+'Do you want to mark page as patrolled?',
+automatic_quit=False)
# Patrol the page
if choice:
diff --git a/scripts/redirect.py b/scripts/redirect.py
index bd8ddec..86855f0 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -168,7 +168,8 @@
not in self.namespaces:
continue
if alsoGetPageTitles:
-pageTitles.add(space_to_underscore(pywikibot.Link(entry.title,
self.site)))
+pageTitles.add(space_to_underscore(pywikibot.Link(entry.title,
+ self.site)))
m = redirR.match(entry.text)
if m:
@@ -186,8 +187,9 @@
else:
if target_link.site != self.site:
pywikibot.output(
-u'NOTE: Ignoring {0} which is a redirect to '
-u'another site {1}.'.format(entry.title,
target_link.site))
+'NOTE: Ignoring {0} which is a redirect to '
+'another site {1}.'
+.format(entry.title, target_link.site))
target_link = None
# if the redirect does not link to another wiki
if target_link and target_link.title:
@@ -497,7 +499,7 @@
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Add missing "timedmedia-webm-audios" message
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372094 )
Change subject: Add missing "timedmedia-webm-audios" message
..
Add missing "timedmedia-webm-audios" message
Bug: T173395
Change-Id: I1952a8c355a599d9543076dcfcd692c086ba08fd
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/94/372094/1
diff --git a/i18n/en.json b/i18n/en.json
index b4cf16d..e99e71b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -167,6 +167,7 @@
"timedmedia-ogg-audios": "{{PLURAL:$1|$1 Ogg audio file|$1 Ogg audio
files}}",
"timedmedia-flac-audios": "{{PLURAL:$1|$1 FLAC audio file|$1 FLAC audio
files}}",
"timedmedia-wav-audios": "{{PLURAL:$1|$1 WAV audio file|$1 WAV audio
files}}",
+ "timedmedia-webm-audios": "{{PLURAL:$1|$1 WebM audio file|$1 WebM audio
files}}",
"beta-feature-timedmediahandler-message-videojs": "New video player",
"beta-feature-timedmediahandler-description-videojs": "Watch video
files in a modern player with a cleaner look and mobile compatibility.",
"right-transcode-reset": "Reset failed or transcoded videos so they are
inserted into the job queue again",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 43c7c11..9110705 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -185,6 +185,7 @@
"timedmedia-ogg-audios": "Number of ogg audio files, displayed on
[[Special:TimedMediaHandler]]. Parameters:\n* $1 - the number of
files\n{{Related|Timedmedia-format-type}}",
"timedmedia-flac-audios": "Number of FLAC audio files, displayed on
[[Special:TimedMediaHandler]]. Parameters:\n* $1 - the number of
files\n{{Related|Timedmedia-format-type}}",
"timedmedia-wav-audios": "Number of WAV audio files, displayed on
[[Special:TimedMediaHandler]]. Parameters:\n* $1 - the number of
files\n{{Related|Timedmedia-format-type}}",
+ "timedmedia-webm-audios": "Number of WebM audio files, displayed on
[[Special:TimedMediaHandler]]. Parameters:\n* $1 - the number of
files\n{{Related|Timedmedia-format-type}}",
"beta-feature-timedmediahandler-message-videojs": "Description of
TimedMediaHandler VideoJS in beta features page.",
"beta-feature-timedmediahandler-description-videojs": "Title of
TimedMediaHandler VideoJS section in beta features page.",
"right-transcode-reset": "{{doc-right|transcode-reset}}",
--
To view, visit https://gerrit.wikimedia.org/r/372094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1952a8c355a599d9543076dcfcd692c086ba08fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
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/mediawiki-config[master]: Don't deploy Timeless on fr.wiktionary for now
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372092 ) Change subject: Don't deploy Timeless on fr.wiktionary for now .. Don't deploy Timeless on fr.wiktionary for now Header doesn't render well. This is a follow-up for 4b2b787. Bug: T154371 Change-Id: Ie213db83dfe151972ae58637b96fbf3e6a85de32 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5705172..6664eee 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19413,7 +19413,6 @@ 'frwikinews' => true, // T154371 'frwikisource' => true, 'frwikiversity' => true, - 'frwiktionary' => true, ], ]; -- To view, visit https://gerrit.wikimedia.org/r/372092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie213db83dfe151972ae58637b96fbf3e6a85de32 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow 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[wmf/1.30.0-wmf.13]: Explicitly load badges extension
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372093 )
Change subject: Explicitly load badges extension
..
Explicitly load badges extension
Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
(cherry picked from commit 560f3c3fcff65a81e96e1a2af48f25e8cdc8dbb5)
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/93/372093/1
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/372093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.13
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Don't deploy Timeless on fr.wiktionary for now
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372092 ) Change subject: Don't deploy Timeless on fr.wiktionary for now .. Don't deploy Timeless on fr.wiktionary for now Header doesn't render well. Change-Id: Ie213db83dfe151972ae58637b96fbf3e6a85de32 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/372092/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5705172..6664eee 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19413,7 +19413,6 @@ 'frwikinews' => true, // T154371 'frwikisource' => true, 'frwikiversity' => true, - 'frwiktionary' => true, ], ]; -- To view, visit https://gerrit.wikimedia.org/r/372092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie213db83dfe151972ae58637b96fbf3e6a85de32 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update Wikidata property blacklist
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370846 ) Change subject: Update Wikidata property blacklist .. Update Wikidata property blacklist Change-Id: I2e9fa6dc6cd546450b3f9ec1bd47eb5700616fb7 --- M wmf-config/Wikibase.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index 7ef0e97..566fa23 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -125,9 +125,11 @@ $wgPropertySuggesterDeprecatedIds = [ 143, // imported from /** -* Deprecated properties (none at the moment) +* Deprecated properties * @see https://www.wikidata.org/wiki/Special:WhatLinksHere/Q18644427 */ + 1222, // (deprecated) NARA person ID + 2315, // comment (DEPRECATED) /** * @see https://www.wikidata.org/w/index.php?oldid=335040857 */ @@ -147,6 +149,8 @@ 2368, // wikibase-property 2535, // math 2536, // external-id + 4045, // tabular-data + 4047, // geo-shape ]; // Don't try to let users answer captchas if they try to add links -- To view, visit https://gerrit.wikimedia.org/r/370846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e9fa6dc6cd546450b3f9ec1bd47eb5700616fb7 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek Gerrit-Reviewer: Aude Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hoo man 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...Wikidata[wmf/1.30.0-wmf.14]: Explicitly load badges extension
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372051 )
Change subject: Explicitly load badges extension
..
Explicitly load badges extension
Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dereckson: Looks good to me, approved
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/372051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.12]: Explicitly load badges extension
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372088 )
Change subject: Explicitly load badges extension
..
Explicitly load badges extension
Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dereckson: Looks good to me, approved
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/372088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: Aude
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove wbq_evaluation logging
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/367913 ) Change subject: Remove wbq_evaluation logging .. Remove wbq_evaluation logging The job that used this log channel was already removed in I5f572c6ff2. Change-Id: Ic41d27f857e792d0f72cf3d4a71b5ba04a0acb61 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, but someone else must approve jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f41df5c..5705172 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -5183,7 +5183,6 @@ 'UpdateRepo' => 'debug', 'updateTranstagOnNullRevisions' => 'debug', 'upload' => 'debug', - 'wbq_evaluation' => 'debug', // WikibaseQualityConstraints evaluation logs 'wfLogDBError' => 'debug', // Former $wgDBerrorLog 'wikibase-debug' => 'debug', 'xenon' => 'debug', -- To view, visit https://gerrit.wikimedia.org/r/367913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic41d27f857e792d0f72cf3d4a71b5ba04a0acb61 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Aude Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hoo man 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]: Enable Timeless on four French wikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372087 ) Change subject: Enable Timeless on four French wikis .. Enable Timeless on four French wikis Bug: T154371 Change-Id: I56100f66cad155e8faf9d740818c5b87673fa76d --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3b798de..f41df5c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19411,6 +19411,10 @@ 'testwiki' => true, 'test2wiki' => true, 'mediawikiwiki' => true, + 'frwikinews' => true, // T154371 + 'frwikisource' => true, + 'frwikiversity' => true, + 'frwiktionary' => true, ], ]; -- To view, visit https://gerrit.wikimedia.org/r/372087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56100f66cad155e8faf9d740818c5b87673fa76d Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow 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...WikimediaBadges[master]: Release 1.0.0 without translatewiki localization
Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372091 )
Change subject: Release 1.0.0 without translatewiki localization
..
Release 1.0.0 without translatewiki localization
My reason to touch this is the awkward, outdated version number.
I also suggest to remove the localization overhead entirely. Localizing
the description of this extension (and nothing else) is not really
worth it.
Depends-On: Iebbc3849b638c16daa6fe8debb5fa9d81a811c1a
Change-Id: I6b407bf9cc73d9d2ac3db04f23b9759a7510536c
---
M Gruntfile.js
D README.md
D RELEASE-NOTES.md
D WikimediaBadges.php
M composer.json
M extension.json
D i18n/ast.json
D i18n/ba.json
D i18n/be-tarask.json
D i18n/bg.json
D i18n/cs.json
D i18n/de.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/gl.json
D i18n/hi.json
D i18n/it.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lij.json
D i18n/mk.json
D i18n/nb.json
D i18n/nl.json
D i18n/oc.json
D i18n/pl.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/sr-ec.json
D i18n/sv.json
D i18n/uk.json
D i18n/vi.json
D i18n/zh-hans.json
D i18n/zh-hant.json
M includes/BeforePageDisplayHookHandler.php
M includes/OtherProjectsSidebarHookHandler.php
M package.json
M phpcs.xml
M tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php
M tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php
43 files changed, 25 insertions(+), 339 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaBadges
refs/changes/91/372091/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 644fee3..3c5c1ad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,14 +3,8 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-eslint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- banana: {
- all: [
- 'i18n/'
- ]
- },
eslint: {
all: '.'
},
@@ -30,7 +24,7 @@
]
}
} );
- grunt.registerTask( 'lint', [ 'eslint', 'jsonlint', 'banana',
'stylelint' ] );
+ grunt.registerTask( 'lint', [ 'eslint', 'jsonlint', 'stylelint' ] );
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', [ 'test' ] );
};
diff --git a/README.md b/README.md
deleted file mode 100644
index b03c676..000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-WikimediaBadges
-===
-
-Extension which contains default themes to display badges on Wikimedia
projects.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
deleted file mode 100644
index 44b6e55..000
--- a/RELEASE-NOTES.md
+++ /dev/null
@@ -1,7 +0,0 @@
-These are the release notes for the [WikimediaBadges extension](README.md).
-
-## Version 0.1 (dev)
-
-Initial release with these features:
-
-* New default theme to display badges on Wikimedia wikis
diff --git a/WikimediaBadges.php b/WikimediaBadges.php
deleted file mode 100644
index 42415fc..000
--- a/WikimediaBadges.php
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/wmde/WikimediaBadges
- * @license GNU GPL v2+
- */
-
-if ( function_exists( 'wfLoadExtension' ) ) {
- wfLoadExtension( 'WikimediaBadges', __DIR__ . '/extension.json' );
- // Keep i18n globals so mergeMessageFileList.php doesn't break
- $wgMessagesDirs['WikimediaBadges'] = __DIR__ . '/i18n';
- /*wfWarn(
- 'Deprecated PHP entry point used for WikimediaBadges extension.
Please use wfLoadExtension instead, ' .
- 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
- );*/
- return;
-} else {
- die( 'This version of the WikimediaBadges extension requires MediaWiki
1.25+' );
-}
diff --git a/composer.json b/composer.json
index c838078..13291b9 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "wikibase/wikimedia-badges",
"description": "Extension which contains default themes to display
badges on Wikimedia projects",
"type": "mediawiki-extension",
- "version": "0.1-alpha",
+ "version": "1.0.0",
"keywords": [
"Wikidata",
"Wikibase"
@@ -36,6 +36,7 @@
"scripts": {
"fix": "phpcbf",
"test": [
+ "@validate --no-interaction",
"parallel-lint . --exclude vendor",
"phpcs -p -s"
]
diff --git a/extension.json b/extension.json
index 14baa10..88107f8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,19 +1,14 @@
{
"name": "WikimediaBadges",
- "version": "0.1 alpha",
+ "version": "1.0.0",
[MediaWiki-commits] [Gerrit] wikidata/build-resources[master]: Update WikimediaBadges loading to use wfLoadExtension
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372090 ) Change subject: Update WikimediaBadges loading to use wfLoadExtension .. Update WikimediaBadges loading to use wfLoadExtension I would like to remove this file because it does not do anything but executing wfLoadExtension. Change-Id: Iebbc3849b638c16daa6fe8debb5fa9d81a811c1a --- M Wikidata.localisation.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/build-resources refs/changes/90/372090/1 diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php index 0132552..e125c43 100644 --- a/Wikidata.localisation.php +++ b/Wikidata.localisation.php @@ -17,7 +17,7 @@ require_once "$wgWikidataBaseDir/extensions/Wikibase/repo/Wikibase.php"; require_once "$wgWikidataBaseDir/extensions/Wikidata.org/WikidataOrg.php"; -require_once "$wgWikidataBaseDir/extensions/WikimediaBadges/WikimediaBadges.php"; +wfLoadExtension( 'WikimediaBadges', "$wgWikidataBaseDir/extensions/WikimediaBadges/WikimediaBadges.php" ); require_once "$wgWikidataBaseDir/extensions/PropertySuggester/PropertySuggester.php"; require_once "$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php"; require_once "$wgWikidataBaseDir/extensions/Quality/WikibaseQuality.php"; -- To view, visit https://gerrit.wikimedia.org/r/372090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebbc3849b638c16daa6fe8debb5fa9d81a811c1a Gerrit-PatchSet: 1 Gerrit-Project: wikidata/build-resources Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.13]: Update git submodules
Dereckson has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372089 ) Change subject: Update git submodules .. Update git submodules * Update skins/Timeless from branch 'wmf/1.30.0-wmf.13' - Fix Timeless watchlist legends Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60 (cherry picked from commit 1d2636dfdfe85ef06c18a01607dc0168209de431) Change-Id: I14fd7d91e71bc4ea982594ed488eb3494c660911 --- M skins/Timeless 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dereckson: Verified; Looks good to me, approved diff --git a/skins/Timeless b/skins/Timeless index f11212f..fe1e4f7 16 --- a/skins/Timeless +++ b/skins/Timeless @@ -1 +1 @@ -Subproject commit f11212f7bd75663517a3466bf0174c9a2347ada2 +Subproject commit fe1e4f74ece40af11847acf7924c4fde330955fc -- To view, visit https://gerrit.wikimedia.org/r/372089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14fd7d91e71bc4ea982594ed488eb3494c660911 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.13 Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson 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/core[wmf/1.30.0-wmf.13]: Update git submodules
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372089 ) Change subject: Update git submodules .. Update git submodules * Update skins/Timeless from branch 'wmf/1.30.0-wmf.13' - Fix Timeless watchlist legends Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60 (cherry picked from commit 1d2636dfdfe85ef06c18a01607dc0168209de431) Change-Id: I14fd7d91e71bc4ea982594ed488eb3494c660911 --- M skins/Timeless 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/372089/1 diff --git a/skins/Timeless b/skins/Timeless index f11212f..fe1e4f7 16 --- a/skins/Timeless +++ b/skins/Timeless @@ -1 +1 @@ -Subproject commit f11212f7bd75663517a3466bf0174c9a2347ada2 +Subproject commit fe1e4f74ece40af11847acf7924c4fde330955fc -- To view, visit https://gerrit.wikimedia.org/r/372089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14fd7d91e71bc4ea982594ed488eb3494c660911 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.13 Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.12]: Explicitly load badges extension
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372088 )
Change subject: Explicitly load badges extension
..
Explicitly load badges extension
Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/88/372088/1
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/372088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix spacing for @param and indent of function comments
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371585 )
Change subject: Fix spacing for @param and indent of function comments
..
Fix spacing for @param and indent of function comments
In phpcs.xml rename renamed sniffs and add the failing sniffs,
because now the whole sniff is no longer excluded.
Change-Id: If5b0bd16028761abc2c47ace9e97d37ad14bb36f
---
M includes/content/ContentHandler.php
M includes/content/TextContentHandler.php
M includes/debug/logger/LegacyLogger.php
M includes/exception/MWExceptionHandler.php
M includes/filerepo/file/File.php
M includes/filerepo/file/UnregisteredLocalFile.php
M includes/libs/objectcache/RESTBagOStuff.php
M includes/libs/stats/NullStatsdDataFactory.php
M includes/media/MediaHandler.php
M includes/page/WikiPage.php
M includes/resourceloader/ResourceLoaderJqueryMsgModule.php
M includes/search/NullIndexField.php
M includes/search/SearchEngine.php
M includes/search/SearchIndexField.php
M includes/search/SearchIndexFieldDefinition.php
M includes/search/SearchResult.php
M includes/skins/QuickTemplate.php
M includes/specials/SpecialMediaStatistics.php
M includes/utils/BatchRowUpdate.php
M includes/utils/BatchRowWriter.php
M phpcs.xml
M tests/phpunit/MediaWikiTestCase.php
22 files changed, 73 insertions(+), 58 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 90364f3..0509e29 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1135,9 +1135,9 @@
/**
* Add new field definition to array.
* @param SearchIndexField[] &$fields
-* @param SearchEngine $engine
-* @param string $name
-* @param int$type
+* @param SearchEngine $engine
+* @param string $name
+* @param int $type
* @return SearchIndexField[] new field defs
* @since 1.28
*/
@@ -1151,7 +1151,7 @@
* as representation of this document.
* Overriding class should call parent function or take care of calling
* the SearchDataForIndex hook.
-* @param WikiPage $page Page to index
+* @param WikiPage $page Page to index
* @param ParserOutput $output
* @param SearchEngine $engine Search engine for which we are indexing
* @return array Map of name=>value for fields
@@ -1190,7 +1190,7 @@
*
* Specific content handlers may override it if they need different
content handling.
*
-* @param WikiPage$page
+* @param WikiPage $page
* @param ParserCache $cache
* @return ParserOutput
*/
diff --git a/includes/content/TextContentHandler.php
b/includes/content/TextContentHandler.php
index 698a37b..ced2a66 100644
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -40,7 +40,7 @@
* Returns the content's text as-is.
*
* @param Content $content
-* @param string $format The serialization format to check
+* @param string $format The serialization format to check
*
* @return mixed
*/
diff --git a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index 6359509..06ec574 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -454,14 +454,14 @@
}
/**
- * Log to a file without getting "file size exceeded" signals.
- *
- * Can also log to UDP with the syntax udp://host:port/prefix. This will
send
- * lines to the specified port, prefixed by the specified prefix and a
space.
- *
- * @param string $text
- * @param string $file Filename
- */
+* Log to a file without getting "file size exceeded" signals.
+*
+* Can also log to UDP with the syntax udp://host:port/prefix. This
will send
+* lines to the specified port, prefixed by the specified prefix and a
space.
+*
+* @param string $text
+* @param string $file Filename
+*/
public static function emit( $text, $file ) {
if ( substr( $file, 0, 4 ) == 'udp:' ) {
$transport = UDPTransport::newFromString( $file );
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index a2867a1..bf232e9 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -616,7 +616,7 @@
* @param ErrorException $e
* @param string $channel
* @param string $level
- */
+*/
protected static function logError(
ErrorException $e, $channel, $level = LogLevel::ERROR
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable WikidataPageBanner on test wikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372081 ) Change subject: Enable WikidataPageBanner on test wikis .. Enable WikidataPageBanner on test wikis Bug: T173388 Change-Id: If4f8e1646e2fd43d41725e3384cfde4a163a8a30 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4e20c1f..3b798de 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19145,6 +19145,8 @@ // WikidataPageBanner extension (T98029) 'wmgUseWikidataPageBanner' => [ 'default' => false, + 'testwiki' => true, // T173388 + 'test2wiki' => true, // T125000, T115023, T140717, T145328, T142963 // T110837, T121999, T114334, T152344, T163662 'wikivoyage' => true, -- To view, visit https://gerrit.wikimedia.org/r/372081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4f8e1646e2fd43d41725e3384cfde4a163a8a30 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow 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]: Enable Timeless on four French wikis
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372087 ) Change subject: Enable Timeless on four French wikis .. Enable Timeless on four French wikis Change-Id: I56100f66cad155e8faf9d740818c5b87673fa76d --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/87/372087/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2fd0ca6..23552d5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19404,6 +19404,10 @@ 'testwiki' => true, 'test2wiki' => true, 'mediawikiwiki' => true, + 'frwikinews' => true, // T154371 + 'frwikisource' => true, + 'frwikiversity' => true, + 'frwiktionary' => true, ], ]; -- To view, visit https://gerrit.wikimedia.org/r/372087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56100f66cad155e8faf9d740818c5b87673fa76d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create a few of namespace aliases for hiwikiversity
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370990 ) Change subject: Create a few of namespace aliases for hiwikiversity .. Create a few of namespace aliases for hiwikiversity Bug: T172977 Change-Id: I80b2bf9390e37e5f22d329afe62f9b2d2e38a915 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2fd0ca6..4e20c1f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3643,6 +3643,11 @@ 'प्र' => 100, 'प्रवा' => 101, ], + '+hiwikiversity' => [ + 'Portal' => 100, // T172977 + 'School' => 102, // T172977 + 'Collection' => 106, // T172977 + ], '+hrwikisource' => [ 'Author' => 100, 'Author_talk' => 101, -- To view, visit https://gerrit.wikimedia.org/r/370990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80b2bf9390e37e5f22d329afe62f9b2d2e38a915 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow 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...Timeless[wmf/1.30.0-wmf.14]: Fix messed up recent changes/watchlist legends
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372085 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dereckson: Looks good to me, approved
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 428df2b..b3f2319 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -301,6 +301,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Isarra
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...Timeless[wmf/1.30.0-wmf.13]: Fix messed up recent changes/watchlist legends
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372086 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
(cherry picked from commit 1d2636dfdfe85ef06c18a01607dc0168209de431)
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dereckson: Looks good to me, approved
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 4dc60a7..c80d363 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -305,6 +305,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: wmf/1.30.0-wmf.13
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Isarra
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...Timeless[wmf/1.30.0-wmf.13]: Fix messed up recent changes/watchlist legends
Dereckson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372086 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
(cherry picked from commit 1d2636dfdfe85ef06c18a01607dc0168209de431)
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/86/372086/1
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 4dc60a7..c80d363 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -305,6 +305,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: wmf/1.30.0-wmf.13
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Isarra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Fix messed up recent changes/watchlist legends
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372084 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
Dereckson: Looks good to me, but someone else must approve
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 428df2b..b3f2319 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -301,6 +301,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Isarra
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Isarra
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...Timeless[wmf/1.30.0-wmf.14]: Fix messed up recent changes/watchlist legends
Dereckson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372085 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/85/372085/1
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 428df2b..b3f2319 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -301,6 +301,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Isarra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Splash[master]: Fix messed up recent changes/watchlist legends
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372083 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T132044
Change-Id: I8c5e1974b83f7e18280c761e249582cc4a603f23
---
M resources/screen.less
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/resources/screen.less b/resources/screen.less
index 64663b5..b25e1da 100644
--- a/resources/screen.less
+++ b/resources/screen.less
@@ -625,8 +625,11 @@
margin-left: 2em;
text-shadow: 0px 1px 1px #ccc;
}
+ dt {
+ margin: 0 0.5em 0 0;
+ }
}
- label{
+ label {
padding-left: 1em;
}
.mw-label {
--
To view, visit https://gerrit.wikimedia.org/r/372083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c5e1974b83f7e18280c761e249582cc4a603f23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Splash
Gerrit-Branch: master
Gerrit-Owner: Isarra
Gerrit-Reviewer: Isarra
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...Splash[master]: Refactor everything
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372078 )
Change subject: Refactor everything
..
Refactor everything
Bug: T165443
Change-Id: I202c95c606f00e8d370c4f3957a22856adc7a7b6
---
M Splash.skin.php
M SplashTemplate.php
M i18n/en.json
M i18n/qqq.json
D resources/fonts.css
M resources/screen.less
A resources/variables.less
M skin.json
8 files changed, 565 insertions(+), 372 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/Splash.skin.php b/Splash.skin.php
index 88985e9..cd7155f 100644
--- a/Splash.skin.php
+++ b/Splash.skin.php
@@ -17,10 +17,10 @@
$out->addMeta( 'viewport', 'width=device-width,
initial-scale=1, maximum-scale=1' );
# Add css/js
- $out->addModuleStyles( array (
+ $out->addModuleStyles( [
'mediawiki.skinning.content.externallinks',
'skins.splash'
- ) );
+ ] );
$out->addModuleScripts( 'skins.splash' );
}
@@ -29,7 +29,6 @@
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
- global $wgFontCSSLocation;
parent::setupSkinUserCss( $out );
}
}
diff --git a/SplashTemplate.php b/SplashTemplate.php
index c18a034..da9c587 100644
--- a/SplashTemplate.php
+++ b/SplashTemplate.php
@@ -7,210 +7,246 @@
class SplashTemplate extends BaseTemplate {
/**
-* Template filter callback for Splash skin.
-* Takes an associative array of data set from a SkinTemplate-based
-* class, and a wrapper for MediaWiki's localization database, and
-* outputs a formatted page.
-*
-* @access private
+* Outputs the entire contents of the page
*/
function execute() {
+ // Open html, body elements, etc
+ $html = $this->get( 'headelement' );
+
+ $html .= Html::openElement( 'div', [ 'id' => 'globalWrapper' ]
);
+ $html .= Html::openElement( 'div', [ 'id' => 'container-top' ]
);
+ $html .= Html::openElement( 'div', [ 'id' => 'container-top-l1'
] );
+ $html .= Html::openElement( 'div', [ 'id' => 'container-top-l2'
] );
+ $html .= Html::openElement( 'div', [ 'id' => 'container-bottom'
] );
+
+ $html .= Html::rawElement( 'div', [ 'id' => 'container-content'
],
+ Html::rawElement(
+ 'div',
+ [ 'id' => 'header', 'class' => [ 'noprint',
$this->get( 'userlangattributes' ) ] ],
+ $this->getGlobalLinks() .
+ Html::rawElement(
+ 'div',
+ [ 'id' => 'site-links' ],
+ $this->getPersonalToolsBlock() .
+ Html::rawElement( 'div', [ 'id' =>
'site-navigation' ],
+ $this->getMainNavigation()
+ ) .
+ $this->getSearchBox() .
+ Html::rawElement( 'div', [ 'id' =>
'main-logo', 'role' => 'banner' ],
+ Html::rawElement(
+ 'a',
+ [ 'class' => [
'mw-wiki-title' ], 'href' => htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] ) ],
+ Html::rawElement(
'div', [ 'id' => 'mainlogo-text' ],
+
Html::rawElement( 'h1', [], $this->getMsg( 'site-banner' )->text() )
+ )
+ )
+ )
+ )
+ ) .
+ Html::rawElement( 'div', [ 'id' => 'page-content' ],
+ Html::rawElement( 'div', [ 'id' =>
'content-container' ],
+ Html::rawElement(
+ 'div',
+ [ 'id' => 'content', 'class' =>
'mw-body-primary', 'role' => 'main' ],
+ Html::element( 'a', [ 'id' =>
'top' ] ) .
+ $this->getIndicators() .
+ $this->getSiteNotices() .
+ Html::rawElement(
+ 'h1',
+
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CI: install CiviCRM with a fake sendmail
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363141 )
Change subject: CI: install CiviCRM with a fake sendmail
..
CI: install CiviCRM with a fake sendmail
The CI instances lack an exim installation and hence the Drupal
installation fails with:
Starting Drupal installation. This takes a few seconds ... [ok]
sh: 1: /usr/sbin/sendmail: not found
WD mail: Error sending e-mail (from ad...@example.com to [error]
ad...@example.com).
Set PHP_OPTIONS so that drush invokes PHP with sendmail_path=true
Bug: T161724
Depends-On: Ia5909efc841bab9798658702515b703c1acd3c71
Change-Id: Id215d8b37fe10eb151fe485964785d0e4204949d
---
M bin/ci-populate-dbs.sh
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index e8ab288..60e9bd5 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -10,6 +10,11 @@
export AMPHOME="${WORKSPACE}/.amp-${BUILD_NUMBER}"
export NO_SAMPLE_DATA=1
+# CI lacks sendmail and Drupal install would fails without it. drush can pass
+# extra options to PHP via PHP_OPTIONS - T171724
+PHP_OPTIONS="-d sendmail_path=$(which true)"
+export PHP_OPTIONS
+
#FIXME: --web-root="$WORKSPACE/src/crm"
"$WORKSPACE"/src/wikimedia/fundraising/civicrm-buildkit/bin/civi-download-tools
--
To view, visit https://gerrit.wikimedia.org/r/363141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id215d8b37fe10eb151fe485964785d0e4204949d
Gerrit-PatchSet: 7
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Fix messed up recent changes/watchlist legends
Isarra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372084 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T173151
Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
---
M resources/screen-common.less
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/84/372084/1
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 428df2b..b3f2319 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -301,6 +301,9 @@
line-height: 1.25;
margin: 1.5em 0 0.5em;
}
+ form dt {
+ margin: 0 0.5em 0 0;
+ }
h1,
h2 {
--
To view, visit https://gerrit.wikimedia.org/r/372084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf0f7dd9d03ea43db6355ccc09fb731187abf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Isarra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Splash[master]: Fix messed up recent changes/watchlist legends
Isarra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372083 )
Change subject: Fix messed up recent changes/watchlist legends
..
Fix messed up recent changes/watchlist legends
Bug: T132044
Change-Id: I8c5e1974b83f7e18280c761e249582cc4a603f23
---
M resources/screen.less
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Splash
refs/changes/83/372083/1
diff --git a/resources/screen.less b/resources/screen.less
index 64663b5..b25e1da 100644
--- a/resources/screen.less
+++ b/resources/screen.less
@@ -625,8 +625,11 @@
margin-left: 2em;
text-shadow: 0px 1px 1px #ccc;
}
+ dt {
+ margin: 0 0.5em 0 0;
+ }
}
- label{
+ label {
padding-left: 1em;
}
.mw-label {
--
To view, visit https://gerrit.wikimedia.org/r/372083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c5e1974b83f7e18280c761e249582cc4a603f23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Splash
Gerrit-Branch: master
Gerrit-Owner: Isarra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Add validation for hierarchy input
Fz-29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372082 )
Change subject: Add validation for hierarchy input
..
Add validation for hierarchy input
Change-Id: I24fe67be0469dd628ddfd3d68960285bf1b6fe4d
---
M CargoFieldDescription.php
M CargoUtils.php
2 files changed, 33 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/82/372082/1
diff --git a/CargoFieldDescription.php b/CargoFieldDescription.php
index 6c78859..9fff7d0 100644
--- a/CargoFieldDescription.php
+++ b/CargoFieldDescription.php
@@ -71,6 +71,7 @@
// hardcode it to a semicolon.
if(
$fieldDescription->mIsHierarchy == true ) {
// $paramValue contains
"*" hierarchy structure
+
CargoUtils::validateHierarchyStructure( trim( $paramValue ) );
$fieldDescription->mHierarchyStructure = trim( $paramValue );
// now make the allowed
values param similar to the syntax
// used by other fields
@@ -78,7 +79,7 @@
$allowedValuesArray =
array();
foreach (
$hierarchyNodesArray as $node ) {
// Remove
prefix of multiple "*"
-
$allowedValuesArray[] = preg_replace( '/^[*]*/', '', $node );
+
$allowedValuesArray[] = preg_replace( '/^[*]* ?/', '', $node );
}
} else {
$delimiter = ',';
diff --git a/CargoUtils.php b/CargoUtils.php
index a1686be..c72ce24 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -942,4 +942,35 @@
}
}
+ public static function validateHierarchyStructure( $hierarchyStructure
) {
+ $hierarchyNodesArray = explode( "\n", $hierarchyStructure );
+ $matches = array();
+ preg_match( '/^([*]*)[^*]*/i', $hierarchyNodesArray[0],
$matches );
+ if ( strlen( $matches[1] ) != 1 ) {
+ throw new MWException( "Error: First entry of hierarchy
values should start with exact one '*', the entry \"" .
+ $hierarchyNodesArray[0] . "\" has " . strlen(
$matches[1] ) . " '*'" );
+ }
+ $level = 0;
+ foreach( $hierarchyNodesArray as $node ) {
+ if ( !preg_match( '/^([*]*)( *)(.*)/i', $node, $matches
) ) {
+ throw new MWException( "Error: The \"" . $node
. "\" entry of hierarchy values does not follow syntax. " .
+ "The entry should be of the form : *
entry" );
+ }
+ if ( strlen( $matches[1] ) < 1 ) {
+ throw new MWException( "Error: Each entry of
hierarchy values should start with atleast one '*', the entry \"" .
+ $node . "\" has " . strlen( $matches[1]
) . " '*'" );
+ }
+ if ( strlen( $matches[1] ) - $level > 1 ) {
+ throw new MWException( "Error: Level or count
of '*' in hierarchy values should be increased only by count of 1, the entry
\"" .
+ $node . "\" should have " . ( $level +
1 ) . " or less '*'" );
+ }
+ $level = strlen( $matches[1] );
+ if ( strlen( $matches[3] ) == 0 ) {
+ throw new MWException( "Error: The entry of
hierarchy values cannot be empty." );
+ }
+ if ( strlen( $matches[2] ) > 1 ) {
+ throw new MWException( "Error: Single or no
space should follow after '*'. \"" . $node . "\" needs correction." );
+ }
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/372082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24fe67be0469dd628ddfd3d68960285bf1b6fe4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Fz-29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable WikidataPageBanner on test wikis
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372081 ) Change subject: Enable WikidataPageBanner on test wikis .. Enable WikidataPageBanner on test wikis Bug: T173388 Change-Id: If4f8e1646e2fd43d41725e3384cfde4a163a8a30 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/372081/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2fd0ca6..3c99fe1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19140,6 +19140,8 @@ // WikidataPageBanner extension (T98029) 'wmgUseWikidataPageBanner' => [ 'default' => false, + 'testwiki' => true, // T173388 + 'test2wiki' => true, // T125000, T115023, T140717, T145328, T142963 // T110837, T121999, T114334, T152344, T163662 'wikivoyage' => true, -- To view, visit https://gerrit.wikimedia.org/r/372081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4f8e1646e2fd43d41725e3384cfde4a163a8a30 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Add tests for extractLeadIntroduction and fix edge case
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372079 )
Change subject: Add tests for extractLeadIntroduction and fix edge case
..
Add tests for extractLeadIntroduction and fix edge case
Add some tests for the extractLeadIntroduction method
Previously any tables that followed a lead paragraph may have
been included in the introduction. This is not wanted. Fix.
Change-Id: Ifa3e9fb5c684ee71ab69f95305de71b21214d4dd
---
M lib/transformations/extractLeadIntroduction.js
A test/lib/transformations/extractLeadIntroduction.js
2 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/79/372079/1
diff --git a/lib/transformations/extractLeadIntroduction.js
b/lib/transformations/extractLeadIntroduction.js
index 3e4f803..e360ecf 100644
--- a/lib/transformations/extractLeadIntroduction.js
+++ b/lib/transformations/extractLeadIntroduction.js
@@ -19,6 +19,7 @@
function extractLeadIntroduction(doc) {
let p = '';
const remove = [];
+const blacklist = [ 'P', 'TABLE' ];
const nodes = doc.querySelectorAll('body > p');
Array.prototype.forEach.call(nodes, (node) => {
@@ -27,8 +28,10 @@
p = node.outerHTML;
remove.push(node);
nextSibling = node.nextSibling;
-// check the next element is a text node or not a P tag
-while (nextSibling && (nextSibling.nodeType === 3 ||
nextSibling.tagName !== 'P')) {
+// check the next element is a text node or not in list of
blacklisted elements
+while (nextSibling && (nextSibling.nodeType === 3 ||
+blacklist.indexOf(nextSibling.tagName) === -1
+)) {
// Deal with text nodes
if (nextSibling.nodeType === 3) {
if (!isEmpty(nextSibling)) {
diff --git a/test/lib/transformations/extractLeadIntroduction.js
b/test/lib/transformations/extractLeadIntroduction.js
new file mode 100644
index 000..b1ea6a1
--- /dev/null
+++ b/test/lib/transformations/extractLeadIntroduction.js
@@ -0,0 +1,50 @@
+"use strict";
+
+/* eslint-disable max-len */
+const domino = require('domino');
+const assert = require('./../../utils/assert.js');
+const extractLeadIntroduction =
require('./../../../lib/transformations/extractLeadIntroduction');
+
+describe('extractLeadIntroduction', () => {
+it('matches the spec', () => {
+const testCases = [
+// Only the first paragraph is selected
+[
+'OneTwo',
+'One'
+],
+// Text nodes and children (e.g. b tags) are included in the intro
+[
+'Colombo Airport may refer to:',
+'Colombo Airport may refer to:'
+],
+// Lists are included in the lead intro
+[
+'Colombo Airport may refer
to:item',
+'Colombo Airport may refer
to:item'
+],
+// Tables are not part of the lead introduction.
+[
+'Colombo Airport may refer
to:itemText',
+'Colombo Airport may refer
to:item'
+],
+// We take the first available P tag
+[
+'List itemThe lead paragraph is
here.',
+'The lead paragraph is here.'
+],
+// We do not take nested P tags as being the intro.
+[
+'List itemThe lead paragraph is not
here.',
+''
+]
+];
+
+testCases.forEach((test) => {
+const doc =
domino.createDocument(`${test[0]}`);
+const lead = extractLeadIntroduction(doc);
+assert.equal(lead, test[1]);
+});
+});
+});
+/* eslint-enable max-len */
--
To view, visit https://gerrit.wikimedia.org/r/372079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa3e9fb5c684ee71ab69f95305de71b21214d4dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Make it easier to run unit tests
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372080 )
Change subject: Make it easier to run unit tests
..
Make it easier to run unit tests
Currently `npm test` runs integration tests which can be very slow
This adds an alias for unit tests to encourage their usage.
Change-Id: Ibb5a4b779de9ad8e8aafc55cf1c17646f28d9195
---
M package.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/80/372080/1
diff --git a/package.json b/package.json
index ace1ab6..8d9ae38 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"scripts": {
"start": "service-runner",
"test": "npm run -s lint && PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
+"test:unit": "PREQ_CONNECT_TIMEOUT=15 mocha test/lib",
"lint": "eslint --cache --max-warnings 0 --ext .js --ext .json .",
"docker-start": "service-runner docker-start",
"docker-test": "service-runner docker-test",
--
To view, visit https://gerrit.wikimedia.org/r/372080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb5a4b779de9ad8e8aafc55cf1c17646f28d9195
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Splash[master]: Refactor everything
Isarra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372078 )
Change subject: Refactor everything
..
Refactor everything
Change-Id: I202c95c606f00e8d370c4f3957a22856adc7a7b6
---
M Splash.skin.php
M SplashTemplate.php
M i18n/en.json
M i18n/qqq.json
D resources/fonts.css
M resources/screen.less
A resources/variables.less
M skin.json
8 files changed, 422 insertions(+), 371 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Splash
refs/changes/78/372078/1
diff --git a/Splash.skin.php b/Splash.skin.php
index 88985e9..cd7155f 100644
--- a/Splash.skin.php
+++ b/Splash.skin.php
@@ -17,10 +17,10 @@
$out->addMeta( 'viewport', 'width=device-width,
initial-scale=1, maximum-scale=1' );
# Add css/js
- $out->addModuleStyles( array (
+ $out->addModuleStyles( [
'mediawiki.skinning.content.externallinks',
'skins.splash'
- ) );
+ ] );
$out->addModuleScripts( 'skins.splash' );
}
@@ -29,7 +29,6 @@
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
- global $wgFontCSSLocation;
parent::setupSkinUserCss( $out );
}
}
diff --git a/SplashTemplate.php b/SplashTemplate.php
index c18a034..8e576fe 100644
--- a/SplashTemplate.php
+++ b/SplashTemplate.php
@@ -7,210 +7,209 @@
class SplashTemplate extends BaseTemplate {
/**
-* Template filter callback for Splash skin.
-* Takes an associative array of data set from a SkinTemplate-based
-* class, and a wrapper for MediaWiki's localization database, and
-* outputs a formatted page.
-*
-* @access private
+* Outputs the entire contents of the page
*/
function execute() {
$user = $this->getSkin()->getUser();
- # Suppress warnings to prevent notices about missing indexes in
$this->data
- wfSuppressWarnings();
+ // Menu for global navigation (for cross-wiki stuff or just
whatever things)
+ $globalLinksMenu = '';
+ if ( wfMessage( 'global-links-menu' )->escaped() ) {
+ $globalLinksMenu = Html::rawElement(
+ 'div',
+ [ 'id' => 'global-links', 'class' =>
'mw-portlet', 'role' => 'navigation' ],
+ $this->getNavigation( 'global-links-menu',
'global-links-menu-header' )
+ );
+ }
- $this->html( 'headelement' );
- ?>
-
-
-
-
-
-
- html(
'userlangattributes' ); ?>>
-
- escaped() ) {
- $this->renderNavigation(
'global-links-menu', 'main-links' );
- }
- ?>
-
-
-
- isLoggedIn() ) {
- ?>
-
- getName(); ?>
-
-
-
-
-
- html(
'userlangattributes' ) ?>>
- getPersonalTools() as $key => $item ) {
- echo
$this->makeListItem( $key, $item );
- }
- ?>
-
-
-
-
- renderPortals(
$this->data['sidebar'] ); ?>
-
- searchBox(); ?>
+ // Personal tools dropdown information
+ $personalToolsMsg = 'personaltools';
+ $personalToolsClass = 'not-logged-in';
+ if ( $user->isLoggedIn() ) {
+ $personalToolsMsg = [ 'splash-personaltools',
$user->getName() ];
+ $personalToolsClass = 'logged-in';
+ }
-
-
- parse(); ?>
-
-
-
-
-
-
- data['si
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: User always passed in as an argument to classes
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372077 )
Change subject: User always passed in as an argument to classes
..
User always passed in as an argument to classes
Depends-On: To be written
Bug: T172455
Change-Id: I34be76d6cdb5cbd6d624b92ed6575c31bbf6da52
---
M resources/mobile.betaoptin/BetaOptinPanel.js
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.pagelist.scripts/WatchstarPageList.js
M resources/mobile.search/MobileWebSearchLogger.js
M resources/mobile.talk.overlays/TalkOverlay.js
M resources/mobile.talk.overlays/TalkOverlayBase.js
M resources/mobile.talk.overlays/TalkSectionOverlay.js
M resources/mobile.watchstar/Watchstar.js
M tests/qunit/mobile.pagelist.scripts/test_WatchstarPageList.js
M tests/qunit/mobile.talk.overlays/test_TalkSectionOverlay.js
M tests/qunit/mobile.watchlist/test_WatchList.js
M tests/qunit/mobile.watchstar/test_Watchstar.js
12 files changed, 41 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/77/372077/1
diff --git a/resources/mobile.betaoptin/BetaOptinPanel.js
b/resources/mobile.betaoptin/BetaOptinPanel.js
index a1d506c..0b21e3b 100644
--- a/resources/mobile.betaoptin/BetaOptinPanel.js
+++ b/resources/mobile.betaoptin/BetaOptinPanel.js
@@ -6,8 +6,11 @@
/**
* @class BetaOptinPanel
* @extends Panel
+* @param {Object} options
+* @param {User} user
*/
- function BetaOptinPanel() {
+ function BetaOptinPanel( options, user ) {
+ this.user = user;
Panel.apply( this, arguments );
}
@@ -19,7 +22,7 @@
template: mw.template.get( 'mobile.betaoptin', 'Panel.hogan' ),
defaults: $.extend( {}, Panel.prototype.defaults, {
postUrl: undefined,
- editToken: mw.user.tokens.get( 'editToken' ),
+ editToken: user.tokens.get( 'editToken' ),
text: mw.msg( 'mobile-frontend-panel-betaoptin-msg' ),
buttons: [
new Button( {
diff --git a/resources/mobile.editor.common/EditorOverlayBase.js
b/resources/mobile.editor.common/EditorOverlayBase.js
index ebb2f9f..8dbd16f 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -3,8 +3,7 @@
PageGateway = M.require( 'mobile.startup/PageGateway' ),
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
Icon = M.require( 'mobile.startup/Icon' ),
- toast = M.require( 'mobile.startup/toast' ),
- user = M.require( 'mobile.startup/user' );
+ toast = M.require( 'mobile.startup/toast' );
/**
* 'Edit' button
@@ -41,19 +40,20 @@
* @class EditorOverlayBase
* @extends Overlay
* @uses Icon
-* @uses user
* @param {Object} options Configuration options
+* @param {User} user current user
*/
- function EditorOverlayBase( options ) {
+ function EditorOverlayBase( options, user ) {
var self = this;
if ( options.isNewPage ) {
- options.placeholder = mw.msg(
'mobile-frontend-editor-placeholder-new-page', mw.user );
+ options.placeholder = mw.msg(
'mobile-frontend-editor-placeholder-new-page', user );
}
// change the message to request a summary when not in article
namespace
if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ) {
options.summaryRequestMsg = mw.msg(
'mobile-frontend-editor-summary' );
}
+ this.user = user;
this.pageGateway = new PageGateway( options.api );
this.editCount = user.getEditCount();
this.isNewPage = options.isNewPage;
@@ -162,7 +162,7 @@
if ( this.isNewPage &&
// TODO: Replace with an OOUI dialog
// eslint-disable-next-line no-alert
- !window.confirm( mw.msg(
'mobile-frontend-editor-new-page-confirm', mw.user ) )
+ !window.confirm( mw.msg(
'mobile-frontend-editor-new-page-confirm', this.user ) )
) {
return false;
} else {
diff --git a/resources/mobile.pagelist.scripts/WatchstarPageList.js
b/resources/mobile.pagelist.scripts/WatchstarPageList.js
index ab41157..9666e3d 100644
--- a/resources/mobile.pagelist.scripts/WatchstarPageList.js
+++ b/resources/mobile.pagelist.scripts/WatchstarPageList.js
@@ -2,7 +2,6 @@
var PageList = M.require( 'mobile.startup/Pa
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Omnimail::omnigroupmember.get job: add slow download handling.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369830 )
Change subject: Omnimail::omnigroupmember.get job: add slow download handling.
..
Omnimail::omnigroupmember.get job: add slow download handling.
This adds handling to for when the download takes a while, same as the
recipient job.
Bug T160949
Change-Id: Id65ab87235de86000393e66b0f7e7679692115bf
---
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
6 files changed, 224 insertions(+), 37 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index fd9a6b7..e38e65f 100644
---
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -25,7 +25,7 @@
/**
* @param array $params
*
- * @return \Omnimail\Silverpop\Responses\RecipientsResponse
+ * @return \Omnimail\Silverpop\Responses\GroupMembersResponse
*
* @throws \CRM_Omnimail_IncompleteDownloadException
* @throws \API_Exception
@@ -43,7 +43,7 @@
$request = Omnimail::create($params['mail_provider'],
$mailerCredentials)->getGroupMembers($jobParameters);
$startTimestamp = self::getStartTimestamp($params, $jobSettings);
-$endTimestamp = self::getEndTimestamp(CRM_Utils_Array::value('end_date',
$params), $settings, $startTimestamp);
+$this->endTimeStamp =
self::getEndTimestamp(CRM_Utils_Array::value('end_date', $params), $settings,
$startTimestamp);
if (isset($jobSettings['retrieval_parameters'])) {
if (!empty($params['end_date']) || !empty($params['start_date'])) {
@@ -53,7 +53,7 @@
}
elseif ($startTimestamp) {
$request->setStartTimeStamp($startTimestamp);
- $request->setEndTimeStamp($endTimestamp);
+ $request->setEndTimeStamp($this->endTimeStamp);
}
$request->setGroupIdentifier($params['group_identifier']);
@@ -61,23 +61,66 @@
for ($i = 0; $i < $settings['omnimail_job_retry_number']; $i++) {
if ($result->isCompleted()) {
$data = $result->getData();
-civicrm_api3('Setting', 'create', array(
- 'omnimail_' . $this->job . '_load' => array(
-$params['mail_provider'] => array('last_timestamp' =>
$endTimestamp),
- ),
-));
return $data;
}
else {
sleep($settings['omnimail_job_retry_interval']);
}
}
+
throw new CRM_Omnimail_IncompleteDownloadException('Download incomplete',
0, array(
'retrieval_parameters' => $result->getRetrievalParameters(),
'mail_provider' => $params['mail_provider'],
- 'end_date' => $endTimestamp,
+ 'end_date' => $this->endTimeStamp,
));
}
+ /**
+ * Format the result into the fields we with to return.
+ *
+ * @param array $params
+ * @param \Omnimail\Silverpop\Responses\Contact $result
+ *
+ * @return array
+ */
+ public function formatResult($params, $result) {
+$options = _civicrm_api3_get_options_from_params($params);
+$values = array();
+foreach ($result as $groupMember) {
+ $value = $this->formatRow($groupMember, $params['custom_data_map']);
+ $values[] = $value;
+ if ($options['limit'] > 0 && count($values) === (int) $options['limit'])
{
+break;
+ }
+}
+return $values;
+ }
+
+ /**
+ * Format a single row of the result.
+ *
+ * @param $groupMember
+ * @param array $customDataMap
+ * - Mapping of provider fields to desired output fields.
+ *
+ * @return array
+ */
+ public function formatRow($groupMember, $customDataMap) {
+$value = array(
+ 'email' => (string) $groupMember->getEmail(),
+ 'is_opt_out' => (string) $groupMember->isOptOut(),
+ 'opt_in_date' => (string) $groupMember->getOptInIsoDateTime(),
+ 'opt_in_source' => (string) $groupMember->getOptInSource(),
+ 'opt_out_source' => (string) $groupMember->getOptOutSource(),
+ 'opt_out_date' => (string) $groupMember->getOptOutIsoDateTime(),
+ 'contact_id' => (string) $groupMember->getContactReference(),
+);
+foreach ($customDataMap as $fieldName => $dataKey) {
+ $value[$fieldName] = (string
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Support AJAX watch in skins that use a different class struc...
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372076 )
Change subject: Support AJAX watch in skins that use a different class structure
..
Support AJAX watch in skins that use a different class structure
Skipping links that are in #bodyContent or #content doesn't work for
skins like Timeless. Instead of trying to filter based on those classes,
have SkinTemplate set a 'data-mw-watch' attribute on the element,
and filter based on that. The Sanitizer prevents any data-mw* attributes
being set by users, so it must have been created by MediaWiki, and
therefore safe to use.
Bug: T173279
Change-Id: I1688a499dda40428dd514230b78ccded0d228ca3
---
M includes/skins/SkinTemplate.php
M resources/src/mediawiki/page/watch.js
2 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/76/372076/1
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index f49d46c..9428e38 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1080,7 +1080,10 @@
),
// uses 'watch' or 'unwatch'
message
'text' => $this->msg( $mode
)->text(),
- 'href' => $title->getLocalURL(
[ 'action' => $mode ] )
+ 'href' => $title->getLocalURL(
[ 'action' => $mode ] ),
+ 'data' => [
+ 'mw-watch' => 'true',
+ ],
];
}
}
diff --git a/resources/src/mediawiki/page/watch.js
b/resources/src/mediawiki/page/watch.js
index 6322ccd..8638c49 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -110,9 +110,13 @@
);
$( function () {
- var $links = $( '.mw-watchlink a, a.mw-watchlink' );
- // Restrict to core interfaces, ignore user-generated content
- $links = $links.filter( ':not( #bodyContent *, #content * )' );
+ var $links = $( '.mw-watchlink a[data-mw-watch],
a.mw-watchlink[data-mw-watch]' );
+ if ( !$links.length ) {
+ // Fallback to the class-based exclusion method for
backwards-compatibility
+ $links = $( '.mw-watchlink a, a.mw-watchlink' );
+ // Restrict to core interfaces, ignore user-generated
content
+ $links = $links.filter( ':not( #bodyContent *, #content
* )' );
+ }
$links.click( function ( e ) {
var mwTitle, action, api, $link;
--
To view, visit https://gerrit.wikimedia.org/r/372076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1688a499dda40428dd514230b78ccded0d228ca3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki/core[master]: Turn html5shiv into a raw ResourceLoader module
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372075 )
Change subject: Turn html5shiv into a raw ResourceLoader module
..
Turn html5shiv into a raw ResourceLoader module
This lets us take advantage of ResourceLoader's on the fly minification
rather than needing to ship a minified copy, which is problematic for
other distributions like Debian.
Because the startup module excludes raw modules, it is not possible to
load or depend upon this module, and trying to use
`mw.loader.load('html5shiv')` for example will throw an exception.
This follows-up 3a30e03645f895b.
Change-Id: I635e224fb043c614c4918771c7c8f836575c683b
---
M includes/OutputPage.php
M resources/Resources.php
D resources/lib/html5shiv/html5shiv.min.js
3 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/372075/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 2a3a7cd..a9f2e15 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2910,15 +2910,13 @@
$pieces = array_merge( $pieces, array_values(
$this->getHeadLinksArray() ) );
$pieces = array_merge( $pieces, array_values( $this->mHeadItems
) );
- $min = ResourceLoader::inDebugMode() ? '' : '.min';
// Use an IE conditional comment to serve the script only to
old IE
$pieces[] = '';
$pieces[] = Html::closeElement( 'head' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 144747b..669e870 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2631,6 +2631,21 @@
'targets' => [ 'desktop', 'mobile' ],
],
+ /**
+* html5shiv
+*
+* This library is intended to run on older browsers
+* that MediaWiki no longer supports as Grade A, and
+* is not loaded through the normal module loading
+* system.
+*/
+ 'html5shiv' => [
+ 'scripts' => [
+ 'resources/lib/html5shiv/html5shiv.js'
+ ],
+ 'raw' => true,
+ ],
+
/* OOjs */
'oojs' => [
'scripts' => [
diff --git a/resources/lib/html5shiv/html5shiv.min.js
b/resources/lib/html5shiv/html5shiv.min.js
deleted file mode 100644
index 355afd1..000
--- a/resources/lib/html5shiv/html5shiv.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2
Licensed
-*/
-!function(a,b){function c(a,b){var
c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return
c.innerHTML="x"+b+"",d.insertBefore(c.lastChild,d.firstChild)}function
d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function
e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof
a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return
b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return
c.createElement(a);d||(d=f(c));var e;return
e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function
h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var
e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return
e}function
i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return
t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return
function(){var
n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return
b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return
n}")(t,b.frag)}function j(a){a||(a=b);var
d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var
k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var
a=b.createElement("a");a.innerHTML="",k="hidden"in
a,l=1==a.childNodes.length||function(){b.createElement("a");var
a=b.createDocumentFragment();return"undefined"==typeof
a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof
a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr
article aside audio bdi canvas data datalist details dialog figcaption figure
footer header hgroup main mark meter nav output picture progress section
summary template time
video",version:m,shivC
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to wmf.14
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372071 ) Change subject: Group0 to wmf.14 .. Group0 to wmf.14 Change-Id: If7ed9a11737ad49930db5bfe3f0ae153fd5a9fe4 --- M wikiversions.json 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/wikiversions.json b/wikiversions.json index f7a142f..6ae6add 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -445,7 +445,7 @@ "kywikiquote": "php-1.30.0-wmf.13", "kywiktionary": "php-1.30.0-wmf.13", "labswiki": "php-1.30.0-wmf.13", -"labtestwiki": "php-1.30.0-wmf.13", +"labtestwiki": "php-1.30.0-wmf.14", "ladwiki": "php-1.30.0-wmf.13", "lawiki": "php-1.30.0-wmf.13", "lawikibooks": "php-1.30.0-wmf.13", @@ -487,7 +487,7 @@ "maiwikimedia": "php-1.30.0-wmf.13", "map_bmswiki": "php-1.30.0-wmf.13", "mdfwiki": "php-1.30.0-wmf.13", -"mediawikiwiki": "php-1.30.0-wmf.13", +"mediawikiwiki": "php-1.30.0-wmf.14", "metawiki": "php-1.30.0-wmf.13", "mgwiki": "php-1.30.0-wmf.13", "mgwikibooks": "php-1.30.0-wmf.13", @@ -760,9 +760,9 @@ "tcywiki": "php-1.30.0-wmf.13", "techconductwiki": "php-1.30.0-wmf.13", "tenwiki": "php-1.30.0-wmf.13", -"test2wiki": "php-1.30.0-wmf.13", -"testwiki": "php-1.30.0-wmf.13", -"testwikidatawiki": "php-1.30.0-wmf.13", +"test2wiki": "php-1.30.0-wmf.14", +"testwiki": "php-1.30.0-wmf.14", +"testwikidatawiki": "php-1.30.0-wmf.14", "tetwiki": "php-1.30.0-wmf.13", "tewiki": "php-1.30.0-wmf.13", "tewikibooks": "php-1.30.0-wmf.13", @@ -893,7 +893,7 @@ "zawikiquote": "php-1.30.0-wmf.13", "zawiktionary": "php-1.30.0-wmf.13", "zeawiki": "php-1.30.0-wmf.13", -"zerowiki": "php-1.30.0-wmf.13", +"zerowiki": "php-1.30.0-wmf.14", "zh_classicalwiki": "php-1.30.0-wmf.13", "zh_min_nanwiki": "php-1.30.0-wmf.13", "zh_min_nanwikibooks": "php-1.30.0-wmf.13", -- To view, visit https://gerrit.wikimedia.org/r/372071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7ed9a11737ad49930db5bfe3f0ae153fd5a9fe4 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Chad 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...SpamRegex[master]: Add missing qqq message documentation
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372074 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Activate banana checker
Change-Id: I5d90de07952aea41c9a32a23fcae9ee52f9e4d39
---
M Gruntfile.js
M i18n/qqq.json
M package.json
3 files changed, 31 insertions(+), 5 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 237b9d7..76ffb3a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- // grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -19,11 +19,11 @@
'!node_modules/**'
]
},
- /* banana: {
+ banana: {
all: 'i18n/'
- } */
+ }
} );
- grunt.registerTask( 'test', [ 'jshint', 'jsonlint' /* 'banana' */ ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3169f4a..d9ec23e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,10 +7,35 @@
"The Evil IP address"
]
},
- "spamregex-desc": "{{desc}}",
+ "spamregex": "{{name}}",
+ "spamregex-desc":
"{{desc|name=SpamRegex|url=https://www.mediawiki.org/wiki/Extension:SpamRegex}}";,
+ "spamregex-error-unblocking": "Used as text on Special:SpamRegex",
+ "spamregex-summary": "Used as summary on Special:SpamRegex",
+ "spamregex-intro": "Used as intro on Special:SpamRegex",
+ "spamregex-page-title": "Used as page title on Special:SpamRegex",
+ "spamregex-currently-blocked": "Used as header for a list",
+ "spamregex-move": "Currently unused",
+ "spamregex-no-currently-blocked": "Used as hint for a empty list",
"spamregex-log": "Parameters:\n* $1 is spam text\n* $2 is a
description\n* $3 is an unblock link\n* $4 is the IP address to be unblocked\n*
$5 is a username\n* $6 is a date\n* $7 is a time",
+ "spamregex-page-title-1": "Used as page title on Special:SpamRegexList",
+ "spamregex-unblock-success": "Used as sub title on
Special:SpamRegexList",
+ "spamregex-unblock-message": "Used as text on Special:SpamRegexList",
+ "spamregex-page-title-2": "Used as page title on form for blocking
phrases",
+ "spamregex-block-success": "Used as sub title on form for blocking
phrases",
+ "spamregex-block-message": "Used as text on form for blocking phrases",
+ "spamregex-warning-1": "Used as error message",
+ "spamregex-error-1": "Used as error message",
+ "spamregex-warning-2": "Used as error message",
"spamregex-already-blocked": "{{Identical|$1 is already blocked}}",
+ "spamregex-phrase-block": "Used as table header on Special:SpamRegex",
+ "spamregex-reason": "Used as table header on Special:SpamRegex",
+ "spamregex-error-no-reason": "Used as error message",
+ "spamregex-phrase-block-text": "Used as label on Special:SpamRegex",
+ "spamregex-phrase-block-summary": "Used as label on Special:SpamRegex",
+ "spamregex-block-submit": "Used as text for submit button on
Special:SpamRegex",
"spamregex-text": "{{Identical|Text}}",
+ "spamregex-text-and-summary-log":
"{{Identical|Text}}{{Identical|Summary}}",
"spamregex-summary-log": "{{Identical|Summary}}",
+ "action-spamregex": "{{doc-action|spamregex}}",
"right-spamregex": "{{doc-right|spamregex}}"
}
diff --git a/package.json b/package.json
index 4108670..361cbb7 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.6.0",
"grunt-contrib-jshint": "1.1.0",
"grunt-jsonlint": "1.1.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/372074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d90de07952aea41c9a32a23fcae9ee52f9e4d39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamRegex
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
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...SpamRegex[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372074 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Activate banana checker
Change-Id: I5d90de07952aea41c9a32a23fcae9ee52f9e4d39
---
M Gruntfile.js
M i18n/qqq.json
M package.json
3 files changed, 31 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamRegex
refs/changes/74/372074/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 237b9d7..76ffb3a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- // grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -19,11 +19,11 @@
'!node_modules/**'
]
},
- /* banana: {
+ banana: {
all: 'i18n/'
- } */
+ }
} );
- grunt.registerTask( 'test', [ 'jshint', 'jsonlint' /* 'banana' */ ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3169f4a..d9ec23e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,10 +7,35 @@
"The Evil IP address"
]
},
- "spamregex-desc": "{{desc}}",
+ "spamregex": "{{name}}",
+ "spamregex-desc":
"{{desc|name=SpamRegex|url=https://www.mediawiki.org/wiki/Extension:SpamRegex}}";,
+ "spamregex-error-unblocking": "Used as text on Special:SpamRegex",
+ "spamregex-summary": "Used as summary on Special:SpamRegex",
+ "spamregex-intro": "Used as intro on Special:SpamRegex",
+ "spamregex-page-title": "Used as page title on Special:SpamRegex",
+ "spamregex-currently-blocked": "Used as header for a list",
+ "spamregex-move": "Currently unused",
+ "spamregex-no-currently-blocked": "Used as hint for a empty list",
"spamregex-log": "Parameters:\n* $1 is spam text\n* $2 is a
description\n* $3 is an unblock link\n* $4 is the IP address to be unblocked\n*
$5 is a username\n* $6 is a date\n* $7 is a time",
+ "spamregex-page-title-1": "Used as page title on Special:SpamRegexList",
+ "spamregex-unblock-success": "Used as sub title on
Special:SpamRegexList",
+ "spamregex-unblock-message": "Used as text on Special:SpamRegexList",
+ "spamregex-page-title-2": "Used as page title on form for blocking
phrases",
+ "spamregex-block-success": "Used as sub title on form for blocking
phrases",
+ "spamregex-block-message": "Used as text on form for blocking phrases",
+ "spamregex-warning-1": "Used as error message",
+ "spamregex-error-1": "Used as error message",
+ "spamregex-warning-2": "Used as error message",
"spamregex-already-blocked": "{{Identical|$1 is already blocked}}",
+ "spamregex-phrase-block": "Used as table header on Special:SpamRegex",
+ "spamregex-reason": "Used as table header on Special:SpamRegex",
+ "spamregex-error-no-reason": "Used as error message",
+ "spamregex-phrase-block-text": "Used as label on Special:SpamRegex",
+ "spamregex-phrase-block-summary": "Used as label on Special:SpamRegex",
+ "spamregex-block-submit": "Used as text for submit button on
Special:SpamRegex",
"spamregex-text": "{{Identical|Text}}",
+ "spamregex-text-and-summary-log":
"{{Identical|Text}}{{Identical|Summary}}",
"spamregex-summary-log": "{{Identical|Summary}}",
+ "action-spamregex": "{{doc-action|spamregex}}",
"right-spamregex": "{{doc-right|spamregex}}"
}
diff --git a/package.json b/package.json
index 4108670..361cbb7 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.6.0",
"grunt-contrib-jshint": "1.1.0",
"grunt-jsonlint": "1.1.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/372074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d90de07952aea41c9a32a23fcae9ee52f9e4d39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamRegex
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] operations/mediawiki-config[master]: Scap prep: Fix stupid syntax errors
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372073 ) Change subject: Scap prep: Fix stupid syntax errors .. Scap prep: Fix stupid syntax errors Change-Id: I555e258988beb05ac300c3ad57ba99b45d6f5077 --- M scap/plugins/prep.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py index ea757ee..e71c602 100644 --- a/scap/plugins/prep.py +++ b/scap/plugins/prep.py @@ -91,7 +91,7 @@ ls_stub = ( 'https://gerrit.wikimedia.org/r/372073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I555e258988beb05ac300c3ad57ba99b45d6f5077 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Chad 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]: Scap prep: Fix stupid syntax errors
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372073 ) Change subject: Scap prep: Fix stupid syntax errors .. Scap prep: Fix stupid syntax errors Change-Id: I555e258988beb05ac300c3ad57ba99b45d6f5077 --- M scap/plugins/prep.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/73/372073/1 diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py index ea757ee..e71c602 100644 --- a/scap/plugins/prep.py +++ b/scap/plugins/prep.py @@ -91,7 +91,7 @@ ls_stub = ( 'https://gerrit.wikimedia.org/r/372073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I555e258988beb05ac300c3ad57ba99b45d6f5077 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 85a4dc4
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372072 ) Change subject: Update restbase to 85a4dc4 .. Update restbase to 85a4dc4 List of changes: 591e3d9 Remove references to old parsoid tables 834ea61 Removed the 'options.bucket_type' setting 85a4dc4 Commented out the data-mw bucket Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 71baac4..85a4dc4 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 71baac4b17422dfa2f27a03e54a17c8f670ee2b6 +Subproject commit 85a4dc44613fb156a791538d8175af51aa7035c3 -- To view, visit https://gerrit.wikimedia.org/r/372072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 85a4dc4
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372072 ) Change subject: Update restbase to 85a4dc4 .. Update restbase to 85a4dc4 List of changes: 591e3d9 Remove references to old parsoid tables 834ea61 Removed the 'options.bucket_type' setting 85a4dc4 Commented out the data-mw bucket Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/72/372072/1 diff --git a/restbase b/restbase index 71baac4..85a4dc4 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 71baac4b17422dfa2f27a03e54a17c8f670ee2b6 +Subproject commit 85a4dc44613fb156a791538d8175af51aa7035c3 -- To view, visit https://gerrit.wikimedia.org/r/372072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to wmf.14
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372071 ) Change subject: Group0 to wmf.14 .. Group0 to wmf.14 Change-Id: If7ed9a11737ad49930db5bfe3f0ae153fd5a9fe4 --- M wikiversions.json 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/71/372071/1 diff --git a/wikiversions.json b/wikiversions.json index f7a142f..6ae6add 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -445,7 +445,7 @@ "kywikiquote": "php-1.30.0-wmf.13", "kywiktionary": "php-1.30.0-wmf.13", "labswiki": "php-1.30.0-wmf.13", -"labtestwiki": "php-1.30.0-wmf.13", +"labtestwiki": "php-1.30.0-wmf.14", "ladwiki": "php-1.30.0-wmf.13", "lawiki": "php-1.30.0-wmf.13", "lawikibooks": "php-1.30.0-wmf.13", @@ -487,7 +487,7 @@ "maiwikimedia": "php-1.30.0-wmf.13", "map_bmswiki": "php-1.30.0-wmf.13", "mdfwiki": "php-1.30.0-wmf.13", -"mediawikiwiki": "php-1.30.0-wmf.13", +"mediawikiwiki": "php-1.30.0-wmf.14", "metawiki": "php-1.30.0-wmf.13", "mgwiki": "php-1.30.0-wmf.13", "mgwikibooks": "php-1.30.0-wmf.13", @@ -760,9 +760,9 @@ "tcywiki": "php-1.30.0-wmf.13", "techconductwiki": "php-1.30.0-wmf.13", "tenwiki": "php-1.30.0-wmf.13", -"test2wiki": "php-1.30.0-wmf.13", -"testwiki": "php-1.30.0-wmf.13", -"testwikidatawiki": "php-1.30.0-wmf.13", +"test2wiki": "php-1.30.0-wmf.14", +"testwiki": "php-1.30.0-wmf.14", +"testwikidatawiki": "php-1.30.0-wmf.14", "tetwiki": "php-1.30.0-wmf.13", "tewiki": "php-1.30.0-wmf.13", "tewikibooks": "php-1.30.0-wmf.13", @@ -893,7 +893,7 @@ "zawikiquote": "php-1.30.0-wmf.13", "zawiktionary": "php-1.30.0-wmf.13", "zeawiki": "php-1.30.0-wmf.13", -"zerowiki": "php-1.30.0-wmf.13", +"zerowiki": "php-1.30.0-wmf.14", "zh_classicalwiki": "php-1.30.0-wmf.13", "zh_min_nanwiki": "php-1.30.0-wmf.13", "zh_min_nanwikibooks": "php-1.30.0-wmf.13", -- To view, visit https://gerrit.wikimedia.org/r/372071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7ed9a11737ad49930db5bfe3f0ae153fd5a9fe4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix: No comma escaping for hierarchy structure input
Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371574 )
Change subject: Fix: No comma escaping for hierarchy structure input
..
Fix: No comma escaping for hierarchy structure input
Change-Id: Ifbaaade0706ad5a6a008502ade782fcc6db58b50
---
M CargoFieldDescription.php
1 file changed, 9 insertions(+), 8 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CargoFieldDescription.php b/CargoFieldDescription.php
index 6c78859..23b0646 100644
--- a/CargoFieldDescription.php
+++ b/CargoFieldDescription.php
@@ -69,13 +69,13 @@
// already used to separate
// "extra parameters", so just
// hardcode it to a semicolon.
+ $allowedValuesArray = array();
if(
$fieldDescription->mIsHierarchy == true ) {
// $paramValue contains
"*" hierarchy structure
$fieldDescription->mHierarchyStructure = trim( $paramValue );
// now make the allowed
values param similar to the syntax
// used by other fields
$hierarchyNodesArray =
explode( "\n", $paramValue );
- $allowedValuesArray =
array();
foreach (
$hierarchyNodesArray as $node ) {
// Remove
prefix of multiple "*"
$allowedValuesArray[] = preg_replace( '/^[*]*/', '', $node );
@@ -83,14 +83,15 @@
} else {
$delimiter = ',';
$allowedValuesStr =
str_replace( "\\$delimiter", "\a", $paramValue );
- $allowedValuesArray =
explode( $delimiter, $allowedValuesStr );
+ $allowedValuesTempArray
= explode( $delimiter, $allowedValuesStr );
+ foreach (
$allowedValuesTempArray as $i => $value ) {
+ if ( $value ==
'' ) continue;
+ // Replace beep
back with delimiter, trim.
+ $value =
str_replace( "\a", $delimiter, trim( $value ) );
+
$allowedValuesArray[] = $value;
+ }
}
- foreach ( $allowedValuesArray
as $i => $value ) {
- if ( $value == '' )
continue;
- // Replace beep back
with delimiter, trim.
- $value = str_replace(
"\a", $delimiter, trim( $value ) );
-
$fieldDescription->mAllowedValues[] = $value;
- }
+
$fieldDescription->mAllowedValues = $allowedValuesArray;
} elseif ( $paramKey == 'size' ) {
$fieldDescription->mSize =
$paramValue;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/371574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbaaade0706ad5a6a008502ade782fcc6db58b50
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Fz-29
Gerrit-Reviewer: Nischayn22
Gerrit-Reviewer: Oetterer
Gerrit-Reviewer: Yaron Koren
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...SpellingDictionary[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372070 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Activate banana checker
Change-Id: I7d3477962ad7a3418f17d096f6ba93ff4d06fb00
---
M Gruntfile.js
M i18n/qqq.json
M package.json
3 files changed, 24 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpellingDictionary
refs/changes/70/372070/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 8859cd3..ae4e6d7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,7 +1,7 @@
/* eslint-env node */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
- // grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jsonlint: {
@@ -11,11 +11,11 @@
'!node_modules/**'
]
},
- /* banana: {
+ banana: {
all: 'i18n/'
- } */
+ }
} );
- grunt.registerTask( 'test', [ 'jsonlint' /* 'banana' */ ] );
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d5a8eba..a67fbe7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,14 +2,29 @@
"@metadata": {
"authors": ["Ankita Shukla"]
},
- "desc": "{{desc}}",
+ "spellingdictionary": "Used as name for special page",
+ "spellingdictionaryadmin": "Used as name for special page",
+ "viewall": "Used as name for special page",
+ "viewbylanguage": "Used as name for special page",
+ "desc":
"{{desc|name=SpellingDictionary|url=https://www.mediawiki.org/wiki/Extension:SpellingDictionary}}";,
"title-special": "Title of Special:SpellingDictionary.",
"title-special-admin": "Title of Special:SpellingDictionaryAdmin.",
+ "title-view-all": "Used as page title for Special:ViewAll",
+ "title-view-by-language": "Used as page title for
Special:ViewByLanguage",
"intro-paragraph": "Intro paragraph shown on
Special:SpellingDictionary.",
"intro-paragraph-admin": "Intro paragraph shown on
Special:SpellingDictionaryAdmin.",
"spell-dict-word": "Form label for word field to add word",
- "spell-dict-lang": "Form label for language field to add word",
+ "spell-dict-language": "Form label for language field to add word",
"add-word-form-submit": "Submit button of form",
- "-section-chooselanguage": "Title for the section for choosing the
language",
- "-section-addword": "Title for the section for adding a new word"
+ "sd-admin-browse-edit": "Used as section name on
Special:SpellingDictionaryAdmin",
+ "sd-admin-add-more-spellings": "Used as section name on
Special:SpellingDictionaryAdmin",
+ "sd-admin-viewall": "Used as section name on
Special:SpellingDictionaryAdmin",
+ "view-all-intro": "Used as intro text on Special:ViewAll",
+ "sd-admin-view-by-lang": "Used as section name on
Special:SpellingDictionaryAdmin",
+ "view-by-lang-intro": "Used as intro text on Special:ViewByLanguage",
+ "sd-admin-importexport": "Used as section name on
Special:SpellingDictionaryAdmin",
+ "sd-admin-select-language": "Used as label on
Special:ViewByLanguage\nUsed with javascript",
+ "sd-admin-view-selected-language": "Used as submit text on
Special:ViewByLanguage\nUsed with javascript",
+ "view-by-lang-section-chooselanguage": "Title for the section for
choosing the language\nUsed with javascript",
+ "add-word-section-addword": "Title for the section for adding a new
word"
}
\ No newline at end of file
diff --git a/package.json b/package.json
index 8528003..cca4845 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.6.0",
"grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d3477962ad7a3418f17d096f6ba93ff4d06fb00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpellingDictionary
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...Cargo[master]: Rename CargoHierarchy.php and its class variable
Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371206 )
Change subject: Rename CargoHierarchy.php and its class variable
..
Rename CargoHierarchy.php and its class variable
Change-Id: Iff9694bcc519851ee696e1881aa5bc07f792850c
---
M Cargo.php
R CargoHierarchyTree.php
M CargoUtils.php
M drilldown/CargoDrilldownHierarchy.php
M drilldown/CargoSpecialDrilldown.php
M extension.json
6 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
Nischayn22: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Cargo.php b/Cargo.php
index 35fe54f..e5e5508 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -82,7 +82,7 @@
$wgAutoloadClasses['CargoUtils'] = $dir . '/CargoUtils.php';
$wgAutoloadClasses['CargoFieldDescription'] = $dir .
'/CargoFieldDescription.php';
$wgAutoloadClasses['CargoTableSchema'] = $dir . '/CargoTableSchema.php';
-$wgAutoloadClasses['CargoHierarchy'] = $dir . '/CargoHierarchy.php';
+$wgAutoloadClasses['CargoHierarchyTree'] = $dir . '/CargoHierarchyTree.php';
$wgAutoloadClasses['CargoDeclare'] = $dir .
'/parserfunctions/CargoDeclare.php';
$wgAutoloadClasses['CargoAttach'] = $dir . '/parserfunctions/CargoAttach.php';
$wgAutoloadClasses['CargoStore'] = $dir . '/parserfunctions/CargoStore.php';
diff --git a/CargoHierarchy.php b/CargoHierarchyTree.php
similarity index 90%
rename from CargoHierarchy.php
rename to CargoHierarchyTree.php
index 18caaf8..3eec753 100644
--- a/CargoHierarchy.php
+++ b/CargoHierarchyTree.php
@@ -1,20 +1,20 @@
mTitle = $curTitle;
+ $this->mRootValue = $curTitle;
$this->mChildren = array();
}
@@ -62,7 +62,7 @@
while ( !$stack->isEmpty() ) {
$node = $stack->pop();
$row = array();
- $row['_value'] = $node->mTitle;
+ $row['_value'] = $node->mRootValue;
$row['_left'] = $node->mLeft;
$row['_right'] = $node->mRight;
$tableData[] = $row;
diff --git a/CargoUtils.php b/CargoUtils.php
index a1686be..d8628a4 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -732,7 +732,7 @@
$cdb->query( $createIndexSQL );
$fieldHelperTableNames[] =
$fieldHelperTableName;
// Insert hierarchy information in the
__hierarchy table
- $hierarchyTree =
CargoHierarchy::newFromWikiText( $fieldDescription->mHierarchyStructure );
+ $hierarchyTree =
CargoHierarchyTree::newFromWikiText( $fieldDescription->mHierarchyStructure );
$hierarchyStructureTableData =
$hierarchyTree->generateHierarchyStructureTableData();
foreach( $hierarchyStructureTableData as $entry
) {
$cdb->insert( $fieldHelperTableName,
$entry );
diff --git a/drilldown/CargoDrilldownHierarchy.php
b/drilldown/CargoDrilldownHierarchy.php
index 42598a0..07f889b 100644
--- a/drilldown/CargoDrilldownHierarchy.php
+++ b/drilldown/CargoDrilldownHierarchy.php
@@ -6,7 +6,7 @@
* @ingroup Cargo
*/
-class CargoDrilldownHierarchy extends CargoHierarchy {
+class CargoDrilldownHierarchy extends CargoHierarchyTree {
public $mWithinTreeMatchCount = 0;
public $mExactRootMatchCount = 0;
@@ -67,11 +67,11 @@
if ( $node->mLeft !== 1 ) {
// check if its not __pseudo_root__ node, then
only add count
CargoDrilldownHierarchy::computeNodeCountByFilter( $node, $f,
$fullTextSearchTerm, $appliedFilters );
- $filter_values[$node->mTitle] =
$node->mWithinTreeMatchCount;
+ $filter_values[$node->mRootValue] =
$node->mWithinTreeMatchCount;
}
if ( count( $node->mChildren ) > 0 ) {
if ( $node->mLeft !== 1 ) {
- $filter_values[$node->mTitle . " only"]
= $node->mWithinTreeMatchCount;
+ $filter_values[$node->mRootValue . "
only"] = $node->mWithinTreeMatchCount;
}
for ( $i = count( $node->mChildren ) - 1; $i >=
0; $i-- ) {
$stack->push( $node->mChildren[$i] );
diff --git a/drilldown/CargoSpecialDrilldown.php
b/drilldown/CargoSpecialDrilldown.php
index 7f7e062..b89561a 100644
--- a/drilldown/CargoSpecialDrilldown.php
+++ b/drilldown/CargoSpecialDrilldown.php
@@ -499,7 +499,7 @@
function printUnappliedFilterValuesForHierarchy( $cur_url, $f,
$fullTextSearchTerm, $applied_filters ) {
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 33b80dd
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372068 ) Change subject: Update mobileapps to 33b80dd .. Update mobileapps to 33b80dd List of changes: 4d7c843 Bring back anchorencode and locutus dependency fac019c Source coordinates from GeoData 60e04a6 Do not use MobileView to source metadata fb38647 MCS no longer uses mobile view API under the hood 304c1da Remove redirect handling 2f0dd2e Revert "Bring back anchorencode and locutus dependency" 399c85e Fix broken tests c4f6e8c Look for dablinks when extracting hatnotes 2d3ec25 Scrub #coordinates from response 33b80dd Release mobile-sections 0.12.2 xxx Update node module dependencies Change-Id: Iff17f73f1ebfc2a5a31ed9f0c9a6a6c4fe8a1473 --- M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/core-js/Gruntfile.js M node_modules/core-js/build/Gruntfile.ls M node_modules/core-js/build/build.ls M node_modules/core-js/build/config.js M node_modules/core-js/build/index.js M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/core/_.js M node_modules/core-js/core/dict.js M node_modules/core-js/core/number.js M node_modules/core-js/core/regexp.js M node_modules/core-js/core/string.js M node_modules/core-js/es5/index.js M node_modules/core-js/es6/array.js M node_modules/core-js/es6/date.js M node_modules/core-js/es6/function.js M node_modules/core-js/es6/index.js M node_modules/core-js/es6/map.js M node_modules/core-js/es6/math.js M node_modules/core-js/es6/number.js M node_modules/core-js/es6/object.js M node_modules/core-js/es6/parse-float.js M node_modules/core-js/es6/parse-int.js M node_modules/core-js/es6/promise.js M node_modules/core-js/es6/reflect.js M node_modules/core-js/es6/regexp.js M node_modules/core-js/es6/set.js M node_modules/core-js/es6/string.js M node_modules/core-js/es6/symbol.js M node_modules/core-js/es6/typed.js M node_modules/core-js/es6/weak-map.js M node_modules/core-js/es6/weak-set.js M node_modules/core-js/es7/array.js M node_modules/core-js/es7/error.js A node_modules/core-js/es7/global.js M node_modules/core-js/es7/index.js M node_modules/core-js/es7/map.js M node_modules/core-js/es7/math.js M node_modules/core-js/es7/object.js M node_modules/core-js/es7/observable.js A node_modules/core-js/es7/promise.js M node_modules/core-js/es7/set.js M node_modules/core-js/es7/symbol.js M node_modules/core-js/es7/system.js A node_modules/core-js/es7/weak-map.js A node_modules/core-js/es7/weak-set.js M node_modules/core-js/fn/_.js M node_modules/core-js/fn/array/concat.js M node_modules/core-js/fn/array/copy-within.js M node_modules/core-js/fn/array/entries.js M node_modules/core-js/fn/array/every.js M node_modules/core-js/fn/array/fill.js M node_modules/core-js/fn/array/filter.js M node_modules/core-js/fn/array/find-index.js M node_modules/core-js/fn/array/find.js A node_modules/core-js/fn/array/flat-map.js A node_modules/core-js/fn/array/flatten.js M node_modules/core-js/fn/array/for-each.js M node_modules/core-js/fn/array/from.js M node_modules/core-js/fn/array/includes.js M node_modules/core-js/fn/array/index-of.js M node_modules/core-js/fn/array/index.js M node_modules/core-js/fn/array/is-array.js M node_modules/core-js/fn/array/iterator.js M node_modules/core-js/fn/array/join.js M node_modules/core-js/fn/array/keys.js M node_modules/core-js/fn/array/last-index-of.js M node_modules/core-js/fn/array/map.js M node_modules/core-js/fn/array/of.js M node_modules/core-js/fn/array/pop.js M node_modules/core-js/fn/array/push.js M node_modules/core-js/fn/array/reduce-right.js M node_modules/core-js/fn/array/reduce.js M node_modules/core-js/fn/array/reverse.js M node_modules/core-js/fn/array/shift.js M node_modules/core-js/fn/array/slice.js M node_modules/core-js/fn/array/some.js M node_modules/core-js/fn/array/sort.js M node_modules/core-js/fn/array/splice.js M node_modules/core-js/fn/array/unshift.js M node_modules/core-js/fn/array/values.js M node_modules/core-js/fn/array/virtual/copy-within.js M node_modules/core-js/fn/array/virtual/entries.js M node_modules/core-js/fn/array/virtual/every.js M node_modules/core-js/fn/array/virtual/fill.js M node_modules/core-js/fn/array/virtual/filter.js M node_modules/core-js/fn/array/virtual/find-index.js M node_modules/core-js/fn/array/virtual/find.js A node_modules/core-js/fn/array/virtual/flat-map.js A node_modules/core-js/fn/array/virtual/flatten.js M node_modules/core-js/fn/array/virtual/for-each.js M node_modules/core-js/fn/array/virtual/includes.js M node_modules/core-js/fn/
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Core] Add 2 keys to ignore
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372069 ) Change subject: [Core] Add 2 keys to ignore .. [Core] Add 2 keys to ignore https://gerrit.wikimedia.org/r/#/c/293892/ Change-Id: If2f2e7787207d1a22b57205b815a5e81e898a0e0 --- M groups/MediaWiki/MediaWiki.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml index 3a969c5..9e39f2b 100644 --- a/groups/MediaWiki/MediaWiki.yaml +++ b/groups/MediaWiki/MediaWiki.yaml @@ -569,6 +569,8 @@ - version-entrypoints-index-php - version-entrypoints-load-php - version-summary +- watchlist-unwatch +- watchlist-unwatch-undo - wantedcategories-summary - wantedfiles-summary - wantedtemplates-summary -- To view, visit https://gerrit.wikimedia.org/r/372069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2f2e7787207d1a22b57205b815a5e81e898a0e0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Core] Add 2 keys to ignore
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372069 ) Change subject: [Core] Add 2 keys to ignore .. [Core] Add 2 keys to ignore https://gerrit.wikimedia.org/r/#/c/293892/ Change-Id: If2f2e7787207d1a22b57205b815a5e81e898a0e0 --- M groups/MediaWiki/MediaWiki.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/69/372069/1 diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml index 3a969c5..9e39f2b 100644 --- a/groups/MediaWiki/MediaWiki.yaml +++ b/groups/MediaWiki/MediaWiki.yaml @@ -569,6 +569,8 @@ - version-entrypoints-index-php - version-entrypoints-load-php - version-summary +- watchlist-unwatch +- watchlist-unwatch-undo - wantedcategories-summary - wantedfiles-summary - wantedtemplates-summary -- To view, visit https://gerrit.wikimedia.org/r/372069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2f2e7787207d1a22b57205b815a5e81e898a0e0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 33b80dd
BearND has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372068 ) Change subject: Update mobileapps to 33b80dd .. Update mobileapps to 33b80dd List of changes: 4d7c843 Bring back anchorencode and locutus dependency fac019c Source coordinates from GeoData 60e04a6 Do not use MobileView to source metadata fb38647 MCS no longer uses mobile view API under the hood 304c1da Remove redirect handling 2f0dd2e Revert "Bring back anchorencode and locutus dependency" 399c85e Fix broken tests c4f6e8c Look for dablinks when extracting hatnotes 2d3ec25 Scrub #coordinates from response 33b80dd Release mobile-sections 0.12.2 xxx Update node module dependencies Change-Id: Iff17f73f1ebfc2a5a31ed9f0c9a6a6c4fe8a1473 --- M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/core-js/Gruntfile.js M node_modules/core-js/build/Gruntfile.ls M node_modules/core-js/build/build.ls M node_modules/core-js/build/config.js M node_modules/core-js/build/index.js M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/core/_.js M node_modules/core-js/core/dict.js M node_modules/core-js/core/number.js M node_modules/core-js/core/regexp.js M node_modules/core-js/core/string.js M node_modules/core-js/es5/index.js M node_modules/core-js/es6/array.js M node_modules/core-js/es6/date.js M node_modules/core-js/es6/function.js M node_modules/core-js/es6/index.js M node_modules/core-js/es6/map.js M node_modules/core-js/es6/math.js M node_modules/core-js/es6/number.js M node_modules/core-js/es6/object.js M node_modules/core-js/es6/parse-float.js M node_modules/core-js/es6/parse-int.js M node_modules/core-js/es6/promise.js M node_modules/core-js/es6/reflect.js M node_modules/core-js/es6/regexp.js M node_modules/core-js/es6/set.js M node_modules/core-js/es6/string.js M node_modules/core-js/es6/symbol.js M node_modules/core-js/es6/typed.js M node_modules/core-js/es6/weak-map.js M node_modules/core-js/es6/weak-set.js M node_modules/core-js/es7/array.js M node_modules/core-js/es7/error.js A node_modules/core-js/es7/global.js M node_modules/core-js/es7/index.js M node_modules/core-js/es7/map.js M node_modules/core-js/es7/math.js M node_modules/core-js/es7/object.js M node_modules/core-js/es7/observable.js A node_modules/core-js/es7/promise.js M node_modules/core-js/es7/set.js M node_modules/core-js/es7/symbol.js M node_modules/core-js/es7/system.js A node_modules/core-js/es7/weak-map.js A node_modules/core-js/es7/weak-set.js M node_modules/core-js/fn/_.js M node_modules/core-js/fn/array/concat.js M node_modules/core-js/fn/array/copy-within.js M node_modules/core-js/fn/array/entries.js M node_modules/core-js/fn/array/every.js M node_modules/core-js/fn/array/fill.js M node_modules/core-js/fn/array/filter.js M node_modules/core-js/fn/array/find-index.js M node_modules/core-js/fn/array/find.js A node_modules/core-js/fn/array/flat-map.js A node_modules/core-js/fn/array/flatten.js M node_modules/core-js/fn/array/for-each.js M node_modules/core-js/fn/array/from.js M node_modules/core-js/fn/array/includes.js M node_modules/core-js/fn/array/index-of.js M node_modules/core-js/fn/array/index.js M node_modules/core-js/fn/array/is-array.js M node_modules/core-js/fn/array/iterator.js M node_modules/core-js/fn/array/join.js M node_modules/core-js/fn/array/keys.js M node_modules/core-js/fn/array/last-index-of.js M node_modules/core-js/fn/array/map.js M node_modules/core-js/fn/array/of.js M node_modules/core-js/fn/array/pop.js M node_modules/core-js/fn/array/push.js M node_modules/core-js/fn/array/reduce-right.js M node_modules/core-js/fn/array/reduce.js M node_modules/core-js/fn/array/reverse.js M node_modules/core-js/fn/array/shift.js M node_modules/core-js/fn/array/slice.js M node_modules/core-js/fn/array/some.js M node_modules/core-js/fn/array/sort.js M node_modules/core-js/fn/array/splice.js M node_modules/core-js/fn/array/unshift.js M node_modules/core-js/fn/array/values.js M node_modules/core-js/fn/array/virtual/copy-within.js M node_modules/core-js/fn/array/virtual/entries.js M node_modules/core-js/fn/array/virtual/every.js M node_modules/core-js/fn/array/virtual/fill.js M node_modules/core-js/fn/array/virtual/filter.js M node_modules/core-js/fn/array/virtual/find-index.js M node_modules/core-js/fn/array/virtual/find.js A node_modules/core-js/fn/array/virtual/flat-map.js A node_modules/core-js/fn/array/virtual/flatten.js M node_modules/core-js/fn/array/virtual/for-each.js M node_modules/core-js/fn/array/virtual/includes.js M node_modules/core-js/fn/array/virtual
[MediaWiki-commits] [Gerrit] mediawiki...SiteScout[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372067 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: I556ee1c805053d5f0f66dd4a612ad46ee70a367d
---
M i18n/qqq.json
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteScout
refs/changes/67/372067/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8254b71..5de9b7a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,18 @@
{
"@metadata": {},
- "sitescout-desc":
"{{desc|name=SiteScout|url=https://www.mediawiki.org/wiki/Extension:SiteScout}}";
+ "sitescout": "{{name}}",
+ "sitescout-desc":
"{{desc|name=SiteScout|url=https://www.mediawiki.org/wiki/Extension:SiteScout}}";,
+ "sitescout-anon": "Used as username, when anonym user",
+ "sitescout-new": "Used to indicate new items\nUsed with javascript",
+ "sitescout-minor": "Used to indicate minor items\nUsed with javascript",
+ "sitescout-today-stats": "Used as header",
+ "sitescout-votes": "Used as text inside a table",
+ "sitescout-edits": "Used as text inside a table",
+ "sitescout-comments": "Used as text inside a table",
+ "sitescout-thoughts": "Used as text inside a table",
+ "sitescout-header-type": "Used as header",
+ "sitescout-header-page": "Used as header",
+ "sitescout-header-comment": "Used as header",
+ "sitescout-header-user": "Used as header",
+ "sitescout-change-filter": "Used as link text"
}
--
To view, visit https://gerrit.wikimedia.org/r/372067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I556ee1c805053d5f0f66dd4a612ad46ee70a367d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteScout
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...mobileapps[master]: Release mobile-sections 0.12.2
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370282 )
Change subject: Release mobile-sections 0.12.2
..
Release mobile-sections 0.12.2
Significant changes so far:
* T152441: Source coordinates from MW API instead of Parsoid HTML
* T103362: Remove the mobileview API call for most pages
(use action=query instead)
* T172548: Remove redirect handling
* T172021: Remove #coordinates from response
Change-Id: I467cb1bfc5eb4e1b3414a4ccc127e710a226ba05
---
M lib/mobile-util.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 05f1ffd..d6c26b0 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -7,7 +7,7 @@
mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.12.1' },
+mobileSections: { name: 'mobile-sections', version: '0.12.2' },
definition: { name: 'definition', version: '0.7.2' },
random: { name: 'random', version: '0.6.0' },
announcements: { name: 'announcements', version: '0.1.0' },
--
To view, visit https://gerrit.wikimedia.org/r/370282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I467cb1bfc5eb4e1b3414a4ccc127e710a226ba05
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: Ppchelko
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Semantic Update On Purge] Obsolete
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372066 ) Change subject: [Semantic Update On Purge] Obsolete .. [Semantic Update On Purge] Obsolete Change-Id: I72d40154c5da73929b7eb06cad1f372a0a140659 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index fe9077f..599d406 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2255,8 +2255,7 @@ Semantic Title -Semantic Update On Purge -descmsg = suop-desc +# Semantic Update On Purge // 2015-08-15: Obsolete Semantic Web Browser descmsg = swb_desc -- To view, visit https://gerrit.wikimedia.org/r/372066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72d40154c5da73929b7eb06cad1f372a0a140659 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Semantic Update On Purge] Obsolete
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372066 ) Change subject: [Semantic Update On Purge] Obsolete .. [Semantic Update On Purge] Obsolete Change-Id: I72d40154c5da73929b7eb06cad1f372a0a140659 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/66/372066/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index fe9077f..599d406 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2255,8 +2255,7 @@ Semantic Title -Semantic Update On Purge -descmsg = suop-desc +# Semantic Update On Purge // 2015-08-15: Obsolete Semantic Web Browser descmsg = swb_desc -- To view, visit https://gerrit.wikimedia.org/r/372066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72d40154c5da73929b7eb06cad1f372a0a140659 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UploadLogo[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372065 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Activate banana checker
Change-Id: Ib325b879668620cdf6228794d529fbacf50081dd
---
M Gruntfile.js
M i18n/qqq.json
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadLogo
refs/changes/65/372065/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 1c2a4a1..dc2f66e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,6 +24,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jsonlint', /** 'banana' **/] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b33bc82..7e12c86 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,16 @@
{
"@metadata": {},
- "uploadlogo-desc":
"{{desc|name=UploadLogo|url=https://www.mediawiki.org/wiki/Extension:UploadLogo}}";
+ "uploadlogo": "{{name}}",
+ "uploadlogo-desc":
"{{desc|name=UploadLogo|url=https://www.mediawiki.org/wiki/Extension:UploadLogo}}";,
+ "possible_extensions": "Used as label on Special:UploadLogo",
+ "candidate_logos": "Used as legende on Special:UploadLogo",
+ "change_logo": "Used as button on Special:UploadLogo",
+ "delete_logo": "Used as button on Special:UploadLogo",
+ "uploaded_logo_image": "Used as hint on Special:UploadLogo",
+ "upload_fail": "Shown as result on Special:UploadLogo",
+ "upload_success": "Shown as result on Special:UploadLogo",
+ "result": "Used as list item on Special:UploadLogo",
+ "file_name": "Used as list item on Special:UploadLogo",
+ "file_size": "Used as list item on Special:UploadLogo",
+ "image_preview": "Used as list item on Special:UploadLogo"
}
--
To view, visit https://gerrit.wikimedia.org/r/372065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib325b879668620cdf6228794d529fbacf50081dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadLogo
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] pywikibot/core[master]: exceptions.py: Let Server504Error and Server414Error inherit...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371771 ) Change subject: exceptions.py: Let Server504Error and Server414Error inherit from ServerError .. exceptions.py: Let Server504Error and Server414Error inherit from ServerError This is potentially a breaking change, but it makes sense and hopefully nobody relies on catching a `ServerError` without catching `Server414Error` or `Server504Error`. Bug: T173289 Change-Id: I5f068886442d55aa0072815f4edbffbefa3577ae --- M pywikibot/exceptions.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index d9dff19..2914eb7 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -464,14 +464,14 @@ pass -class Server504Error(Error): # noqa +class Server504Error(ServerError): # noqa """Server timed out with HTTP 504 code""" pass -class Server414Error(Error): +class Server414Error(ServerError): """Server returned with HTTP 414 code.""" -- To view, visit https://gerrit.wikimedia.org/r/371771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f068886442d55aa0072815f4edbffbefa3577ae Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba Gerrit-Reviewer: Dalba Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt 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...mobileapps[master]: Scrub #coordinates from response
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370253 )
Change subject: Scrub #coordinates from response
..
Scrub #coordinates from response
Now we are using the MediaWiki coordinates
prop to source coordinates there is no need to keep this element in
the HTML. On many pages it may be the first paragraph so removing it
will help us serve the first paragraph of content to our users
After this change:
http://0.0.0.0:6927/en.wikipedia.org/v1/page/preview-html/Spain
will render a sensible summary.
Additional changes:
Selectors are joined into a single querySelectorAll call.
Some selectors like this one may be ids and this approach avoids
the issue with https://github.com/fgnass/domino/issues/99 with making
a document querySelectorAll call on an id (which is just as easily done
by a querySelector call.
Bug: T172021
Change-Id: Ia854f7f6808a745634d9b72e12ea2880fe579c66
---
M lib/transforms.js
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-text.html
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-section0-text.html
5 files changed, 9 insertions(+), 24 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/transforms.js b/lib/transforms.js
index e0f59b7..3771d4e 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -50,12 +50,10 @@
}
function _rmElementsWithSelectors(doc, selectors) {
-for (let i = 0, n = selectors.length; i < n; i++) {
-const elems = doc.querySelectorAll(selectors[i]);
-for (let j = 0, m = elems.length; j < m; j++) {
-const elem = elems[j];
-elem.parentNode.removeChild(elem);
-}
+const elems = doc.querySelectorAll(selectors.join(','));
+for (let j = 0; j < elems.length; j++) {
+const elem = elems[j];
+elem.parentNode.removeChild(elem);
}
}
@@ -255,6 +253,7 @@
'span.Z3988', // Remove
'span:empty', // Remove empty
'link',
+'#coordinates',
'table.navbox',
'.geo-nondefault',
'.geo-multi-punct',
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index b9d2c8d..c64542e 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -16,7 +16,7 @@
"latitude": 49.4388,
"longitude": 7.975
},
-"text": "This page in a
nutshell: A Collection of various elements of WP pages to be used for
testing.\n\nFrankenstein Castle\nCoordinates: 49.4388°N 7.9750°E / 49.4388;
7.9750\n\nRed link in da house!\n\n"
+"text": "This page in a
nutshell: A Collection of various elements of WP pages to be used for
testing.\n\nFrankenstein Castle\n\n\nRed link in
da house!\n\n"
},
"remaining": {
"sections": [
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html"
index a59f651..1ece32e 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html"
@@ -11,14 +11,7 @@
Frankenstein Castle
-Coordinates: 49.4388°N 7.9750°E
- / 49.4388;
7.9750
-
-
-
-
-
+
Red link in da house!
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 244222d..eb3cd88 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -18,7 +18,7 @@
"sections": [
{
"id": 0,
-"text": "Frankenstein Castle is a medieval
fortification on a spur
above the village of Frankenstein,
Rhineland-Palatinate in the Palatinate Forest in Germany. Its name derives from the local House of
Frankenstein.Layout of Frankenstein
CastleThis page in a
nutshell: A Collection of various elements of WP pages to be used for
testing.\
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] Exclude links in disambiguation templates from possib...
Dvorapa has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372064 )
Change subject: [IMPR] Exclude links in disambiguation templates from
possibilities
..
[IMPR] Exclude links in disambiguation templates from possibilities
Bug: T118719
Change-Id: I7f6762f9b7ebda4bbf04598fa15ba4f82266c9c6
---
M scripts/solve_disambiguation.py
1 file changed, 54 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/64/372064/1
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index eb1b361..a537518 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -97,6 +97,25 @@
'fr': u'{{Lien vers un homonyme}}',
}
+# Regexes of disambiguation template titles to exclude links from
+disamb_templates = {
+'cs': [
+'[Rr]ozcestník',
+'[Rr]ozcestník - [^\}]+'
+],
+'en': [
+'[Dd]isambiguation',
+'.+? disambiguation',
+'[Dd]isambiguation cleanup',
+'[Gg]eodis',
+'[Hh]ndis-cleanup',
+'[Ll]etter-Number Combination Disambiguation',
+'[Mm]il-unit-dis',
+'[Nn]umberdis',
+'[Dd]isambig-plants'
+]
+}
+
# disambiguation page name format for "primary topic" disambiguations
# (Begriffsklärungen nach Modell 2)
primary_topic_format = {
@@ -964,6 +983,33 @@
pywikibot.output(u'Page not saved: %s' % error.args)
return True
+def removeDisambTemplateLinks(self, disambPage, links):
+"""Remove patterns in disamb_templates.linkedPages from links.
+
+@param disambPage: the disambiguation page
+@type disambPage: pywikibot.Page
+@param links: list of links to process
+@type links: list of pywikibot.Page.title
+@return: list of processed links
+@rtype: list of pywikibot.Page.title
+
+"""
+site_disamb_templates = i18n.translate(self.site, disamb_templates)
+if site_disamb_templates:
+disamb_templates_regex = re.compile(
+r'\{\{ *(?:' + self.site.namespace(10) + ':)?(' +
+'|'.join([t for t in site_disamb_templates]) + ')[^\}]*\}\}'
+)
+page_disamb_templates = disamb_templates_regex.findall(
+disambPage.text)
+template_links = []
+for template in page_disamb_templates:
+disamb_template = pywikibot.Page(
+self.site, self.site.namespace(10) + ":" + template)
+template_links += disamb_template.linkedPages()
+links = [l for l in links if l not in template_links]
+return links
+
def findAlternatives(self, disambPage):
"""Extend self.alternatives using correctcap of disambPage.linkedPages.
@@ -989,11 +1035,13 @@
disambPage2 = pywikibot.Page(
pywikibot.Link(disambTitle, self.mysite))
links = disambPage2.linkedPages()
+links = self.removeDisambTemplateLinks(disambPage2, links)
links = [correctcap(l, disambPage2.get()) for l in links]
except pywikibot.NoPage:
pywikibot.output(u"No page at %s, using redirect target."
% disambTitle)
links = disambPage.linkedPages()[:1]
+links = self.removeDisambTemplateLinks(disambPage, links)
links = [correctcap(l, disambPage.get(get_redirect=True))
for l in links]
self.alternatives += links
@@ -1025,6 +1073,8 @@
% disambPage.title(),
self.mysite))
links = disambPage2.linkedPages()
+links = self.removeDisambTemplateLinks(
+disambPage2, links)
links = [correctcap(l, disambPage2.get())
for l in links]
except pywikibot.NoPage:
@@ -1032,11 +1082,15 @@
'Page does not exist; using first link in page %s.'
% disambPage.title())
links = disambPage.linkedPages()[:1]
+links = self.removeDisambTemplateLinks(
+disambPage, links)
links = [correctcap(l, disambPage.get())
for l in links]
else:
try:
links = disambPage.linkedPages()
+links = self.removeDisambTemplateLinks(
+disambPage, links)
links = [correctcap(l, disambPage.get())
for l in links]
except
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: getPreviewCountBucket should return unknown when no bucket i...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372056 ) Change subject: getPreviewCountBucket should return unknown when no bucket is found .. getPreviewCountBucket should return unknown when no bucket is found Under some unknown circumstances getPreviewCountBucket() is called with a value that is not a -1 or a natural number. When that happens function returns 'undefined bucket' which causes eventLogging to fail. I wasn't able to reproduce the issue, it might be specific to browser/os. The safest way is to return 'unknown' for any other case. Bug: T168371 Change-Id: I374bb629762a86ac06a18e775d3c1a14682c9f55 --- M resources/dist/index.js M resources/dist/index.js.map M src/counts.js M tests/node-qunit/counts.test.js 4 files changed, 8 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/372056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I374bb629762a86ac06a18e775d3c1a14682c9f55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Pmiazga Gerrit-Reviewer: Jdlrobson 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/puppet[production]: service::node: move to puppet4 compatible parameter validation
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372063 )
Change subject: service::node: move to puppet4 compatible parameter validation
..
service::node: move to puppet4 compatible parameter validation
The use of validate_legacy will ease the puppet4 transition.
Bug: T171704
Change-Id: Ibc0e23b7dc9452aca39d529361a417455ce2fe2c
---
M modules/service/manifests/node.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/372063/1
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index c734172..f10424d 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -213,9 +213,7 @@
}
# sanity check since a default port cannot be assigned
-unless $port and $port =~ /^\d+$/ {
-fail('Service port must be specified and must be a number!')
-}
+validate_lecacy('Integer[0,65535]', 'validate_integer', $port)
# the local log directory
$local_logdir = "${service::configuration::log_dir}/${title}"
--
To view, visit https://gerrit.wikimedia.org/r/372063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc0e23b7dc9452aca39d529361a417455ce2fe2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Don't float article actions on tablets
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371953 )
Change subject: Don't float article actions on tablets
..
Don't float article actions on tablets
Bug: T171608
Change-Id: Ie9ba7df0a0f052948d46b6a9b14a3bbcef2b99fe
---
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.tablet.styles/common.less
2 files changed, 0 insertions(+), 37 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/skins.minerva.base.styles/pageactions.less
b/resources/skins.minerva.base.styles/pageactions.less
index f1c304b..4b9ba1f 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -129,17 +129,3 @@
}
}
}
-
-@media all and ( min-width: @deviceWidthTablet ) {
- #page-actions {
- position: initial;
- float: right;
- width: auto;
- border: 0;
- margin: 0 0 @iconGutterWidth @iconGutterWidth;
-
- .language-selector {
- float: inherit;
- }
- }
-}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 8274c19..2f9f5d5 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -54,29 +54,6 @@
clear: none;
}
- .heading-holder {
- padding: 20px 0;
- position: relative;
-
- #section_0 {
- border-bottom: 0;
- padding: 0 0 7px 0;
- font-size: @firstHeadingFontSize;
- }
- }
-
- #page-actions {
- padding: 18px 0 0 0;
-
- li {
- display: inline-block;
- }
-
- li:first-child {
- margin-top: 0;
- }
- }
-
// FIXME: Have a class that identifies all of these selectors
.pre-content,
.content,
--
To view, visit https://gerrit.wikimedia.org/r/371953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9ba7df0a0f052948d46b6a9b14a3bbcef2b99fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Pmiazga
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/core[master]: wikibase_tests.py: Update mainpage alias
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371945 )
Change subject: wikibase_tests.py: Update mainpage alias
..
wikibase_tests.py: Update mainpage alias
Bug: T173318
Change-Id: I30eff420aefc95cc699ea256500343acda73d58f
---
M tests/wikibase_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index 86b1f2d..e5ae318 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -130,7 +130,7 @@
self.assertIn('en', item.labels)
self.assertTrue(item.labels['en'].lower().endswith('main page'))
self.assertIn('en', item.aliases)
-self.assertIn('Home page', item.aliases['en'])
+self.assertIn('home page', item.aliases['en'])
self.assertEqual(item.namespace(), 0)
item2 = ItemPage(repo, 'q5296')
self.assertEqual(item2.getID(), 'Q5296')
--
To view, visit https://gerrit.wikimedia.org/r/371945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30eff420aefc95cc699ea256500343acda73d58f
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Xqt
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...Popups[master]: Add phan config to Popups
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372062 ) Change subject: Add phan config to Popups .. Add phan config to Popups Bug: T133664 Change-Id: I57de60a783cd011e93aef87c81187dbbf92cb270 --- A tests/phan/config.php 1 file changed, 307 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/62/372062/1 diff --git a/tests/phan/config.php b/tests/phan/config.php new file mode 100644 index 000..803503b --- /dev/null +++ b/tests/phan/config.php @@ -0,0 +1,307 @@ + [ + ], + + /** +* A list of directories that should be parsed for class and +* method information. After excluding the directories +* defined in exclude_analysis_directory_list, the remaining +* files will be statically analyzed for errors. +* +* Thus, both first-party and third-party code being used by +* your application should be included in this list. +*/ + 'directory_list' => [ + 'src/', + 'tests/phan/stubs/', + './../../includes', + './../../languages', + './../../maintenance', + './../../vendor', + './../../extensions/BetaFeatures/includes', + ], + + /** +* A file list that defines files that will be excluded +* from parsing and analysis and will not be read at all. +* +* This is useful for excluding hopelessly unanalyzable +* files that can't be removed for whatever reason. +*/ + 'exclude_file_list' => function_exists( 'xcache_get' ) ? [] : [ + ], + + /** +* A list of directories holding code that we want +* to parse, but not analyze. Also works for individual +* files. +*/ + "exclude_analysis_directory_list" => [ + 'tests/phan/stubs/', + './../../includes', + './../../languages', + './../../maintenance', + './../../vendor', + './../../extensions/BetaFeatures/includes', + ], + + /** +* Backwards Compatibility Checking. This is slow +* and expensive, but you should consider running +* it before upgrading your version of PHP to a +* new version that has backward compatibility +* breaks. +*/ + 'backward_compatibility_checks' => false, + + /** +* A set of fully qualified class-names for which +* a call to parent::__construct() is required +*/ + 'parent_constructor_required' => [ + ], + + /** +* Run a quick version of checks that takes less +* time at the cost of not running as thorough +* an analysis. You should consider setting this +* to true only when you wish you had more issues +* to fix in your code base. +* +* In quick-mode the scanner doesn't rescan a function +* or a method's code block every time a call is seen. +* This means that the problem here won't be detected: +* +* ```php +* false, + + /** +* By default, Phan will not analyze all node types +* in order to save time. If this config is set to true, +* Phan will dig deeper into the AST tree and do an +* analysis on all nodes, possibly finding more issues. +* +* See \Phan\Analysis::shouldVisit for the set of skipped +* nodes. +*/ + 'should_visit_all_nodes' => true, + + /** +* If enabled, check all methods that override a +* parent method to make sure its signature is +* compatible with the parent's. This check +* can add quite a bit of time to the analysis. +*/ + 'analyze_signature_compatibility' => true, + + // Emit all issues. They are then supressed via + // suppress_issue_types, rather than a minimum + // severity. + "minimum_severity" => 0, + + /** +* If true, missing properties will be created when +* they are first seen. If false, we'll report an +* error message if there is an attempt to write +* to a class property that wasn't explicitly +* defined. +*/ + 'allow_missing_properties' => false, + + /** +* Allow null to be cast as any type and for any +* type to be cast to null. Setting this to false +* will cut down on false positives. +*/ + 'null_casts_as_any_type' => true, + + /** +* If enabled, scalars (int, float, bool, string, null) +* are treated as if they can cast to each other. +* +* MediaWiki is pretty lax and uses many scalar +* types interchangably. +*/ + 'scalar_implicit_cast' => true, + + /** +
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Add phan config to MinervaNeue
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372061 ) Change subject: Add phan config to MinervaNeue .. Add phan config to MinervaNeue phantastic! Bug: T133664 Change-Id: I3b8f1120b3e3103359166f2716e1218729beef17 --- A tests/phan/config_new.php 1 file changed, 307 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/61/372061/1 diff --git a/tests/phan/config_new.php b/tests/phan/config_new.php new file mode 100644 index 000..803503b --- /dev/null +++ b/tests/phan/config_new.php @@ -0,0 +1,307 @@ + [ + ], + + /** +* A list of directories that should be parsed for class and +* method information. After excluding the directories +* defined in exclude_analysis_directory_list, the remaining +* files will be statically analyzed for errors. +* +* Thus, both first-party and third-party code being used by +* your application should be included in this list. +*/ + 'directory_list' => [ + 'src/', + 'tests/phan/stubs/', + './../../includes', + './../../languages', + './../../maintenance', + './../../vendor', + './../../extensions/BetaFeatures/includes', + ], + + /** +* A file list that defines files that will be excluded +* from parsing and analysis and will not be read at all. +* +* This is useful for excluding hopelessly unanalyzable +* files that can't be removed for whatever reason. +*/ + 'exclude_file_list' => function_exists( 'xcache_get' ) ? [] : [ + ], + + /** +* A list of directories holding code that we want +* to parse, but not analyze. Also works for individual +* files. +*/ + "exclude_analysis_directory_list" => [ + 'tests/phan/stubs/', + './../../includes', + './../../languages', + './../../maintenance', + './../../vendor', + './../../extensions/BetaFeatures/includes', + ], + + /** +* Backwards Compatibility Checking. This is slow +* and expensive, but you should consider running +* it before upgrading your version of PHP to a +* new version that has backward compatibility +* breaks. +*/ + 'backward_compatibility_checks' => false, + + /** +* A set of fully qualified class-names for which +* a call to parent::__construct() is required +*/ + 'parent_constructor_required' => [ + ], + + /** +* Run a quick version of checks that takes less +* time at the cost of not running as thorough +* an analysis. You should consider setting this +* to true only when you wish you had more issues +* to fix in your code base. +* +* In quick-mode the scanner doesn't rescan a function +* or a method's code block every time a call is seen. +* This means that the problem here won't be detected: +* +* ```php +* false, + + /** +* By default, Phan will not analyze all node types +* in order to save time. If this config is set to true, +* Phan will dig deeper into the AST tree and do an +* analysis on all nodes, possibly finding more issues. +* +* See \Phan\Analysis::shouldVisit for the set of skipped +* nodes. +*/ + 'should_visit_all_nodes' => true, + + /** +* If enabled, check all methods that override a +* parent method to make sure its signature is +* compatible with the parent's. This check +* can add quite a bit of time to the analysis. +*/ + 'analyze_signature_compatibility' => true, + + // Emit all issues. They are then supressed via + // suppress_issue_types, rather than a minimum + // severity. + "minimum_severity" => 0, + + /** +* If true, missing properties will be created when +* they are first seen. If false, we'll report an +* error message if there is an attempt to write +* to a class property that wasn't explicitly +* defined. +*/ + 'allow_missing_properties' => false, + + /** +* Allow null to be cast as any type and for any +* type to be cast to null. Setting this to false +* will cut down on false positives. +*/ + 'null_casts_as_any_type' => true, + + /** +* If enabled, scalars (int, float, bool, string, null) +* are treated as if they can cast to each other. +* +* MediaWiki is pretty lax and uses many scalar +* types interchangably. +*/ + 'scalar_
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Add MinervaNeue Doxyfile
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372060 ) Change subject: Add MinervaNeue Doxyfile .. Add MinervaNeue Doxyfile We forgot to copy this across when migrating Minerva out of MobileFrontend. Bug: T173255 Change-Id: I449d2a0705fe12d6edec332b5a2275dd85e1b189 --- A Doxyfile 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/60/372060/1 diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 000..724d013 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,36 @@ +# Configuration file for Doxygen + +PROJECT_NAME = MinervaNeue +PROJECT_BRIEF = A responsive mobile first skin + +OUTPUT_DIRECTORY = docs +HTML_OUTPUT= php + +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = YES + +WARN_NO_PARAMDOC = YES + +INPUT = README.md ./ +EXCLUDE_PATTERNS = */vendor/* +EXCLUDE_PATTERNS += */docs/* +EXCLUDE_PATTERNS += */node_modules/* +FILE_PATTERNS = *.php +RECURSIVE = YES +# Requires doxygen 1.8.3+ +USE_MDFILE_AS_MAINPAGE = README.md + +HTML_DYNAMIC_SECTIONS = YES +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 250 + +GENERATE_LATEX = NO + +HAVE_DOT = YES +DOT_FONTNAME = Helvetica +DOT_FONTSIZE = 10 +TEMPLATE_RELATIONS = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +# Makes dot run faster. Requires graphviz >1.8.10 +DOT_MULTI_TARGETS = YES -- To view, visit https://gerrit.wikimedia.org/r/372060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I449d2a0705fe12d6edec332b5a2275dd85e1b189 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Move $entityInfoBuilder->removeMissing() to after fetching t...
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372059 ) Change subject: Move $entityInfoBuilder->removeMissing() to after fetching terms .. Move $entityInfoBuilder->removeMissing() to after fetching terms Right now, it removes redirect targets causing bugs Bug: T96553 Change-Id: Id9ce769713a3e2438b7513d98263534609867bd6 --- M repo/includes/ParserOutput/EntityParserOutputGenerator.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/59/372059/1 diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php b/repo/includes/ParserOutput/EntityParserOutputGenerator.php index 0829638..c7d92ca 100644 --- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php +++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php @@ -215,13 +215,13 @@ $entityInfoBuilder = $this->entityInfoBuilderFactory->newEntityInfoBuilder( $entityIds ); $entityInfoBuilder->resolveRedirects(); - $entityInfoBuilder->removeMissing(); $entityInfoBuilder->collectTerms( [ 'label', 'description' ], $this->languageFallbackChain->getFetchLanguageCodes() ); + $entityInfoBuilder->removeMissing(); $entityInfoBuilder->collectDataTypes(); $entityInfoBuilder->retainEntityInfo( $entityIds ); -- To view, visit https://gerrit.wikimedia.org/r/372059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9ce769713a3e2438b7513d98263534609867bd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace inefficient in_array in ForeignEntityValidator
Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372058 )
Change subject: Replace inefficient in_array in ForeignEntityValidator
..
Replace inefficient in_array in ForeignEntityValidator
Using in_array( array_keys() ) is a typical mistake. While fixing this I
found a bit more code in this class to be unnecessary.
Change-Id: I322be49c9e33125372efa9d5bee20d96dfea8e82
---
M repo/includes/Validators/ForeignEntityValidator.php
1 file changed, 17 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/58/372058/1
diff --git a/repo/includes/Validators/ForeignEntityValidator.php
b/repo/includes/Validators/ForeignEntityValidator.php
index 14ae63b..2d9563f 100644
--- a/repo/includes/Validators/ForeignEntityValidator.php
+++ b/repo/includes/Validators/ForeignEntityValidator.php
@@ -16,12 +16,12 @@
class ForeignEntityValidator implements ValueValidator {
/**
-* @var array
+* @var array[]
*/
private $supportedEntityTypes;
/**
-* @param array $supportedEntityTypes map of repository names to lists
of supported entity types
+* @param array[] $supportedEntityTypes map of repository names to
lists of supported entity types
*/
public function __construct( array $supportedEntityTypes ) {
RepositoryNameAssert::assertParameterKeysAreValidRepositoryNames(
@@ -73,21 +73,27 @@
return Result::newSuccess();
}
+ /**
+* @param string $repository
+*
+* @return bool
+*/
private function isKnownRepositoryName( $repository ) {
- return in_array( $repository, array_keys(
$this->supportedEntityTypes ) );
+ return array_key_exists( $repository,
$this->supportedEntityTypes );
}
+ /**
+* @param EntityId $id
+*
+* @return bool
+*/
private function supportsEntityTypeFromRepository( EntityId $id ) {
$repository = $id->getRepositoryName();
- if ( isset( $this->supportedEntityTypes[$repository] ) ) {
- return in_array(
- $id->getEntityType(),
- $this->supportedEntityTypes[$repository]
- );
- }
-
- return false;
+ return in_array(
+ $id->getEntityType(),
+ $this->supportedEntityTypes[$repository]
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/372058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I322be49c9e33125372efa9d5bee20d96dfea8e82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Add config for tracking category math-tracking-category-rend...
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372057 )
Change subject: Add config for tracking category
math-tracking-category-render-error
..
Add config for tracking category math-tracking-category-render-error
The tracking category was added with
If7537ed9117fb736a09f4396b7d55d774ce9674f
Bug: T173371
Change-Id: I6cdcfa0ece8e2b2644106bc219b538702b0bb2d8
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/57/372057/1
diff --git a/extension.json b/extension.json
index 7b6fbb4..99c1f78 100644
--- a/extension.json
+++ b/extension.json
@@ -267,7 +267,8 @@
"MathStatus": "SpecialMathStatus"
},
"TrackingCategories": [
- "math-tracking-category-error"
+ "math-tracking-category-error",
+ "math-tracking-category-render-error"
],
"manifest_version": 1
}
diff --git a/i18n/en.json b/i18n/en.json
index 80fc3c2..d5c9ed2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -91,6 +91,8 @@
"math_tip": "Mathematical formula (LaTeX)",
"math-tracking-category-error": "Pages with math errors",
"math-tracking-category-error-desc": "Pages in this category have
errors in the usage of math tags.",
+ "math-tracking-category-render-error": "Pages with math render errors",
+ "math-tracking-category-render-error-desc": "Pages in this category
have errors in the render of math tags.",
"math_unknown_error": "unknown error",
"math_unknown_function": "unknown function \"$1\"",
"mw_math_latexml": "LaTeXML (experimental; uses MathML)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index aec10ae..2e13b27 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -91,6 +91,8 @@
"math_tip": "This is the text that appears when you hover the mouse
over the fourth button from the right on the edit toolbar.",
"math-tracking-category-error": "Tracking category name.",
"math-tracking-category-error-desc": "Tracking category description.",
+ "math-tracking-category-render-error": "Tracking category name.",
+ "math-tracking-category-render-error-desc": "Tracking category
description.",
"math_unknown_error": "Used as error message for unknown texvc
error.\n\nThis message follows the message {{msg-mw|Math
failure}}.\n{{Identical|Unknown error}}",
"math_unknown_function": "Used as error message when texvc encounters
an unknown function.\n\nPreceded by the message {{msg-mw|Math
failure}}.\n\nParameters:\n* $1 - name of unknown function",
"mw_math_latexml": "Used as label for latexml radio button.\n\nSee
also:\n* {{msg-mw|Mw math png}}\n* {{msg-mw|Mw math source}}",
--
To view, visit https://gerrit.wikimedia.org/r/372057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cdcfa0ece8e2b2644106bc219b538702b0bb2d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
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...Popups[master]: getPreviewCountBucket should return unknown when no bucket i...
Pmiazga has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372056 ) Change subject: getPreviewCountBucket should return unknown when no bucket is found .. getPreviewCountBucket should return unknown when no bucket is found Under some unknown circumstances getPreviewCountBucket() is called with a value that is not a -1 or a natural number. When that happens function returns 'undefined bucket' which causes eventLogging to fail. I wasn't able to reproduce the issue, it might be specific to browser/os. The safest way is to return 'unknown' for any other case. Bug: T168371 Change-Id: I374bb629762a86ac06a18e775d3c1a14682c9f55 --- M resources/dist/index.js M resources/dist/index.js.map M src/counts.js M tests/node-qunit/counts.test.js 4 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/56/372056/1 -- To view, visit https://gerrit.wikimedia.org/r/372056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I374bb629762a86ac06a18e775d3c1a14682c9f55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Pmiazga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Convert Special:AbuseFilter/import to OOjs
Rendann has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372055 ) Change subject: Convert Special:AbuseFilter/import to OOjs .. Convert Special:AbuseFilter/import to OOjs Based on https://gerrit.wikimedia.org/r/#/c/370150/ Bug: T132284 Change-Id: Iab2a24926c6b547e34f516149ff94953fb0da634 --- M includes/Views/AbuseFilterViewImport.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/55/372055/2 diff --git a/includes/Views/AbuseFilterViewImport.php b/includes/Views/AbuseFilterViewImport.php index 9186451..6bd4c26 100644 --- a/includes/Views/AbuseFilterViewImport.php +++ b/includes/Views/AbuseFilterViewImport.php @@ -9,14 +9,14 @@ } $url = SpecialPage::getTitleFor( 'AbuseFilter', 'new' )->getFullURL(); + $out->addWikiMsg( 'abusefilter-import-intro' ); + $formDescriptor = [ 'ImportText' => [ 'type' => 'textarea', - 'cols' => 200, ] ]; - $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); - $htmlForm->setHeaderText( $this->msg( 'abusefilter-import-intro' ) ) + $htmlform = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ) ->setSubmitTextMsg( 'abusefilter-import-submit' ) ->setAction( $url ) ->show(); -- To view, visit https://gerrit.wikimedia.org/r/372055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab2a24926c6b547e34f516149ff94953fb0da634 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Rendann ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.14]: Disable use of client services in repo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372052 )
Change subject: Disable use of client services in repo
..
Disable use of client services in repo
Change-Id: I0fbc03a9195251de39484846c652fa916d016232
---
M extensions/Wikibase/repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extensions/Wikibase/repo/includes/WikibaseRepo.php
b/extensions/Wikibase/repo/includes/WikibaseRepo.php
index 0da1df2..0b4bb89 100644
--- a/extensions/Wikibase/repo/includes/WikibaseRepo.php
+++ b/extensions/Wikibase/repo/includes/WikibaseRepo.php
@@ -329,12 +329,6 @@
$dataRetrievalServices = null;
- // If client functionality is enabled, use it to enable
federation.
- if ( WikibaseSettings::isClientEnabled() ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
-
return new self(
$settings,
new DataTypeDefinitions(
--
To view, visit https://gerrit.wikimedia.org/r/372052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fbc03a9195251de39484846c652fa916d016232
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.14]: (temporarily) disable use of client services in repo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372053 )
Change subject: (temporarily) disable use of client services in repo
..
(temporarily) disable use of client services in repo
Change-Id: I9bd8fb0691a2d247933fc1a537a84989d5bb76ca
(cherry picked from commit 2e4c4401ea32100d837031f0e3434c65a032a438)
(cherry picked from commit a1c5d12c30ae05bded6fa43bdc1435958dfe1aaa)
(cherry picked from commit f0cd38d5bb64efa20eca6d31b889d0a8bf7c9ed5)
(cherry picked from commit ef94071737e924f1a0c654f17d6b4beb78f8fe2f)
---
M repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 0da1df2..0b4bb89 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -329,12 +329,6 @@
$dataRetrievalServices = null;
- // If client functionality is enabled, use it to enable
federation.
- if ( WikibaseSettings::isClientEnabled() ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
-
return new self(
$settings,
new DataTypeDefinitions(
--
To view, visit https://gerrit.wikimedia.org/r/372053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bd8fb0691a2d247933fc1a537a84989d5bb76ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
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...release[master]: Update Wikidata to wmf/1.30.0-wmf.14
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372048 )
Change subject: Update Wikidata to wmf/1.30.0-wmf.14
..
Update Wikidata to wmf/1.30.0-wmf.14
Change-Id: Id92cb6c7d6b1ea7c38a5e04bcc2cf3b8d0fa24c0
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 50ecb4d..7a1da9f 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -179,6 +179,6 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
- "Wikidata": "wmf/1.30.0-wmf.12"
+ "Wikidata": "wmf/1.30.0-wmf.14"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id92cb6c7d6b1ea7c38a5e04bcc2cf3b8d0fa24c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
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/puppet[production]: Reduce the per-IP concurrency limit in Thumbor
Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372054 )
Change subject: Reduce the per-IP concurrency limit in Thumbor
..
Reduce the per-IP concurrency limit in Thumbor
Bug: T172930
Change-Id: I7ed1d0bee6147a616a59e9babd6393cd5f79432f
---
M modules/thumbor/templates/server.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/372054/1
diff --git a/modules/thumbor/templates/server.conf.erb
b/modules/thumbor/templates/server.conf.erb
index 60cf355..524b593 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -153,7 +153,7 @@
# Up to "workers" thumbnails can be generated at once for a given IP
# address, with up to "maxqueue" thumbnails queued per IP
POOLCOUNTER_CONFIG_PER_IP = {
-'workers': 32,
+'workers': 4,
'maxqueue': 500,
'timeout': 8
}
--
To view, visit https://gerrit.wikimedia.org/r/372054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed1d0bee6147a616a59e9babd6393cd5f79432f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.14]: (temporarily) disable use of client services in repo
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372053 )
Change subject: (temporarily) disable use of client services in repo
..
(temporarily) disable use of client services in repo
Change-Id: I9bd8fb0691a2d247933fc1a537a84989d5bb76ca
(cherry picked from commit 2e4c4401ea32100d837031f0e3434c65a032a438)
(cherry picked from commit a1c5d12c30ae05bded6fa43bdc1435958dfe1aaa)
(cherry picked from commit f0cd38d5bb64efa20eca6d31b889d0a8bf7c9ed5)
(cherry picked from commit ef94071737e924f1a0c654f17d6b4beb78f8fe2f)
---
M repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/53/372053/1
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 0da1df2..0b4bb89 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -329,12 +329,6 @@
$dataRetrievalServices = null;
- // If client functionality is enabled, use it to enable
federation.
- if ( WikibaseSettings::isClientEnabled() ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
-
return new self(
$settings,
new DataTypeDefinitions(
--
To view, visit https://gerrit.wikimedia.org/r/372053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bd8fb0691a2d247933fc1a537a84989d5bb76ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.14]: Disable use of client services in repo
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372052 )
Change subject: Disable use of client services in repo
..
Disable use of client services in repo
Change-Id: I0fbc03a9195251de39484846c652fa916d016232
---
M extensions/Wikibase/repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/52/372052/1
diff --git a/extensions/Wikibase/repo/includes/WikibaseRepo.php
b/extensions/Wikibase/repo/includes/WikibaseRepo.php
index 0da1df2..0b4bb89 100644
--- a/extensions/Wikibase/repo/includes/WikibaseRepo.php
+++ b/extensions/Wikibase/repo/includes/WikibaseRepo.php
@@ -329,12 +329,6 @@
$dataRetrievalServices = null;
- // If client functionality is enabled, use it to enable
federation.
- if ( WikibaseSettings::isClientEnabled() ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
-
return new self(
$settings,
new DataTypeDefinitions(
--
To view, visit https://gerrit.wikimedia.org/r/372052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fbc03a9195251de39484846c652fa916d016232
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.14]: New deployment build - wmf/1.30.0-wmf.14
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372047 ) Change subject: New deployment build - wmf/1.30.0-wmf.14 .. New deployment build - wmf/1.30.0-wmf.14 Change-Id: Ibde68fb7c7683295cd9a48689f05cb86604baf02 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/ArticlePlaceholder/composer.json M extensions/ArticlePlaceholder/i18n/it.json M extensions/ArticlePlaceholder/i18n/nn.json M extensions/ArticlePlaceholder/i18n/pt-br.json M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/includes/SearchHookHandler.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/package.json M extensions/ArticlePlaceholder/phpcs.xml M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php M extensions/PropertySuggester/composer.json M extensions/PropertySuggester/extension.json M extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js M extensions/PropertySuggester/package.json M extensions/Quality/i18n/pt-br.json A extensions/Quality/i18n/sr-ec.json M extensions/Quality/package.json M extensions/ValueView/RELEASE-NOTES.md M extensions/ValueView/ValueView.php M extensions/ValueView/composer.json M extensions/ValueView/i18n/ar.json M extensions/ValueView/i18n/fa.json M extensions/ValueView/i18n/hu.json M extensions/ValueView/i18n/roa-tara.json M extensions/ValueView/i18n/yi.json M extensions/ValueView/lib/jquery.ui/jquery.ui.listrotator.js M extensions/ValueView/lib/jquery/jquery.PurposedCallbacks.js M extensions/ValueView/lib/util/util.CombiningMessageProvider.js M extensions/ValueView/lib/util/util.ContentLanguages.js M extensions/ValueView/lib/util/util.Extendable.js M extensions/ValueView/lib/util/util.HashMessageProvider.js M extensions/ValueView/lib/util/util.MessageProvider.js M extensions/ValueView/lib/util/util.Notifier.js M extensions/ValueView/lib/util/util.PrefixingMessageProvider.js M extensions/ValueView/src/ExpertExtender/ExpertExtender.CalendarHint.js D extensions/ValueView/src/ExpertExtender/ExpertExtender.Toggler.css D extensions/ValueView/src/ExpertExtender/ExpertExtender.Toggler.js M extensions/ValueView/src/ExpertExtender/resources.php M extensions/ValueView/src/jquery.valueview.Expert.js M extensions/ValueView/tests/lib/jquery.event/jquery.event.special.eachchange.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.listrotator.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.ooMenu.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.preview.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.toggler.tests.js M extensions/ValueView/tests/lib/jquery/jquery.AnimationEvent.tests.js M extensions/ValueView/tests/lib/jquery/jquery.PurposedCallbacks.tests.js M extensions/ValueView/tests/lib/jquery/jquery.animateWithEvent.tests.js M extensions/ValueView/tests/lib/util/util.Notifier.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Listrotator.tests.js D extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Toggler.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/ValueView/tests/src/ExpertExtender/resources.php M extensions/ValueView/tests/src/experts/GlobeCoordinateInput.tests.js M extensions/ValueView/tests/src/jquery.valueview.valueview.tests.js A extensions/Wikibase/.mailmap M extensions/Wikibase/Gruntfile.js M extensions/Wikibase/README.md M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php M extensions/Wikibase/client/config/WikibaseClient.example.php M extensions/Wikibase/client/i18n/ar.json M extensions/Wikibase/client/i18n/be-tarask.json M extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/din.json M extensions/Wikibase/client/i18n/fr.json M extensions/Wikibase/client/i18n/frr.json M extensions/Wikibase/client/i18n/ha.json M extensions/Wikibase/client/i18n/he.json M extensions/Wikibase/client/i18n/it.json A extensions/Wikibase/client/i18n/kab.json M extensions/Wikibase/client/i18n/li.json M extensions/Wikibase/client/i18n/ml.json M extensions/Wikibase/client/i18n/ms.json M extensions/Wikibase/client/i18n/nb.json M extensions/Wikibase/client/i18n/nl.json M extensions/Wikibase/client/i18n/pt-br.json M extensions/Wikibase/client/i18n/pt.json M extensions/Wikibase/client/i18n/rm
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.14]: Explicitly load badges extension
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372051 )
Change subject: Explicitly load badges extension
..
Explicitly load badges extension
Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/372051/1
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/372051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7f4db1f357ebc73832989d1fbc21e8dc16b05dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: set linting to ES6
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372050 )
Change subject: Chore: set linting to ES6
..
Chore: set linting to ES6
The TypeScript configuration files specify ES2015. Update the lint
configuration to this version instead of ES7.
Change-Id: I9dbdfea999d7571135ca02ed34da583323d090dd
---
M .eslintrc.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/50/372050/1
diff --git a/.eslintrc.json b/.eslintrc.json
index 5488218..18e37ea 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,7 +11,7 @@
},
"parser": "typescript-eslint-parser",
"parserOptions": {
-"ecmaVersion": 2016,
+"ecmaVersion": 2015,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
--
To view, visit https://gerrit.wikimedia.org/r/372050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dbdfea999d7571135ca02ed34da583323d090dd
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: don't hide Webpack TypeScript warnings
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372049 )
Change subject: Chore: don't hide Webpack TypeScript warnings
..
Chore: don't hide Webpack TypeScript warnings
Increase ts-loader's verbosity to include warnings which should be
noticed.
Change-Id: Ibf1fd89acc6bce94f145676a80e27bfb1d7a0419
---
M webpack.config.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/49/372049/1
diff --git a/webpack.config.js b/webpack.config.js
index 1475dab..0e34c54 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -50,7 +50,7 @@
test: /\.tsx?$/,
loader: "ts-loader",
options: {
- logLevel: "error"
+ logLevel: "warn"
}
}
]
--
To view, visit https://gerrit.wikimedia.org/r/372049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf1fd89acc6bce94f145676a80e27bfb1d7a0419
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Update Wikidata to wmf/1.30.0-wmf.14
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372048 )
Change subject: Update Wikidata to wmf/1.30.0-wmf.14
..
Update Wikidata to wmf/1.30.0-wmf.14
Change-Id: Id92cb6c7d6b1ea7c38a5e04bcc2cf3b8d0fa24c0
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/48/372048/1
diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 50ecb4d..7a1da9f 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -179,6 +179,6 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
- "Wikidata": "wmf/1.30.0-wmf.12"
+ "Wikidata": "wmf/1.30.0-wmf.14"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id92cb6c7d6b1ea7c38a5e04bcc2cf3b8d0fa24c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.14]: New deployment build - wmf/1.30.0-wmf.14
Aude has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372047 ) Change subject: New deployment build - wmf/1.30.0-wmf.14 .. New deployment build - wmf/1.30.0-wmf.14 Change-Id: Ibde68fb7c7683295cd9a48689f05cb86604baf02 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/ArticlePlaceholder/composer.json M extensions/ArticlePlaceholder/i18n/it.json M extensions/ArticlePlaceholder/i18n/nn.json M extensions/ArticlePlaceholder/i18n/pt-br.json M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/includes/SearchHookHandler.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/package.json M extensions/ArticlePlaceholder/phpcs.xml M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php M extensions/PropertySuggester/composer.json M extensions/PropertySuggester/extension.json M extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js M extensions/PropertySuggester/package.json M extensions/Quality/i18n/pt-br.json A extensions/Quality/i18n/sr-ec.json M extensions/Quality/package.json M extensions/ValueView/RELEASE-NOTES.md M extensions/ValueView/ValueView.php M extensions/ValueView/composer.json M extensions/ValueView/i18n/ar.json M extensions/ValueView/i18n/fa.json M extensions/ValueView/i18n/hu.json M extensions/ValueView/i18n/roa-tara.json M extensions/ValueView/i18n/yi.json M extensions/ValueView/lib/jquery.ui/jquery.ui.listrotator.js M extensions/ValueView/lib/jquery/jquery.PurposedCallbacks.js M extensions/ValueView/lib/util/util.CombiningMessageProvider.js M extensions/ValueView/lib/util/util.ContentLanguages.js M extensions/ValueView/lib/util/util.Extendable.js M extensions/ValueView/lib/util/util.HashMessageProvider.js M extensions/ValueView/lib/util/util.MessageProvider.js M extensions/ValueView/lib/util/util.Notifier.js M extensions/ValueView/lib/util/util.PrefixingMessageProvider.js M extensions/ValueView/src/ExpertExtender/ExpertExtender.CalendarHint.js D extensions/ValueView/src/ExpertExtender/ExpertExtender.Toggler.css D extensions/ValueView/src/ExpertExtender/ExpertExtender.Toggler.js M extensions/ValueView/src/ExpertExtender/resources.php M extensions/ValueView/src/jquery.valueview.Expert.js M extensions/ValueView/tests/lib/jquery.event/jquery.event.special.eachchange.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.listrotator.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.ooMenu.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.preview.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.toggler.tests.js M extensions/ValueView/tests/lib/jquery/jquery.AnimationEvent.tests.js M extensions/ValueView/tests/lib/jquery/jquery.PurposedCallbacks.tests.js M extensions/ValueView/tests/lib/jquery/jquery.animateWithEvent.tests.js M extensions/ValueView/tests/lib/util/util.Notifier.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Listrotator.tests.js D extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Toggler.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/ValueView/tests/src/ExpertExtender/resources.php M extensions/ValueView/tests/src/experts/GlobeCoordinateInput.tests.js M extensions/ValueView/tests/src/jquery.valueview.valueview.tests.js A extensions/Wikibase/.mailmap M extensions/Wikibase/Gruntfile.js M extensions/Wikibase/README.md M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php M extensions/Wikibase/client/config/WikibaseClient.example.php M extensions/Wikibase/client/i18n/ar.json M extensions/Wikibase/client/i18n/be-tarask.json M extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/din.json M extensions/Wikibase/client/i18n/fr.json M extensions/Wikibase/client/i18n/frr.json M extensions/Wikibase/client/i18n/ha.json M extensions/Wikibase/client/i18n/he.json M extensions/Wikibase/client/i18n/it.json A extensions/Wikibase/client/i18n/kab.json M extensions/Wikibase/client/i18n/li.json M extensions/Wikibase/client/i18n/ml.json M extensions/Wikibase/client/i18n/ms.json M extensions/Wikibase/client/i18n/nb.json M extensions/Wikibase/client/i18n/nl.json M extensions/Wikibase/client/i18n/pt-br.json M extensions/Wikibase/client/i18n/pt.json M extensions/Wikibase/client/i18n/rm.json M extensi
[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: [DO NOT MERGE] CheckUser.alias translations for Basque (eu)
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372046 ) Change subject: [DO NOT MERGE] CheckUser.alias translations for Basque (eu) .. [DO NOT MERGE] CheckUser.alias translations for Basque (eu) Translations provided by User:Iñaki_LL from eu.wikipedia.org Change-Id: I7c1d98d1ff0f1bb5ac56978ed4bc26e88f0a7e40 --- M CheckUser.alias.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser refs/changes/46/372046/1 diff --git a/CheckUser.alias.php b/CheckUser.alias.php index cde1880..dfafe62 100644 --- a/CheckUser.alias.php +++ b/CheckUser.alias.php @@ -127,6 +127,12 @@ 'CheckUserLog' => [ 'Protokoloj_de_kontrolado_de_uzantoj' ], ]; +/** Basque (euskara) */ +$specialPageAliases['eu'] = [ + 'CheckUser' => [ 'Lankidea_egiaztatu' ], + 'CheckUserLog' => [ 'Lankidearen_erregistroa_egiaztatu' ], +]; + /** Spanish (español) */ $specialPageAliases['es'] = [ 'CheckUser' => [ 'ComprobarUsuario', 'Comprobar_usuario', 'VerificarUsuario', 'Verificar_usuario' ], -- To view, visit https://gerrit.wikimedia.org/r/372046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c1d98d1ff0f1bb5ac56978ed4bc26e88f0a7e40 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Remove unused dependency on DataValues JavaScript's coordina...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371209 )
Change subject: Remove unused dependency on DataValues JavaScript's coordinate
formatter
..
Remove unused dependency on DataValues JavaScript's coordinate formatter
Note that the only thing used from the formatter is the static
PRECISIONTEXT() method. Everything else was already removed long ago.
This patch will allow us to remove the client-side coordinate formatter
entirely.
I did run the QUnit tests and they pass.
A manual test of the expert should be done.
Bug: T172916
Change-Id: I84e17646449d06e8f0035416f1ebbc63b4b26801
---
M src/experts/GlobeCoordinateInput.js
M src/experts/resources.php
2 files changed, 27 insertions(+), 6 deletions(-)
Approvals:
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/experts/GlobeCoordinateInput.js
b/src/experts/GlobeCoordinateInput.js
index 3576d4f..df61cf8 100644
--- a/src/experts/GlobeCoordinateInput.js
+++ b/src/experts/GlobeCoordinateInput.js
@@ -1,4 +1,4 @@
-module.exports = ( function( $, vv, Formatter ) {
+module.exports = ( function( $, vv ) {
'use strict';
var PARENT = vv.experts.StringValue;
@@ -31,6 +31,29 @@
}
/**
+* @param {number} precision
+* @return {string}
+*/
+ function getPrecisionLabel( precision ) {
+ var presets = {
+ 'to an arcminute': 1 / 60,
+ 'to an arcsecond': 1 / 3600,
+ 'to 1/10 of an arcsecond': 1 / 36000,
+ 'to 1/100 of an arcsecond': 1 / 36,
+ 'to 1/1000 of an arcsecond': 1 / 360,
+ '1/1\'': 1 / 3600
+ };
+
+ for ( var label in presets ) {
+ if ( Math.abs( precision - presets[label] ) <
0.0001 ) {
+ return label;
+ }
+ }
+
+ return '±' + roundPrecision( precision ) + '°';
+ }
+
+ /**
* Returns the original precision level for an unrounded precision.
* @ignore
*
@@ -59,10 +82,9 @@
function getPrecisionValues() {
var precisionValues = [];
$.each( PRECISIONS, function( i, precision ) {
- var label = Formatter.PRECISIONTEXT( precision );
precisionValues.unshift( {
value: roundPrecision( precision ),
- label: label
+ label: getPrecisionLabel( precision )
} );
} );
return precisionValues;
@@ -124,7 +146,7 @@
value: precision,
label: self._messageProvider.getMessage(
'valueview-expert-globecoordinateinput-customprecision',
- [ Formatter.PRECISIONTEXT(
precision ) ]
+ [ getPrecisionLabel( precision
) ]
)
};
}
@@ -190,4 +212,4 @@
return vv.experts.GlobeCoordinateInput;
-}( jQuery, jQuery.valueview, globeCoordinate.Formatter ) );
+}( jQuery, jQuery.valueview ) );
diff --git a/src/experts/resources.php b/src/experts/resources.php
index 0018029..6d35007 100644
--- a/src/experts/resources.php
+++ b/src/experts/resources.php
@@ -81,7 +81,6 @@
'GlobeCoordinateInput.css',
),
'dependencies' => array(
- 'globeCoordinate.js',
'jquery.valueview.ExpertExtender',
'jquery.valueview.ExpertExtender.Container',
'jquery.valueview.ExpertExtender.Listrotator',
--
To view, visit https://gerrit.wikimedia.org/r/371209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84e17646449d06e8f0035416f1ebbc63b4b26801
Gerrit-PatchSet: 2
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Lucas Werkmeister (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: WMDE-leszek
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-08-15T10:00:02+0000
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372042 )
Change subject: New Wikidata Build - 2017-08-15T10:00:02+
..
New Wikidata Build - 2017-08-15T10:00:02+
Change-Id: I0d9a7aad121c681b6739a0ae02f317643b5b1aaf
---
M composer.lock
M extensions/Wikibase/client/i18n/tay.json
M extensions/Wikibase/docs/lua.wiki
M extensions/Wikibase/lib/i18n/nn.json
M extensions/Wikibase/repo/i18n/nn.json
M vendor/composer/installed.json
6 files changed, 17 insertions(+), 13 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 109cf64..3ee2f34 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1547,12 +1547,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "3d2a24e91025710a530ac605a84214b692819980"
+"reference": "a14541a3b7ac0708a1996a202516e1bb19db16e9"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3d2a24e91025710a530ac605a84214b692819980";,
-"reference": "3d2a24e91025710a530ac605a84214b692819980",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a14541a3b7ac0708a1996a202516e1bb19db16e9";,
+"reference": "a14541a3b7ac0708a1996a202516e1bb19db16e9",
"shasum": ""
},
"require": {
@@ -1629,7 +1629,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2017-08-14 07:44:44"
+"time": "2017-08-15 07:04:17"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/tay.json
b/extensions/Wikibase/client/i18n/tay.json
index bbe8dbf..a6ab184 100644
--- a/extensions/Wikibase/client/i18n/tay.json
+++ b/extensions/Wikibase/client/i18n/tay.json
@@ -14,7 +14,7 @@
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "smbbaq",
"wikibase-rc-hide-wikidata-show": "Show",
- "wikibase-rc-wikibase-edit-letter": "b",
+ "wikibase-rc-wikibase-edit-letter": "Suwe",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} Smr’zyut miru’",
"wikibase-otherprojects": "Bzinah Cwan’an"
}
diff --git a/extensions/Wikibase/docs/lua.wiki
b/extensions/Wikibase/docs/lua.wiki
index 760912e..4a01a25 100644
--- a/extensions/Wikibase/docs/lua.wiki
+++ b/extensions/Wikibase/docs/lua.wiki
@@ -32,7 +32,11 @@
=== mw.wikibase.getEntityIdForTitle ===
wikibase.getEntityIdForTitle( pageTitle )
-Takes a page title in the local wiki, encoded in a string, and returns the
connected entity ID, if it exists.
+Takes a string page title in the local wiki and returns the connected item ID,
if it exists. Returns nil if there's no linked item.
+
+
+mw.wikibase.getEntityIdForTitle( 'Berlin' ) -- Returns the ID of the item
linked with the "Berlin" page, like "Q64"
+
=== mw.wikibase.getEntityUrl ===
wikibase.getEntityUrl()
diff --git a/extensions/Wikibase/lib/i18n/nn.json
b/extensions/Wikibase/lib/i18n/nn.json
index cd5c734..8149b35 100644
--- a/extensions/Wikibase/lib/i18n/nn.json
+++ b/extensions/Wikibase/lib/i18n/nn.json
@@ -93,8 +93,8 @@
"wikibase-entity-summary-wbsetclaim-create": "Oppretta
{{PLURAL:$3|påstand|påstandar}}",
"wikibase-entity-summary-wbsetclaim-update-qualifiers": "Endra
{{PLURAL:$4|éin kvalifikator|$4 kvalifikatorar}} for {{PLURAL:$3|éin
påstand|fleire påstandar}}",
"wikibase-entity-summary-clientsitelink-update": "Sida flytt frå [$3]
til [$4]",
- "wikibase-entity-summary-wbmergeitems-from": "Flette element frå $3",
- "wikibase-entity-summary-wbmergeitems-to": "Flette element inn i $3",
+ "wikibase-entity-summary-wbmergeitems-from": "Fletta element frå $3",
+ "wikibase-entity-summary-wbmergeitems-to": "Fletta element inn i $3",
"wikibase-item-summary-wbcreate-new": "Oppretta eit nytt element",
"wikibase-item-summary-wbeditentity": "Oppretta eit nytt element",
"wikibase-item-summary-wbeditentity-create": "Oppretta eit nytt
element",
diff --git a/extensions/Wikibase/repo/i18n/nn.json
b/extensions/Wikibase/repo/i18n/nn.json
index cbc77df..ba4825b 100644
--- a/extensions/Wikibase/repo/i18n/nn.json
+++ b/extensions/Wikibase/repo/i18n/nn.json
@@ -145,7 +145,7 @@
"wikibase-modifyentity-id": "ID:",
"wikibase-modifyterm-language": "Språkkode:",
"special-mergeitems": "Flett saman to element",
- "wikibase-mergeitems-intro": "Dersom du fletter saman to element, vil
alle merkelappane, skildringane, andre namn, nettstadlenkjene og utsegnene
flyttast frå det eine ele
[MediaWiki-commits] [Gerrit] wikidata/build-resources[master]: Explicitly load WikimediaBadges with wfLoadExtension
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370462 )
Change subject: Explicitly load WikimediaBadges with wfLoadExtension
..
Explicitly load WikimediaBadges with wfLoadExtension
Bug: T172592
Change-Id: Ib49ac1e0a8b0752cf6c3ea51527423ef10a7845d
---
M Wikidata.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/Wikidata.php b/Wikidata.php
index 04738dd..dcb4143 100755
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -49,6 +49,8 @@
if ( !empty( $wmgUseWikibaseClient ) ) {
include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBaseDir/extensions/WikimediaBadges/extension.json" );
+
if ( !empty( $wmgUseArticlePlaceholder ) ) {
wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/extension.json" );
}
--
To view, visit https://gerrit.wikimedia.org/r/370462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49ac1e0a8b0752cf6c3ea51527423ef10a7845d
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/build-resources
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Ladsgroup
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] operations/mediawiki-config[master]: Administrators to add/remove 'transwiki' at nowiktionary
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372045 ) Change subject: Administrators to add/remove 'transwiki' at nowiktionary .. Administrators to add/remove 'transwiki' at nowiktionary Bug: T172365 Change-Id: I8c01d4ef5f0d51e4fd4a64af1d97a84a48250a68 --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/45/372045/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2fd0ca6..8fd2708 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10126,6 +10126,9 @@ 'bureaucrat' => [ 'sysop', 'bureaucrat', 'bot', 'patroller', 'autopatrolled' ], 'sysop' => [ 'autopatrolled', 'patroller' ], ], + '+nowiktionary' => [ + 'sysop' => [ 'transwiki' ], // T172365 + ], '+nowikimedia' => [ 'sysop' => [ 'translationadmin' ], // T152490 ], @@ -10877,6 +10880,9 @@ 'bureaucrat' => [ 'bot', 'patroller', 'autopatrolled' ], 'sysop' => [ 'autopatrolled', 'patroller' ], ], + '+nowiktionary' => [ + 'sysop' => [ 'transwiki' ], // T172365 + ], '+nowikimedia' => [ 'sysop' => [ 'translationadmin' ], // T152490 ], -- To view, visit https://gerrit.wikimedia.org/r/372045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c01d4ef5f0d51e4fd4a64af1d97a84a48250a68 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
