[MediaWiki-commits] [Gerrit] Improve values-qq entry for the nearby_no_network string. - change (apps...wikipedia)
Deskana has uploaded a new change for review. https://gerrit.wikimedia.org/r/166369 Change subject: Improve values-qq entry for the nearby_no_network string. .. Improve values-qq entry for the nearby_no_network string. Change-Id: I1c525101b9bc084fd7bdac8b8f19ea253c5f3a4b --- M wikipedia/res/values-qq/strings.xml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/69/166369/1 diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 8c0e602..d2b3936 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -78,7 +78,7 @@ string name=nearby_distance_in_kilometersDistance to the place mentioned in the nearby page in kilometers. Please leave the %.2f as is. It represents a floating point number with 2 digits after the decimal point./string string name=nearby_distance_in_feetDistance to the place mentioned in the nearby page in feet. Please leave the %d as is. It represents an integer decimal number up to 999./string string name=nearby_distance_in_milesDistance to the place mentioned in the nearby page in miles. Please leave the %.2f as is. It represents a floating point number with 2 digits after the decimal point./string - string name=nearby_no_networkError message when there was a network error/string + string name=nearby_no_networkError message when there was a network error while displaying nearby articles./string string name=nearby_server_errorError message when the app could not get list of nearby places from the server./string string name=nearby_no_locationError message when the app could not get a location from any location provider (network or GPS)./string string name=nearby_dialog_goto_settingsDialog text that tells the user that Location updates are not enabled on the device, and asks if the user wants to go to the Settings page on the device where they can enable Location updates./string -- To view, visit https://gerrit.wikimedia.org/r/166369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c525101b9bc084fd7bdac8b8f19ea253c5f3a4b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove comment about fixed bug 69401 - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/166370 Change subject: Remove comment about fixed bug 69401 .. Remove comment about fixed bug 69401 Change-Id: If0b3505e0dda12d802875e042a2c4c8517212fc9 --- M tests/wikibase_edit_tests.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/70/166370/1 diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index a060fd5..9094e53 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -76,7 +76,6 @@ end_date.setTarget(pywikibot.WbTime(year=2012)) item.claims['P115'][0].addQualifier(end_date) -# metaclass cant handle this: @unittest.expectedFailure # bug 69401 def test_edit_entity_new_item(self): testsite = self.get_repo() ts = str(time.time()) -- To view, visit https://gerrit.wikimedia.org/r/166370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0b3505e0dda12d802875e042a2c4c8517212fc9 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe SemanticFormsDisplayTitle, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166372 Change subject: Unsubscribe SemanticFormsDisplayTitle, as it will be deleted .. Unsubscribe SemanticFormsDisplayTitle, as it will be deleted Change-Id: Ie389c5c9b6965c56c9186c6faeb3ee36815a028a (cherry picked from commit dc88e611bb661822b573b0ab8c6ce6183906bb16) --- M .gitmodules D SemanticFormsDisplayTitle 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/72/166372/1 diff --git a/.gitmodules b/.gitmodules index fb59c85..1d36e83 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1902,10 +1902,6 @@ path = SemanticForms url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticForms.git branch = . -[submodule SemanticFormsDisplayTitle] - path = SemanticFormsDisplayTitle - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsDisplayTitle.git - branch = . [submodule SemanticFormsInputs] path = SemanticFormsInputs url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsInputs.git diff --git a/SemanticFormsDisplayTitle b/SemanticFormsDisplayTitle deleted file mode 16 index e4e4dc6..000 --- a/SemanticFormsDisplayTitle +++ /dev/null -Subproject commit e4e4dc6f1812902151eaae8dc624b004602d47b1 -- To view, visit https://gerrit.wikimedia.org/r/166372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie389c5c9b6965c56c9186c6faeb3ee36815a028a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: REL1_23 Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe PartitionQuery, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166373 Change subject: Unsubscribe PartitionQuery, as it will be deleted .. Unsubscribe PartitionQuery, as it will be deleted Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf (cherry picked from commit 7215e3aa22974535c70d1e561d3fbefe3f7eaa64) --- M .gitmodules D PartitionQuery 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/73/166373/1 diff --git a/.gitmodules b/.gitmodules index fb59c85..9a5d342 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1518,10 +1518,6 @@ path = Parsoid url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Parsoid.git branch = . -[submodule PartitionQuery] - path = PartitionQuery - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PartitionQuery.git - branch = . [submodule PdfBook] path = PdfBook url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PdfBook.git diff --git a/PartitionQuery b/PartitionQuery deleted file mode 16 index f965acd..000 --- a/PartitionQuery +++ /dev/null -Subproject commit f965acd044b6e51d167676280ec0e507fdbda070 -- To view, visit https://gerrit.wikimedia.org/r/166373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: REL1_23 Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe SemanticFormsUniqueValue, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166371 Change subject: Unsubscribe SemanticFormsUniqueValue, as it will be deleted .. Unsubscribe SemanticFormsUniqueValue, as it will be deleted Change-Id: I9eb70f384ee41e900d8a3de9aada687e5710a838 (cherry picked from commit 226544b53969daa4c0349f8ae5fb415539241b0e) --- M .gitmodules D SemanticFormsUniqueValue 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/71/166371/1 diff --git a/.gitmodules b/.gitmodules index fb59c85..bcea348 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1910,10 +1910,6 @@ path = SemanticFormsInputs url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsInputs.git branch = . -[submodule SemanticFormsUniqueValue] - path = SemanticFormsUniqueValue - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsUniqueValue.git - branch = . [submodule SemanticGenealogy] path = SemanticGenealogy url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticGenealogy.git diff --git a/SemanticFormsUniqueValue b/SemanticFormsUniqueValue deleted file mode 16 index b321a46..000 --- a/SemanticFormsUniqueValue +++ /dev/null -Subproject commit b321a46f20fa89e2d7627ec5a2715dbf8846c240 -- To view, visit https://gerrit.wikimedia.org/r/166371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9eb70f384ee41e900d8a3de9aada687e5710a838 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: REL1_23 Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow @unittest.expectedFailure on all TestCase methods - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/166374 Change subject: Allow @unittest.expectedFailure on all TestCase methods .. Allow @unittest.expectedFailure on all TestCase methods TestCase allows test methods to be 'multi-site' tests, which will be re-run for each site in the TestCase sites matrix. The metaclass has previously checked that the test method only has 1 or 2 arguments. @unittest.expectedFailure replaces the test method with a decorated version that appears as if it has zero arguments, due to the way decorators work. This change allows test methods with 0 arguments. Change-Id: Ib6d74af168e0bad93df65da2965daffa6b3951e0 --- M tests/aspects.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/74/166374/1 diff --git a/tests/aspects.py b/tests/aspects.py index cbd870c..e62f384 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -340,6 +340,8 @@ return super(MetaTestCaseClass, cls).__new__(cls, name, bases, dct) +# The following section is only processed if the test uses sites. + if 'cacheinfo' in dct and dct['cacheinfo']: bases = tuple([CacheInfoMixin] + list(bases)) @@ -355,9 +357,16 @@ for test in tests: test_func = dct[test] +# method decorated with unittest.expectedFailure has no arguments +# so it is assumed to not be a multi-site test method. +if test_func.__code__.co_argcount == 0: +continue + +# a normal test method only accepts 'self' if test_func.__code__.co_argcount == 1: continue +# a multi-site test method only accepts 'self' and the site-key if test_func.__code__.co_argcount != 2: raise Exception( '%s: Test method %s must accept either 1 or 2 arguments; ' -- To view, visit https://gerrit.wikimedia.org/r/166374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6d74af168e0bad93df65da2965daffa6b3951e0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split testImageusage into four tests - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166375
Change subject: Split testImageusage into four tests
..
Split testImageusage into four tests
There is a reoccurring problem with this test method on English Wikipedia.
As the test currently has four different sets of tests, it is not 100%
reliable to determine which queries are causing the problem.
Output message regarding which image is being used in these tests.
Bug: 71971
Change-Id: I8443bc0f55ff77b8fc266f55c2bfbf32940be892
---
M tests/site_tests.py
1 file changed, 45 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/75/166375/1
diff --git a/tests/site_tests.py b/tests/site_tests.py
index c9b99bf..19b01ee 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -591,11 +591,27 @@
self.assertIsInstance(link, pywikibot.Page)
self.assertIn(link.namespace(), (2, 3))
-def testImageusage(self):
-Test the site.imageusage() method
+
+class TestImageUsage(DefaultSiteTestCase):
+
+Test cases for Site.imageusage method.
+
+cached = True
+
+@property
+def imagepage(self):
+Find an image which is used on a page.
+
+If there are no images included in pages it'll skip all tests.
+
+Note: This is not implemented as setUpClass which would be invoked
+while initialising all tests, to reduce chance of an error preventing
+all tests from running.
+
+if hasattr(self.__class__, '_image_page'):
+return self.__class__._image_page
+
mysite = self.get_site()
-# Find a page which uses an image, so we can test imageusage
-# If there are no images included in pages it'll skip this test
for page in mysite.allpages(filterredir=False):
try:
imagepage = next(iter(page.imagelinks())) # 1st image of page
@@ -606,16 +622,41 @@
else:
raise unittest.SkipTest(No images on site {0!r}.format(mysite))
+pywikibot.output(u'site_tests.TestImageUsage found %s on %s'
+ % (imagepage, page))
+
+self.__class__._image_page = imagepage
+return imagepage
+
+def test_image_usage(self):
+Test the site.imageusage() method.
+mysite = self.get_site()
+imagepage = self.imagepage
iu = list(mysite.imageusage(imagepage, total=10))
self.assertLessEqual(len(iu), 10)
self.assertTrue(all(isinstance(link, pywikibot.Page)
for link in iu))
+
+def test_image_usage_in_namespaces(self):
+Test the site.imageusage() method with namespaces.
+mysite = self.get_site()
+imagepage = self.imagepage
for using in mysite.imageusage(imagepage, namespaces=[3, 4], total=5):
self.assertIsInstance(using, pywikibot.Page)
self.assertIn(imagepage, list(using.imagelinks()))
+
+def test_image_usage_in_redirects(self):
+Test the site.imageusage() method on redirects only.
+mysite = self.get_site()
+imagepage = self.imagepage
for using in mysite.imageusage(imagepage, filterredir=True, total=5):
self.assertIsInstance(using, pywikibot.Page)
self.assertTrue(using.isRedirectPage())
+
+def test_image_usage_not_in_redirects(self):
+Test the site.imageusage() method with redirects.
+mysite = self.get_site()
+imagepage = self.imagepage
for using in mysite.imageusage(imagepage, filterredir=False, total=5):
self.assertIsInstance(using, pywikibot.Page)
self.assertFalse(using.isRedirectPage())
--
To view, visit https://gerrit.wikimedia.org/r/166375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8443bc0f55ff77b8fc266f55c2bfbf32940be892
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: consistency tweaks - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n: consistency tweaks
..
i18n: consistency tweaks
- Fix variable name $wgMathDebug
- Cannot
Change-Id: I5a5958670e52b906ad74c2f69c5083e9f502b591
---
M SpecialMathIndex.php
M i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Physikerwelt: Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialMathIndex.php b/SpecialMathIndex.php
index 6d8ed94..c5ad6f2 100644
--- a/SpecialMathIndex.php
+++ b/SpecialMathIndex.php
@@ -29,7 +29,7 @@
}
} else {
$output-addWikiText( '\'\'\'This page is avaliblible
in math debug mode only.\'\'\'' . \n\n .
- 'Enable the math debug mode by setting code
$wgDebugMath = true/code .' );
+ 'Enable the math debug mode by setting code
$wgMathDebug = true/code .' );
}
}
function testIndex() {
diff --git a/i18n/en.json b/i18n/en.json
index 6e88244..16a8ef1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -29,7 +29,7 @@
math-wmc-FileLabel : CSV File,
math-wmc-FileHelp : Upload your results as ranked, comma separated list
of (queryId,formulaId)-pairs. A column header of the form
codequeryID,formulaId/code is required.,
math-wmc-RunAdded: Added submission \$1\ with Id \$2\,
-math-wmc-RunAddError: Error: Can not add submission \$1\.,
+math-wmc-RunAddError: Error: Cannot add submission \$1\.,
math-wmc-RunAddExist: Submission named \$1\ already exists with Id
\$2\,
math-wmc-Warnings : The following lines of the input files were
ignored:,
math-wmc-SubmissionSuccess : Submission succeeded.,
--
To view, visit https://gerrit.wikimedia.org/r/166277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a5958670e52b906ad74c2f69c5083e9f502b591
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki.userSuggest to Special:ListFiles - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add mediawiki.userSuggest to Special:ListFiles .. Add mediawiki.userSuggest to Special:ListFiles This gives a suggestion list when typing a username on that special page Bug: 48240 Change-Id: I9960325f27eddb6ea0b3317b00996ccb91c51994 --- M includes/specials/SpecialListfiles.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php index 2a97abc..bf17a20 100644 --- a/includes/specials/SpecialListfiles.php +++ b/includes/specials/SpecialListfiles.php @@ -519,6 +519,7 @@ ); } + $this-getOutput()-addModules( 'mediawiki.userSuggest' ); $fields['user'] = array( 'type' = 'text', 'name' = 'user', @@ -527,6 +528,7 @@ 'default' = $this-mUserName, 'size' = '40', 'maxlength' = '255', + 'cssclass' = 'mw-autocomplete-user', // used by mediawiki.userSuggest ); $fields['ilshowall'] = array( -- To view, visit https://gerrit.wikimedia.org/r/166036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9960325f27eddb6ea0b3317b00996ccb91c51994 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Alex Monk kren...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] role::servermon: Convert to package|provider==trebuchet| - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: role::servermon: Convert to package|provider==trebuchet|
..
role::servermon: Convert to package|provider==trebuchet|
The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.
Change-Id: I8808f9e85ae465012a5702d2b3a4e5096c50c577
---
M manifests/role/servermon.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/servermon.pp b/manifests/role/servermon.pp
index ff2c04d..0bb9235 100644
--- a/manifests/role/servermon.pp
+++ b/manifests/role/servermon.pp
@@ -44,7 +44,9 @@
admins = '(Ops Team, o...@lists.wikimedia.org)',
}
-deployment::target {'servermon': }
+package { 'servermon/servermon':
+provider = 'trebuchet',
+}
apache::site { 'servermon.wikimedia.org':
content = template('apache/sites/servermon.wikimedia.org.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/163369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8808f9e85ae465012a5702d2b3a4e5096c50c577
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use radio buttons only for math mode selection - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged.
Change subject: Use radio buttons only for math mode selection
..
Use radio buttons only for math mode selection
While the combination of all redering modes, might
be useful for some power users it will confuse the
average user and makes bug reporting harder.
Therefore, source rendering on the server side is
used when MathJax is enabled on the client side.
Change-Id: I05a20d7c2298115dbf0429db6c107e8132cc15ff
---
M Math.hooks.php
M Math.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.math.mathjax.enabler.js
5 files changed, 14 insertions(+), 32 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Math.hooks.php b/Math.hooks.php
index e2ef1db..8fadacb 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -92,7 +92,7 @@
* @return array
*/
static function mathTagHook( $content, $attributes, $parser ) {
- global $wgUseMathJax;
+ global $wgMathDisableTexFilter;
if ( trim( $content ) === '' ) { // bug 8372
return '';
@@ -130,7 +130,7 @@
$renderedMath,
$parser-getTitle()-getArticleID(),
$parser-nextLinkID() ) );// Enables indexing
of math formula
- if ( $wgUseMathJax ) {
+ if ( $mode == MW_MATH_MATHJAX || $mode == MW_MATH_LATEXML_JAX )
{
$parser-getOutput()-addModules( array(
'ext.math.mathjax.enabler' ) );
}
$parser-getOutput()-addModuleStyles( array( 'ext.math.styles'
) );
@@ -152,20 +152,13 @@
* @return Boolean: true
*/
static function onGetPreferences( $user, $defaultPreferences ) {
- global $wgUseMathJax, $wgMathValidModes, $wgDefaultUserOptions;
+ global $wgMathValidModes, $wgDefaultUserOptions;
$defaultPreferences['math'] = array(
'type' = 'radio',
'options' = array_flip( self::getMathNames() ),
'label' = '#160;',
'section' = 'rendering/math',
);
- if ( $wgUseMathJax ) {
- $defaultPreferences['mathJax'] = array(
- 'type' = 'toggle',
- 'label-message' = 'mw_math_mathjax',
- 'section' = 'rendering/math',
- );
- }
// If the default option is not in the valid options the
// user interface throws an exception (BUG 64844)
if ( ! in_array( $wgDefaultUserOptions['math'] ,
$wgMathValidModes ) ){
@@ -187,7 +180,9 @@
MW_MATH_SOURCE = 'mw_math_source',
MW_MATH_PNG = 'mw_math_png',
MW_MATH_MATHML = 'mw_math_mathml',
- MW_MATH_LATEXML = 'mw_math_latexml'
+ MW_MATH_LATEXML = 'mw_math_latexml',
+ MW_MATH_LATEXML_JAX = 'mw_math_latexml_jax',
+ MW_MATH_MATHJAX = 'mw_math_mathjax'
);
$names = array();
foreach ( $wgMathValidModes as $mode ) {
diff --git a/Math.php b/Math.php
index 339810b..bfa3685 100644
--- a/Math.php
+++ b/Math.php
@@ -45,6 +45,7 @@
define( 'MW_MATH_MATHML', 5 );
define( 'MW_MATH_MATHJAX', 6 ); /// @deprecated
define( 'MW_MATH_LATEXML', 7 ); /// new in 1.22
+define( 'MW_MATH_LATEXML_JAX', 8 ); /// new in 1.22
/**@}*/
/**@{
@@ -58,15 +59,13 @@
/**@}*/
/**@var array defines the mode allowed on the server */
-$wgMathValidModes = array( MW_MATH_PNG, MW_MATH_SOURCE, MW_MATH_MATHML );
+$wgMathValidModes = array( MW_MATH_PNG, MW_MATH_SOURCE, MW_MATH_MATHML,
MW_MATH_MATHJAX );
/*
* The default rendering mode for anonymous users.
* Valid options are defined in $wgMathValidModes.
*/
$wgDefaultUserOptions['math'] = MW_MATH_PNG;
-/** @var boolean $wgDefaultUserOptions['mathJax'] determines if client-side
MathJax is enabled by default */
-$wgDefaultUserOptions['mathJax'] = false;
/** Location of the texvc binary */
$wgTexvc = __DIR__ . '/math/texvc';
@@ -116,16 +115,6 @@
* set up mathematical formula display.
*/
$wgMathDirectory = false;
-
-/**
- * Enables the option to use MathJax library to do client-side math rendering
- * when JavaScript is available. In supporting browsers this makes nice output
- * that's scalable for zooming, printing, and high-resolution displays, even if
- * the browsers do not support HTML5 (i.e. MathML).
- *
- * @todo Rename to $wgMathJax
- */
-$wgUseMathJax = false;
/**
* The url of the mathoid server.
diff --git a/i18n/en.json b/i18n/en.json
[MediaWiki-commits] [Gerrit] hhvm: monitor busy threads and queued requests. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166376
Change subject: hhvm: monitor busy threads and queued requests.
..
hhvm: monitor busy threads and queued requests.
Change-Id: I8ac0d13d847a1d45235163c4db0e1a4a3788dc8f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/monitoring/webserver.pp
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/166376/1
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 2ca7bf3..1b1b868 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -16,6 +16,25 @@
settings = { url = '/check-health' },
require = Apache::Site['hhvm_admin'],
}
+
+monitor_graphite_threshold { 'hhvm_queue_size':
+description = 'HHVM queue size',
+metric =
servers.${::hostname}.hhvm_healthCollector.queued.value,
+warning = 10,
+critical= 80,
+nagios_critical = false
+}
+
+$hhvm_max_threads = $::processorcount * 2
+
+monitor_graphite_threshold { 'hhvm_load':
+description = 'HHVM busy threads',
+metric =
servers.${::hostname}.hhvm_healthCollector.load.value,
+warning = $hhvm_max_threads * 0.8,
+critical= $hhvm_max_threads,
+nagios_critical = false
+}
+
}
# Basic vhost files
--
To view, visit https://gerrit.wikimedia.org/r/166376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ac0d13d847a1d45235163c4db0e1a4a3788dc8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set Browser Timeout for Wikidata Performance Test - change (integration/config)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166377
Change subject: Set Browser Timeout for Wikidata Performance Test
..
Set Browser Timeout for Wikidata Performance Test
Change-Id: Iadaa8211db8704d0052a2d46087a78e8c8269e8a
---
M jjb/browsertests.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/166377/1
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index d3bd8d4..8892679 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -535,6 +535,7 @@
- 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
name: PerformanceTests
+ browser_timeout: 360
cucumber_tags: '@performance_testing'
recipients: *emails-Wikidata-devs
--
To view, visit https://gerrit.wikimedia.org/r/166377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadaa8211db8704d0052a2d46087a78e8c8269e8a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed typo in Line 67. Resolves Bug 70587: Change-Id: I22a86... - change (mediawiki...Wikibase)
Memeht has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166378
Change subject: Fixed typo in Line 67. Resolves Bug 70587: Change-Id:
I22a86a87c5adf12b3a3efc717c976b305ffadc66
..
Fixed typo in Line 67. Resolves Bug 70587:
Change-Id: I22a86a87c5adf12b3a3efc717c976b305ffadc66
---
M client/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/166378/1
diff --git a/client/i18n/en.json b/client/i18n/en.json
index bda97dc..43e1725 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -64,5 +64,5 @@
wikibase-property-render-error: Failed to render property $1: $2,
wikibase-otherprojects: Other projects,
wikibase-otherprojects-beta-message: Other projects sidebar,
- wikibase-otherprojects-beta-description: Adds a
\{{int:wikibase-otherprojects}}\ section to the sidebar that provides links
to the other Wikimedia projects based on {{WBREPONAME}} data.
+ wikibase-otherprojects-beta-description: Adds an
\{{int:wikibase-otherprojects}}\ section to the sidebar that provides links
to the other Wikimedia projects based on {{WBREPONAME}} data.
}
--
To view, visit https://gerrit.wikimedia.org/r/166378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22a86a87c5adf12b3a3efc717c976b305ffadc66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Memeht eco...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed typo in Line 67. Resolves Bug 70587: Change-Id: I22a86... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed typo in Line 67. Resolves Bug 70587: Change-Id:
I22a86a87c5adf12b3a3efc717c976b305ffadc66
..
Fixed typo in Line 67. Resolves Bug 70587:
Change-Id: I22a86a87c5adf12b3a3efc717c976b305ffadc66
---
M client/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/i18n/en.json b/client/i18n/en.json
index bda97dc..43e1725 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -64,5 +64,5 @@
wikibase-property-render-error: Failed to render property $1: $2,
wikibase-otherprojects: Other projects,
wikibase-otherprojects-beta-message: Other projects sidebar,
- wikibase-otherprojects-beta-description: Adds a
\{{int:wikibase-otherprojects}}\ section to the sidebar that provides links
to the other Wikimedia projects based on {{WBREPONAME}} data.
+ wikibase-otherprojects-beta-description: Adds an
\{{int:wikibase-otherprojects}}\ section to the sidebar that provides links
to the other Wikimedia projects based on {{WBREPONAME}} data.
}
--
To view, visit https://gerrit.wikimedia.org/r/166378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22a86a87c5adf12b3a3efc717c976b305ffadc66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Memeht eco...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix harvest_template.py - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166379
Change subject: Fix harvest_template.py
..
Fix harvest_template.py
Broken by 806a5f2
Bug: 71699
Change-Id: I1c36907b7a7de3a952ec812fef505c8a38f4b187
---
M scripts/harvest_template.py
1 file changed, 47 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/79/166379/1
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index cdb1275..13ce7cf 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -122,62 +122,62 @@
ns=10).title(withNamespace=False)
except pywikibot.exceptions.InvalidTitle:
pywikibot.error(uFailed parsing template; '%s' should be the
template name. % template)
-return
+continue
# We found the template we were looking for
if template in self.templateTitles:
for field, value in fielddict.items():
field = field.strip()
value = value.strip()
if not field or not value:
-return
+continue
-# This field contains something useful for us
-if field in self.fields:
-# Check if the property isn't already set
-claim = pywikibot.Claim(self.repo,
self.fields[field])
-if claim.getID() in item.get().get('claims'):
-pywikibot.output(
-u'A claim for %s already exists. Skipping'
-% claim.getID())
-# TODO: Implement smarter approach to merging
-# harvested values with existing claims esp.
-# without overwriting humans unintentionally.
+# This field contains something useful for us
+if field in self.fields:
+# Check if the property isn't already set
+claim = pywikibot.Claim(self.repo, self.fields[field])
+if claim.getID() in item.get().get('claims'):
+pywikibot.output(
+u'A claim for %s already exists. Skipping'
+% claim.getID())
+# TODO: Implement smarter approach to merging
+# harvested values with existing claims esp.
+# without overwriting humans unintentionally.
+else:
+if claim.type == 'wikibase-item':
+# Try to extract a valid page
+match = re.search(pywikibot.link_regex, value)
+if not match:
+pywikibot.output(u'%s field %s value %s
isnt a wikilink. Skipping' % (claim.getID(), field, value))
+continue
+
+link_text = match.group(1)
+linked_item = self._template_link_target(item,
link_text)
+if not linked_item:
+continue
+
+claim.setTarget(linked_item)
+elif claim.type == 'string':
+claim.setTarget(value.strip())
+elif claim.type == 'commonsMedia':
+commonssite = pywikibot.Site(commons,
commons)
+imagelink = pywikibot.Link(value,
source=commonssite, defaultNamespace=6)
+image = pywikibot.FilePage(imagelink)
+if image.isRedirectPage():
+image =
pywikibot.FilePage(image.getRedirectTarget())
+if not image.exists():
+pywikibot.output('[[%s]] doesn\'t exist so
I can\'t link to it' % (image.title(),))
+continue
+claim.setTarget(image)
else:
-if claim.type == 'wikibase-item':
-# Try to extract a valid page
-match = re.search(pywikibot.link_regex,
value)
-if not match:
-pywikibot.output(u'%s field %s value
%s isnt a wikilink. Skipping' % (claim.getID(), field, value))
-return
+
[MediaWiki-commits] [Gerrit] hhvm: monitor busy threads and queued requests. - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: monitor busy threads and queued requests.
..
hhvm: monitor busy threads and queued requests.
Change-Id: I8ac0d13d847a1d45235163c4db0e1a4a3788dc8f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/monitoring/webserver.pp
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 2ca7bf3..1b1b868 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -16,6 +16,25 @@
settings = { url = '/check-health' },
require = Apache::Site['hhvm_admin'],
}
+
+monitor_graphite_threshold { 'hhvm_queue_size':
+description = 'HHVM queue size',
+metric =
servers.${::hostname}.hhvm_healthCollector.queued.value,
+warning = 10,
+critical= 80,
+nagios_critical = false
+}
+
+$hhvm_max_threads = $::processorcount * 2
+
+monitor_graphite_threshold { 'hhvm_load':
+description = 'HHVM busy threads',
+metric =
servers.${::hostname}.hhvm_healthCollector.load.value,
+warning = $hhvm_max_threads * 0.8,
+critical= $hhvm_max_threads,
+nagios_critical = false
+}
+
}
# Basic vhost files
--
To view, visit https://gerrit.wikimedia.org/r/166376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ac0d13d847a1d45235163c4db0e1a4a3788dc8f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] netmon1001's ganglia aggregator pmtpa removal - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166380
Change subject: netmon1001's ganglia aggregator pmtpa removal
..
netmon1001's ganglia aggregator pmtpa removal
Replace it with codfw
Change-Id: I1dcafdf56526d0ecadd83656e447985deaf45c95
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/166380/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 04d15da..dd3a650 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2097,7 +2097,7 @@
include role::servermon
class { 'ganglia_new::monitor::aggregator':
-sites = ['pmtpa', 'eqiad'],
+sites = ['eqiad', 'codfw'],
}
$snmp_ro_community = $passwords::network::snmp_ro_community
--
To view, visit https://gerrit.wikimedia.org/r/166380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dcafdf56526d0ecadd83656e447985deaf45c95
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] netmon1001's ganglia aggregator pmtpa removal - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: netmon1001's ganglia aggregator pmtpa removal
..
netmon1001's ganglia aggregator pmtpa removal
Replace it with codfw
Change-Id: I1dcafdf56526d0ecadd83656e447985deaf45c95
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 04d15da..dd3a650 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2097,7 +2097,7 @@
include role::servermon
class { 'ganglia_new::monitor::aggregator':
-sites = ['pmtpa', 'eqiad'],
+sites = ['eqiad', 'codfw'],
}
$snmp_ro_community = $passwords::network::snmp_ro_community
--
To view, visit https://gerrit.wikimedia.org/r/166380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1dcafdf56526d0ecadd83656e447985deaf45c95
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: consistency tweaks - change (mediawiki...Interwiki)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166381
Change subject: i18n: consistency tweaks
..
i18n: consistency tweaks
- Use otherlanguages message
Change-Id: Ifce536d1015b71856213823b9ab6472fd27a8c99
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Interwiki
refs/changes/81/166381/1
diff --git a/i18n/en.json b/i18n/en.json
index 8e06982..c934721 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,5 +67,5 @@
interwiki-links: Interwiki prefixes,
interwiki-description: ,
interwiki-language-links: Interlanguage prefixes,
-interwiki-language-description: These prefixes match defined language
codes, and will be used to create the 'in other languages' listing when added
to a page.
+interwiki-language-description: These prefixes match defined language
codes, and will be used to create the \{{int:otherlanguages}}\ listing when
added to a page.
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3897b9a..b392078 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -77,5 +77,5 @@
interwiki-links: Used on [[Special:Interwiki]] as header text for
interwiki prefix table if no global table is present,
interwiki-description: {{notranslate}}\nAppears under the
interwiki-links header on [[Special:Interwiki]],
interwiki-language-links: Used on [[Special:Interwiki]] as header
text for interwiki language prefix table,
- interwiki-language-description: Appears under the
interwiki-language-links header on [[Special:Interwiki]]; explains what
interlanguage links do
+ interwiki-language-description: Appears under the
interwiki-language-links header on [[Special:Interwiki]]; explains what
interlanguage links do.\n\nRefers to {{msg-mw|Otherlanguages}}.
}
--
To view, visit https://gerrit.wikimedia.org/r/166381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifce536d1015b71856213823b9ab6472fd27a8c99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] refactored BurndownData and created abstract SprintView class - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: refactored BurndownData and created abstract SprintView class
..
refactored BurndownData and created abstract SprintView class
Change-Id: I926cb70cf238fb9d1251c64ca63953ea20d392c4
---
M __phutil_library_map__.php
M src/BurndownApplication.php
M src/BurndownController.php
R src/BurndownDataView.php
A src/BurndownDataViewController.php
M src/BurndownListController.php
M src/SprintConstants.php
M src/SprintReportController.php
A src/SprintView.php
9 files changed, 166 insertions(+), 108 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/__phutil_library_map__.php b/__phutil_library_map__.php
index 39775ae..faf7a05 100644
--- a/__phutil_library_map__.php
+++ b/__phutil_library_map__.php
@@ -12,25 +12,29 @@
'BurndownActionMenuEventListener' =
'src/BurndownActionMenuEventListener.php',
'BurndownApplication' = 'src/BurndownApplication.php',
'BurndownController' = 'src/BurndownController.php',
-'BurndownData' = 'src/BurndownData.php',
'BurndownDataDate' = 'src/BurndownDataDate.php',
+'BurndownDataView' = 'src/BurndownDataView.php',
+'BurndownDataViewController' = 'src/BurndownDataViewController.php',
'BurndownException' = 'src/BurndownException.php',
'BurndownListController' = 'src/BurndownListController.php',
'BurndownTestDataGenerator' = 'src/BurndownTestDataGenerator.php',
'SprintConstants' = 'src/SprintConstants.php',
-'SprintStartDateField' = 'src/SprintStartDateField.php',
'SprintEndDateField' = 'src/SprintEndDateField.php',
'SprintProjectCustomField' = 'src/SprintProjectCustomField.php',
'SprintReportController' = 'src/SprintReportController.php',
+'SprintStartDateField' = 'src/SprintStartDateField.php',
'SprintTaskStoryPointsField' = 'src/SprintTaskStoryPointsField.php',
+'SprintView' = 'src/SprintView.php',
),
'function' = array(),
'xmap' = array(
'BurndownActionMenuEventListener' = 'PhabricatorEventListener',
'BurndownApplication' = 'PhabricatorApplication',
'BurndownController' = 'PhabricatorController',
+'BurndownDataView' = 'SprintView',
+'BurndownDataViewController' = 'BurndownController',
'BurndownException' = 'Exception',
-'BurndownListController' = 'PhabricatorController',
+'BurndownListController' = 'BurndownController',
'BurndownTestDataGenerator' = 'PhabricatorTestDataGenerator',
'SprintConstants' = 'ManiphestConstants',
'SprintStartDateField' = 'SprintProjectCustomField',
@@ -39,10 +43,11 @@
'PhabricatorProjectCustomField',
'PhabricatorStandardCustomFieldInterface',
),
-'SprintReportController' = 'ManiphestController',
+'SprintReportController' = 'BurndownController',
'SprintTaskStoryPointsField' = array(
-'ManiphestCustomField',
-'PhabricatorStandardCustomFieldInterface',
+ 'ManiphestCustomField',
+ 'PhabricatorStandardCustomFieldInterface',
),
+'SprintView' = 'AphrontView',
),
));
diff --git a/src/BurndownApplication.php b/src/BurndownApplication.php
index 98413e3..3033320 100644
--- a/src/BurndownApplication.php
+++ b/src/BurndownApplication.php
@@ -35,7 +35,7 @@
'report/' = 'BurndownListController',
'report/list/' = 'BurndownListController',
'report/(?:(?Pview\w+)/)?' = 'SprintReportController',
-'view/(?Pid\d+)/' = 'BurndownController',
+'view/(?Pid\d+)/' = 'BurndownDataViewController',
),
);
}
diff --git a/src/BurndownController.php b/src/BurndownController.php
index 59fa771..55e2694 100644
--- a/src/BurndownController.php
+++ b/src/BurndownController.php
@@ -4,71 +4,65 @@
* Licensed under GNU GPL v3. See LICENSE for full details
*/
-final class BurndownController extends PhabricatorController {
+abstract class BurndownController extends PhabricatorController {
- // Project data
- private $projectID;
-
- public function shouldAllowPublic() {
+public function shouldAllowPublic() {
return true;
}
- public function willProcessRequest(array $data) {
-$this-projectID = $data['id'];
- }
+ public function getProjectsURI() {
+return '/project/';
+ }
- public function processRequest() {
+ public function buildApplicationMenu() {
+return $this-buildSideNavView(true)-getMenu();
+ }
-$request = $this-getRequest();
-$viewer = $request-getUser();
+ public function buildSideNavView($for_app = false) {
+$user = $this-getRequest()-getUser();
-// Load the project we're looking at, based on the project ID in the URL.
-$project = id(new PhabricatorProjectQuery())
- -setViewer($viewer)
- -withIDs(array($this-projectID))
- -executeOne();
-if (!$project) {
- return new Aphront404Response();
+$nav = new AphrontSideNavFilterView();
[MediaWiki-commits] [Gerrit] Add public policy to List and Report Controllers - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: Add public policy to List and Report Controllers
..
Add public policy to List and Report Controllers
Change-Id: I9ff43d6e1b30596c8a2607e0f0dc6b3a24b34881
---
M src/BurndownListController.php
M src/SprintReportController.php
2 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/BurndownListController.php b/src/BurndownListController.php
index d836777..3fc90eb 100644
--- a/src/BurndownListController.php
+++ b/src/BurndownListController.php
@@ -8,6 +8,10 @@
private $view;
+ public function shouldAllowPublic() {
+return true;
+ }
+
public function processRequest() {
$request = $this-getRequest();
diff --git a/src/SprintReportController.php b/src/SprintReportController.php
index c7f65e5..56dacbf 100644
--- a/src/SprintReportController.php
+++ b/src/SprintReportController.php
@@ -3,7 +3,11 @@
final class SprintReportController extends ManiphestController {
private $view;
- //private $type_status = 'core:customfield';
+
+ public function shouldAllowPublic() {
+return true;
+ }
+
public function willProcessRequest(array $data) {
$this-view = idx($data, 'view');
}
@@ -203,6 +207,14 @@
$col_header = pht('Project');
$header = pht('Open Tasks by Project and Priority (%s)', $date);
break;
+ default:
+$result = array();
+$result_closed = array();
+$base_link = null;
+$leftover = array();
+$leftover_closed = array();
+$leftover_name = null;
+break;
}
$phids = array_keys($result);
--
To view, visit https://gerrit.wikimedia.org/r/166183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ff43d6e1b30596c8a2607e0f0dc6b3a24b34881
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated getPrefixedId in Repo - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166382
Change subject: Replace deprecated getPrefixedId in Repo
..
Replace deprecated getPrefixedId in Repo
Change-Id: I6b59524a81a37f198d1f60c7ade446395cb6f5fe
---
M repo/Wikibase.hooks.php
M repo/includes/ChangeOp/ChangeOpClaimRemove.php
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/includes/api/ModifyEntity.php
M repo/includes/api/SearchEntities.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/EntityViewTest.php
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M repo/tests/phpunit/includes/api/SetReferenceTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
32 files changed, 55 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/82/166382/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index a08e42b..a1140ce 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -652,9 +652,9 @@
$entityType = preg_replace( '/^wikibase-/i',
'', $entityContent-getEntity()-getType() );
// add class to body so it's clear this is a wb
item:
- $bodyAttrs['class'] .= wb-entitypage
wb-{$entityType}page;
+ $bodyAttrs['class'] .= ' wb-entitypage wb-' .
$entityType . 'page';
// add another class with the ID of the item:
- $bodyAttrs['class'] .=
wb-{$entityType}page-{$entityContent-getEntityId()-getPrefixedId()};
+ $bodyAttrs['class'] .= ' wb-' . $entityType .
'page-' . $entityContent-getEntityId()-getSerialization();
if ( $sk-getRequest()-getCheck( 'diff' ) ) {
$bodyAttrs['class'] .= ' wb-diffpage';
diff --git a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
index 82758e2..6084a14 100644
--- a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
@@ -88,7 +88,7 @@
*/
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
- return array( array( $propertyId-getPrefixedId() = $mainSnak
) );
+ return array( array( $propertyId-getSerialization() =
$mainSnak ) );
}
/**
diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index 5d7a536..9687a1a 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -146,7 +146,7 @@
*/
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
- return array( array( $propertyId-getPrefixedId() = $mainSnak
) );
+ return array( array( $propertyId-getSerialization() =
$mainSnak ) );
}
/**
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index 0341bb6..31c663f 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -111,7 +111,7 @@
*/
protected function addQualifier( Snaks $qualifiers, Summary $summary =
null ) {
if ( $qualifiers-hasSnak( $this-snak ) ) {
- throw new ChangeOpException( Claim has already a
qualifier with hash {$this-snak-getHash()}
[MediaWiki-commits] [Gerrit] Replace deprecated getPrefixedId in Client and Lib - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166383
Change subject: Replace deprecated getPrefixedId in Client and Lib
..
Replace deprecated getPrefixedId in Client and Lib
In case you wonder, the removed method is unused and broken anyway.
Change-Id: I6fa896855890d4195663a946a9a67356ee47a3f6
---
M client/includes/ChangeHandler.php
M client/includes/LangLinkHandler.php
M lib/includes/changes/EntityChangeFactory.php
M lib/includes/formatters/EntityIdHtmlLinkFormatter.php
M lib/includes/formatters/EntityIdLabelFormatter.php
M lib/includes/serializers/ByPropertyListSerializer.php
M lib/includes/serializers/ClaimSerializer.php
M lib/includes/serializers/EntitySerializer.php
M lib/includes/serializers/ReferenceSerializer.php
M lib/includes/serializers/SnakSerializer.php
M lib/includes/store/sql/SiteLinkTable.php
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/ChangesTableTest.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/changes/EntityChangeTest.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
M lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
21 files changed, 41 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/166383/1
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index 9601647..4fc108c 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -211,7 +211,7 @@
$groups = array();
foreach ( $changes as $change ) {
- $id = $change-getEntityId()-getPrefixedId();
+ $id = $change-getEntityId()-getSerialization();
if ( !isset( $groups[$id] ) ) {
$groups[$id] = array();
@@ -466,8 +466,6 @@
return 0;
}
-
- //
==
/**
* Handle the provided changes.
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 1da6aa2..cc93b8b 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -120,8 +120,8 @@
$itemId = $this-getItemIdForTitle( $title );
if ( $itemId !== null ) {
- wfDebugLog( __CLASS__, __FUNCTION__ . : Item ID for
. $title-getFullText()
- . is . $itemId-getPrefixedId() );
+ wfDebugLog( __CLASS__, __FUNCTION__ . ': Item ID for '
. $title-getFullText()
+ . ' is ' . $itemId-getSerialization() );
//NOTE: SiteLinks we could get from
$this-siteLinkLookup do not contain badges,
// so we have to fetch the links from the Item.
diff --git a/lib/includes/changes/EntityChangeFactory.php
b/lib/includes/changes/EntityChangeFactory.php
index ec39d86..7f24474 100644
--- a/lib/includes/changes/EntityChangeFactory.php
+++ b/lib/includes/changes/EntityChangeFactory.php
@@ -49,7 +49,6 @@
$this-entityFactory = $entityFactory;
}
-
/**
* @since 0.5
*
@@ -76,7 +75,7 @@
);
if ( !$instance-hasField( 'object_id' ) ) {
- $instance-setField( 'object_id',
$entityId-getPrefixedId() );
+ $instance-setField( 'object_id',
$entityId-getSerialization() );
}
if ( !$instance-hasField( 'info' ) ) {
diff --git a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
index a3a6b0f..b813795 100644
--- a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
@@ -47,14 +47,14 @@
if ( isset( $this-entityTitleLookup ) ) {
$title = $this-entityTitleLookup-getTitleForId(
$entityId );
} else {
- $title = Title::newFromText( $entityId-getPrefixedId()
);
+ $title = Title::newFromText(
$entityId-getSerialization() );
}
$attributes = array(
'title' = $title-getPrefixedText(),
'href' = $title-getLocalURL()
);
- $label = $entityId-getPrefixedId();
+ $label = $entityId-getSerialization();
if ( $this-getOption( self::OPT_LOOKUP_LABEL ) ) {
try {
[MediaWiki-commits] [Gerrit] Cleanup previous EntityIdParser cleanup - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166385
Change subject: Cleanup previous EntityIdParser cleanup
..
Cleanup previous EntityIdParser cleanup
This fixes some minor details introduced in Ie6cc3dd.
Change-Id: Ib3565635f0e5d86b51b36a1dd409cc1c36d44d6e
---
M repo/includes/api/ModifyEntity.php
M repo/includes/specials/SpecialSetSiteLink.php
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/166385/1
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 7008013..7fd5b53 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -21,7 +21,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\StringNormalizer;
use Wikibase\Summary;
-use WikiPage;
/**
* Base class for API modules modifying a single entity identified based on id
xor a combination of site and page title.
@@ -197,7 +196,7 @@
foreach ( $badgesParams as $badgeSerialization ) {
try {
$badgeId = new ItemId( $badgeSerialization );
- } catch( InvalidArgumentException $e ) {
+ } catch ( InvalidArgumentException $ex ) {
$this-dieError( 'Badges: could not parse ' .
$badgeSerialization
. ', the id is invalid',
'invalid-entity-id' );
continue;
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index d2eadb3..84e5c36 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -3,6 +3,7 @@
namespace Wikibase\Repo\Specials;
use Html;
+use InvalidArgumentException;
use OutOfBoundsException;
use Status;
use Wikibase\ChangeOp\ChangeOpException;
@@ -10,7 +11,6 @@
use Wikibase\CopyrightMessageBuilder;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\WikibaseRepo;
--
To view, visit https://gerrit.wikimedia.org/r/166385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3565635f0e5d86b51b36a1dd409cc1c36d44d6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert WIP: Added initial Debian package - change (operations...apertium-apy)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166386
Change subject: Revert WIP: Added initial Debian package
..
Revert WIP: Added initial Debian package
This reverts commit 6b8556e1adc0dcda1ff5d158c4b5a5a29e634bfe.
Change-Id: Icd79b08fa15d54a320a362cbc9b3a69f147f41ce
---
D debian/README.source
D debian/apertium-apy.init
D debian/apertium-apy.install
D debian/apertium-apy.logratate
D debian/apertium-apy.postinst
D debian/apertium-apy.postrm
D debian/apertium-apy.service
D debian/changelog
D debian/compat
D debian/control
D debian/copyright
D debian/rules
D debian/source/format
D debian/upstart/apertium-apy.conf
D debian/watch
15 files changed, 0 insertions(+), 430 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-apy
refs/changes/86/166386/1
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 535fcd7..000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-apertium-apy for Debian
-
-apertium-apy is part of apertium-tools from upstream Apertium repository.
-
- -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 21:21:33 +0530
-
diff --git a/debian/apertium-apy.init b/debian/apertium-apy.init
deleted file mode 100644
index 673c8bb..000
--- a/debian/apertium-apy.init
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: apertium-apy
-# Required-Start:$local_fs $network $remote_fs $syslog
-# Required-Stop: $local_fs $network $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Apertium APY service
-# Description: Apertium APY is simple API for Apertium written in Python3
-### END INIT INFO
-
-# Authors: Gabriel Wicke gwi...@wikimedia.org,
-# Kartik Mistry kmis...@wikimedia.org
-
-# Do NOT set -e
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=Apertium APY service
-NAME=apertium-apy
-SCRIPT_PATH=/usr/share/apertium-apy/servlet.py
-DAEMON=python3 $SCRIPT_PATH -p 80 /usr/share/apertium/modes
-DAEMON_ARGS=
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -e $SCRIPT_PATH ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] . /etc/default/$NAME
-
-# export the port and host env vars, if set
-export PORT
-export INTERFACE
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # up the number of fds [sockets] from 1024
- ulimit -n 64000
-
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- # calling /bin/sh is a hack needed to get output redirection on Ubuntu
- # 12.04 LTS, see below
- start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
- -c apertium:apertium --test \
- --exec /bin/sh -- \
- -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
- -c apertium:apertium \
- --exec /bin/sh -- \
- -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
- || return 2
- echo Started apertium-apy on port $PORT
-
- # Cleaner version of the above, but does not work with Ubuntu 12.04
- # LTS as the --no-close parameter is not yet supported there
- #start-stop-daemon --start --quiet --pidfile $PIDFILE -bm --no-close \
- # -c apertium:apertium \
- # --exec $DAEMON -- $DAEMON_ARGS
/var/log/apertium/apertium-apy.log 21 \
- # || return 2
-
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-sleep 5
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/60/KILL/5 --pidfile
$PIDFILE --name $NAME
- RETVAL=$?
- [ $RETVAL = 2 ] return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
[MediaWiki-commits] [Gerrit] Revert WIP: Added initial Debian package - change (operations...apertium-apy)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert WIP: Added initial Debian package
..
Revert WIP: Added initial Debian package
This reverts commit 6b8556e1adc0dcda1ff5d158c4b5a5a29e634bfe.
Change-Id: Icd79b08fa15d54a320a362cbc9b3a69f147f41ce
---
D debian/README.source
D debian/apertium-apy.init
D debian/apertium-apy.install
D debian/apertium-apy.logratate
D debian/apertium-apy.postinst
D debian/apertium-apy.postrm
D debian/apertium-apy.service
D debian/changelog
D debian/compat
D debian/control
D debian/copyright
D debian/rules
D debian/source/format
D debian/upstart/apertium-apy.conf
D debian/watch
15 files changed, 0 insertions(+), 430 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 535fcd7..000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-apertium-apy for Debian
-
-apertium-apy is part of apertium-tools from upstream Apertium repository.
-
- -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 21:21:33 +0530
-
diff --git a/debian/apertium-apy.init b/debian/apertium-apy.init
deleted file mode 100644
index 673c8bb..000
--- a/debian/apertium-apy.init
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: apertium-apy
-# Required-Start:$local_fs $network $remote_fs $syslog
-# Required-Stop: $local_fs $network $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Apertium APY service
-# Description: Apertium APY is simple API for Apertium written in Python3
-### END INIT INFO
-
-# Authors: Gabriel Wicke gwi...@wikimedia.org,
-# Kartik Mistry kmis...@wikimedia.org
-
-# Do NOT set -e
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=Apertium APY service
-NAME=apertium-apy
-SCRIPT_PATH=/usr/share/apertium-apy/servlet.py
-DAEMON=python3 $SCRIPT_PATH -p 80 /usr/share/apertium/modes
-DAEMON_ARGS=
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -e $SCRIPT_PATH ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] . /etc/default/$NAME
-
-# export the port and host env vars, if set
-export PORT
-export INTERFACE
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # up the number of fds [sockets] from 1024
- ulimit -n 64000
-
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- # calling /bin/sh is a hack needed to get output redirection on Ubuntu
- # 12.04 LTS, see below
- start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
- -c apertium:apertium --test \
- --exec /bin/sh -- \
- -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
- -c apertium:apertium \
- --exec /bin/sh -- \
- -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
- || return 2
- echo Started apertium-apy on port $PORT
-
- # Cleaner version of the above, but does not work with Ubuntu 12.04
- # LTS as the --no-close parameter is not yet supported there
- #start-stop-daemon --start --quiet --pidfile $PIDFILE -bm --no-close \
- # -c apertium:apertium \
- # --exec $DAEMON -- $DAEMON_ARGS
/var/log/apertium/apertium-apy.log 21 \
- # || return 2
-
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-sleep 5
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/60/KILL/5 --pidfile
$PIDFILE --name $NAME
- RETVAL=$?
- [ $RETVAL = 2 ] return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
-
[MediaWiki-commits] [Gerrit] Replace deprecated getPrefixedId in Client and Lib - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated getPrefixedId in Client and Lib
..
Replace deprecated getPrefixedId in Client and Lib
In case you wonder, the removed method is unused and broken anyway.
Change-Id: I6fa896855890d4195663a946a9a67356ee47a3f6
---
M client/includes/ChangeHandler.php
M client/includes/LangLinkHandler.php
M lib/includes/changes/EntityChangeFactory.php
M lib/includes/formatters/EntityIdHtmlLinkFormatter.php
M lib/includes/formatters/EntityIdLabelFormatter.php
M lib/includes/serializers/ByPropertyListSerializer.php
M lib/includes/serializers/ClaimSerializer.php
M lib/includes/serializers/EntitySerializer.php
M lib/includes/serializers/ReferenceSerializer.php
M lib/includes/serializers/SnakSerializer.php
M lib/includes/store/sql/SiteLinkTable.php
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/ChangesTableTest.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/changes/EntityChangeTest.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
M lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
21 files changed, 41 insertions(+), 70 deletions(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index 9601647..4fc108c 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -211,7 +211,7 @@
$groups = array();
foreach ( $changes as $change ) {
- $id = $change-getEntityId()-getPrefixedId();
+ $id = $change-getEntityId()-getSerialization();
if ( !isset( $groups[$id] ) ) {
$groups[$id] = array();
@@ -466,8 +466,6 @@
return 0;
}
-
- //
==
/**
* Handle the provided changes.
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 1da6aa2..cc93b8b 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -120,8 +120,8 @@
$itemId = $this-getItemIdForTitle( $title );
if ( $itemId !== null ) {
- wfDebugLog( __CLASS__, __FUNCTION__ . : Item ID for
. $title-getFullText()
- . is . $itemId-getPrefixedId() );
+ wfDebugLog( __CLASS__, __FUNCTION__ . ': Item ID for '
. $title-getFullText()
+ . ' is ' . $itemId-getSerialization() );
//NOTE: SiteLinks we could get from
$this-siteLinkLookup do not contain badges,
// so we have to fetch the links from the Item.
diff --git a/lib/includes/changes/EntityChangeFactory.php
b/lib/includes/changes/EntityChangeFactory.php
index ec39d86..7f24474 100644
--- a/lib/includes/changes/EntityChangeFactory.php
+++ b/lib/includes/changes/EntityChangeFactory.php
@@ -49,7 +49,6 @@
$this-entityFactory = $entityFactory;
}
-
/**
* @since 0.5
*
@@ -76,7 +75,7 @@
);
if ( !$instance-hasField( 'object_id' ) ) {
- $instance-setField( 'object_id',
$entityId-getPrefixedId() );
+ $instance-setField( 'object_id',
$entityId-getSerialization() );
}
if ( !$instance-hasField( 'info' ) ) {
diff --git a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
index a3a6b0f..b813795 100644
--- a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
@@ -47,14 +47,14 @@
if ( isset( $this-entityTitleLookup ) ) {
$title = $this-entityTitleLookup-getTitleForId(
$entityId );
} else {
- $title = Title::newFromText( $entityId-getPrefixedId()
);
+ $title = Title::newFromText(
$entityId-getSerialization() );
}
$attributes = array(
'title' = $title-getPrefixedText(),
'href' = $title-getLocalURL()
);
- $label = $entityId-getPrefixedId();
+ $label = $entityId-getSerialization();
if ( $this-getOption( self::OPT_LOOKUP_LABEL ) ) {
try {
diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php
[MediaWiki-commits] [Gerrit] Don't use EntityIdParser if only ItemIds are supported - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't use EntityIdParser if only ItemIds are supported
..
Don't use EntityIdParser if only ItemIds are supported
Also improved some error messages.
Change-Id: Ie6cc3dd47fca2423d33acc258f5eadeb117dcfea
---
M repo/includes/api/ModifyEntity.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
3 files changed, 12 insertions(+), 24 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 22b7e2d..7008013 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -4,6 +4,7 @@
use ApiBase;
use ApiMain;
+use InvalidArgumentException;
use LogicException;
use Status;
use UsageException;
@@ -20,6 +21,7 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\StringNormalizer;
use Wikibase\Summary;
+use WikiPage;
/**
* Base class for API modules modifying a single entity identified based on id
xor a combination of site and page title.
@@ -194,16 +196,11 @@
foreach ( $badgesParams as $badgeSerialization ) {
try {
- $badgeId = $this-getIdParser()-parse(
$badgeSerialization );
- } catch( EntityIdParsingException $e ) {
+ $badgeId = new ItemId( $badgeSerialization );
+ } catch( InvalidArgumentException $e ) {
$this-dieError( 'Badges: could not parse ' .
$badgeSerialization
- . ', the id is invalid',
'no-such-entity-id' );
- $badgeId = null;
- }
-
- if ( !( $badgeId instanceof ItemId ) ) {
- $this-dieError( 'Badges: entity with id ' .
$badgeSerialization
- . ' is not an item', 'not-item' );
+ . ', the id is invalid',
'invalid-entity-id' );
+ continue;
}
if ( !array_key_exists( $badgeId-getPrefixedId(),
$this-badgeItems ) ) {
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 83deb8f..d2eadb3 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -413,22 +413,13 @@
* @return ItemId[]|boolean
*/
protected function parseBadges( array $badges, Status $status ) {
- $repo = WikibaseRepo::getDefaultInstance();
-
- $entityIdParser = $repo-getEntityIdParser();
-
$badgesObjects = array();
foreach ( $badges as $badge ) {
try {
- $badgeId = $entityIdParser-parse( $badge );
- } catch ( EntityIdParsingException $ex ) {
- $status-fatal(
'wikibase-setsitelink-not-badge', $badge );
- return false;
- }
-
- if ( !( $badgeId instanceof ItemId ) ) {
- $status-fatal(
'wikibase-setsitelink-not-item', $badgeId-getPrefixedId() );
+ $badgeId = new ItemId( $badge );
+ } catch ( InvalidArgumentException $ex ) {
+ $status-fatal(
'wikibase-wikibaserepopage-not-itemid', $badge );
return false;
}
@@ -440,7 +431,7 @@
$itemTitle = $this-getEntityTitle( $badgeId );
if ( is_null( $itemTitle ) || !$itemTitle-exists() ) {
- $status-fatal(
'wikibase-setsitelink-not-badge', $badgeId );
+ $status-fatal(
'wikibase-wikibaserepopage-invalid-id', $badgeId );
return false;
}
diff --git a/repo/tests/phpunit/includes/api/EditEntityTest.php
b/repo/tests/phpunit/includes/api/EditEntityTest.php
index 9a58b4f..5ae6c0e 100644
--- a/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -459,10 +459,10 @@
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'not-recognized', 'message' = 'Unknown key in
json: remove' ) ) ),
'bad badge id' = array( // bad badge id
'p' = array( 'site' = 'enwiki', 'title' =
'Berlin', 'data' =
'{sitelinks:{dewiki:{site:dewiki,title:TestPage!,badges:[abc,%Q149%]}}}'
),
- 'e' = array(
[MediaWiki-commits] [Gerrit] Cleanup previous EntityIdParser cleanup - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup previous EntityIdParser cleanup
..
Cleanup previous EntityIdParser cleanup
This fixes some minor details introduced in Ie6cc3dd.
Change-Id: Ib3565635f0e5d86b51b36a1dd409cc1c36d44d6e
---
M repo/includes/api/ModifyEntity.php
M repo/includes/specials/SpecialSetSiteLink.php
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 7008013..7fd5b53 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -21,7 +21,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\StringNormalizer;
use Wikibase\Summary;
-use WikiPage;
/**
* Base class for API modules modifying a single entity identified based on id
xor a combination of site and page title.
@@ -197,7 +196,7 @@
foreach ( $badgesParams as $badgeSerialization ) {
try {
$badgeId = new ItemId( $badgeSerialization );
- } catch( InvalidArgumentException $e ) {
+ } catch ( InvalidArgumentException $ex ) {
$this-dieError( 'Badges: could not parse ' .
$badgeSerialization
. ', the id is invalid',
'invalid-entity-id' );
continue;
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index d2eadb3..84e5c36 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -3,6 +3,7 @@
namespace Wikibase\Repo\Specials;
use Html;
+use InvalidArgumentException;
use OutOfBoundsException;
use Status;
use Wikibase\ChangeOp\ChangeOpException;
@@ -10,7 +11,6 @@
use Wikibase\CopyrightMessageBuilder;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\WikibaseRepo;
--
To view, visit https://gerrit.wikimedia.org/r/166385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3565635f0e5d86b51b36a1dd409cc1c36d44d6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166389
Change subject: Update Metrolook
..
Update Metrolook
* Fixes Bugs
* Renames theme.css to theme.less
`
Change-Id: I7cff4fe248275aa7bae0a7cfab89b3636897792e
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 201 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/89/166389/1
diff --git a/Metrolook.php b/Metrolook.php
index a2a3974..08ba2cc 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '1.3.1',
+ 'version' = '1.3.3',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -82,7 +82,6 @@
'styles' = array(
'Metrolook/screen.less' = array( 'media' = 'screen' ),
'Metrolook/screen-hd.less' = array( 'media' = 'screen and
(min-width: 982px)' ),
- 'Metrolook/theme.css' = array( 'media' = 'screen' ),
'Metrolook/special.less',
'Metrolook/special.preferences.less',
),
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index a69ae45..d46f1e8 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -152,7 +152,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -160,10 +160,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -333,7 +333,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index 6f30b73..a708032 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,18 @@
background-image: url('images/page-fade.png');
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+min-width:65em;
+}
+}
+
div.vectorTabs a:hover {
background-color: blue;
}
@@ -249,6 +261,7 @@
1.x.x requires MediaWiki 1.23.
+0.3.x
[MediaWiki-commits] [Gerrit] Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomain... - change (operations/mediawiki-config)
Dan-nl has uploaded a new change for review. https://gerrit.wikimedia.org/r/166390 Change subject: Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomains whitelist .. Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomains whitelist Bug: 71990 Change-Id: I4028ec3cae95544799e0c39b706bb7848c0d3b46 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/166390/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8cba3a6..a5bf24d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10775,6 +10775,7 @@ '*.beeldbank.cultureelerfgoed.nl', // Cultureel Erfgoed - bug 70840 '*.metilli.com',// Mart Museum - bug 71460 '*.nijmegen.nl',// Nijmegen - bug 71191 + 'edh-www.adw.uni-heidelberg.de/', // Heidelberg Academy of Sciences and Humanities, Epigraphic Database - bug 71990 ), ), -- To view, visit https://gerrit.wikimedia.org/r/166390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4028ec3cae95544799e0c39b706bb7848c0d3b46 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dan-nl d_ent...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translateAnnotations with partial mapping - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: translateAnnotations with partial mapping
..
translateAnnotations with partial mapping
LinearDoc:
* Allow partial rangeMappings for translateAnnotations
* Fallback to plaintext where range info is incomplete
* Fallback to segment end placement for references
* Inline span['data-mw'] (like img) if it only contains whitespace
LinearDoc.test.js, translate.test.json
* Test translateAnnotations with plaintext translation and range mapping
Change-Id: I960dbe6155a5ea859b716e4a8748002a513618a6
---
M lineardoc/LinearDoc.js
M tests/lineardoc/LinearDoc.test.js
A tests/lineardoc/translate.test.json
3 files changed, 235 insertions(+), 13 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lineardoc/LinearDoc.js b/lineardoc/LinearDoc.js
index 92e8549..58a0cdd 100644
--- a/lineardoc/LinearDoc.js
+++ b/lineardoc/LinearDoc.js
@@ -316,20 +316,137 @@
* @returns {TextBlock} Translated textblock with annotations applied
*/
TextBlock.prototype.translateAnnotations = function ( targetText,
rangeMappings ) {
- var i, len, rangeMapping, oldTextChunk, newText,
- newTextChunks = [];
+ var i, iLen, j, rangeMapping, sourceTextChunk, text, pos, textChunk,
offset,
+ sourceRangeEnd, targetRangeEnd, tail, tailSpace,
+ // map of { offset: x, textChunks: [...] }
+ emptyTextChunks = {},
+ emptyTextChunkOffsets = [],
+ // list of { start: x, length: x, textChunk: x }
+ textChunks = [];
- for ( i = 0, len = rangeMappings.length; i len; i++ ) {
- rangeMapping = rangeMappings[ i ];
- oldTextChunk = this.getTextChunkAt( rangeMapping.source.start );
- newText = targetText.substr( rangeMapping.target.start,
rangeMapping.target.length );
- newTextChunks.push( new TextChunk(
- newText,
- oldTextChunk.tags,
- oldTextChunk.inlineContent
- ) );
+ function pushEmptyTextChunks( offset, chunks ) {
+ var c, cLen;
+ for ( c = 0, cLen = chunks.length; c cLen; c++ ) {
+ textChunks.push( {
+ start: offset,
+ length: 0,
+ textChunk: chunks[ c ]
+ } );
+ }
}
- return new TextBlock( newTextChunks );
+
+ // Create map of empty text chunks, by offset
+ for ( i = 0, iLen = this.textChunks.length; i iLen; i++ ) {
+ textChunk = this.textChunks[ i ];
+ offset = this.startOffsets[ i ];
+ if ( textChunk.text.length 0 ) {
+ continue;
+ }
+ if ( !emptyTextChunks[ offset ] ) {
+ emptyTextChunks[ offset ] = [];
+ }
+ emptyTextChunks[ offset ].push( textChunk );
+ }
+ for ( offset in emptyTextChunks ) {
+ emptyTextChunkOffsets.push( offset );
+ }
+ emptyTextChunkOffsets.sort( function ( a, b ) { return a - b; } );
+
+ for ( i = 0, iLen = rangeMappings.length; i iLen; i++ ) {
+ // Copy annotations from source text start offset
+ rangeMapping = rangeMappings[ i ];
+ sourceRangeEnd = rangeMapping.source.start +
rangeMapping.source.length;
+ targetRangeEnd = rangeMapping.target.start +
rangeMapping.target.length;
+ sourceTextChunk = this.getTextChunkAt(
rangeMapping.source.start );
+ text = targetText.substr( rangeMapping.target.start,
rangeMapping.target.length );
+ textChunks.push( {
+ start: rangeMapping.target.start,
+ length: rangeMapping.target.length,
+ textChunk: new TextChunk(
+ text,
+ sourceTextChunk.tags,
+ sourceTextChunk.inlineContent
+ )
+ } );
+
+ // Empty source text chunks will not be represented in the
target plaintext
+ // (because they have no plaintext representation). Therefore
we must clone each
+ // one manually into the target rich text.
+
+ // Iterate through all remaining emptyTextChunks
+ for ( j = 0; j emptyTextChunkOffsets.length; j++ ) {
+ offset = emptyTextChunkOffsets[ j ];
+ // Check whether chunk is in range
+ if ( offset rangeMapping.source.start || offset
sourceRangeEnd ) {
+ continue;
+ }
+ //
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
* Fixes Bugs
* Renames theme.css to theme.less
Change-Id: I7cff4fe248275aa7bae0a7cfab89b3636897792e
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 201 insertions(+), 28 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index a2a3974..08ba2cc 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '1.3.1',
+ 'version' = '1.3.3',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -82,7 +82,6 @@
'styles' = array(
'Metrolook/screen.less' = array( 'media' = 'screen' ),
'Metrolook/screen-hd.less' = array( 'media' = 'screen and
(min-width: 982px)' ),
- 'Metrolook/theme.css' = array( 'media' = 'screen' ),
'Metrolook/special.less',
'Metrolook/special.preferences.less',
),
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index a69ae45..d46f1e8 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -152,7 +152,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -160,10 +160,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -333,7 +333,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index 6f30b73..a708032 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,18 @@
background-image: url('images/page-fade.png');
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+min-width:65em;
+}
+}
+
div.vectorTabs a:hover {
background-color: blue;
}
@@ -249,6 +261,7 @@
1.x.x requires MediaWiki 1.23.
+0.3.x requires MediaWiki 1.22.
## Removed things
diff --git
[MediaWiki-commits] [Gerrit] Derive MT subsentence map from uppercasing - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Derive MT subsentence map from uppercasing
..
Derive MT subsentence map from uppercasing
See https://www.mediawiki.org/wiki/Content_translation/Markup
bin/apertium-xhtml
* Executable script for testing
mt/Apertium.js
* Subsentence map detection logic
lineardoc/LinearDoc.js
* Tag range info functionality
tests/*
* Unit tests for subsentence mapping
Change-Id: I6d1483e69aae979a684728f7724f6874194eee11
---
A bin/apertium-xhtml
M index.js
M lineardoc/LinearDoc.js
M mt/Apertium.js
D tests/apertium/Apertium.test.js
M tests/index.js
M tests/lineardoc/LinearDoc.test.js
M tests/lineardoc/translate.test.json
A tests/mt/Apertium.test.js
9 files changed, 509 insertions(+), 153 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/apertium-xhtml b/bin/apertium-xhtml
new file mode 100755
index 000..08d6865
--- /dev/null
+++ b/bin/apertium-xhtml
@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+var sourceLang, targetLang, sourceHtml, script, args,
+ Apertium = require( __dirname + '/../mt/Apertium.js' );
+
+script = process.argv[ 1 ];
+args = process.argv.slice( 2 );
+if ( args.length !== 2 ) {
+ process.stderr.write(
+ 'Usage: node ' + script + ' sourceLang targetLang
xhtmlSource\n\n' +
+ 'xhtml must be wrapped in a block element such as p.../p or
div../div.\n' +
+ 'Example:\n\techo pA bred/b box./p | node ' + script
+ ' en es\n\n'
+ );
+ process.exit( 1 );
+}
+
+sourceLang = args[ 0 ];
+targetLang = args[ 1 ];
+
+sourceHtml = [];
+
+process.stdin.on( 'data', function( data ) {
+ sourceHtml.push( data );
+} );
+process.stdin.on( 'end', function() {
+ Apertium.translate(
+ sourceLang,
+ targetLang,
+ sourceHtml.join( '' )
+ ).then( function( targetHtml ) {
+ process.stdout.write( targetHtml + '\n' );
+ }, function( error ) {
+ console.error( 'error', error );
+ process.exit( 2 );
+ } );
+} );
diff --git a/index.js b/index.js
index 1b309e1..f955bdb 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,6 @@
module.exports = {
Segmenter: require( './segmentation/CXSegmenter.js' ).CXSegmenter,
+ Apertium: require( './mt/Apertium.js' ),
LinearDoc: require( './lineardoc/LinearDoc.js' ),
Dictionary: require( './dictionary' )
};
diff --git a/lineardoc/LinearDoc.js b/lineardoc/LinearDoc.js
index 58a0cdd..3144bad 100644
--- a/lineardoc/LinearDoc.js
+++ b/lineardoc/LinearDoc.js
@@ -109,7 +109,7 @@
*
* @private
* @param {Object[]} tagArray SAX open tags
- * @returns [string[]] Tag names
+ * @return {string[]} Tag names
*/
function dumpTags( tagArray ) {
var i, len, tag, attr, attrDumps,
@@ -153,7 +153,7 @@
*
* @private
* @param {string} tagName The name of the tag (lowercase)
- * @returns {boolean} Whether the tag is an inline empty tag
+ * @return {boolean} Whether the tag is an inline empty tag
*/
function isInlineEmptyTag( tagName ) {
// link/meta as they're allowed anywhere in HTML5+RDFa, and must be
treated as void
@@ -166,7 +166,7 @@
*
* @private
* @param {string} tagName The name of the tag (lowercase)
- * @returns {boolean} Whether the tag is an inline annotation
+ * @return {boolean} Whether the tag is an inline annotation
*/
isInlineAnnotationTag = ( function ( tagArray ) {
var i, len,
@@ -215,7 +215,7 @@
* @param {number[]} boundaries Boundary offsets
* @param chunks Chunks to which the boundaries apply
* @param {Function} getLength Function returning the length of a chunk
- * @returns {Object[]} Array of {chunk: ch, boundaries: [...]}
+ * @return {Object[]} Array of {chunk: ch, boundaries: [...]}
*/
function getChunkBoundaryGroups( boundaries, chunks, getLength ) {
var i, len, groupBoundaries, chunk, chunkLength, boundary,
@@ -282,13 +282,28 @@
function TextBlock( textChunks ) {
var i, len, cursor;
this.textChunks = textChunks;
- this.startOffsets = [];
+ this.offsets = [];
cursor = 0;
for ( i = 0, len = this.textChunks.length; i len; i++ ) {
- this.startOffsets[i] = cursor;
- cursor += this.textChunks[i].text.length;
+ this.offsets[ i ] = { start: cursor, length: this.textChunks[ i
].text.length };
+ cursor += this.offsets[ i ].length;
}
}
+
+/**
+ * Get the start and length of each non-common annotation
+ * @return {Object[]}
+ * @return[i].start {number} Position of each text chunk
+ * @return[i].length {number} Length of each text chunk
+ */
+TextBlock.prototype.getTagOffsets = function () {
+ var textBlock = this,
+ commonTags = this.getCommonTags();
+ return this.offsets.filter( function ( offset, i ) {
+
[MediaWiki-commits] [Gerrit] Fix for bug 57964 - change (mediawiki...Translate)
Brainzest has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166391
Change subject: Fix for bug 57964
..
Fix for bug 57964
Change-Id: I8ea0d941530995ce22aed8e7f2c068da0c83c691
Removed else throw exception so the function call checkError for no headers
inside SpecialImportTranslations.php
Change-Id: I600bacbf4c2da7bcc84543360fcf7f5977bc424d
---
M ffs/GettextFFS.php
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/91/166391/1
diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php
index 50c0a9a..01abcc7 100644
--- a/ffs/GettextFFS.php
+++ b/ffs/GettextFFS.php
@@ -107,10 +107,7 @@
if ( in_array( 'fuzzy', $flags, true ) ) {
$potmode = true;
}
- } else {
- throw new MWException( Gettext file header was not
found:\n\n$data );
- }
-
+ }
$template = array();
$messages = array();
--
To view, visit https://gerrit.wikimedia.org/r/166391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I600bacbf4c2da7bcc84543360fcf7f5977bc424d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Brainzest ntekri...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166392
Change subject: Update Metrolook
..
Update Metrolook
* Fixes Bugs.
* Please see README.md for information on customizing and options.
Change-Id: Icf01ca798a2437cfde31866ecb712352a8a294ba
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 199 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/92/166392/1
diff --git a/Metrolook.php b/Metrolook.php
index 5dd719a..ae3e45e 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.4.4',
+ 'version' = '2.4.6',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -102,7 +102,6 @@
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
- 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9bd9c4c..4e4cd29 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -154,7 +154,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -162,10 +162,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -402,7 +402,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index d8bef96..c3d6884 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,18 @@
background-image: url('images/page-fade.png');
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+min-width:65em;
+}
+}
+
div.vectorTabs a:hover {
background-color: blue;
}
diff --git a/components/common.less b/components/common.less
index
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
* Fixes Bugs.
* Please see README.md for information on customizing and options.
Change-Id: Icf01ca798a2437cfde31866ecb712352a8a294ba
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 199 insertions(+), 27 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index 5dd719a..ae3e45e 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.4.4',
+ 'version' = '2.4.6',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -102,7 +102,6 @@
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
- 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9bd9c4c..4e4cd29 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -154,7 +154,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -162,10 +162,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -402,7 +402,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index d8bef96..c3d6884 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,18 @@
background-image: url('images/page-fade.png');
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+min-width:65em;
+}
+}
+
div.vectorTabs a:hover {
background-color: blue;
}
diff --git a/components/common.less b/components/common.less
index d4c08bc..7e36eb2 100644
--- a/components/common.less
+++ b/components/common.less
[MediaWiki-commits] [Gerrit] Added initial Debian packaging - change (operations...apertium-apy)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166393
Change subject: Added initial Debian packaging
..
Added initial Debian packaging
Change-Id: I7c1f5c750317b44eff962a819f8bad1fb908dbec
---
A debian/README.source
A debian/apertium-apy.init
A debian/apertium-apy.install
A debian/apertium-apy.logratate
A debian/apertium-apy.postinst
A debian/apertium-apy.postrm
A debian/apertium-apy.service
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/rules
A debian/source/format
A debian/upstart/apertium-apy.conf
A debian/watch
15 files changed, 428 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-apy
refs/changes/93/166393/1
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..535fcd7
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,7 @@
+apertium-apy for Debian
+---
+
+apertium-apy is part of apertium-tools from upstream Apertium repository.
+
+ -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 21:21:33 +0530
+
diff --git a/debian/apertium-apy.init b/debian/apertium-apy.init
new file mode 100644
index 000..673c8bb
--- /dev/null
+++ b/debian/apertium-apy.init
@@ -0,0 +1,180 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: apertium-apy
+# Required-Start:$local_fs $network $remote_fs $syslog
+# Required-Stop: $local_fs $network $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Apertium APY service
+# Description: Apertium APY is simple API for Apertium written in Python3
+### END INIT INFO
+
+# Authors: Gabriel Wicke gwi...@wikimedia.org,
+# Kartik Mistry kmis...@wikimedia.org
+
+# Do NOT set -e
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=Apertium APY service
+NAME=apertium-apy
+SCRIPT_PATH=/usr/share/apertium-apy/servlet.py
+DAEMON=python3 $SCRIPT_PATH -p 80 /usr/share/apertium/modes
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -e $SCRIPT_PATH ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# export the port and host env vars, if set
+export PORT
+export INTERFACE
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # up the number of fds [sockets] from 1024
+ ulimit -n 64000
+
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+
+ # calling /bin/sh is a hack needed to get output redirection on Ubuntu
+ # 12.04 LTS, see below
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
+ -c apertium:apertium --test \
+ --exec /bin/sh -- \
+ -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -bm \
+ -c apertium:apertium \
+ --exec /bin/sh -- \
+ -c $DAEMON $DAEMON_ARGS /var/log/apertium/apertium-apy.log
21 \
+ || return 2
+ echo Started apertium-apy on port $PORT
+
+ # Cleaner version of the above, but does not work with Ubuntu 12.04
+ # LTS as the --no-close parameter is not yet supported there
+ #start-stop-daemon --start --quiet --pidfile $PIDFILE -bm --no-close \
+ # -c apertium:apertium \
+ # --exec $DAEMON -- $DAEMON_ARGS
/var/log/apertium/apertium-apy.log 21 \
+ # || return 2
+
+ # Add code here, if necessary, that waits for the process to be ready
+ # to handle requests from services started subsequently which depend
+ # on this one. As a last resort, sleep for some time.
+sleep 5
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/60/KILL/5 --pidfile
$PIDFILE --name $NAME
+ RETVAL=$?
+ [ $RETVAL = 2 ] return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166394
Change subject: Update Metrolook
..
Update Metrolook
* Fixes bugs and improves other things. please see README.md for settings and
other customzations.
Change-Id: I5772672dd00e19d9c66bd54f7d9ec6ee86eea35c
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 203 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/94/166394/1
diff --git a/Metrolook.php b/Metrolook.php
index a821720..00bf07f 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '3.0 beta 4',
+ 'version' = '3.0 beta 6',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -102,7 +102,6 @@
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
- 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9bd9c4c..4e4cd29 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -154,7 +154,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -162,10 +162,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -402,7 +402,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index e5693bc..880dbb8 100644
--- a/README.md
+++ b/README.md
@@ -189,6 +189,7 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
pre
+
/* Top Bar colour and hover colour start */
#mw-page-base {
@@ -198,6 +199,18 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
+}
+
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+
[MediaWiki-commits] [Gerrit] Move reflinks stop page checker in Bot - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166395
Change subject: Move reflinks stop page checker in Bot
..
Move reflinks stop page checker in Bot
The 'stop page' checker in reflinks is a basic implementation
that can be improved as scripts are standardised.
This changeset changes the stop page from being a hardcoded page
for each language, to being the user subpage of the logged in bot.
Change-Id: I511bff7a5574402857de12e8b169757a882c3db4
---
M pywikibot/bot.py
M scripts/reflinks.py
2 files changed, 50 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/95/166395/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 8fbf9ad..b776c02 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -947,6 +947,49 @@
pywikibot.output('\nKeyboardInterrupt during %s bot run...' %
self.__class__.__name__)
+def user_page(self, subpage=None, site=None):
+if not site:
+if hasattr(self, 'site'):
+site = self.site
+else:
+raise NotImplementedError('Can not load a Bot.user_page. '
+ 'Property %s.site not set.'
+ % self.__class__.__name__)
+
+if not site.username():
+raise pywikibot.NoUsername(u'No username for %s' % site)
+
+page = pywikibot.User(site, site.username())
+if subpage:
+page = page.getUserPage(subpage)
+
+return page
+
+def set_stop_page_suffix(self, suffix):
+self.stop_page = self.user_page(suffix)
+try:
+self.stop_page_rev_id = self.stop_page.latestRevision()
+except pywikibot.NoPage:
+pywikibot.output(u'The stop page %s does not exist'
+ % self.stop_page.title(asLink=True))
+raise
+
+def stop_page_changed(self):
+
+Check the stop page.
+
+@return: True if the stop page has been modified
+@rtype: bool
+
+pywikibot.output('\03{lightgreen}Checking stop page...\03{default}')
+latest_rev_id = self.stop_page.latestRevision()
+if latest_rev_id != self.stop_page_rev_id:
+pywikibot.output(
+u'[[%s]] has been edited : Someone wants us to stop.'
+% self.stop_page)
+return True
+return False
+
class WikidataBot(Bot):
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 477b668..6d56b45 100644
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -77,18 +77,7 @@
stopPage = {
-'fr': u'Utilisateur:DumZiBoT/EditezCettePagePourMeStopper',
-'da': u'Bruger:DumZiBoT/EditThisPageToStopMe',
-'de': u'Benutzer:DumZiBoT/EditThisPageToStopMe',
-'fa': u'کاربر:Amirobot/EditThisPageToStopMe',
-'it': u'Utente:Marco27Bot/EditThisPageToStopMe',
-'ko': u'사용자:GrassnBreadRefBot/EditThisPageToStopMe1',
-'he': u'User:Matanyabot/EditThisPageToStopMe',
-'hu': u'User:Damibot/EditThisPageToStopMe',
-'en': u'User:DumZiBoT/EditThisPageToStopMe',
-'pl': u'Wikipedysta:MastiBot/EditThisPageToStopMe',
-'ru': u'User:Rubinbot/EditThisPageToStopMe',
-'zh': u'User:Sz-iwbot',
+'fr': u'EditezCettePagePourMeStopper',
}
deadLinkTag = {
@@ -424,8 +413,11 @@
self.msg = i18n.twtranslate(self.site, 'reflinks-msg', locals())
else:
self.msg = self.getOption('summary')
-self.stopPage = pywikibot.Page(self.site,
- i18n.translate(self.site, stopPage))
+
+stop_page_suffix = stopPage.get(self.site.code, 'EditThisPageToStopMe')
+if self.site.username() == 'GrassnBreadRefBot':
+stop_page_suffix = 'EditThisPageToStopMe1'
+self.set_stop_page_suffix(stop_page_suffix)
local = i18n.translate(self.site, badtitles)
if local:
@@ -435,12 +427,6 @@
self.titleBlackList = re.compile(bad, re.I | re.S | re.X)
self.norefbot = noreferences.NoReferencesBot(None, verbose=False)
self.deduplicator = DuplicateReferences()
-try:
-self.stopPageRevId = self.stopPage.latestRevision()
-except pywikibot.NoPage:
-pywikibot.output(u'The stop page %s does not exist'
- % self.stopPage.title(asLink=True))
-raise
# Regex to grasp content-type meta HTML tag in HTML source
self.META_CONTENT = re.compile(r'(?i)meta[^]*content\-type[^]*')
@@ -771,13 +757,7 @@
return
if editedpages % 20 == 0:
-pywikibot.output(
-'\03{lightgreen}Checking stop page...\03{default}')
-actualRev = self.stopPage.latestRevision()
-if actualRev !=
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
* Fixes bugs and improves other things. please see README.md for settings and
other customzations.
Change-Id: I5772672dd00e19d9c66bd54f7d9ec6ee86eea35c
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 203 insertions(+), 29 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index a821720..00bf07f 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '3.0 beta 4',
+ 'version' = '3.0 beta 6',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -102,7 +102,6 @@
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
- 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9bd9c4c..4e4cd29 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -154,7 +154,7 @@
z-index:100;
}
.tilebar {
-position: fixed;
+position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -162,10 +162,10 @@
align:right;
color:#fff;
background:#1D1D1D;
-width:100%;
+width:21474836.47em;
height:400px;
display:block;
-z-index:102;
+z-index:999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -402,7 +402,7 @@
div style=vertical-align:top;align:left;
div class=topleft
-div
style=align:left;margin-left:auto;margin-right:auto;display:none;height:200px;
class=tilebar id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
+div style=align:left;display:none;height:200px; class=tilebar
id=bartilediv style=height:200px;display:table;div
style=vertical-align:middle;display:table-cell;padding-left:36px;
div style=float:left;padding:5px;div class=tile?php if ( $link1 ):
?a href=http://www.pidgi.net/wiki/;?php else: ?a href=?php echo
$GLOBALS['$url1'] ??php endif; ??php if ( $image1 ): ?img
src=http://images.pidgi.net/pidgiwikitiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture1'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link2 ): ?a
href=http://www.pidgi.net/press/;?php else: ?a href=?php echo
$GLOBALS['$url2'] ??php endif; ??php if ( $image2 ): ?img
src=http://images.pidgi.net/pidgipresstiletop.png; /?php else: ?img
src=?php echo $GLOBALS['$picture2'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link3 ): ?a
href=http://www.pidgi.net/jcc/;?php else: ?a href=?php echo
$GLOBALS['$url3'] ??php endif; ??php if ( $image3 ): ?img
src=http://images.pidgi.net/jcctiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture3'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link4 ): ?a
href=http://www.petalburgwoods.com/;?php else: ?a href=?php echo
$GLOBALS['$url4'] ??php endif; ??php if ( $image4 ): ?img
src=http://images.pidgi.net/pwntiletop.png; /?php else: ?img src=?php
echo $GLOBALS['$picture4'] ? /?php endif; ?/a/div/divdiv
style=float:left;padding:5px;div class=tile?php if ( $link5 ): ?a
href=?php echo $GLOBALS['$url5'] ??php else: ??php endif; ??php if (
$image5 ): ?img src=?php echo $GLOBALS['$picture5'] ? /?php else:
??php endif; ?/a/div/divdiv style=float:left;padding:5px;div
class=tile?php if ( $link6 ): ?a href=?php echo $GLOBALS['$url6']
??php else: ??php endif; ??php if ( $image6 ): ?img src=?php echo
$GLOBALS['$picture6'] ? /?php else: ??php endif; ?/a/div/div
/div/div/div
diff --git a/README.md b/README.md
index e5693bc..880dbb8 100644
--- a/README.md
+++ b/README.md
@@ -189,6 +189,7 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
pre
+
/* Top Bar colour and hover colour start */
#mw-page-base {
@@ -198,6 +199,18 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
+}
+
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom
[MediaWiki-commits] [Gerrit] Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomain... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomains whitelist .. Add edh-www.adw.uni-heidelberg.de to the wgCopyUploadsDomains whitelist Bug: 71990 Change-Id: I4028ec3cae95544799e0c39b706bb7848c0d3b46 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8cba3a6..75ecb3f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10775,6 +10775,7 @@ '*.beeldbank.cultureelerfgoed.nl', // Cultureel Erfgoed - bug 70840 '*.metilli.com',// Mart Museum - bug 71460 '*.nijmegen.nl',// Nijmegen - bug 71191 + 'edh-www.adw.uni-heidelberg.de', // Heidelberg Academy of Sciences and Humanities, Epigraphic Database - bug 71990 ), ), -- To view, visit https://gerrit.wikimedia.org/r/166390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4028ec3cae95544799e0c39b706bb7848c0d3b46 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dan-nl d_ent...@yahoo.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitreview file - change (operations...apertium-apy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/166396 Change subject: Add .gitreview file .. Add .gitreview file Change-Id: If2d45a28dfd80196c9596b6bf2cf54908851af86 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-apy refs/changes/96/166396/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..20f0e47 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=operations/debs/contenttranslation/apertium-apy.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/166396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2d45a28dfd80196c9596b6bf2cf54908851af86 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/contenttranslation/apertium-apy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move standard page save exception handling into Bot - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166397
Change subject: Move standard page save exception handling into Bot
..
Move standard page save exception handling into Bot
Most bots wish to continue processing pages from their generator
even if a page fails to save, whether because of a page-specific
or server related error.
This functionality is not enabled by default. reflinks.py has
been migrated to use this functionality.
Change-Id: I34898b36f915a1399522040201aac84fa8f1324c
---
M pywikibot/bot.py
M scripts/reflinks.py
2 files changed, 37 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/97/166397/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 8fbf9ad..f669d51 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -900,6 +900,12 @@
Option used:
* 'always'
+
+Keyword args used:
+* 'async' - passed to page.save
+* 'comment' - passed to page.save
+* 'ignore_save_related_errors' - report and ignore
+* 'ignore_server_errors' - report and ignore
if oldtext == newtext:
pywikibot.output(u'No changes were needed on %s'
@@ -918,7 +924,34 @@
kwargs['async'] = True
page.text = newtext
-page.save(**kwargs)
+
+ignore_save_related_errors = kwargs.pop('ignore_save_related_errors',
False)
+ignore_server_errors = kwargs.pop('ignore_server_errors', False)
+
+try:
+page.save(**kwargs)
+except pywikibot.PageSaveRelatedError as e:
+if not ignore_save_related_errors:
+raise
+if isinstance(e, pywikibot.EditConflict):
+pywikibot.output(u'Skipping %s because of edit conflict'
+ % page.title())
+elif isinstance(e, pywikibot.SpamfilterError):
+pywikibot.output(
+u'Cannot change %s because of blacklist entry %s'
+% (page.title(), e.url))
+elif isinstance(e, pywikibot.LockedPage):
+pywikibot.output(u'Skipping %s (locked page)'
+ % page.title())
+else:
+pywikibot.error(
+u'Skipping %s because of a save related error: %s'
+% (page.title(), e))
+except pywikibot.ServerError as e:
+if not ignore_server_errors:
+raise
+pywikibot.error(u'Server Error while processing %s: %s'
+% (page.title(), e))
def quit(self):
Cleanup and quit processing.
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 477b668..f0b7d61 100644
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -744,22 +744,9 @@
new_text = self.deduplicator.process(new_text)
-try:
-self.userPut(page, page.text, new_text, comment=self.msg)
-except pywikibot.EditConflict:
-pywikibot.output(u'Skipping %s because of edit conflict'
- % page.title())
-except pywikibot.SpamfilterError as e:
-pywikibot.output(
-u'Cannot change %s because of blacklist entry %s'
-% (page.title(), e.url))
-except pywikibot.LockedPage:
-pywikibot.output(u'Skipping %s (locked page)'
- % page.title())
-except pywikibot.PageNotSaved as error:
-pywikibot.error(u'putting page: %s' % (error.args,))
-except pywikibot.ServerError as e:
-pywikibot.output(u'Server Error : %s' % e)
+self.userPut(page, page.text, new_text, comment=self.msg,
+ ignore_save_related_errors=True,
+ ignore_server_errors=True)
if new_text == page.text:
continue
--
To view, visit https://gerrit.wikimedia.org/r/166397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34898b36f915a1399522040201aac84fa8f1324c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Remaining widgets: Icon, Indicator, Label, Input, Text... - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/166398 Change subject: [WIP] Remaining widgets: Icon, Indicator, Label, Input, TextInput, CheckboxInput .. [WIP] Remaining widgets: Icon, Indicator, Label, Input, TextInput, CheckboxInput Change-Id: I914d4973171567fb1e54de283d380f2f5bef4962 --- M demos/widgets.php M php/OoUiTag.php A php/widgets/OoUiCheckboxInputWidget.php A php/widgets/OoUiIconWidget.php A php/widgets/OoUiIndicatorWidget.php A php/widgets/OoUiInputWidget.php A php/widgets/OoUiLabelWidget.php A php/widgets/OoUiTextInputWidget.php M src/widgets/CheckboxInputWidget.js 9 files changed, 484 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/98/166398/1 diff --git a/demos/widgets.php b/demos/widgets.php index f694685..6d0ebd4 100644 --- a/demos/widgets.php +++ b/demos/widgets.php @@ -24,6 +24,12 @@ require_once '../php/elements/OoUiGroupElement.php'; require_once '../php/widgets/OoUiButtonWidget.php'; require_once '../php/widgets/OoUiButtonGroupWidget.php'; + require_once '../php/widgets/OoUiIconWidget.php'; + require_once '../php/widgets/OoUiIndicatorWidget.php'; + require_once '../php/widgets/OoUiLabelWidget.php'; + require_once '../php/widgets/OoUiInputWidget.php'; + require_once '../php/widgets/OoUiCheckboxInputWidget.php'; + require_once '../php/widgets/OoUiTextInputWidget.php'; require_once '../php/OoUiTheme.php'; require_once '../php/layouts/OoUiFieldLayout.php'; require_once '../php/layouts/OoUiFieldsetLayout.php'; @@ -182,6 +188,134 @@ ) ); ? + + ?php + echo new OoUiFieldsetLayout( array( + 'label' = 'Super simple widgets', + 'items' = array( + new OoUiFieldLayout( + new OoUiIconWidget( array( + 'icon' = 'picture', + 'title' = 'Picture icon' + ) ), + array( + 'label' = 'IconWidget (normal)', + 'align' = 'top' + ) + ), + new OoUiFieldLayout( + new OoUiIconWidget( array( + 'icon' = 'picture', + 'title' = 'Picture icon', + 'disabled' = true + ) ), + array( + 'label' = 'IconWidget (disabled)', + 'align' = 'top' + ) + ), + new OoUiFieldLayout( + new OoUiIndicatorWidget( array( + 'indicator' = 'required', + 'title' = 'Required icon' + ) ), + array( + 'label' = 'IndicatorWidget (normal)', + 'align' = 'top' + ) + ), + new OoUiFieldLayout( + new OoUiIndicatorWidget( array( + 'indicator' = 'required', + 'title' = 'Required icon', +
[MediaWiki-commits] [Gerrit] Removed else statement, so that checkError() call in Special... - change (mediawiki...Translate)
Brainzest has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166399
Change subject: Removed else statement, so that checkError() call in
SpecialImportTransaltions.php can give 'no headers found' error
..
Removed else statement, so that checkError() call in
SpecialImportTransaltions.php can give 'no headers found' error
Change-Id: Ic5f88fd1abbda6ab70f2fdafc370de678bd4ae68
---
M ffs/GettextFFS.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/99/166399/1
diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php
index 8674b5b..1a47270 100644
--- a/ffs/GettextFFS.php
+++ b/ffs/GettextFFS.php
@@ -107,9 +107,7 @@
if ( in_array( 'fuzzy', $flags, true ) ) {
$potmode = true;
}
- } else {
- //throw new MWException( Gettext file header was not
found:\n\n$data ); // removed as of bug 57964
- }
+ }
$template = array();
$messages = array();
--
To view, visit https://gerrit.wikimedia.org/r/166399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5f88fd1abbda6ab70f2fdafc370de678bd4ae68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Brainzest ntekri...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding new datasource for new active editors for mobile limn... - change (analytics/limn-mobile-data)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166401
Change subject: Adding new datasource for new active editors for mobile limn
graphs
..
Adding new datasource for new active editors for mobile limn graphs
Change-Id: I92305cad3a78a50b7f2891db1446d20faddc3f34
---
A datasources/edits-monthly-new-active.json
A mobile/edits-monthly-new-active.sql
2 files changed, 65 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data
refs/changes/01/166401/1
diff --git a/datasources/edits-monthly-new-active.json
b/datasources/edits-monthly-new-active.json
new file mode 100644
index 000..061e9cf
--- /dev/null
+++ b/datasources/edits-monthly-new-active.json
@@ -0,0 +1,22 @@
+{
+name: Editors who reached 5 edits on enwiki within 30 days of
registering,
+url:
http://stat1001.wikimedia.org/limn-public-data/mobile/datafiles/edits-monthly-new-active.csv;,
+format: csv,
+shortName: edits-monthly-new-active,
+type: timeseries,
+id: edits-monthly-new-active,
+columns: [
+{
+type: date,
+label: Month
+},
+{
+type: int,
+label: Mobile
+},
+{
+type: int,
+label: Desktop
+}
+]
+}
diff --git a/mobile/edits-monthly-new-active.sql
b/mobile/edits-monthly-new-active.sql
new file mode 100644
index 000..b53f3ed
--- /dev/null
+++ b/mobile/edits-monthly-new-active.sql
@@ -0,0 +1,43 @@
+SET @n = 5; /* edits threshold */
+SET @u = 30; /* activity unit in days */
+
+select sum(if(event_displaymobile = 1, 1, 0)) as mobile,
+ sum(if(event_displaymobile 1, 1, 0)) as desktop
+ from (SELECT user_id
+ FROM (SELECT rev_user as user_id,
+count(*) AS revisions
+ FROM enwiki.revision
+ WHERE rev_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+AND rev_user in (select log_user
+ from enwiki.logging
+ where log_type = 'newusers'
+and log_action = 'create'
+and log_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+)
+ GROUP BY rev_user
+
+ UNION ALL
+
+ SELECT ar_user as user_id,
+count(*) AS revisions
+ FROM enwiki.archive
+ WHERE ar_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+AND ar_user in (select log_user
+ from enwiki.logging
+ where log_type = 'newusers'
+ and log_action = 'create'
+ and log_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+ )
+ GROUP BY ar_user
+
+) AS user_revisions
+ GROUP BY user_id
+ HAVING SUM(revisions) = @n
+) as rolling_active_editors
+inner join
+log.ServerSideAccountCreation_5487345 on event_userId =
rolling_active_editors.user_id
+ AND useragent NOT LIKE
%WikipediaApp%
+ AND wiki = enwiki
+ and timestamp between
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u+1 DAY), %Y%m%d%H%i%S)
+ AND
date_format(date_add('{to_timestamp}', interval 1 day), '%Y%m%d%H%i%S')
+;
--
To view, visit https://gerrit.wikimedia.org/r/166401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92305cad3a78a50b7f2891db1446d20faddc3f34
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding new datasource for new active editors for mobile limn... - change (analytics/limn-mobile-data)
jenkins-bot has submitted this change and it was merged.
Change subject: Adding new datasource for new active editors for mobile limn
graphs
..
Adding new datasource for new active editors for mobile limn graphs
Change-Id: I92305cad3a78a50b7f2891db1446d20faddc3f34
---
A datasources/edits-monthly-new-active.json
A mobile/edits-monthly-new-active.sql
2 files changed, 65 insertions(+), 0 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/datasources/edits-monthly-new-active.json
b/datasources/edits-monthly-new-active.json
new file mode 100644
index 000..061e9cf
--- /dev/null
+++ b/datasources/edits-monthly-new-active.json
@@ -0,0 +1,22 @@
+{
+name: Editors who reached 5 edits on enwiki within 30 days of
registering,
+url:
http://stat1001.wikimedia.org/limn-public-data/mobile/datafiles/edits-monthly-new-active.csv;,
+format: csv,
+shortName: edits-monthly-new-active,
+type: timeseries,
+id: edits-monthly-new-active,
+columns: [
+{
+type: date,
+label: Month
+},
+{
+type: int,
+label: Mobile
+},
+{
+type: int,
+label: Desktop
+}
+]
+}
diff --git a/mobile/edits-monthly-new-active.sql
b/mobile/edits-monthly-new-active.sql
new file mode 100644
index 000..b53f3ed
--- /dev/null
+++ b/mobile/edits-monthly-new-active.sql
@@ -0,0 +1,43 @@
+SET @n = 5; /* edits threshold */
+SET @u = 30; /* activity unit in days */
+
+select sum(if(event_displaymobile = 1, 1, 0)) as mobile,
+ sum(if(event_displaymobile 1, 1, 0)) as desktop
+ from (SELECT user_id
+ FROM (SELECT rev_user as user_id,
+count(*) AS revisions
+ FROM enwiki.revision
+ WHERE rev_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+AND rev_user in (select log_user
+ from enwiki.logging
+ where log_type = 'newusers'
+and log_action = 'create'
+and log_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+)
+ GROUP BY rev_user
+
+ UNION ALL
+
+ SELECT ar_user as user_id,
+count(*) AS revisions
+ FROM enwiki.archive
+ WHERE ar_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+AND ar_user in (select log_user
+ from enwiki.logging
+ where log_type = 'newusers'
+ and log_action = 'create'
+ and log_timestamp BETWEEN
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u DAY), %Y%m%d%H%i%S) AND
'{to_timestamp}'
+ )
+ GROUP BY ar_user
+
+) AS user_revisions
+ GROUP BY user_id
+ HAVING SUM(revisions) = @n
+) as rolling_active_editors
+inner join
+log.ServerSideAccountCreation_5487345 on event_userId =
rolling_active_editors.user_id
+ AND useragent NOT LIKE
%WikipediaApp%
+ AND wiki = enwiki
+ and timestamp between
DATE_FORMAT(DATE_SUB('{to_timestamp}', INTERVAL @u+1 DAY), %Y%m%d%H%i%S)
+ AND
date_format(date_add('{to_timestamp}', interval 1 day), '%Y%m%d%H%i%S')
+;
--
To view, visit https://gerrit.wikimedia.org/r/166401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92305cad3a78a50b7f2891db1446d20faddc3f34
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix test of trebuchet provider - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166402
Change subject: fix test of trebuchet provider
..
fix test of trebuchet provider
the provider expects a package name with basedir/reponame
so for example integration/phpcs (not just integration);
in the special case where the basedir and the repo subdir
name are the same the code will 'just work' but it's by luck,
not by design
Change-Id: I09479423b6428e5d16f59d6da0b4a2185b926fa3
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/166402/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5fe9a85..5d8a597 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -274,7 +274,7 @@
}
class role::deployment::test {
-package { 'testrepo':
+package { 'test/testrepo':
provider = 'trebuchet',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09479423b6428e5d16f59d6da0b4a2185b926fa3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix test of trebuchet provider - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: fix test of trebuchet provider
..
fix test of trebuchet provider
the provider expects a package name with basedir/reponame
so for example integration/phpcs (not just integration);
in the special case where the basedir and the repo subdir
name are the same the code will 'just work' but it's by luck,
not by design
Change-Id: I09479423b6428e5d16f59d6da0b4a2185b926fa3
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5fe9a85..5d8a597 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -274,7 +274,7 @@
}
class role::deployment::test {
-package { 'testrepo':
+package { 'test/testrepo':
provider = 'trebuchet',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09479423b6428e5d16f59d6da0b4a2185b926fa3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readded contenttable styling - change (mediawiki...BlueSpiceSkin)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166403
Change subject: Readded contenttable styling
..
Readded contenttable styling
Change-Id: Ibd493f4853cc303e261c1efecc34006822342da7
---
M resources/components/skin.content.tables.less
1 file changed, 67 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/03/166403/1
diff --git a/resources/components/skin.content.tables.less
b/resources/components/skin.content.tables.less
index 8cda935..617ee91 100644
--- a/resources/components/skin.content.tables.less
+++ b/resources/components/skin.content.tables.less
@@ -101,3 +101,70 @@
table.greyscale-narrow tbody tr:hover{
background-color: #DEDCDC;
}
+table.contenttable {
+ width:100%;
+ border:1px #ccc solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable td,table.contenttable tr {
+ border:1px #ccc solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable th {
+ background-color:#E0E0E0;
+ border:1px solid #CCC;
+ padding:4px;
+}
+
+table.contenttable-black {
+ width:100%;
+ border:1px #000 solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable-black td, table.contenttable-black tr {
+ border:1px #000 solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable-black th {
+ background-color:#E0E0E0;
+ border:1px solid #000;
+ padding:4px;
+}
+
+table.contenttable-blue td, table.contenttable-blue tr,
table.contenttable-darkblue td, table.contenttable-darkblue tr {
+ border:1px #B1B9CF solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable-blue th {
+ background-color:#EFF3F9;
+ border:1px solid #B1B9CF;
+ color:#3E5389;
+ padding:4px;
+}
+
+table.contenttable-blue, table.contenttable-darkblue {
+ width:100%;
+ border:1px #B1B9CF solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable-darkblue th {
+ background-color:#3E5389;
+ border:1px solid #B1B9CF;
+ color:#FFF;
+ padding:4px;
+}
--
To view, visit https://gerrit.wikimedia.org/r/166403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd493f4853cc303e261c1efecc34006822342da7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow setting the browser-timeout in browsertests - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow setting the browser-timeout in browsertests
..
Allow setting the browser-timeout in browsertests
This allows browsertest projects to change the default browser-timeout.
This is already supported in the mediawiki-selenium gem.
See: https://github.com/wikimedia/mediawiki-selenium#028-2014-03-06
Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051
---
M jjb/job-templates-browsertests.yaml
M jjb/macro.yaml
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index d2ab5a1..f2a7ae0 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -29,6 +29,7 @@
- shell: mkdir -p $WORKSPACE/log/junit
- browsertest-website-version:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
@@ -78,6 +79,7 @@
- defaults:
name: browsertests
node: contintLabsSlave UbuntuPrecise
+browser_timeout: ''
repository_host: 'gerrit.wikimedia.org/r'
cucumber_tags: ''
@@ -106,6 +108,7 @@
- shell: mkdir -p $WORKSPACE/log/junit
- browsertest-website:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index d7b6845..ca69cd2 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -659,6 +659,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export BROWSER_TIMEOUT={browser_timeout}
export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
@@ -778,6 +779,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export BROWSER_TIMEOUT={browser_timeout}
export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
--
To view, visit https://gerrit.wikimedia.org/r/166025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] First of (hopefully many) es-tool commands - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: First of (hopefully many) es-tool commands
..
First of (hopefully many) es-tool commands
`es-tool health` prints out the server's health as a string of
green yellow or red
Useful because many other scripts want to wait on green.
Change-Id: I07c4420c4fe482515f7dd9f175ce2e067c817a1b
---
A modules/elasticsearch/files/es-tool
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/packages.pp
3 files changed, 61 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/modules/elasticsearch/files/es-tool
b/modules/elasticsearch/files/es-tool
new file mode 100755
index 000..5b4ee64
--- /dev/null
+++ b/modules/elasticsearch/files/es-tool
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import argparse
+import os
+import sys
+
+from elasticsearch import ConnectionError, Elasticsearch
+
+
+# Helper functions go here
+def cluster_health():
+es = Elasticsearch(args.server)
+return es.cluster.health()[status]
+
+
+# Add new command functions here
+def es_health():
+health = cluster_health()
+print health
+if health != green:
+return os.EX_UNAVAILABLE
+else:
+return os.EX_OK
+
+# And register them here
+commands = {
+health: es_health,
+}
+
+# main()
+parser = argparse.ArgumentParser(
+description=Tool for Elasticsearch cluster maintenance)
+parser.add_argument(command, metavar='CMD', type=str,
+choices=commands.keys(),
+help=Subcommand, one of: + ,.join(commands))
+parser.add_argument(--server, metavar='S', type=str, default=localhost,
+help=Server to work on, default localhost)
+args = parser.parse_args()
+
+try:
+sys.exit(commands[args.command]())
+except ConnectionError:
+print Unable to connect
+sys.exit(os.EX_UNAVAILABLE)
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 963f63e..a4d0903 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -152,4 +152,16 @@
file { '/var/log/elasticsearch/elasticsearch_index_search_slowlog.log':
ensure = absent
}
+
+# Cluster management tool, trusty only
+if ubuntu_version('= trusty') {
+file { '/usr/local/bin/es-tool':
+ensure = file,
+owner = root,
+group = root,
+mode= '0755',
+source = 'puppet:///modules/elasticsearch/es-tool',
+require = Package['python-elasticsearch']
+}
+}
}
diff --git a/modules/elasticsearch/manifests/packages.pp
b/modules/elasticsearch/manifests/packages.pp
index 2c35efe..db87a1c 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -17,4 +17,9 @@
if ! defined ( Package['curl'] ) {
package { 'curl': ensure = present }
}
+
+# library for elasticsearch. only in trusty+
+if ubuntu_version('= trusty') {
+package { 'python-elasticsearch': ensure = present }
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/163945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07c4420c4fe482515f7dd9f175ce2e067c817a1b
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate bundler based jobs to ruby2.0 (on Trusty) - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate bundler based jobs to ruby2.0 (on Trusty)
..
Migrate bundler based jobs to ruby2.0 (on Trusty)
Change the bundle jobs to use ruby2.0 which is installed by puppet
change: https://gerrit.wikimedia.org/r/#/c/166046/
gem2.0 deprecated `--no-ri --no-doc` in favor of `--no-document`
Change-Id: Ia3958f4201e72f5669a00caf9195d95c0662d77c
---
M jjb/ruby-jobs.yaml
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 3107d17..a3bc9c1 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -8,7 +8,7 @@
# install ruby dependencies
mkdir -p vendor
- gem1.9.3 install --env-shebang -i vendor --no-ri --no-rdoc bundler
+ gem2.0 install --env-shebang -i vendor --no-document bundler
# Prepare some paths lookup
export GEM_PATH=`pwd`/vendor
@@ -18,7 +18,7 @@
- job-template:
name: '{name}-bundle-{bundlecommand}'
-node: contintLabsSlave UbuntuPrecise
+node: contintLabsSlave UbuntuTrusty
defaults: use-remote-zuul
concurrent: true
triggers:
@@ -31,7 +31,7 @@
# doc.wikimedia.org using an intermediate rsync repository in labs.
- job-template:
name: '{name}-bundle-yard-publish'
-node: contintLabsSlave UbuntuPrecise
+node: contintLabsSlave UbuntuTrusty
defaults: use-remote-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/166049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3958f4201e72f5669a00caf9195d95c0662d77c
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't register ResourceLoaderFileModule objects - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't register ResourceLoaderFileModule objects
..
Don't register ResourceLoaderFileModule objects
Instead just register the definition array
Bug: 71768
Change-Id: I2ff9b4f2d10170a397e6c651d83d907ce417df1f
---
M UploadWizardHooks.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 0202f06..c6cbc3e 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -656,12 +656,11 @@
* Adds modules to ResourceLoader
*
* @param ResourceLoader $resourceLoader
+* @return bool
*/
public static function resourceLoaderRegisterModules( $resourceLoader
) {
- global $wgExtensionAssetsPath, $wgAPIModules;
+ global $wgAPIModules;
- $localpath = dirname( __FILE__ );
- $remotepath = $wgExtensionAssetsPath/UploadWizard;
if ( array_key_exists( 'titleblacklist', $wgAPIModules ) ) {
self::$modules['ext.uploadWizard']['dependencies'][] =
'mediawiki.api.titleblacklist';
}
@@ -685,7 +684,7 @@
foreach ( self::$modules as $name = $resources ) {
$resourceLoader-register(
$name,
- new ResourceLoaderFileModule( $resources,
$localpath, $remotepath )
+ $resources + array( 'localBasePath' = __DIR__,
'remoteExtPath' = 'UploadWizard' )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/166202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ff9b4f2d10170a397e6c651d83d907ce417df1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure $found actually contains values - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166404
Change subject: Make sure $found actually contains values
..
Make sure $found actually contains values
I had one key where the value was null on my local machine (likely odd test
data), which caused a warning when trying to array_merge a couple lines down:
Warning: array_merge(): Argument #3 is not an array in
includes/Formatter/RecentChangesQuery.php on line 90
Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289
---
M includes/Formatter/RecentChangesQuery.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/04/166404/1
diff --git a/includes/Formatter/RecentChangesQuery.php
b/includes/Formatter/RecentChangesQuery.php
index 94ff62c..b89fd3b 100644
--- a/includes/Formatter/RecentChangesQuery.php
+++ b/includes/Formatter/RecentChangesQuery.php
@@ -81,6 +81,7 @@
$found[] = $this-storage-getMulti( $type, $uids );
}
+ $found = array_filter( $found );
$count = count( $found );
if ( $count === 0 ) {
$results = array();
--
To view, visit https://gerrit.wikimedia.org/r/166404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set Browser Timeout for Wikidata Performance Test - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Set Browser Timeout for Wikidata Performance Test
..
Set Browser Timeout for Wikidata Performance Test
Change-Id: Iadaa8211db8704d0052a2d46087a78e8c8269e8a
---
M jjb/browsertests.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index d3bd8d4..8892679 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -535,6 +535,7 @@
- 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
name: PerformanceTests
+ browser_timeout: 360
cucumber_tags: '@performance_testing'
recipients: *emails-Wikidata-devs
--
To view, visit https://gerrit.wikimedia.org/r/166377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iadaa8211db8704d0052a2d46087a78e8c8269e8a
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add initial Debian packaging - change (operations...apertium-lex-tools)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Add initial Debian packaging
..
Add initial Debian packaging
Change-Id: Ib55630aba7aefad1081a4c517417fba96a9ba95b
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 87 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..940f2f5
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+apertium-lex-tools (0.1.0+svn~57414-1) trusty; urgency=low
+
+ [ Tino Didriksen ]
+ * Initial release based on upstream SVN.
+
+ -- Kartik Mistry kar...@debian.org Wed, 01 Oct 2014 16:50:33 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..7e83e86
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: apertium-lex-tools
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+ Kartik Mistry kar...@debian.org
+Build-Depends: autoconf,
+ autotools-dev,
+ debhelper (= 9.0),
+ dh-autoreconf,
+ flex (= 2.5.33),
+ gawk,
+ libapertium3-3.3-dev,
+ liblttoolbox3-3.3-dev,
+ libpcre3-dev,
+ libxml2-dev,
+ libxml2-utils (= 2.6.24),
+ pkg-config (= 0.20),
+ xsltproc (= 1.1.16),
+ zlib1g-dev
+Standards-Version: 3.9.5
+Homepage: http://apertium.org/
+Vcs-Git:
git://anonscm.debian.org/debian-science/packages/apertium-lex-tools.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium-lex-tools.git
+
+Package: apertium-lex-tools
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Constraint-based lexical selection module
+ Constraint-based lexical selection module used by Apertium
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..35e65f6
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
apertium-...@dlsi.ua.es
+ See AUTHORS for more copyrights.
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..2350341
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+%:
+ dh $@ --parallel --with autoreconf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..306ec03
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=filenamemangle=s/\S*download=//g \
+https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/apertium/apertium-lex-tools
\
[MediaWiki-commits] [Gerrit] Make the empty page of Nearby more consistent with Saved P... - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Make the empty page of Nearby more consistent with Saved Pages and History. .. Make the empty page of Nearby more consistent with Saved Pages and History. - Tweak prose of empty Nearby page to be more consistent. - Make the Nearby prose a little bit more fun! - Tweak wrapping of secondary empty message to be consistent with Saved Pages and history. Change-Id: I8ca1afa741bf8b8271338a92e081a01fa8f386a1 --- M wikipedia/res/layout/activity_nearby.xml M wikipedia/res/values/strings.xml 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Dbrant: Looks good to me, approved diff --git a/wikipedia/res/layout/activity_nearby.xml b/wikipedia/res/layout/activity_nearby.xml index 2f6c534..eea7b1b 100644 --- a/wikipedia/res/layout/activity_nearby.xml +++ b/wikipedia/res/layout/activity_nearby.xml @@ -38,7 +38,7 @@ TextView android:id=@+id/nearby_empty_message -android:layout_width=wrap_content +android:layout_width=256dp android:layout_height=wrap_content android:layout_gravity=center_horizontal android:gravity=center diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index bc597ee..99e6e69 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -48,8 +48,8 @@ string name=nearby_activity_titleNearby/string string name=nav_item_nearbyNearby/string string name=menu_update_nearbyUpdate nearby/string -string name=nearby_empty_titleNo pages nearby/string -string name=nearby_empty_messageYou can refresh this page when you move to a new location./string +string name=nearby_empty_titleNo nearby pages here!/string +string name=nearby_empty_messageWhen you move to a new location, try refreshing this page to learn more about what's around you./string string name=nearby_distance_in_meters%d m/string string name=nearby_distance_in_kilometers%.2f km/string string name=nearby_distance_in_feet%d ft/string -- To view, visit https://gerrit.wikimedia.org/r/166172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ca1afa741bf8b8271338a92e081a01fa8f386a1 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org Gerrit-Reviewer: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwprof: Convert to package|provider==trebuchet| - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: mwprof: Convert to package|provider==trebuchet|
..
mwprof: Convert to package|provider==trebuchet|
The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.
Change-Id: Ic13504f6d763d2f6b9bda35a70abef9dc5ade5a3
---
M modules/mwprof/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/mwprof/manifests/init.pp b/modules/mwprof/manifests/init.pp
index 5b5a0a9..8d1d652 100644
--- a/modules/mwprof/manifests/init.pp
+++ b/modules/mwprof/manifests/init.pp
@@ -11,7 +11,9 @@
description = 'MediaWiki profiler',
}
-deployment::target { 'mwprof': }
+package { 'mwprof/mwprof':
+provider = 'trebuchet',
+}
package { [ 'build-essential', 'libglib2.0-dev', 'glib-networking' ]: }
--
To view, visit https://gerrit.wikimedia.org/r/163372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic13504f6d763d2f6b9bda35a70abef9dc5ade5a3
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve values-qq entry for the nearby_no_network string. - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Improve values-qq entry for the nearby_no_network string. .. Improve values-qq entry for the nearby_no_network string. Change-Id: I1c525101b9bc084fd7bdac8b8f19ea253c5f3a4b --- M wikipedia/res/values-qq/strings.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dbrant: Looks good to me, approved diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 8c0e602..d2b3936 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -78,7 +78,7 @@ string name=nearby_distance_in_kilometersDistance to the place mentioned in the nearby page in kilometers. Please leave the %.2f as is. It represents a floating point number with 2 digits after the decimal point./string string name=nearby_distance_in_feetDistance to the place mentioned in the nearby page in feet. Please leave the %d as is. It represents an integer decimal number up to 999./string string name=nearby_distance_in_milesDistance to the place mentioned in the nearby page in miles. Please leave the %.2f as is. It represents a floating point number with 2 digits after the decimal point./string - string name=nearby_no_networkError message when there was a network error/string + string name=nearby_no_networkError message when there was a network error while displaying nearby articles./string string name=nearby_server_errorError message when the app could not get list of nearby places from the server./string string name=nearby_no_locationError message when the app could not get a location from any location provider (network or GPS)./string string name=nearby_dialog_goto_settingsDialog text that tells the user that Location updates are not enabled on the device, and asks if the user wants to go to the Settings page on the device where they can enable Location updates./string -- To view, visit https://gerrit.wikimedia.org/r/166369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c525101b9bc084fd7bdac8b8f19ea253c5f3a4b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org Gerrit-Reviewer: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix: FakeDatabasUpdater::setAppliedUpdates - change (mediawiki/core)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166405
Change subject: Fix: FakeDatabasUpdater::setAppliedUpdates
..
Fix: FakeDatabasUpdater::setAppliedUpdates
To be consistent with DatabaseUpdater::setAppliedUpdates
the second arg $updates is now optional.
This caused a problem at
https://travis-ci.org/Krinkle/mediawiki-core/jobs/37801162
Change-Id: Ida2adfe30099ea4c65f0c16fafc4eae6603fc93a
---
M tests/phpunit/includes/installer/DatabaseUpdaterTest.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/166405/1
diff --git a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
index 29c3052..a05acbd 100644
--- a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
+++ b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
@@ -272,8 +272,8 @@
public function canUseNewUpdatelog() {
return true;
}
-
- public function setAppliedUpdates( $version, $updates ) {
+
+ public function setAppliedUpdates( $version, $updates = array() ) {
parent::setAppliedUpdates( $version, $updates );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida2adfe30099ea4c65f0c16fafc4eae6603fc93a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change phab_update_tag script to remove library lock file Ch... - change (operations/puppet)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166406
Change subject: Change phab_update_tag script to remove library lock file
Change library_lock path to /var/run/$library_lock Update library tag
..
Change phab_update_tag script to remove library lock file
Change library_lock path to /var/run/$library_lock
Update library tag
Change-Id: Ie9704746d33f2852387b47abff9b146f50559dbc
---
M manifests/role/phabricator.pp
M modules/phabricator/manifests/init.pp
M modules/phabricator/templates/phab_update_tag.erb
3 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/166406/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 633026c..40837c7 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -123,7 +123,7 @@
git_tag = $current_tag,
lock_file= '/var/run/phab_repo_lock',
auth_type= 'local',
-libext_tag = 'HEAD',
+libext_tag = '0.5.2',
libraries= {
'burndown' = '/srv/phab/libext/Sprint',
},
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 3727a8d..9feebda 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -171,7 +171,7 @@
$phab_settings['load-libraries'] = $libraries
-$libext_lock_path = ${phabdir}/library_lock_${libext_tag}
+$libext_lock_path = /var/run/library_lock_${libext_tag}
phabricator::libext { 'Sprint':
rootdir = $phabdir,
diff --git a/modules/phabricator/templates/phab_update_tag.erb
b/modules/phabricator/templates/phab_update_tag.erb
index b7a4f1e..c491624 100644
--- a/modules/phabricator/templates/phab_update_tag.erb
+++ b/modules/phabricator/templates/phab_update_tag.erb
@@ -57,6 +57,7 @@
gitcmd rev-parse HEAD %= @phabdir %/phabricator/
gitcmd rev-parse HEAD %= @phabdir %/arcanist/
gitcmd rev-parse HEAD %= @phabdir %/libphutil/
+ gitcmd rev-parse HEAD %= @phabdir %/libext/Sprint/
}
if [ $1 != '-y' ]
@@ -82,8 +83,15 @@
else
log %= @lock_file % not found
fi
-% end -%
+if [ -e %= @libext_lock_path % ]
+ then
+ $rm -v %= @libext_lock_path %
+ else
+log %= @libext_lock_path % not found
+fi
+
+% end -%
/etc/init.d/puppet stop
/etc/init.d/apache2 stop
%= @phabdir %/phabricator/bin/phd stop
--
To view, visit https://gerrit.wikimedia.org/r/166406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9704746d33f2852387b47abff9b146f50559dbc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 71619) Remove duplicate created topic item from watch... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/166407 Change subject: (bug 71619) Remove duplicate created topic item from watchlist .. (bug 71619) Remove duplicate created topic item from watchlist Wasn't properly collapsing created topic entries; used old new-post action name. Bug: 71619 Change-Id: If901d5216807984fe836784d5e573470c0aa8b1a --- M includes/Formatter/RecentChangesQuery.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/07/166407/1 diff --git a/includes/Formatter/RecentChangesQuery.php b/includes/Formatter/RecentChangesQuery.php index b89fd3b..40406bb 100644 --- a/includes/Formatter/RecentChangesQuery.php +++ b/includes/Formatter/RecentChangesQuery.php @@ -180,7 +180,7 @@ // moderation actions are always shown when visible to the user return false; - case 'new-post': + case 'new-topic': case 'reply': case 'edit-post': case 'edit-title': -- To view, visit https://gerrit.wikimedia.org/r/166407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If901d5216807984fe836784d5e573470c0aa8b1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] servermon: Set a cron for the make_updates command - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166408
Change subject: servermon: Set a cron for the make_updates command
..
servermon: Set a cron for the make_updates command
Use the (old) new make_updates.py django management command that
populates package updates
Change-Id: Ib507c1aaa5dcd9328ae792e13e4ebb8385a5dbe2
---
M modules/servermon/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/166408/1
diff --git a/modules/servermon/manifests/init.pp
b/modules/servermon/manifests/init.pp
index ea5d957..069cf19 100644
--- a/modules/servermon/manifests/init.pp
+++ b/modules/servermon/manifests/init.pp
@@ -92,4 +92,11 @@
content = template('servermon/gunicorn.erb'),
require = Package['gunicorn'],
}
+
+cron { 'servermon_make_updates':
+command = ${directory}/servermon/manage.py make_updates
--pythonpath=${directory},
+user= www-data,
+hour= 0,
+minute = 0,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/166408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib507c1aaa5dcd9328ae792e13e4ebb8385a5dbe2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add E2E test page import to MV role - change (mediawiki/vagrant)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/166409 Change subject: Add E2E test page import to MV role .. Add E2E test page import to MV role The E2E tests rely on that page, including it in the role makes settings up the development environment for MV faster. Change-Id: I508146417c600fbd28f21fd5ac572c2c78713d25 --- A puppet/modules/role/files/multimediaviewer/page/MediaViewerE2ETest.xml M puppet/modules/role/manifests/multimediaviewer.pp 2 files changed, 97 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/09/166409/1 diff --git a/puppet/modules/role/files/multimediaviewer/page/MediaViewerE2ETest.xml b/puppet/modules/role/files/multimediaviewer/page/MediaViewerE2ETest.xml new file mode 100644 index 000..30835ad --- /dev/null +++ b/puppet/modules/role/files/multimediaviewer/page/MediaViewerE2ETest.xml @@ -0,0 +1,83 @@ +mediawiki xmlns=http://www.mediawiki.org/xml/export-0.9/; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mediawiki.org/xml/export-0.9/ http://www.mediawiki.org/xml/export-0.9.xsd; version=0.9 xml:lang=en + siteinfo +sitenameMediaWiki/sitename +dbnamemediawikiwiki/dbname +basehttp://www.mediawiki.org/wiki/MediaWiki/base +generatorMediaWiki 1.25wmf3/generator +casefirst-letter/case +namespaces + namespace key=-2 case=first-letterMedia/namespace + namespace key=-1 case=first-letterSpecial/namespace + namespace key=0 case=first-letter / + namespace key=1 case=first-letterTalk/namespace + namespace key=2 case=first-letterUser/namespace + namespace key=3 case=first-letterUser talk/namespace + namespace key=4 case=first-letterProject/namespace + namespace key=5 case=first-letterProject talk/namespace + namespace key=6 case=first-letterFile/namespace + namespace key=7 case=first-letterFile talk/namespace + namespace key=8 case=first-letterMediaWiki/namespace + namespace key=9 case=first-letterMediaWiki talk/namespace + namespace key=10 case=first-letterTemplate/namespace + namespace key=11 case=first-letterTemplate talk/namespace + namespace key=12 case=first-letterHelp/namespace + namespace key=13 case=first-letterHelp talk/namespace + namespace key=14 case=first-letterCategory/namespace + namespace key=15 case=first-letterCategory talk/namespace + namespace key=90 case=first-letterThread/namespace + namespace key=91 case=first-letterThread talk/namespace + namespace key=92 case=first-letterSummary/namespace + namespace key=93 case=first-letterSummary talk/namespace + namespace key=100 case=first-letterManual/namespace + namespace key=101 case=first-letterManual talk/namespace + namespace key=102 case=first-letterExtension/namespace + namespace key=103 case=first-letterExtension talk/namespace + namespace key=104 case=first-letterAPI/namespace + namespace key=105 case=first-letterAPI talk/namespace + namespace key=106 case=first-letterSkin/namespace + namespace key=107 case=first-letterSkin talk/namespace + namespace key=484 case=first-letterGraph/namespace + namespace key=485 case=first-letterGraph talk/namespace + namespace key=486 case=first-letterData/namespace + namespace key=487 case=first-letterData talk/namespace + namespace key=828 case=first-letterModule/namespace + namespace key=829 case=first-letterModule talk/namespace + namespace key=1198 case=first-letterTranslations/namespace + namespace key=1199 case=first-letterTranslations talk/namespace + namespace key=2500 case=first-letterVisualEditor/namespace + namespace key=2501 case=first-letterVisualEditor talk/namespace + namespace key=2600 case=first-letterTopic/namespace +/namespaces + /siteinfo + page +titleMediaViewerE2ETest/title +ns0/ns +id216598/id +revision + id976577/id + timestamp2014-04-22T06:54:46Z/timestamp + contributor +usernameGDubuc (WMF)/username +id1232234/id + /contributor + commentCreated page with quot;lt;biggt;PLEASE DO NOT EDIT THIS PAGE! IT NEEDS TO STAY THE SAME FOR THE PURPOSE OF AUTOMATED TESTINGlt;/biggt; ==Test Images== Here are some sample images for testing different feat...quot;/comment + text xml:space=preserve bytes=1030lt;biggt;PLEASE DO NOT EDIT THIS PAGE! IT NEEDS TO STAY THE SAME FOR THE PURPOSE OF AUTOMATED TESTINGlt;/biggt; + +==Test Images== +Here are some sample images for testing different features of Media Viewer. + +[[File:Sunrise over fishing boats in Kerala.jpg|thumb|left|Sunrise over fishing boats]] [[File:Wikimedia_Foundation_2013_All_Hands_Offsite_-_Day_2_-_Photo_24.jpg|thumb|Tropical Fish Aquarium]] [[File:Wikimania 2013 - Hong Kong - Photo 090.jpg|thumb|center|Hong Kong
[MediaWiki-commits] [Gerrit] servermon: Set a cron for the make_updates command - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: servermon: Set a cron for the make_updates command
..
servermon: Set a cron for the make_updates command
Use the (old) new make_updates.py django management command that
populates package updates
Change-Id: Ib507c1aaa5dcd9328ae792e13e4ebb8385a5dbe2
---
M modules/servermon/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/servermon/manifests/init.pp
b/modules/servermon/manifests/init.pp
index ea5d957..069cf19 100644
--- a/modules/servermon/manifests/init.pp
+++ b/modules/servermon/manifests/init.pp
@@ -92,4 +92,11 @@
content = template('servermon/gunicorn.erb'),
require = Package['gunicorn'],
}
+
+cron { 'servermon_make_updates':
+command = ${directory}/servermon/manage.py make_updates
--pythonpath=${directory},
+user= www-data,
+hour= 0,
+minute = 0,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/166408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib507c1aaa5dcd9328ae792e13e4ebb8385a5dbe2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow the default rendering modes on beta - change (operations/mediawiki-config)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166410
Change subject: Allow the default rendering modes on beta
..
Allow the default rendering modes on beta
Client side MathJax rendering will become
one mode that is avaible per default in
Math 2.0. Overwriting the default value
with a setting that does not include the
MathJax rendering mode, disables MathJax.
Change-Id: I22c35070fb7300c4390136bbc2140b55dccf164e
---
M wmf-config/CommonSettings-labs.php
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/10/166410/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index b47ae0b..029f640 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -146,7 +146,6 @@
if( $wmgUseMath ) {
$wgMathFileBackend = false;
$wgMathDirectory = '/data/project/upload7/math';
- $wgMathValidModes = array( MW_MATH_PNG, MW_MATH_SOURCE, MW_MATH_MATHML
);
$wgMathMathMLUrl = 'http://deployment-mathoid.eqiad.wmflabs:10042';
}
--
To view, visit https://gerrit.wikimedia.org/r/166410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22c35070fb7300c4390136bbc2140b55dccf164e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix strict warning in FakeDatabasUpdater::setAppliedUpdates - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix strict warning in FakeDatabasUpdater::setAppliedUpdates
..
Fix strict warning in FakeDatabasUpdater::setAppliedUpdates
Follows-up ccd051bc44.
To be consistent with DatabaseUpdater::setAppliedUpdates
the second arg $updates is now optional.
Change-Id: Ida2adfe30099ea4c65f0c16fafc4eae6603fc93a
---
M tests/phpunit/includes/installer/DatabaseUpdaterTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
index 29c3052..abff3e6 100644
--- a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
+++ b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php
@@ -273,7 +273,7 @@
return true;
}
- public function setAppliedUpdates( $version, $updates ) {
+ public function setAppliedUpdates( $version, $updates = array() ) {
parent::setAppliedUpdates( $version, $updates );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida2adfe30099ea4c65f0c16fafc4eae6603fc93a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly treat Message plaintext parameters as plaintext - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly treat Message plaintext parameters as plaintext
..
Explicitly treat Message plaintext parameters as plaintext
We have run into a few issues where user provided content passed
into a Message instance gets treated as wikitext in one way or
another. This patch is basically a followup to
I4da934dfe364acb0f87da1c8aed4a4d040d27a05 which was emergency
deployed last friday to deal with exactly this issue.
For the most part we have been solving for this with a combination
of Message::rawParams along with htmlspecialchars. This is less than
desirable and has lead to double encoding issues that have to be
carefully managed.
In I320645cd23c98fea4bfc32ab22b7ef8d320957cb for core I add a new
Message::plaintextParams and here we utilize it. This gives proper
guarantees with regards to outputing the plaintext strings exactly
as we intend them to be output.
Bug: 66547
Change-Id: I5ae4d66b2d6099fb0e38a7073f766628d8560270
---
M includes/Formatter/RevisionFormatter.php
M includes/Model/Anchor.php
M modules/new/flow-handlebars.js
3 files changed, 10 insertions(+), 20 deletions(-)
Approvals:
Jackmcbarn: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/RevisionFormatter.php
b/includes/Formatter/RevisionFormatter.php
index 454da42..b8e7c6e 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -788,16 +788,13 @@
$content = $this-templating-getContent( $revision,
'html' );
// strip html tags and decode to plaintext
$content = Utils::htmlToPlaintext( $content, 140,
$ctx-getLanguage() );
- // The message keys this will be used with include
links so will use Message::parse
- // we don't want anything in this plaintext to be
mistakenly taken as wikitext so
- // encode for html output and mark raw to prevent
Message from evaluating as wikitext
- return Message::rawParam( htmlspecialchars( $content )
);
+ return Message::plaintextParam( $content );
case 'wikitext':
$content = $this-templating-getContent( $revision,
'wikitext' );
// This must be escaped and marked raw to prevent
special chars in
// content, like $1, from changing the i18n result
- return Message::rawParam( htmlspecialchars( $content )
);
+ return Message::plaintextParam( $content );
// This is potentially two networked round trips, much too
expensive for
// the rendering loop
@@ -814,7 +811,7 @@
}
$content = $this-templating-getContent(
$previousRevision, 'wikitext' );
- return Message::rawParam( htmlspecialchars( $content )
);
+ return Message::plaintextParam( $content );
case 'workflow-url':
return $this-urlGenerator
@@ -831,7 +828,7 @@
case 'moderated-reason':
// don-t parse wikitext in the moderation reason
- return Message::rawParam( htmlspecialchars(
$revision-getModeratedReason() ) );
+ return Message::plaintextParam(
$revision-getModeratedReason() );
case 'topic-of-post':
if ( !$revision instanceof PostRevision ) {
@@ -840,7 +837,7 @@
$root = $revision-getRootPost();
$content = $this-templating-getContent( $root,
'wikitext' );
- return Message::rawParam( htmlspecialchars( $content )
);
+ return Message::plaintextParam( $content );
case 'post-of-summary':
if ( !$revision instanceof PostSummary ) {
@@ -848,11 +845,10 @@
}
$post =
$revision-getCollection()-getPost()-getLastRevision();
if ( $post-isTopicTitle() ) {
- $content = htmlspecialchars(
$this-templating-getContent( $post, 'wikitext' ) );
+ return Message::plaintextParam(
$this-templating-getContent( $post, 'wikitext' ) );
} else {
- $content = $this-templating-getContent(
$post, 'html' );
+ return Message::rawParam(
$this-templating-getContent( $post, 'html' ) );
}
- return Message::rawParam( $content );
case 'bundle-count':
return
[MediaWiki-commits] [Gerrit] Use EventLoggingRegisterSchemas hook - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Use EventLoggingRegisterSchemas hook
..
Use EventLoggingRegisterSchemas hook
Change-Id: If4039e7412e7516f062089150d679d840d5bcbe3
---
M MultimediaViewer.php
1 file changed, 12 insertions(+), 8 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 6c57ea9..e0cee02 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -952,17 +952,21 @@
),
);
+$wgHooks['EventLoggingRegisterSchemas'][] = function( array $schemas ) {
+ $schemas += array(
+ 'MediaViewer' = 9989959,
+ 'MultimediaViewerNetworkPerformance' = 7917896,
+ 'MultimediaViewerDuration' = 8572641,
+ 'MultimediaViewerAttribution' = 9758179,
+ 'MultimediaViewerDimensions' = 10014238,
+ );
+};
+
$wgExtensionFunctions[] = function () {
- global $wgResourceModules, $wgEventLoggingSchemas,
- $wgMediaViewerEnableByDefault, $wgDefaultUserOptions;
+ global $wgResourceModules, $wgDefaultUserOptions,
+ $wgMediaViewerEnableByDefault;
if ( isset( $wgResourceModules['ext.eventLogging'] ) ) {
- $wgEventLoggingSchemas[ 'MediaViewer' ] = 9989959;
- $wgEventLoggingSchemas[ 'MultimediaViewerNetworkPerformance' ]
= 7917896;
- $wgEventLoggingSchemas[ 'MultimediaViewerDuration' ] = 8572641;
- $wgEventLoggingSchemas[ 'MultimediaViewerAttribution' ] =
9758179;
- $wgEventLoggingSchemas[ 'MultimediaViewerDimensions' ] =
10014238;
-
$wgResourceModules['mmv.logging.ActionLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.Performance']['dependencies'][]
= 'ext.eventLogging';
$wgResourceModules['mmv.logging.DurationLogger']['dependencies'][] =
'ext.eventLogging';
--
To view, visit https://gerrit.wikimedia.org/r/166264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4039e7412e7516f062089150d679d840d5bcbe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Declare dependency jquery.cookie for ext.navigationTiming - change (mediawiki...NavigationTiming)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/166411 Change subject: Declare dependency jquery.cookie for ext.navigationTiming .. Declare dependency jquery.cookie for ext.navigationTiming Follows-up 6cbf213388. Change-Id: Iea12d9451a13864cfa6d2c113f0c3b26907fd23e --- M NavigationTiming.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming refs/changes/11/166411/1 diff --git a/NavigationTiming.php b/NavigationTiming.php index 5de2f17..db72386 100644 --- a/NavigationTiming.php +++ b/NavigationTiming.php @@ -47,6 +47,7 @@ 'schema.NavigationTiming', 'schema.SaveTiming', 'json', + 'jquery.cookie', ), 'targets' = array( 'desktop', 'mobile' ), ) -- To view, visit https://gerrit.wikimedia.org/r/166411 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea12d9451a13864cfa6d2c113f0c3b26907fd23e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NavigationTiming Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use EventLoggingRegisterSchemas hook - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Use EventLoggingRegisterSchemas hook
..
Use EventLoggingRegisterSchemas hook
There was actually no need to use an extension function here
in the first place, but using the proper hook for it is even
better.
Change-Id: I9654402631e6bd3b99b3b6571d4413d0a23ee89c
---
M ImageMetrics.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ImageMetrics.php b/ImageMetrics.php
index e507fc0..81341eb 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -28,9 +28,8 @@
$wgMessagesDirs['ImageMetrics'] = __DIR__ . '/i18n';
-$wgExtensionFunctions[] = function () {
- global $wgEventLoggingSchemas;
- $wgEventLoggingSchemas['ImageMetricsLoadingTime'] = 10078363;
+$wgHooks['EventLoggingRegisterSchemas'][] = function( array $schemas ) {
+ $schemas['ImageMetricsLoadingTime'] = 10078363;
};
--
To view, visit https://gerrit.wikimedia.org/r/166263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9654402631e6bd3b99b3b6571d4413d0a23ee89c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed some runtime issues - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166412
Change subject: Fixed some runtime issues
..
Fixed some runtime issues
Those files had runtime issues with jquery under MW 1.24.
Change-Id: I50d33f8d81828bc448b3251760e154cacf4d5581
---
M
BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
M ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
M WantedArticle/resources/bluespice.wantedArticle.js
M WidgetBar/resources/bluespice.widgetBar.js
4 files changed, 108 insertions(+), 134 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/12/166412/1
diff --git
a/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
b/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
index 7aae4ac..6d6af31 100644
---
a/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
+++
b/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
@@ -1,29 +1,27 @@
-$(document).ready(function(){
- if($.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload' ) ==
null){
-
$('#bs-bluespiceprojectfeedbackhelperpanel').delay(1500).fadeIn( 'slow' );
+mw.loader.using( 'ext.bluespice', function() {
+ if ( $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload' ) ==
null){
+ $('#bs-bluespiceprojectfeedbackhelperpanel').delay( 1500
).fadeIn( 'slow' );
- $.cookie('bs-bluespiceprojectfeedbackhelperpanel-firstload',
'false', {
+ $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload',
'false', {
path: '/',
expires: 7 // remind once a week
});
- }
- else {
+ } else {
$('#bs-bluespiceprojectfeedbackhelperpanel').show();
}
- if( $.cookie('bs-bluespiceprojectfeedbackhelperpanel-hide') == 'true' ){
+ if ( $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-hide' ) ==
'true' ){
$('#bs-bluespiceprojectfeedbackhelperpanel').hide()
- }
- else{
+ } else{
$('#bs-bluespiceprojectfeedbackhelperpanel-closebutton').click(function(){
if( confirm( $(this).attr('data-confirm-msg') ) ) {
$.get(
bs.util.getAjaxDispatcherUrl('BlueSpiceProjectFeedbackHelper::disableFeedback')
);
}
- $('#bs-bluespiceprojectfeedbackhelperpanel').fadeOut(
'fast' );
- $.cookie('bs-bluespiceprojectfeedbackhelperpanel-hide',
'true', {
+ $( '#bs-bluespiceprojectfeedbackhelperpanel' ).fadeOut(
'fast' );
+ $.cookie(
'bs-bluespiceprojectfeedbackhelperpanel-hide', 'true', {
path: '/',
expires: 7 // remind once a week
});
});
}
-});
\ No newline at end of file
+} );
\ No newline at end of file
diff --git
a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
index d2c6c72..63c7efd 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
@@ -11,66 +11,64 @@
* @filesource
*/
( function( mw, $ ) {
- $( function() {
- mw.loader.using( 'jquery.ui.autocomplete', function() {
- var cache = { };
- var lastXhr = { };
+ mw.loader.using( 'jquery.ui.autocomplete', function() {
+ var cache = { };
+ var lastXhr = { };
- if ( $( #bs-extendedsearch-input,
.bs-autocomplete-field ).length 1 )
- return;
+ if ( $( #bs-extendedsearch-input, .bs-autocomplete-field
).length 1 )
+ return;
- var container = $( div
id='bs-extendedsearch-autocomplete'/div );
- $( body ).append( container );
- $( #bs-extendedsearch-input, .bs-autocomplete-field
).autocomplete( {
- appendTo: container,
- position: {
- my: right top,
- at: right bottom
- },
- source: function( req, setList ) {
- if ( req.term in cache ) {
- setList( cache[ req.term ] );
- } else {
-
[MediaWiki-commits] [Gerrit] Replace class alias Diff\DiffOp usage with original. - change (mediawiki...Wikibase)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/166413 Change subject: Replace class alias Diff\DiffOp usage with original. .. Replace class alias Diff\DiffOp usage with original. Change-Id: I9df7dc846990a4c6561763988d1f67e1ebfda79e --- M repo/includes/Diff/EntityDiffVisualizer.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/13/166413/1 diff --git a/repo/includes/Diff/EntityDiffVisualizer.php b/repo/includes/Diff/EntityDiffVisualizer.php index 441d794..8a10fe8 100644 --- a/repo/includes/Diff/EntityDiffVisualizer.php +++ b/repo/includes/Diff/EntityDiffVisualizer.php @@ -2,8 +2,8 @@ namespace Wikibase\Repo\Diff; -use Diff\DiffOp; use Diff\DiffOp\Diff\Diff; +use Diff\DiffOp\DiffOp; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpChange; use Diff\DiffOp\DiffOpRemove; -- To view, visit https://gerrit.wikimedia.org/r/166413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9df7dc846990a4c6561763988d1f67e1ebfda79e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Finish conversion to new UrlGenerator - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Finish conversion to new UrlGenerator
..
Hygiene: Finish conversion to new UrlGenerator
BaseUrlGenerator::generateUrl was a vestige of the previous url
generation scheme. It turns out its now only used in a single
place, the RevisionViewFormatter.
This patch converts RevisoinViewFormatter to use the new methods
returning Anchors. It turns out that information to build those
urls(which UrlGenerator already has) was the only reason for
RevisionViewRow to exist. With that requirement gone RevisionViewRow
is removed along with support code related to it.
Change-Id: Ide164374732c4b4f88bfea60fab1527206bc7b0c
---
M includes/BaseUrlGenerator.php
M includes/Formatter/RevisionViewFormatter.php
M includes/Formatter/RevisionViewQuery.php
D includes/Formatter/RevisionViewRow.php
M includes/Templating.php
M includes/UrlGenerator.php
6 files changed, 65 insertions(+), 220 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BaseUrlGenerator.php b/includes/BaseUrlGenerator.php
index 9b33479..d2e5af4 100644
--- a/includes/BaseUrlGenerator.php
+++ b/includes/BaseUrlGenerator.php
@@ -45,80 +45,6 @@
}
/**
-* Builds a URL for a given title and action, with a query string.
-*
-* @todo We should probably have more descriptive names than
-* generateUrl and buildUrl
-* @param Title $title Title of the Flow Board to link to.
-* @param string $action Action to execute
-* @param array $query Associative array of query parameters
-* @return String URL
-*/
- protected function buildUrl( $title, $action = 'view', array $query =
array() ) {
- if ( $action !== 'view' ) {
- $query['action'] = $action;
- }
- return $title-getFullUrl( $query );
- }
-
- /**
-* Builds a URL to link to a given Workflow. This method is in the
-* process of being removed. It exist only for the benefit of
-* PostActionMenu which is generic to the point that it requires this
-* method. The PostActionMenu is probably going away when we move to
-* the lightncandy/handlebars frontend.
-*
-* @deprecated 1.23
-* @param Workflow|UUID $workflow The Workflow to link to
-* @param string $action The action to execute
-* @param array $query Associative array of query parameters
-* @param string $fragment URL hash fragment
-* @return string URL
-*/
- public function generateUrl( $workflow, $action = 'view', array $query
= array(), $fragment = '' ) {
- /** @var Title $linkTitle */
- /** @var string $query */
- list( $linkTitle, $query ) = $this-generateUrlData( $workflow,
$action, $query );
-
- $title = clone $linkTitle;
-
- if ( $fragment ) {
- $title-setFragment( '#' . $fragment );
- }
-
- return $title-getFullUrl( $query );
- }
-
- /**
-* Returns the title/query string to link to a given Workflow
-*
-* @todo We should probably have more descriptive names than
-* generateUrl and buildUrl
-* @param Workflow|UUID $workflow The Workflow to link to
-* @param string $action The action to execute
-* @param array $query Associative array of query parameters
-* @return Array Two element array, first element is the title to link
to,
-* @throws InvalidDataException
-* @throws InvalidInputException
-* second element is the query string
-*/
- public function generateUrlData( $workflow, $action = 'view', array
$query = array() ) {
- $workflow = $this-resolveWorkflow( $workflow );
- if ( !$workflow-isNew() ) {
- // TODO: workflow parameter is only necessary if the
definition is non-unique. Likely need to pass
- // ManagerGroup into this class rather than the
workflow ObjectManager so we can fetch definition as
- // needed.
- $query['workflow'] =
$workflow-getId()-getAlphadecimal();
- }
-
- if ( $action !== 'view' ) {
- $query['action'] = $action;
- }
-
- return array( $workflow-getArticleTitle(), $query );
- }
-
- /**
* @param Workflow|UUID $workflow
* @return Workflow
* @throws InvalidDataException
diff --git a/includes/Formatter/RevisionViewFormatter.php
b/includes/Formatter/RevisionViewFormatter.php
index ecd6d47..4e7171c 100644
--- a/includes/Formatter/RevisionViewFormatter.php
+++
[MediaWiki-commits] [Gerrit] Removing jquery dependency - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/166414 Change subject: Removing jquery dependency .. Removing jquery dependency Using jquery as a dependency with MW 1.24 throws an unknown module error. Jquery is loaded by default. Change-Id: I01bdc2d403a454109b6b9a5824046f21e094c956 --- M resources/Resources.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/14/166414/1 diff --git a/resources/Resources.php b/resources/Resources.php index 7394fc7..38646fc 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -23,7 +23,6 @@ 'bluespice/bluespice.multiselect.js' ), 'dependencies' = array( - 'jquery', 'jquery.ui.core', 'jquery.ui.dialog', 'jquery.ui.tabs', -- To view, visit https://gerrit.wikimedia.org/r/166414 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01bdc2d403a454109b6b9a5824046f21e094c956 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused settings - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/166415 Change subject: Remove unused settings .. Remove unused settings Change-Id: Icbdbad5f4cba89ba48ad2785f7b5374792b0c547 --- M TranslatewikiSettings.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/15/166415/1 diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index a3528ba..72a5c6a 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -101,7 +101,6 @@ $wgHiddenPrefs[] = 'math'; $wgHiddenPrefs[] = 'imagesize'; $wgHiddenPrefs[] = 'thumbsize'; -$wgHiddenPrefs[] = 'highlightbroken'; $wgHiddenPrefs[] = 'nocache'; $wgHiddenPrefs[] = 'showtoc'; $wgHiddenPrefs[] = 'showjumplinks'; @@ -214,7 +213,6 @@ require_once __DIR__ . /nikext.php; require_once $EXT/Renameuser/Renameuser.php; require_once $EXT/ParserFunctions/ParserFunctions.php; -$wgMaxIfExistCount = 300; $wgPFEnableStringFunctions = true; require_once $EXT/NewUserMessage/NewUserMessage.php; -- To view, visit https://gerrit.wikimedia.org/r/166415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbdbad5f4cba89ba48ad2785f7b5374792b0c547 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] role::mathoid: Convert to package|provider==trebuchet| - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: role::mathoid: Convert to package|provider==trebuchet|
..
role::mathoid: Convert to package|provider==trebuchet|
The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.
Change-Id: I992ffb4b0d137afdd2dfd6881745c2a9e0b80d74
---
M manifests/role/mathoid.pp
1 file changed, 6 insertions(+), 16 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mathoid.pp b/manifests/role/mathoid.pp
index 94c7152..7503b7d 100644
--- a/manifests/role/mathoid.pp
+++ b/manifests/role/mathoid.pp
@@ -14,17 +14,12 @@
node_path = '/srv/deployment/mathoid/mathoid/node_modules',
conf_path = '/srv/deployment/mathoid/mathoid/mathoid.config.json',
log_dir = '/var/log/mathoid',
+ require = Package['mathoid/mathoid'],
}
-# FIXME: deployment::target really needs to handle this better
-file { [ '/srv/deployment', '/srv/deployment/mathoid' ]:
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
+package { 'mathoid/mathoid':
+provider = 'trebuchet',
}
-
-deployment::target { 'mathoid': }
group { 'mathoid':
ensure = present,
@@ -60,17 +55,12 @@
node_path = '/srv/deployment/mathoid/mathoid/node_modules',
conf_path = '/srv/deployment/mathoid/mathoid/mathoid.config.json',
log_dir = '/var/log/mathoid',
-require = File[ '/srv/deployment/mathoid/mathoid' ]
+require = Package['mathoid'],
}
-file { '/srv/deployment/mathoid/mathoid':
-ensure = directory,
-owner = 'mathoid',
-group = 'mathoid',
-mode = '0755',
+package { 'mathoid':
+provider = 'trebuchet',
}
-
-deployment::target { 'mathoid': }
group { 'mathoid':
ensure = present,
--
To view, visit https://gerrit.wikimedia.org/r/163374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I992ffb4b0d137afdd2dfd6881745c2a9e0b80d74
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace class alias Diff\DiffOp usage with original. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Replace class alias Diff\DiffOp usage with original. .. Replace class alias Diff\DiffOp usage with original. Bug 71295 Change-Id: I9df7dc846990a4c6561763988d1f67e1ebfda79e --- M repo/includes/Diff/EntityDiffVisualizer.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Diff/EntityDiffVisualizer.php b/repo/includes/Diff/EntityDiffVisualizer.php index 441d794..8a10fe8 100644 --- a/repo/includes/Diff/EntityDiffVisualizer.php +++ b/repo/includes/Diff/EntityDiffVisualizer.php @@ -2,8 +2,8 @@ namespace Wikibase\Repo\Diff; -use Diff\DiffOp; use Diff\DiffOp\Diff\Diff; +use Diff\DiffOp\DiffOp; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpChange; use Diff\DiffOp\DiffOpRemove; -- To view, visit https://gerrit.wikimedia.org/r/166413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9df7dc846990a4c6561763988d1f67e1ebfda79e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon - change (mediawiki/core)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166416
Change subject: Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon
..
Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon
Added 1.5x and 2x-density variants of the 'Powered by MediaWiki' footer
icon, built from this SVG version on Commons:
https://commons.wikimedia.org/wiki/File:Powered_by_MediaWiki.svg
Note the SVG version is too large to use directly right now as it
contains a huge amount of detail; the PNGs are only a few KiB.
Renderings from Commons taken and run through pngcrush.
Note that adding 'srcset' attributes to footer icons appears to work
just fine here, so can be done for others.
Bug: 63872
Change-Id: I785d21add456eeddb6ed1ee36a1906d178323e63
---
M includes/DefaultSettings.php
M includes/Setup.php
M includes/skins/Skin.php
A resources/assets/poweredby_mediawiki_132x47.png
A resources/assets/poweredby_mediawiki_176x62.png
5 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/166416/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f2453e8..2dae8fc 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3117,6 +3117,7 @@
* for the icon, the following keys are used:
* - src: An absolute url to the image to use for the icon, this is recommended
*but not required, however some skins will ignore icons without an
image
+ * - srcset: optional additional-resolution images; see HTML5 specs
* - url: The url to use in the a element around the text or icon, if not set
an a element will
*not be outputted
* - alt: This is the text form of the icon, it will be displayed without an
image in
@@ -3133,7 +3134,7 @@
),
poweredby = array(
mediawiki = array(
- src = null, // Defaults to
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png
+ src = null, // Defaults to
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png plus
srcset for 1.5x, 2x
url = //www.mediawiki.org/,
alt = Powered by MediaWiki,
)
diff --git a/includes/Setup.php b/includes/Setup.php
index 743936e..89c3d30 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -137,6 +137,9 @@
) {
$wgFooterIcons['poweredby']['mediawiki']['src'] =
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png;
+ $wgFooterIcons['poweredby']['mediawiki']['srcset'] =
+
$wgResourceBasePath/resources/assets/poweredby_mediawiki_132x47.png 1.5x, .
+
$wgResourceBasePath/resources/assets/poweredby_mediawiki_176x62.png 2x;
}
/**
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index c8c4ba4..c1ebe15 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -837,9 +837,12 @@
function getPoweredBy() {
global $wgResourceBasePath;
- $url = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png );
- $text = 'a href=//www.mediawiki.org/img src=' . $url
- . ' height=31 width=88 alt=Powered by MediaWiki
//a';
+ $url1 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png );
+ $url1_5 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_132x47.png );
+ $url2 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_176x62.png );
+ $text = 'a href=//www.mediawiki.org/img src=' . $url1
+ . ' srcset=' . $url1_5 . ' 1.5x, ' . $url2 . ' 2x '
+ . 'height=31 width=88 alt=Powered by MediaWiki
//a';
wfRunHooks( 'SkinGetPoweredBy', array( $text, $this ) );
return $text;
}
diff --git a/resources/assets/poweredby_mediawiki_132x47.png
b/resources/assets/poweredby_mediawiki_132x47.png
new file mode 100644
index 000..a784ecf
--- /dev/null
+++ b/resources/assets/poweredby_mediawiki_132x47.png
Binary files differ
diff --git a/resources/assets/poweredby_mediawiki_176x62.png
b/resources/assets/poweredby_mediawiki_176x62.png
new file mode 100644
index 000..7970801
--- /dev/null
+++ b/resources/assets/poweredby_mediawiki_176x62.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/166416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I785d21add456eeddb6ed1ee36a1906d178323e63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] role::librenms: Convert to package|provider==trebuchet| - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: role::librenms: Convert to package|provider==trebuchet|
..
role::librenms: Convert to package|provider==trebuchet|
The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.
Change-Id: Ia2d6131840a26b09cc7a1eab77790d7b1cb9c5be
---
M manifests/role/librenms.pp
1 file changed, 5 insertions(+), 10 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/librenms.pp b/manifests/role/librenms.pp
index 23be7df..f631a15 100644
--- a/manifests/role/librenms.pp
+++ b/manifests/role/librenms.pp
@@ -6,17 +6,11 @@
include passwords::network
$sitename = 'librenms.wikimedia.org'
-
-# FIXME: deployment::target really needs to handle this better
-file { [ '/srv/deployment', '/srv/deployment/librenms' ]:
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-
-deployment::target { 'librenms': }
$install_dir = '/srv/deployment/librenms/librenms'
+
+package { 'librenms/librenms':
+provider = 'trebuchet',
+}
$config = {
'title_image' =
'url(//upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Wikimedia_Foundation_RGB_logo_with_text.svg/100px-Wikimedia_Foundation_RGB_logo_with_text.svg.png)',
@@ -69,6 +63,7 @@
install_dir = $install_dir,
rrd_dir = '/srv/librenms/rrd',
config = $config,
+require = Package['librenms/librenms'],
}
class { '::librenms::syslog':
require = Class['::librenms']
--
To view, visit https://gerrit.wikimedia.org/r/163367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2d6131840a26b09cc7a1eab77790d7b1cb9c5be
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce job template '{name}-ruby2.0lint' - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce job template '{name}-ruby2.0lint'
..
Introduce job template '{name}-ruby2.0lint'
The Ubuntu Trusty slaves have ruby2.0 installed, so might want to use it
for linting purposes.
Change-Id: Idbb8e534cac43f9e4f5efc8f72fe5f4da05cd0f9
---
M jjb/job-templates.yaml
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 9682c38..968c637 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -270,6 +270,19 @@
- ruby-lint:
interpreter: 'ruby1.9.3'
+- job-template:
+name: '{name}-ruby2.0lint'
+defaults: use-remote-zuul-no-submodules
+concurrent: true
+node: contintLabsSlave UbuntuTrusty
+logrotate:
+daysToKeep: 90
+triggers:
+ - zuul
+builders:
+ - ruby-lint:
+interpreter: 'ruby2.0'
+
# Verifiy whether there is any leading tabs in files matching 'fileselector'.
#
# 'fileselector': the parameter is passed to grep --include= option and is
--
To view, visit https://gerrit.wikimedia.org/r/166050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbb8e534cac43f9e4f5efc8f72fe5f4da05cd0f9
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add HiDPI PNG variants for 'A Wikimedia Project' logo - change (operations/mediawiki-config)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/166417 Change subject: Add HiDPI PNG variants for 'A Wikimedia Project' logo .. Add HiDPI PNG variants for 'A Wikimedia Project' logo Generated from SVG on Commons: https://en.wikipedia.org/wiki/File:A_Wikimedia_project.svg and run through pngcrush. Using srcset, which should be picked up by browsers natively or through the JavaScript polyfill. Bug: 63872 Change-Id: Ie3ae7808881802d1d856195ae7e7b9e62b7590d9 --- M .gitignore A images/wikimedia-button-1.5x.png A images/wikimedia-button-2x.png M wmf-config/CommonSettings.php 4 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/166417/1 diff --git a/.gitignore b/.gitignore index d01c255..6f298a8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ # Exceptions: # $wgCopyrightIcon !/images/wikimedia-button.png +!/images/wikimedia-button-1.5x.png +!/images/wikimedia-button-2x.png ## Not in version control yet fonts diff --git a/images/wikimedia-button-1.5x.png b/images/wikimedia-button-1.5x.png new file mode 100644 index 000..fb1cb7d --- /dev/null +++ b/images/wikimedia-button-1.5x.png Binary files differ diff --git a/images/wikimedia-button-2x.png b/images/wikimedia-button-2x.png new file mode 100644 index 000..d3f06ea --- /dev/null +++ b/images/wikimedia-button-2x.png Binary files differ diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 3b574db..22ccd6f 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -905,7 +905,13 @@ $wgUseHashTable = true; -$wgCopyrightIcon = 'a href=//wikimediafoundation.org/img src=//' . $wmfHostnames['bits'] . '/images/wikimedia-button.png width=88 height=31 alt=Wikimedia Foundation//a'; +$wgCopyrightIcon = 'a href=//wikimediafoundation.org/' . + 'img src=//' . $wmfHostnames['bits'] . '/images/wikimedia-button.png ' . + 'srcset=' . + '//' . $wmfHostnames['bits'] . '/images/wikimedia-button-1.5x.png 1.5x, ' . + '//' . $wmfHostnames['bits'] . '/images/wikimedia-button-2x.png 2x' . + ' ' . + 'width=88 height=31 alt=Wikimedia Foundation//a'; # For Special:Cite, we only want it on wikipedia (but can't count on $site), # not on these fakers. -- To view, visit https://gerrit.wikimedia.org/r/166417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3ae7808881802d1d856195ae7e7b9e62b7590d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Headers have no postId - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166418
Change subject: Headers have no postId
..
Headers have no postId
Change-Id: I5e1af40dd0e0ba6ab6b23795207f18fc369046a1
---
M includes/Formatter/RevisionViewFormatter.php
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/18/166418/1
diff --git a/includes/Formatter/RevisionViewFormatter.php
b/includes/Formatter/RevisionViewFormatter.php
index 4e7171c..f4b14b4 100644
--- a/includes/Formatter/RevisionViewFormatter.php
+++ b/includes/Formatter/RevisionViewFormatter.php
@@ -2,6 +2,7 @@
namespace Flow\Formatter;
+use Flow\Model\Header;
use Flow\Model\PostRevision;
use Flow\Model\PostSummary;
use Flow\Templating;
@@ -62,12 +63,6 @@
$links = array(
'hist' = $this-urlGenerator-boardHistoryLink( $title
),
'board' = $this-urlGenerator-boardLink( $boardTitle
),
- 'single-view' = $this-urlGenerator-postRevisionLink(
- $title,
- $workflowId,
- $row-revision-getPostId(),
- $row-revision-getRevisionId()
- ),
);
$links['single-view']-setMessage( $title-getPrefixedText() );
@@ -77,6 +72,21 @@
$workflowId
);
$links['root']-setMessage( $title-getPrefixedText() );
+
+ $links['single-view'] =
$this-urlGenerator-postRevisionLink(
+ $title,
+ $workflowId,
+ $row-revision-getPostId(),
+ $row-revision-getRevisionId()
+ );
+ $links['single-view']-setMessage(
$title-getPrefixedText() );
+ } elseif ( $row-revision instanceof Header ) {
+ $links['single-view'] =
$this-urlGenerator-headerRevisionLink(
+ $title,
+ $workflowId,
+ $row-revision-getRevisionId()
+ );
+ $links['single-view']-setMessage(
$title-getPrefixedText() );
}
if ( $row-revision-getPrevRevisionId() !== null ) {
--
To view, visit https://gerrit.wikimedia.org/r/166418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e1af40dd0e0ba6ab6b23795207f18fc369046a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Anchor's toArray should produce full url - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166419
Change subject: Anchor's toArray should produce full url
..
Anchor's toArray should produce full url
We use these urls in some messages. E.g.:
flow-revision-permalink-warning-post: This is a permanent link to a
single version of this post.\nThis version is from $1.\nYou can see the [$5
differences from the previous version], or view other versions on the [$4 post
history page].,
$4 and $5 in this message will be urls from an Anchor object. Only full urls
will be parsed, so the current loccal /index.php?... urls being generated will
cause those messages to be improperly parsed.
I don't think anything can go wrong anywhere else with having full URL.
Change-Id: I659057e882e6d13f9572315e925c4240690e98db
---
M includes/Model/Anchor.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/19/166419/1
diff --git a/includes/Model/Anchor.php b/includes/Model/Anchor.php
index b32c4df..a5ddce1 100644
--- a/includes/Model/Anchor.php
+++ b/includes/Model/Anchor.php
@@ -85,7 +85,7 @@
public function toArray() {
return array(
- 'url' = $this-getLinkURL(),
+ 'url' = $this-getFullUrl(),
'title' = $this-message-text()
);
}
--
To view, visit https://gerrit.wikimedia.org/r/166419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I659057e882e6d13f9572315e925c4240690e98db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added support for MW 1.24 - change (mediawiki...BlueSpiceSkin)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166420
Change subject: Added support for MW 1.24
..
Added support for MW 1.24
- Removed unnecessary import statement which led to an error
- Added fallback support for MW 1.22
Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
---
M BlueSpiceSkin.php
M resources/screen.layout.less
2 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/20/166420/1
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index d5a3d43..385efbc 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -66,18 +66,24 @@
$wgResourceModules['skins.bluespiceskin'] = array(
'styles' = array(
- 'common/commonElements.css' = array('media' = 'screen'),
- 'common/commonContent.css' = array('media' = 'screen'),
- 'common/commonInterface.css' = array('media' = 'screen'),
- 'common/commonPrint.css' = array( 'media' = 'print' ),
-
'BlueSpiceSkin/resources/screen.less',
'BlueSpiceSkin/resources/print.less' = array('media' =
'print'),
'BlueSpiceSkin/resources/bs.icons.css',
'BlueSpiceSkin/resources/fonts.css'
-
+ ),
+ 'dependencies' = array(
+ 'mediawiki.skinning.interface'
)
-)+$aResourceModuleTemplate;
+) + $aResourceModuleTemplate;
+
+if ( version_compare( $GLOBALS['wgVersion'], '1.23', '' ) ) {
+ $wgResourceModules['skins.bluespiceskin']['styles'] += array(
+ 'common/commonElements.css' = array('media' = 'screen'),
+ 'common/commonContent.css' = array('media' = 'screen'),
+ 'common/commonInterface.css' = array('media' = 'screen'),
+ 'common/commonPrint.css' = array( 'media' = 'print' ),
+ );
+}
unset($aResourceModuleTemplate);
diff --git a/resources/screen.layout.less b/resources/screen.layout.less
index 57f4f6b..2032029 100644
--- a/resources/screen.layout.less
+++ b/resources/screen.layout.less
@@ -1,5 +1,3 @@
-@import bluespiceskin.variables.less;
-
body.mediawiki {
/*@embed*/
background:url(images/desktop/bg-lo.png) no-repeat center top #F4F4F4;
--
To view, visit https://gerrit.wikimedia.org/r/166420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make it up the user if he wants links on special page - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged. Change subject: Make it up the user if he wants links on special page .. Make it up the user if he wants links on special page Change-Id: Ic180418b06f76df69148fdcecd31b4780c79f9f7 --- M ExtendedSearch/ExtendedSearch.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smuggli: Verified; Looks good to me, approved diff --git a/ExtendedSearch/ExtendedSearch.class.php b/ExtendedSearch/ExtendedSearch.class.php index 0c2fb2c..ecf28d0 100644 --- a/ExtendedSearch/ExtendedSearch.class.php +++ b/ExtendedSearch/ExtendedSearch.class.php @@ -98,7 +98,7 @@ BsConfig::registerVar( 'MW::ExtendedSearch::LimitResults', 15, BsConfig::TYPE_INT|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-limitresultdef', 'int' ); BsConfig::registerVar( 'MW::ExtendedSearch::SearchFiles', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-searchfiles', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::JumpToTitle', false, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-jumptotitle', 'toggle' ); - BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreateSugg', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-showcreatesugg', 'toggle' ); + BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreateSugg', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showcreatesugg', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowFacets', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showfacets', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowAutocomplete', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-showautocomplete', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreSugInAc', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showcresuginac', 'toggle' ); -- To view, visit https://gerrit.wikimedia.org/r/166022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic180418b06f76df69148fdcecd31b4780c79f9f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n fallback to key - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166421
Change subject: i18n fallback to key
..
i18n fallback to key
Instead of raising exception ImportError when git submodule i18n is not
initialised, fallback to using the key name as the visual element.
Bug: 66897
Change-Id: I12518189126d8f929d30ab18bf8597a288d28891
---
M pywikibot/i18n.py
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/21/166421/1
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index e10ccbf..fcf9423 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -359,8 +359,15 @@
@param parameters: For passing parameters.
package = twtitle.split(-)[0]
-transdict = getattr(__import__(messages_package_name, fromlist=[package]),
package).msg
-
+try:
+transdict = getattr(__import__(messages_package_name,
+ fromlist=[package]),
+package).msg
+except ImportError:
+pywikibot.warning('twtranslate: Could not load message %s.%s'
+ % (messages_package_name, twtitle))
+# Provide a placeholder
+transdict = {'en': {twtitle: '' + twtitle + ''}}
code_needed = False
# If a site is given instead of a code, use its language
if hasattr(code, 'code'):
@@ -487,7 +494,14 @@
@param twtitle: The TranslateWiki string title, in package-key format
package = twtitle.split(-)[0]
-transdict = getattr(__import__(i18n, fromlist=[package]), package).msg
+try:
+transdict = getattr(__import__(i18n, fromlist=[package]),
+package).msg
+except ImportError:
+pywikibot.warning('twhas_key: Could not load message i18n.%s'
+ % (messages_package_name, twtitle))
+return False
+
# If a site is given instead of a code, use its language
if hasattr(code, 'code'):
code = code.code
--
To view, visit https://gerrit.wikimedia.org/r/166421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12518189126d8f929d30ab18bf8597a288d28891
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unnecessary unicode from i18n docstring - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166422
Change subject: Remove unnecessary unicode from i18n docstring
..
Remove unnecessary unicode from i18n docstring
The unicode in a r.. was the last pep257 issue.
Change-Id: I10b8587b2c6d9a42e46e63c9f0fdb9747f5d6040
---
M pywikibot/i18n.py
M tox.ini
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/22/166422/1
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index e10ccbf..33ad626 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -418,9 +418,6 @@
Examples:
If we had a test dictionary in test.py like
msg = {
-'de': {
-'test-changing': u'Bot: Ändere %(num)d
{{PLURAL:num|Seite|Seiten}}.',
-},
'en': {
# number value as format sting is allowed
'test-changing': u'Bot: Changing %(num)s
{{PLURAL:%(num)d|page|pages}}.',
diff --git a/tox.ini b/tox.ini
index ed4e709..2d2b443 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,7 @@
./pywikibot/editor.py \
./pywikibot/family.py \
./pywikibot/fixes.py \
+./pywikibot/i18n.py \
./pywikibot/interwiki_graph.py \
./pywikibot/page.py \
./pywikibot/plural.py \
--
To view, visit https://gerrit.wikimedia.org/r/166422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10b8587b2c6d9a42e46e63c9f0fdb9747f5d6040
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax in string. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/166423 Change subject: Fix syntax in string. .. Fix syntax in string. (could have sworn that it compiled when I tested it, but now fails to compile because of apostrophe.) Change-Id: I96fba2ba6852faed4f271b36527e8662f0f7097f --- M wikipedia/res/values/strings.xml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/23/166423/1 diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 99e6e69..99805ef 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -49,7 +49,7 @@ string name=nav_item_nearbyNearby/string string name=menu_update_nearbyUpdate nearby/string string name=nearby_empty_titleNo nearby pages here!/string -string name=nearby_empty_messageWhen you move to a new location, try refreshing this page to learn more about what's around you./string +string name=nearby_empty_messageWhen you move to a new location, try refreshing this page to learn more about what\'s around you./string string name=nearby_distance_in_meters%d m/string string name=nearby_distance_in_kilometers%.2f km/string string name=nearby_distance_in_feet%d ft/string -- To view, visit https://gerrit.wikimedia.org/r/166423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96fba2ba6852faed4f271b36527e8662f0f7097f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant dbr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax in string. - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Fix syntax in string. .. Fix syntax in string. (could have sworn that it compiled when I tested it, but now fails to compile because of apostrophe.) Change-Id: I96fba2ba6852faed4f271b36527e8662f0f7097f --- M wikipedia/res/values/strings.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dbrant: Looks good to me, approved diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 99e6e69..99805ef 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -49,7 +49,7 @@ string name=nav_item_nearbyNearby/string string name=menu_update_nearbyUpdate nearby/string string name=nearby_empty_titleNo nearby pages here!/string -string name=nearby_empty_messageWhen you move to a new location, try refreshing this page to learn more about what's around you./string +string name=nearby_empty_messageWhen you move to a new location, try refreshing this page to learn more about what\'s around you./string string name=nearby_distance_in_meters%d m/string string name=nearby_distance_in_kilometers%.2f km/string string name=nearby_distance_in_feet%d ft/string -- To view, visit https://gerrit.wikimedia.org/r/166423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96fba2ba6852faed4f271b36527e8662f0f7097f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure openstack::openstack-manager creates /a - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Make sure openstack::openstack-manager creates /a
..
Make sure openstack::openstack-manager creates /a
mediawiki::scap no longer does this as the deployment
dir changed to /srv.
This will (probably) change the ownership of /a from mwdeploy:mwdeploy
to root:root on virt1000.
Change-Id: Iae6dc9cfe832603f8e26662b3df5667a32d6387d
---
M manifests/openstack.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 2bd43cd..2f45050 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -354,10 +354,14 @@
}
# ::mediawiki::scap supports syncing the wikitech wiki from tin.
-# It also defines /a which is used later on in this manifest for backups.
include ::mediawiki::scap
file {
+/a:
+mode = '0755',
+owner = 'root',
+group = 'root',
+ensure = directory;
/var/www/robots.txt:
ensure = present,
mode = '0644',
--
To view, visit https://gerrit.wikimedia.org/r/166360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae6dc9cfe832603f8e26662b3df5667a32d6387d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't force focus after history action - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166424
Change subject: Don't force focus after history action
..
Don't force focus after history action
These days the surface correctly takes focus if necessary so this
is unnecessary and may cause unwanted scrolling when the selection
should be in the paste target.
focus away from the paste target.
Change-Id: Ib5fc40515a8c8780a4fee6e928d1e6322a2b7409
---
M src/ui/actions/ve.ui.HistoryAction.js
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/24/166424/1
diff --git a/src/ui/actions/ve.ui.HistoryAction.js
b/src/ui/actions/ve.ui.HistoryAction.js
index 23f4a9d..fae14a1 100644
--- a/src/ui/actions/ve.ui.HistoryAction.js
+++ b/src/ui/actions/ve.ui.HistoryAction.js
@@ -42,7 +42,6 @@
*/
ve.ui.HistoryAction.prototype.undo = function () {
this.surface.getModel().undo();
- this.surface.getView().focus();
};
/**
@@ -52,7 +51,6 @@
*/
ve.ui.HistoryAction.prototype.redo = function () {
this.surface.getModel().redo();
- this.surface.getView().focus();
};
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/166424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5fc40515a8c8780a4fee6e928d1e6322a2b7409
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Allow dynamic interwiki links - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Allow dynamic interwiki links
..
[FIX] Allow dynamic interwiki links
This uses the 'interwikimap' siteinfo to determine the Site an
interwiki prefix is redirecting to. A Family supports 'from_url' which
returns the 'code' (an entry in 'langs') to which the URL belongs to.
If no code of that family does support that URL 'None' is returned.
Because both the test and wikipedia family support the URL
test.wikipedia.org, the test family returns always None so it chooses the
wikipedia family. This is then consistent with the test wikidata instance
which is in the wikidata family and not in a separate test family.
To get the family for a specific URL it might need to iterate through all
families, which are loaded in the process. Each site has a local cache which
holds the Site represented by a specific interwiki prefix. There is also a
global cache which stores the family name and code for each URL so that later
searches for the URL don't require to iterate through all families.
This also adds an parameter url to pywikibot.Site function which can
only be set when neither code nor fam are set.
The code used in 'nice_get_address' should be returned when the url is parsed
by 'from_url'. This also fixes all link tests so that the 'show_failures'
features could be removed.
It also changes the exception from Error in InvalidTitle, when there is
no title given and it has a namespace or no interwiki link. It also only
throws an InvalidTitle if an interwiki link links to a non local page
via a local interwiki link. Previously all interwiki links which
referred to it's own site wouldn't be allowed.
Change-Id: Iec4f32fdefde15b2330dbb191fb3bbb0d04803e2
---
M pywikibot/__init__.py
M pywikibot/families/test_family.py
M pywikibot/family.py
M pywikibot/page.py
M pywikibot/site.py
M tests/interwiki_link_tests.py
M tests/link_tests.py
7 files changed, 354 insertions(+), 288 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 5257f65..2e569c0 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -459,9 +459,10 @@
_sites = {}
+_url_cache = {} # The code/fam pair for each URL
-def Site(code=None, fam=None, user=None, sysop=None, interface=None):
+def Site(code=None, fam=None, user=None, sysop=None, interface=None, url=None):
A factory method to obtain a Site object.
Site objects are cached and reused by this method.
@@ -479,12 +480,40 @@
@type sysop: unicode
@param interface: site interface (override config.site_interface)
@type interface: string
+@param url: Instead of code and fam, does try to get a Site based on the
+URL. Still requires that the family supporting that URL exists.
+@type url: string
+# Either code and fam or only url
+assert(not url or (not code and not fam))
_logger = wiki
-# Fallback to config defaults
-code = code or config.mylang
-fam = fam or config.family
+if url:
+if url in _url_cache:
+cached = _url_cache[url]
+if cached:
+code = cached[0]
+fam = cached[1]
+else:
+raise Error(Unknown URL '{0}'..format(url))
+else:
+# Iterate through all families and look, which does apply to
+# the given URL
+for fam in config.family_files:
+family = pywikibot.family.Family.load(fam)
+code = family.from_url(url)
+if code:
+_url_cache[url] = (code, fam)
+break
+else:
+_url_cache[url] = None
+# TODO: As soon as AutoFamily is ready, try and use an
+# AutoFamily
+raise Error(Unknown URL '{0}'..format(url))
+else:
+# Fallback to config defaults
+code = code or config.mylang
+fam = fam or config.family
interface = interface or config.site_interface
# config.usernames is initialised with a dict for each family name
diff --git a/pywikibot/families/test_family.py
b/pywikibot/families/test_family.py
index 27d5f4b..c2cc459 100644
--- a/pywikibot/families/test_family.py
+++ b/pywikibot/families/test_family.py
@@ -13,3 +13,6 @@
self.langs = {
'test': 'test.wikipedia.org',
}
+
+def from_url(self, url):
+return None # Don't accept this, but 'test' of 'wikipedia'
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 1bfd558..6765176 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1035,6 +1035,64 @@
def nice_get_address(self, code, title):
return '%s%s' % (self.nicepath(code), title)
+def _get_path_regex(self):
+
+Return a regex
[MediaWiki-commits] [Gerrit] Fix entity deletion updates for properties. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166425
Change subject: Fix entity deletion updates for properties.
..
Fix entity deletion updates for properties.
Bug: 71914
Change-Id: I9197222bbed21369bd881a0e9e8fc88301eaa967
---
M repo/includes/content/PropertyHandler.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
2 files changed, 56 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/25/166425/1
diff --git a/repo/includes/content/PropertyHandler.php
b/repo/includes/content/PropertyHandler.php
index 3b7f83c..e70a7c5 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -148,7 +148,7 @@
);
return array_merge(
- parent::getEntityModificationUpdates( $content, $title
),
+ parent::getEntityDeletionUpdates( $content, $title ),
$updates
);
}
diff --git a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
index c0a15ae..71b3481 100644
--- a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
@@ -10,7 +10,9 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\EntityFactory;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
@@ -64,7 +66,34 @@
return array( $store, $lookup );
}
- public function testSaveEntity() {
+ private function getSimpleEntities() {
+ $item = Item::newEmpty();
+ $item-setLabel( 'en', 'Item' );
+ $item-setDescription( 'en', 'Item description' );
+
+ $property = Property::newFromType( 'string' );
+ $property-setLabel( 'en', 'Property' );
+ $property-setDescription( 'en', 'Property description' );
+
+ return array(
+ $item,
+ $property
+ );
+ }
+
+ public function simpleEntityParameterProvider() {
+ return array_map(
+ function ( $entity ) {
+ return array( $entity );
+ },
+ $this-getSimpleEntities()
+ );
+ }
+
+ /**
+* @dataProvider simpleEntityParameterProvider()
+*/
+ public function testSaveEntity( Entity $entity ) {
/* @var WikiPageEntityStore $store */
/* @var EntityRevisionLookup $lookup */
list( $store, $lookup ) = $this-createStoreAndLookup();
@@ -79,38 +108,34 @@
$store-registerWatcher( $watcher );
- // create one
- $one = Item::newEmpty();
- $one-setLabel( 'en', 'one' );
+ // save entity
+ $r1 = $store-saveEntity( $entity, 'create one', $user,
EDIT_NEW );
+ $entityId = $r1-getEntity()-getId();
- $r1 = $store-saveEntity( $one, 'create one', $user, EDIT_NEW );
- $oneId = $r1-getEntity()-getId();
-
- $r1actual = $lookup-getEntityRevision( $oneId );
+ $r1actual = $lookup-getEntityRevision( $entityId );
$this-assertEquals( $r1-getRevision(),
$r1actual-getRevision(), 'revid' );
$this-assertEquals( $r1-getTimestamp(),
$r1actual-getTimestamp(), 'timestamp' );
$this-assertEquals( $r1-getEntity()-getId(),
$r1actual-getEntity()-getId(), 'entity id' );
// TODO: check notifications in wb_changes table!
- // update one
- $one = Item::newEmpty();
- $one-setId( $oneId );
- $one-setLabel( 'en', 'ONE' );
+ // update entity
+ $entity-clear();
+ $entity-setLabel( 'en', 'UPDATED' );
- $r2 = $store-saveEntity( $one, 'update one', $user,
EDIT_UPDATE );
+ $r2 = $store-saveEntity( $entity, 'update one', $user,
EDIT_UPDATE );
$this-assertNotEquals( $r1-getRevision(), $r2-getRevision(),
'expected new revision id' );
- $r2actual = $lookup-getEntityRevision( $oneId );
+ $r2actual = $lookup-getEntityRevision( $entityId );
$this-assertEquals( $r2-getRevision(),
$r2actual-getRevision(), 'revid' );
$this-assertEquals( $r2-getTimestamp(),
$r2actual-getTimestamp(), 'timestamp' );
[MediaWiki-commits] [Gerrit] Remove unnecessary unicode from i18n docstring - change (pywikibot/core)
XZise has submitted this change and it was merged.
Change subject: Remove unnecessary unicode from i18n docstring
..
Remove unnecessary unicode from i18n docstring
The unicode in a r.. was the last pep257 issue.
Change-Id: I10b8587b2c6d9a42e46e63c9f0fdb9747f5d6040
---
M pywikibot/i18n.py
M tox.ini
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
XZise: Looks good to me, approved
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index e10ccbf..33ad626 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -418,9 +418,6 @@
Examples:
If we had a test dictionary in test.py like
msg = {
-'de': {
-'test-changing': u'Bot: Ändere %(num)d
{{PLURAL:num|Seite|Seiten}}.',
-},
'en': {
# number value as format sting is allowed
'test-changing': u'Bot: Changing %(num)s
{{PLURAL:%(num)d|page|pages}}.',
diff --git a/tox.ini b/tox.ini
index ed4e709..2d2b443 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,7 @@
./pywikibot/editor.py \
./pywikibot/family.py \
./pywikibot/fixes.py \
+./pywikibot/i18n.py \
./pywikibot/interwiki_graph.py \
./pywikibot/page.py \
./pywikibot/plural.py \
--
To view, visit https://gerrit.wikimedia.org/r/166422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10b8587b2c6d9a42e46e63c9f0fdb9747f5d6040
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Link: Use unicode in error messages - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166426
Change subject: [FIX] Link: Use unicode in error messages
..
[FIX] Link: Use unicode in error messages
Change-Id: I8b0aafe9824a519fffc44a6fb173e1924a994c17
---
M pywikibot/page.py
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/26/166426/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index a4ce5cb..6bf04b0 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4052,7 +4052,7 @@
# 'namespace:' is not a valid title
if not t:
raise pywikibot.InvalidTitle(
-'{0}' has no title..format(self._text))
+u'{0}' has no title..format(self._text))
self._namespace = ns
break
try:
@@ -4061,7 +4061,7 @@
break # text before : doesn't match any known prefix
except NoSuchSite:
raise pywikibot.Error(
-'{0} is not a local page on {1}, and the interwiki prefix '
+u'{0} is not a local page on {1}, and the interwiki prefix
'
'{2} is not supported by PyWikiBot!'.format(
self._text, self._site, prefix))
else:
@@ -4069,7 +4069,7 @@
if first_other_site:
if not self._site.local_interwiki(prefix):
raise pywikibot.InvalidTitle(
-'{0} links to a non local site {1} via an '
+u'{0} links to a non local site {1} via an '
'interwiki link to {2}.'.format(
self._text, newsite, first_other_site))
elif newsite != self._source:
@@ -4102,15 +4102,15 @@
or t.endswith(u/..)
):
raise pywikibot.InvalidTitle(
-(contains . / combinations): '%s'
+u(contains . / combinations): '%s'
% self._text)
# Magic tilde sequences? Nu-uh!
if u~~~ in t:
-raise pywikibot.InvalidTitle((contains ~~~): '%s' % self._text)
+raise pywikibot.InvalidTitle(u(contains ~~~): '%s' % self._text)
if self._namespace != -1 and len(t) 255:
-raise pywikibot.InvalidTitle((over 255 bytes): '%s' % t)
+raise pywikibot.InvalidTitle(u(over 255 bytes): '%s' % t)
# empty local links can only be self-links
# with a fragment identifier.
--
To view, visit https://gerrit.wikimedia.org/r/166426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b0aafe9824a519fffc44a6fb173e1924a994c17
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor: Use bunyan.warn for warning/* not just warn/* - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Minor: Use bunyan.warn for warning/* not just warn/*
..
Minor: Use bunyan.warn for warning/* not just warn/*
Change-Id: I45912fe4f4be5ea55cf7a1d2e536513cfbe47161
---
M lib/Logger.bunyan.js
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/Logger.bunyan.js b/lib/Logger.bunyan.js
index c224fe6..e5e01e1 100644
--- a/lib/Logger.bunyan.js
+++ b/lib/Logger.bunyan.js
@@ -45,7 +45,7 @@
logger = this._logger.fatal;
} else if (logType.match(/^error($|\/)/)) {
logger = this._logger.error;
- } else if (logType.match(/^warn($|\/)/)) {
+ } else if (logType.match(/^warn(ing)?($|\/)/)) {
logger = this._logger.warn;
} else if (logType.match(/^info($|\/)/)) {
logger = this._logger.info;
@@ -75,10 +75,6 @@
cb();
};
-BunyanLogger.prototype.getLogger = function() {
- return this._log.bind(this);
-};
-
BunyanLogger.prototype._trace = function(logData, cb) {
var logger = this._getBunyanLogger(logData),
log = this._createBunyanLog(logData),
@@ -99,6 +95,10 @@
cb();
};
+BunyanLogger.prototype.getLogger = function() {
+ return this._log.bind(this);
+};
+
BunyanLogger.prototype.getTracer = function() {
return this._trace.bind(this);
};
--
To view, visit https://gerrit.wikimedia.org/r/166145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45912fe4f4be5ea55cf7a1d2e536513cfbe47161
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
