date:20131007

[MediaWiki-commits] [Gerrit] sub db1015 into s6 during slave upgrades - change (operations/puppet)

2013-10-07 Thread Springle (Code Review)

Springle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88001


Change subject: sub db1015 into s6 during slave upgrades
..

sub db1015 into s6 during slave upgrades

Change-Id: If47ea4592645ce6468b52235c53b794671306618
---
M manifests/site.pp
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/88001/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 074a305..a412319 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -644,10 +644,10 @@
 }
 }
 
-node /^db10(06|22|27|39|40)\.eqiad\.wmnet/ {
+node /^db10(06|15|22|27|39|40)\.eqiad\.wmnet/ {
 if $hostname =~ /^db10(22|39)/ {
 class { role::coredb::s6 : innodb_file_per_table = true, mariadb = 
true }
-} elsif $hostname == db1027 {
+} elsif $hostname =~ /^db10(15|27)/ {
 class { role::coredb::s6 : mariadb = true }
 } else {
 include role::coredb::s6
@@ -770,9 +770,8 @@
 
 ## 2013-04-10: py using db101[45] and db1023 and db1033 for testing
 ## not currently in production and/or hardware issues
-# db1015
 # db1033
-node /^db10(15|33)\.eqiad\.wmnet/ {
+node /^db10(33)\.eqiad\.wmnet/ {
 include standard
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If47ea4592645ce6468b52235c53b794671306618
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] sub db1015 into s6 during slave upgrades - change (operations/puppet)

2013-10-07 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: sub db1015 into s6 during slave upgrades
..


sub db1015 into s6 during slave upgrades

Change-Id: If47ea4592645ce6468b52235c53b794671306618
---
M manifests/site.pp
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Springle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 074a305..a412319 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -644,10 +644,10 @@
 }
 }
 
-node /^db10(06|22|27|39|40)\.eqiad\.wmnet/ {
+node /^db10(06|15|22|27|39|40)\.eqiad\.wmnet/ {
 if $hostname =~ /^db10(22|39)/ {
 class { role::coredb::s6 : innodb_file_per_table = true, mariadb = 
true }
-} elsif $hostname == db1027 {
+} elsif $hostname =~ /^db10(15|27)/ {
 class { role::coredb::s6 : mariadb = true }
 } else {
 include role::coredb::s6
@@ -770,9 +770,8 @@
 
 ## 2013-04-10: py using db101[45] and db1023 and db1033 for testing
 ## not currently in production and/or hardware issues
-# db1015
 # db1033
-node /^db10(15|33)\.eqiad\.wmnet/ {
+node /^db10(33)\.eqiad\.wmnet/ {
 include standard
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If47ea4592645ce6468b52235c53b794671306618
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@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] Populate the revision dict if lastrev is not in it. - change (pywikibot/core)

2013-10-07 Thread Xqt (Code Review)

Xqt has submitted this change and it was merged.

Change subject: Populate the revision dict if lastrev is not in it.
..


Populate the revision dict if lastrev is not in it.

This allows avoinding a KeyError when the timestamp is extracted.

Bug: 54995
Change-Id: I1f97dac718dc6b645b1b35af4a894b84e14e6385
---
M pywikibot/site.py
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Xqt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/pywikibot/site.py b/pywikibot/site.py
index f14132c..fff2fe0 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2691,6 +2691,8 @@
 if bot:
 params[bot] = 
 if lastrev is not None:
+if lastrev not in page._revisions:
+self.loadrevisions(page)
 params[basetimestamp] = page._revisions[lastrev].timestamp
 if minor:
 params['minor'] = 

-- 
To view, visit https://gerrit.wikimedia.org/r/87915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f97dac718dc6b645b1b35af4a894b84e14e6385
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.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] Remove CodeEditor from UploadWizard - change (mediawiki/vagrant)

2013-10-07 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88002


Change subject: Remove CodeEditor from UploadWizard
..

Remove CodeEditor from UploadWizard

This meant that we could not use both Scribunto and UW roles
at the same time. Removing from UW for now

Change-Id: I6b33c3e2f8fdb20c4d9c4a1c25db1d9b0965d0c3
---
M puppet/manifests/roles.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/02/88002/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index c720409..c145b77 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -244,7 +244,7 @@
 include role::eventlogging
 include role::multimedia
 
-@mediawiki::extension { [ 'CodeEditor', 'WikiEditor', 'Campaigns' ]: }
+@mediawiki::extension { [ 'Campaigns' ]: }
 
 @mediawiki::extension { 'UploadWizard':
 require  = Package['imagemagick'],

-- 
To view, visit https://gerrit.wikimedia.org/r/88002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b33c3e2f8fdb20c4d9c4a1c25db1d9b0965d0c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add AntiSpam role - change (mediawiki/vagrant)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add AntiSpam role
..


Add AntiSpam role

Includes AntiSpoof, AbuseFilter and SpamBlacklist extensions

Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
---
M puppet/manifests/roles.pp
1 file changed, 30 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index c720409..4db69ea 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -548,3 +548,33 @@
 require  = Mediawiki::Extension['Interwiki'],
 }
 }
+
+# == Class: role::antispam
+# Installs and sets up AntiSpoof, AbuseFilter, and the SpamBlacklist extensions
+class role::antispam {
+include role::mediawiki
+
+@mediawiki::extension { 'AntiSpoof':
+needs_update = true,
+}
+
+@mediawiki::extension { 'AbuseFilter':
+needs_update = true,
+settings = [
+'$wgGroupPermissions[sysop][abusefilter-modify] = true',
+'$wgGroupPermissions[*][abusefilter-log-detail] = true',
+'$wgGroupPermissions[*][abusefilter-view] = true',
+'$wgGroupPermissions[*][abusefilter-log] = true',
+'$wgGroupPermissions[sysop][abusefilter-private] = true',
+'$wgGroupPermissions[sysop][abusefilter-modify-restricted] = 
true',
+'$wgGroupPermissions[sysop][abusefilter-revert] = true',
+],
+require = MediaWiki::Extension['AntiSpoof'],
+}
+
+@mediawiki::extension { 'SpamBlacklist':
+settings = {
+wgLogSpamBlacklistHits = true,
+},
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/88000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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 MassMessage role - change (mediawiki/vagrant)

2013-10-07 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88003


Change subject: Add MassMessage role
..

Add MassMessage role

Also includes LQT and mleb (Translate) to test integration
with those extensions.

Change-Id: I6a716776aee089f4ea5e782799b9ae97733f5d6b
---
M puppet/manifests/roles.pp
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/03/88003/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 4db69ea..c3b4d14 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -578,3 +578,19 @@
 },
 }
 }
+
+# == Class: role::massmessage
+# Installs and sets up the MassMessage extension
+# Also sets up everything that it might be able to integrate with
+class role::massmessage {
+include role::mediawiki
+include role::mleb
+
+@mediawiki::extension { 'MassMessage': }
+@mediawiki::extension { 'LiquidThreads':
+needs_update = true,
+settings = {
+wgLqtTalkPages = false,
+}
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/88003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a716776aee089f4ea5e782799b9ae97733f5d6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add - method _get_deploy_tags, utilize in diff log_deploys. - change (sartoris)

2013-10-07 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add - method _get_deploy_tags, utilize in diff  log_deploys.
..


add - method _get_deploy_tags, utilize in diff  log_deploys.

Change-Id: Icd2d077ce60aaea9304f0ba5bfa0855f1f8b0b71
---
M sartoris/sartoris.py
1 file changed, 19 insertions(+), 23 deletions(-)

Approvals:
  Rfaulk: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 9686a16..f0106cc 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -167,10 +167,21 @@
 raise SartorisError(message=exit_codes[8], exit_code=8)
 
 def _get_latest_deploy_tag(self):
- Returns the latest tag containing 'sync'
-Sets self._tag to tag string
 
-return self._dulwich_get_tags().keys()[-1]
+Returns the latest tag containing 'sync'
+Sets self._tag to tag string
+
+return self._get_deploy_tags()[-1]
+
+def _get_deploy_tags(self):
+
+Returns the all deploy tags.
+
+# 1. Pull last 'num_tags' sync tags
+# 2. Filter only matched deploy tags
+tags = self._dulwich_get_tags().keys()
+f = lambda x: search(self.config['user'] + '-', x)
+return filter(f, tags)
 
 def _dulwich_tag(self, tag, author, message=DEFAULT_TAG_MSG):
 
@@ -585,13 +596,7 @@
 except NameError:
 raise SartorisError(message=exit_codes[10], exit_code=10)
 
-# Pull last 'num_tags' sync tags
-# Reverse the tags since the later ones will appear further down
-tags = self._dulwich_get_tags().keys()
-
-# Filter only matched deploy tags
-f = lambda x: search(self.config['user'] + '-', x)
-tags = filter(f, tags)
+tags = self._get_deploy_tags()
 
 if num_tags = len(tags):
 tags = tags[:num_tags]
@@ -605,25 +610,16 @@
 * show a git diff of the last deploy and it's previous deploy
 
 
-# Get the last two tags - assumes tagging on deployment only
-proc = subprocess.Popen(git tag.split(),
-stdout=subprocess.PIPE,
-stderr=subprocess.PIPE,)
-
-# Get the last two tags
-sync_tags = filter(lambda x: search(r'sync', x),
-   proc.communicate()[0].split('\n'))
+tags = self._get_deploy_tags()
 
 # Check the return code  whether at least two sync tags were
 # returned
-if proc.returncode:
-raise SartorisError(message=exit_codes[6], exit_code=6)
-elif len(sync_tags)  2:
+if len(tags)  2:
 raise SartorisError(message=exit_codes[7], exit_code=7)
 
 # Get the associated commit hashes for those tags
-sha_1 = self._get_commit_sha_for_tag(sync_tags[0])
-sha_2 = self._get_commit_sha_for_tag(sync_tags[1])
+sha_1 = self._get_commit_sha_for_tag(tags[0])
+sha_2 = self._get_commit_sha_for_tag(tags[1])
 
 # Produce the diff
 # @TODO replace with dulwich

-- 
To view, visit https://gerrit.wikimedia.org/r/88004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd2d077ce60aaea9304f0ba5bfa0855f1f8b0b71
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
Gerrit-Reviewer: Rfaulk rfaulk...@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 - method _get_deploy_tags, utilize in diff log_deploys. - change (sartoris)

2013-10-07 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88004


Change subject: add - method _get_deploy_tags, utilize in diff  log_deploys.
..

add - method _get_deploy_tags, utilize in diff  log_deploys.

Change-Id: Icd2d077ce60aaea9304f0ba5bfa0855f1f8b0b71
---
M sartoris/sartoris.py
1 file changed, 19 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/04/88004/1

diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 9686a16..f0106cc 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -167,10 +167,21 @@
 raise SartorisError(message=exit_codes[8], exit_code=8)
 
 def _get_latest_deploy_tag(self):
- Returns the latest tag containing 'sync'
-Sets self._tag to tag string
 
-return self._dulwich_get_tags().keys()[-1]
+Returns the latest tag containing 'sync'
+Sets self._tag to tag string
+
+return self._get_deploy_tags()[-1]
+
+def _get_deploy_tags(self):
+
+Returns the all deploy tags.
+
+# 1. Pull last 'num_tags' sync tags
+# 2. Filter only matched deploy tags
+tags = self._dulwich_get_tags().keys()
+f = lambda x: search(self.config['user'] + '-', x)
+return filter(f, tags)
 
 def _dulwich_tag(self, tag, author, message=DEFAULT_TAG_MSG):
 
@@ -585,13 +596,7 @@
 except NameError:
 raise SartorisError(message=exit_codes[10], exit_code=10)
 
-# Pull last 'num_tags' sync tags
-# Reverse the tags since the later ones will appear further down
-tags = self._dulwich_get_tags().keys()
-
-# Filter only matched deploy tags
-f = lambda x: search(self.config['user'] + '-', x)
-tags = filter(f, tags)
+tags = self._get_deploy_tags()
 
 if num_tags = len(tags):
 tags = tags[:num_tags]
@@ -605,25 +610,16 @@
 * show a git diff of the last deploy and it's previous deploy
 
 
-# Get the last two tags - assumes tagging on deployment only
-proc = subprocess.Popen(git tag.split(),
-stdout=subprocess.PIPE,
-stderr=subprocess.PIPE,)
-
-# Get the last two tags
-sync_tags = filter(lambda x: search(r'sync', x),
-   proc.communicate()[0].split('\n'))
+tags = self._get_deploy_tags()
 
 # Check the return code  whether at least two sync tags were
 # returned
-if proc.returncode:
-raise SartorisError(message=exit_codes[6], exit_code=6)
-elif len(sync_tags)  2:
+if len(tags)  2:
 raise SartorisError(message=exit_codes[7], exit_code=7)
 
 # Get the associated commit hashes for those tags
-sha_1 = self._get_commit_sha_for_tag(sync_tags[0])
-sha_2 = self._get_commit_sha_for_tag(sync_tags[1])
+sha_1 = self._get_commit_sha_for_tag(tags[0])
+sha_2 = self._get_commit_sha_for_tag(tags[1])
 
 # Produce the diff
 # @TODO replace with dulwich

-- 
To view, visit https://gerrit.wikimedia.org/r/88004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd2d077ce60aaea9304f0ba5bfa0855f1f8b0b71
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add puppet-cron submodule - change (mediawiki/vagrant)

2013-10-07 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88005


Change subject: Add puppet-cron submodule
..

Add puppet-cron submodule

Change-Id: I0479d1f742f0198562367359ac439764e622f720
---
A .gitmodules
A puppet/modules/cron
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/05/88005/1

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..5d1e161
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule puppet/modules/cron]
+   path = puppet/modules/cron
+   url = https://github.com/torrancew/puppet-cron
diff --git a/puppet/modules/cron b/puppet/modules/cron
new file mode 16
index 000..ca2c383
--- /dev/null
+++ b/puppet/modules/cron
+Subproject commit ca2c3832c9d3d709a0f416e716c77634cb774955

-- 
To view, visit https://gerrit.wikimedia.org/r/88005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0479d1f742f0198562367359ac439764e622f720
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add redisjobqueue role - change (mediawiki/vagrant)

2013-10-07 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88006


Change subject: Add redisjobqueue role
..

Add redisjobqueue role

Change-Id: I0d9f515e053cbba94a626180c32fde19697d2325
---
M puppet/manifests/roles.pp
1 file changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/06/88006/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 4db69ea..bf29f19 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -578,3 +578,29 @@
 },
 }
 }
+
+# == Class: role::redisjobqueue
+# Sets up the JobQueue to use redis!
+class role::redisjobqueue {
+include role::mediawiki
+include cron
+
+cron::job {
+'runJobs':
+minute = '*',
+hour = '*',
+date = '*',
+month = '*',
+weekday = '*',
+user = 'root',
+command = 'php /vagrant/mediawiki/maintenance/runJobs.php',
+}
+@mediawiki::settings {
+'redisjobqueue':
+values: {
+wgJobRunRate = 0,
+wgJobTypeConf = 
'array(default=array(class=JobQueueRedis,redisServer=localhost,redisConfig=array(connectTimeout=2,compression=gzip)))'
+}
+}
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/88006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d9f515e053cbba94a626180c32fde19697d2325
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Native digits on 'rank-description' - change (mediawiki...TwnMainPage)

2013-10-07 Thread Ebrahim (Code Review)

Ebrahim has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88007


Change subject: Native digits on 'rank-description'
..

Native digits on 'rank-description'

Change-Id: I21c7153c002e1c61063b4b02feb12bec193bd474
---
M specials/SpecialTwnMainPage.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage 
refs/changes/07/88007/1

diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index 199ea47..ecad5c9 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -635,7 +635,7 @@
// @todo When refactoring, $languageName should 
not be used
// when using the message for the source page
$msg = $this-msg( $translationStatsRankingMsg )
-   -params( $myuser, $i, $translators, 
$languageName )
+   -params( $myuser )-numParams( $i, 
$translators )-params( $languageName )
-plain();
$wrap = new RawMessage( div 
class='rank-description'$msg/div );
$out .= $wrap-parse();
@@ -680,7 +680,7 @@
// @todo When refactoring, $languageName should 
not be used
// when using the message for the source page
$msg = $this-msg( $translationStatsRankingMsg )
-   -params( $myuser, $i, $translators, 
$languageName )
+   -params( $myuser )-numParams( $i, 
$translators )-params( $languageName )
-plain();
$wrap = new RawMessage( div 
class='rank-description'$msg/div );
$out .= $wrap-parse();

-- 
To view, visit https://gerrit.wikimedia.org/r/88007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21c7153c002e1c61063b4b02feb12bec193bd474
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove CodeEditor from UploadWizard - change (mediawiki/vagrant)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove CodeEditor from UploadWizard
..


Remove CodeEditor from UploadWizard

This meant that we could not use both Scribunto and UW roles
at the same time. Removing from UW for now

Change-Id: I6b33c3e2f8fdb20c4d9c4a1c25db1d9b0965d0c3
---
M puppet/manifests/roles.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 4db69ea..b2df868 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -244,7 +244,7 @@
 include role::eventlogging
 include role::multimedia
 
-@mediawiki::extension { [ 'CodeEditor', 'WikiEditor', 'Campaigns' ]: }
+@mediawiki::extension { 'Campaigns': }
 
 @mediawiki::extension { 'UploadWizard':
 require  = Package['imagemagick'],

-- 
To view, visit https://gerrit.wikimedia.org/r/88002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b33c3e2f8fdb20c4d9c4a1c25db1d9b0965d0c3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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] Native digits on 'mw-fr-revisiontag-edit' - change (mediawiki...FlaggedRevs)

2013-10-07 Thread Ebrahim (Code Review)

Ebrahim has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88008


Change subject: Native digits on 'mw-fr-revisiontag-edit'
..

Native digits on 'mw-fr-revisiontag-edit'

Change-Id: I801919a3efddba7379a8b1ba4951c7bd1c9f18a0
---
M frontend/FlaggedRevsXML.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/08/88008/1

diff --git a/frontend/FlaggedRevsXML.php b/frontend/FlaggedRevsXML.php
index 66d128d..e34408c 100644
--- a/frontend/FlaggedRevsXML.php
+++ b/frontend/FlaggedRevsXML.php
@@ -435,7 +435,7 @@
$msg = FlaggedRevs::isQuality( $flags )
? 'revreview-pending-quality'
: 'revreview-pending-basic';
-   return wfMessage( $msg, $frev-getRevId(), $time, $revsSince );
+   return wfMessage( $msg, $frev-getRevId(), $time )-numParams( 
$revsSince );
}
 
/*

-- 
To view, visit https://gerrit.wikimedia.org/r/88008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I801919a3efddba7379a8b1ba4951c7bd1c9f18a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Icinga check for l10nupdate drop !log-based alerts - change (operations/puppet)

2013-10-07 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88009


Change subject: Add Icinga check for l10nupdate  drop !log-based alerts
..

Add Icinga check for l10nupdate  drop !log-based alerts

Localisation update is the only job that uses !log to issue alerts, to my
knowledge, and it does so indiscriminantly, spamming the server admin log with
both successes and failures. It's not clear to me that anyone takes its
failures very seriously, either. (The last run failed, for example.)

This patch adds an Icinga plug-in that checks the status of the localisation
cache. It issues a WARNING if the caches are 26 hours old, and a CRITICAL if
over 50. The numbers were chosen because l10nupdate runs once a day and takes
some arbitrary fraction of an hour to complete, and because failures are (in my
anecdotal experience) typically given another shot to self-correct before being
debugged.

With the Icinga check in effect, it would not be necessary (or appropriate) for
l10nupdate to use the SAL, so this patch also updates l10nupdate-1 to echo
verbose log messages to standard out instead. (The l10nupdate cron job
redirects stdout to a log file.)

Change-Id: I6eca6c063319a2663bb25d76a92709103c9dd88a
---
A files/icinga/check_l10n_cache
M files/misc/l10nupdate/l10nupdate-1
M manifests/misc/deployment.pp
M templates/icinga/checkcommands.cfg.erb
4 files changed, 76 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/88009/1

diff --git a/files/icinga/check_l10n_cache b/files/icinga/check_l10n_cache
new file mode 100755
index 000..28dc285
--- /dev/null
+++ b/files/icinga/check_l10n_cache
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# Icinga plug-in for Wikimedia's MediaWiki localisation cache.
+#
+# This check should run on the host that runs l10nupdate. It ensures
+# that an up-to-date localisation cache directory exists for each
+# deployed version of MediaWiki. The check will report
+#
+#  OK   - If localisation caches are up-to-date.
+#  WARNING  - If the l10n cache files are more than 26 hours old.
+#  CRITICAL - If the l10n cache files are more than 50 hours old.
+#  UNKNOWN  - If no MediaWiki versions are in use.
+#  UNKNOWN  - If no l10n cache directory exists for a version.
+#
+. /usr/local/lib/mw-deployment-vars.sh
+. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+
+versions=($(/usr/local/bin/mwversionsinuse))
+
+if [ -z $versions ]; then
+echo UNKNOWN: mwversionsinuse returned an empty list
+exit 3
+fi
+
+missing=()
+critical=()
+warning=()
+
+for version in ${versions[@]}; do
+l10n_dir=${MW_COMMON_SOURCE}/php-${version}/cache/l10n
+if [ ! -d $l10n_dir ]; then
+missing+=($version)
+elif [ ! `find ${l10n_dir} -mtime -2.1 -print -quit` ]; then
+critical+=($version)
+elif [ ! `find ${l10n_dir} -mtime -1.1 -print -quit` ]; then
+warning+=($version)
+fi
+done
+
+IFS=,
+if [ -n $critical ]; then
+echo CRITICAL: localisation cache is more than 50 hours old -- 
${critical[*]}
+exit 2
+elif [ -n $warning ]; then
+echo WARNING: localisation cache is more than 50 hours old -- 
${warning[*]}
+exit 1
+elif [ -n $missing ]; then
+echo UNKNOWN: localisation cache directory is missing -- ${missing[*]}
+exit 3
+fi
+
+echo OK: localisation caches are up-to-date.
+exit 0
diff --git a/files/misc/l10nupdate/l10nupdate-1 
b/files/misc/l10nupdate/l10nupdate-1
index 95c939b..2328b8f 100755
--- a/files/misc/l10nupdate/l10nupdate-1
+++ b/files/misc/l10nupdate/l10nupdate-1
@@ -23,8 +23,7 @@
then
echo Updated $path
else
-   $BINDIR/dologmsg !log LocalisationUpdate failed: git 
pull of $path failed
-   echo Updating $path FAILED.
+   echo LocalisationUpdate failed: git pull of $path 
failed
exit 1
fi
else
@@ -36,8 +35,7 @@
then
echo Cloned $path
else
-   $BINDIR/dologmsg !log LocalisationUpdate failed: git 
clone of $path failed
-   echo Cloning $path FAILED.
+   echo LocalisationUpdate failed: git clone of $path 
failed
exit 1
fi
fi
@@ -47,8 +45,7 @@
 # Get all MW message cache versions (and a wiki DB name for each)
 mwVerDbSets=$($BINDIR/mwversionsinuse --extended --withdb)
 if [ -z $mwVerDbSets ]; then
-   $BINDIR/dologmsg !log LocalisationUpdate failed: mwversionsinuse 
returned empty list
-   echo Obtaining MediaWiki version list FAILED
+   echo LocalisationUpdate failed: mwversionsinuse returned empty list
exit 1
 fi
 
@@ -79,11 +76,9 @@
cp --preserve=timestamps --force 
/var/lib/l10nupdate/cache-$mwVerNum/l10n_cache-*

[MediaWiki-commits] [Gerrit] Moving shared code to mediawiki-selenium Ruby gem - change (mediawiki...Wikibase)

2013-10-07 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88010


Change subject: Moving shared code to mediawiki-selenium Ruby gem
..

Moving shared code to mediawiki-selenium Ruby gem

Bug: 53579
Change-Id: I86fa677e1bb9353dc804e2934eb6be40d325d6ff
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
M selenium_cuc/features/support/env.rb
D selenium_cuc/features/support/sauce.rb
4 files changed, 20 insertions(+), 109 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/10/88010/1

diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index 7d86f78..b0df5af 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -12,3 +12,4 @@
 gem 'activesupport'
 gem 'net-http-persistent'
 gem 'rest-client'
+gem 'mediawiki-selenium'
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index da9f775..79666d0 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -7,17 +7,17 @@
   multi_json (~ 1.3)
   thread_safe (~ 0.1)
   tzinfo (~ 0.3.37)
-atomic (1.1.13)
+atomic (1.1.14)
 builder (3.2.2)
 childprocess (0.3.9)
   ffi (~ 1.0, = 1.0.11)
-cucumber (1.3.6)
+cucumber (1.3.8)
   builder (= 2.1.2)
   diff-lcs (= 1.1.3)
-  gherkin (~ 2.12.0)
-  multi_json (~ 1.7.5)
+  gherkin (~ 2.12.1)
+  multi_json (= 1.7.5,  2.0)
   multi_test (= 0.0.2)
-data_magic (0.15.2)
+data_magic (0.16.1)
   faker (= 1.1.2)
   yml_reader (= 0.2)
 diff-lcs (1.2.4)
@@ -31,30 +31,31 @@
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.0)
-mime-types (1.24)
+mediawiki-selenium (0.1.8)
+mime-types (1.25)
 minitest (4.7.5)
-multi_json (1.7.9)
+multi_json (1.8.1)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.1)
+page-object (0.9.2)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.33.0)
+  selenium-webdriver (= 2.35.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
-require_all (1.2.1)
+require_all (1.3.1)
 rest-client (1.6.7)
   mime-types (= 1.16)
-rspec-expectations (2.14.2)
+rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (0.9.9)
-selenium-webdriver (2.35.0)
+selenium-webdriver (2.35.1)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip
+  rubyzip ( 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
-thread_safe (0.1.2)
+thread_safe (0.1.3)
   atomic
 tzinfo (0.3.37)
 watir-webdriver (0.6.4)
@@ -70,6 +71,7 @@
   activesupport
   cucumber
   json
+  mediawiki-selenium
   net-http-persistent
   page-object
   require_all
diff --git a/selenium_cuc/features/support/env.rb 
b/selenium_cuc/features/support/env.rb
index 507db0d..57425b3 100644
--- a/selenium_cuc/features/support/env.rb
+++ b/selenium_cuc/features/support/env.rb
@@ -9,14 +9,10 @@
 # setup  bootstrapping
 
 # before all
-require 'bundler/setup'
-require 'page-object'
-require 'page-object/page_factory'
-require 'watir-webdriver'
-require 'yaml'
+require 'mediawiki/selenium'
+
 require 'net/http'
 require 'active_support/all'
-require 'rest_client'
 require 'require_all'
 
 config = YAML.load_file('config/config.yml')
@@ -28,25 +24,7 @@
 require_all 'features/support/pages'
 require_all 'features/support/utils'
 
-World(PageObject::PageFactory)
-
-def browser(environment, test_name, language)
-  if environment == :cloudbees
-sauce_browser(test_name)
-  else
-local_browser(language)
-  end
-end
-
-def environment
-  if ENV['SAUCE_ONDEMAND_ACCESS_KEY']  ENV['SAUCE_ONDEMAND_USERNAME']
-:cloudbees
-  else
-:local
-  end
-end
-
-def sauce_browser(test_name)
+def sauce_browser(test_name, language)
   browsers = YAML.load_file('config/browsers.yml')
   if ENV['BROWSER_LABEL']
 browser_label = browsers[ENV['BROWSER_LABEL']]
@@ -67,64 +45,4 @@
   :desired_capabilities = caps)
 
   browser
-end
-
-
-def local_browser(language)
-  browsers = YAML.load_file('config/browsers.yml')
-  if ENV['BROWSER_LABEL']
-browser_label = browsers[ENV['BROWSER_LABEL']]['name'].to_sym
-  else
-browser_label = :firefox
-  end
-
-  if language == 'default'
-Watir::Browser.new browser_label
-  else
-if browser_label == :firefox
-  profile = Selenium::WebDriver::Firefox::Profile.new
-elsif browser_label == :chrome
-  profile = Selenium::WebDriver::Chrome::Profile.new
-else
-  raise Changing default language is currently supported only for Firefox 
and Chrome!
-end
-profile['intl.accept_languages'] = language
-Watir::Browser.new browser_label, :profile = profile
-  end
-end
-
-def test_name(scenario)
-  if scenario.respond_to? :feature
-#{scenario.feature.name}: #{scenario.name}
-  elsif scenario.respond_to? :scenario_outline
-

[MediaWiki-commits] [Gerrit] Set 'tooltip-iwiki' as optional - change (mediawiki/core)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88011


Change subject: Set 'tooltip-iwiki' as optional
..

Set 'tooltip-iwiki' as optional

Change-Id: Ib60dd6072728238684112865a5ee0b015d1f2f0c
---
M maintenance/language/messageTypes.inc
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/88011/1

diff --git a/maintenance/language/messageTypes.inc 
b/maintenance/language/messageTypes.inc
index d47138d..8676d74 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -485,6 +485,7 @@
'limitreport-ppgeneratednodes-value',
'limitreport-expansiondepth-value',
'limitreport-expensivefunctioncount-value',
+   'tooltip-iwiki',
 );
 
 /** Exif messages, which may be set as optional in several checks, but are 
generally mandatory */

-- 
To view, visit https://gerrit.wikimedia.org/r/88011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib60dd6072728238684112865a5ee0b015d1f2f0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] whitelist dan-nl - change (integration/zuul-config)

2013-10-07 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88012


Change subject: whitelist dan-nl
..

whitelist dan-nl

Change-Id: I2e254740d01ca6169849104223a4edcd5df024bf
---
M layout.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/12/88012/1

diff --git a/layout.yaml b/layout.yaml
index 2616ec3..6e0b812 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -38,7 +38,7 @@
 # TODO: Figure out a way to not have to repeat this from pipeline 
'test'.
 # This email_filter and the one for 'test' can be removed once we have 
fixed bug 45499.
 email_filter:
- - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com)).*$
+ - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com)).*$
   - event: comment-added
 comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
 success:
@@ -151,6 +151,7 @@
  - ^markus@semantic-mediawiki\.org$
  - ^s7eph4n@gmail\.org$ # Foxtrott
  - ^wiki@physikerwelt\.de$
+ - ^d_entous@yahoo\.com$
 
 # Misc
  - ^moriel@gmail\.com  # Moriel Schottlender (GSoC 2013, VE)

-- 
To view, visit https://gerrit.wikimedia.org/r/88012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e254740d01ca6169849104223a4edcd5df024bf
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] whitelist dan-nl - change (integration/zuul-config)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: whitelist dan-nl
..


whitelist dan-nl

Change-Id: I2e254740d01ca6169849104223a4edcd5df024bf
---
M layout.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index 2616ec3..6e0b812 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -38,7 +38,7 @@
 # TODO: Figure out a way to not have to repeat this from pipeline 
'test'.
 # This email_filter and the one for 'test' can be removed once we have 
fixed bug 45499.
 email_filter:
- - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com)).*$
+ - 
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com)).*$
   - event: comment-added
 comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
 success:
@@ -151,6 +151,7 @@
  - ^markus@semantic-mediawiki\.org$
  - ^s7eph4n@gmail\.org$ # Foxtrott
  - ^wiki@physikerwelt\.de$
+ - ^d_entous@yahoo\.com$
 
 # Misc
  - ^moriel@gmail\.com  # Moriel Schottlender (GSoC 2013, VE)

-- 
To view, visit https://gerrit.wikimedia.org/r/88012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e254740d01ca6169849104223a4edcd5df024bf
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 GENDER support for 'thanks-button-thank' - change (mediawiki...Thanks)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88013


Change subject: Add GENDER support for 'thanks-button-thank'
..

Add GENDER support for 'thanks-button-thank'

Spotted by Asaifm at
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Thanks-button-thank/ar.

Change-Id: Iaeacd998344645557384e9c90c9cc48350abf9f0
---
M Thanks.i18n.php
M modules/ext.thanks.mobilediff.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/13/88013/1

diff --git a/Thanks.i18n.php b/Thanks.i18n.php
index f04fe44..1d9cc98 100644
--- a/Thanks.i18n.php
+++ b/Thanks.i18n.php
@@ -15,7 +15,7 @@
'thanks-desc' = 'Adds thank links to history and diff views',
'thanks-thank' = 'thank',
'thanks-thanked' = '{{GENDER:$1|thanked}}',
-   'thanks-button-thank' = 'Thank',
+   'thanks-button-thank' = '{{GENDER:$1|Thank}}',
'thanks-button-thanked' = '{{GENDER:$1|Thanked}}',
'thanks-error-undefined' = 'Thank action failed. Please try again.',
'thanks-error-invalidrevision' = 'Revision ID is not valid.',
diff --git a/modules/ext.thanks.mobilediff.js b/modules/ext.thanks.mobilediff.js
index a5aff81..31ff2f6 100644
--- a/modules/ext.thanks.mobilediff.js
+++ b/modules/ext.thanks.mobilediff.js
@@ -46,7 +46,7 @@
if ( name !== mw.config.get( 'wgUserName' ) ) {
return $( 'button class=mw-mf-action-button' )
.html( 'img width=25 height=20 src=' + 
thankImg + ' class=mw-mf-action-button-icon/' +
-   mw.message( 'thanks-button-thank' 
).escaped()
+   mw.message( 'thanks-button-thank', 
mw.user ).escaped()
)
.on( 'click', function() {
var $thankLink = $( this );

-- 
To view, visit https://gerrit.wikimedia.org/r/88013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeacd998344645557384e9c90c9cc48350abf9f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Set 'tooltip-iwiki' as optional - change (mediawiki/core)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Set 'tooltip-iwiki' as optional
..


Set 'tooltip-iwiki' as optional

Spotted by Beta16 in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Tooltip-iwiki/en

Change-Id: Ib60dd6072728238684112865a5ee0b015d1f2f0c
---
M maintenance/language/messageTypes.inc
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Santhosh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/language/messageTypes.inc 
b/maintenance/language/messageTypes.inc
index d47138d..8676d74 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -485,6 +485,7 @@
'limitreport-ppgeneratednodes-value',
'limitreport-expansiondepth-value',
'limitreport-expensivefunctioncount-value',
+   'tooltip-iwiki',
 );
 
 /** Exif messages, which may be set as optional in several checks, but are 
generally mandatory */

-- 
To view, visit https://gerrit.wikimedia.org/r/88011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib60dd6072728238684112865a5ee0b015d1f2f0c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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 GENDER support for 'thanks-button-thank' - change (mediawiki...Thanks)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add GENDER support for 'thanks-button-thank'
..


Add GENDER support for 'thanks-button-thank'

Spotted by Asaifm at
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Thanks-button-thank/ar

Change-Id: Iaeacd998344645557384e9c90c9cc48350abf9f0
---
M Thanks.i18n.php
M modules/ext.thanks.mobilediff.js
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Santhosh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Thanks.i18n.php b/Thanks.i18n.php
index f04fe44..1d9cc98 100644
--- a/Thanks.i18n.php
+++ b/Thanks.i18n.php
@@ -15,7 +15,7 @@
'thanks-desc' = 'Adds thank links to history and diff views',
'thanks-thank' = 'thank',
'thanks-thanked' = '{{GENDER:$1|thanked}}',
-   'thanks-button-thank' = 'Thank',
+   'thanks-button-thank' = '{{GENDER:$1|Thank}}',
'thanks-button-thanked' = '{{GENDER:$1|Thanked}}',
'thanks-error-undefined' = 'Thank action failed. Please try again.',
'thanks-error-invalidrevision' = 'Revision ID is not valid.',
diff --git a/modules/ext.thanks.mobilediff.js b/modules/ext.thanks.mobilediff.js
index a5aff81..31ff2f6 100644
--- a/modules/ext.thanks.mobilediff.js
+++ b/modules/ext.thanks.mobilediff.js
@@ -46,7 +46,7 @@
if ( name !== mw.config.get( 'wgUserName' ) ) {
return $( 'button class=mw-mf-action-button' )
.html( 'img width=25 height=20 src=' + 
thankImg + ' class=mw-mf-action-button-icon/' +
-   mw.message( 'thanks-button-thank' 
).escaped()
+   mw.message( 'thanks-button-thank', 
mw.user ).escaped()
)
.on( 'click', function() {
var $thankLink = $( this );

-- 
To view, visit https://gerrit.wikimedia.org/r/88013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeacd998344645557384e9c90c9cc48350abf9f0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] Introducing EntityIdLinkFormatter - change (mediawiki...Wikibase)

2013-10-07 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88014


Change subject: Introducing EntityIdLinkFormatter
..

Introducing EntityIdLinkFormatter

Change-Id: If9368d42acdd4771f601898fe8ebaaad70042bdf
---
M lib/WikibaseLib.classes.php
M lib/includes/formatters/EntityIdLabelFormatter.php
A lib/includes/formatters/EntityIdLinkFormatter.php
A lib/includes/formatters/EntityIdTitleFormatter.php
A lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
A lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
6 files changed, 294 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/14/88014/1

diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index ca402ab..71345c5 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -95,6 +95,8 @@
'Wikibase\Lib\DispatchingValueFormatter' = 
'includes/formatters/DispatchingValueFormatter.php',
'Wikibase\Lib\EntityIdFormatter' = 
'includes/formatters/EntityIdFormatter.php',
'Wikibase\Lib\EntityIdLabelFormatter' = 
'includes/formatters/EntityIdLabelFormatter.php',
+   'Wikibase\Lib\EntityIdTitleFormatter' = 
'includes/formatters/EntityIdTitleFormatter.php',
+   'Wikibase\Lib\EntityIdLinkFormatter' = 
'includes/formatters/EntityIdLinkFormatter.php',
'Wikibase\Lib\MwTimeIsoFormatter' = 
'includes/formatters/MwTimeIsoFormatter.php',
'Wikibase\Lib\EscapingValueFormatter' = 
'includes/formatters/EscapingValueFormatter.php',
'Wikibase\Lib\FormattingException' = 
'includes/formatters/FormattingException.php',
diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php 
b/lib/includes/formatters/EntityIdLabelFormatter.php
index 56960cf..50830a4 100644
--- a/lib/includes/formatters/EntityIdLabelFormatter.php
+++ b/lib/includes/formatters/EntityIdLabelFormatter.php
@@ -14,18 +14,14 @@
 /**
  * @since 0.4
  *
- * @file
- * @ingroup WikibaseLib
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Katie Filbert  aude.w...@gmail.com 
  * @author Daniel Kinzler
  *
- * @todo: once this is no longer used directly, rename it to 
EntityIdValueFormatter
  * @todo: add support for language fallback chains
  */
-class EntityIdLabelFormatter extends ValueFormatterBase {
+class EntityIdLabelFormatter extends EntityIdFormatter {
 
/**
 * Whether we should try to find the label of the entity
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php 
b/lib/includes/formatters/EntityIdLinkFormatter.php
new file mode 100644
index 000..c6cdfc2
--- /dev/null
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -0,0 +1,53 @@
+?php
+
+namespace Wikibase\Lib;
+use InvalidArgumentException;
+use RuntimeException;
+use ValueFormatters\FormatterOptions;
+use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\EntityId;
+use Wikibase\EntityTitleLookup;
+
+/**
+ * Formats entity IDs by generating a wiki link to the corresponding page 
title.
+ *
+ * @since 0.4
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class EntityIdLinkFormatter extends EntityIdTitleFormatter {
+
+   /**
+* @since 0.4
+*
+* @param FormatterOptions $options
+* @param EntityTitleLookup $titleLookup
+*
+* @internal param \Wikibase\EntityLookup $entityLookup
+*
+*/
+   public function __construct( FormatterOptions $options, 
EntityTitleLookup $titleLookup ) {
+   parent::__construct( $options, $titleLookup );
+   }
+
+   /**
+* Format an EntityId data value
+*
+* @since 0.4
+*
+* @param EntityId|EntityIdValue $value The value to format
+*
+* @return string
+*
+* @throws RuntimeException
+* @throws InvalidArgumentException
+*/
+   public function format( $value ) {
+   $title = parent::format( $value );
+
+   return [[$title]];
+   }
+
+}
+
diff --git a/lib/includes/formatters/EntityIdTitleFormatter.php 
b/lib/includes/formatters/EntityIdTitleFormatter.php
new file mode 100644
index 000..e0dce57
--- /dev/null
+++ b/lib/includes/formatters/EntityIdTitleFormatter.php
@@ -0,0 +1,68 @@
+?php
+
+namespace Wikibase\Lib;
+
+use InvalidArgumentException;
+use RuntimeException;
+use ValueFormatters\FormatterOptions;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\EntityTitleLookup;
+
+/**
+ * Formats entity IDs by generating the corresponding page title.
+ *
+ * @since 0.4
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class EntityIdTitleFormatter extends EntityIdFormatter {
+
+   /**
+* @var EntityTitleLookup
+*/
+   protected

[MediaWiki-commits] [Gerrit] Remove duplicate method from ItemHandler - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88021


Change subject: Remove duplicate method from ItemHandler
..

Remove duplicate method from ItemHandler

Change-Id: Ia41d3be0449a5ce2ee0b8fbc928d14f732c0f857
---
M repo/includes/content/ItemHandler.php
M repo/includes/specials/SpecialItemByTitle.php
2 files changed, 9 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/21/88021/1

diff --git a/repo/includes/content/ItemHandler.php 
b/repo/includes/content/ItemHandler.php
index 6416677..2a18ff5 100644
--- a/repo/includes/content/ItemHandler.php
+++ b/repo/includes/content/ItemHandler.php
@@ -8,26 +8,7 @@
 /**
  * Content handler for Wikibase items.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
  * @since 0.1
- *
- * @file
- * @ingroup WikibaseRepo
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Daniel Kinzler
@@ -95,7 +76,13 @@
 */
public function getContentFromSiteLink( $siteId, $pageName ) {
$id = $this-getIdForSiteLink( $siteId, $pageName );
-   return $id === false ? null : 
WikibaseRepo::getDefaultInstance()-getEntityContentFactory()-getFromId( new 
EntityId( Item::ENTITY_TYPE, $id ) );
+
+   if ( $id === false ) {
+   return null;
+   }
+
+   $eid = new EntityId( Item::ENTITY_TYPE, $id );
+   return 
WikibaseRepo::getDefaultInstance()-getEntityContentFactory()-getFromId( $eid 
);
}
 
/**
@@ -111,21 +98,6 @@
 */
public function getIdForSiteLink( $siteId, $pageName ) {
return 
StoreFactory::getStore()-newSiteLinkCache()-getItemIdForLink( $siteId, 
$pageName );
-   }
-
-   /**
-* Get the item corresponding to the provided site and title pair, or 
null if there is no such item.
-*
-* @since 0.1
-*
-* @param string $siteId
-* @param string $pageName
-*
-* @return ItemContent|null
-*/
-   public function getFromSiteLink( $siteId, $pageName ) {
-   $id = $this-getIdForSiteLink( $siteId, $pageName );
-   return $id === false ? null : 
WikibaseRepo::getDefaultInstance()-getEntityContentFactory()-getFromId( new 
EntityId( Item::ENTITY_TYPE, $id ) );
}
 
/**
diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index 9ae1131..d7ba2ca 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -61,14 +61,14 @@
}
 
$itemHandler = new ItemHandler();
-   $itemContent = $itemHandler-getFromSiteLink( $siteId, 
$pageName );
+   $itemContent = $itemHandler-getContentFromSiteLink( 
$siteId, $pageName );
// Do we have an item content, and if not can we try 
harder?
if ( $itemContent === null  Settings::get( 
'normalizeItemByTitlePageNames' ) === true ) {
// Try harder by requesting normalization on 
the external site
$siteObj = 
\SiteSQLStore::newInstance()-getSite( $siteId );
if ( $siteObj instanceof Site ) {
$pageName = 
$siteObj-normalizePageName( $page );
-   $itemContent = 
$itemHandler-getFromSiteLink( $siteId, $pageName );
+   $itemContent = 
$itemHandler-getContentFromSiteLink( $siteId, $pageName );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia41d3be0449a5ce2ee0b8fbc928d14f732c0f857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

___

[MediaWiki-commits] [Gerrit] Document class property and break long lines - change (mediawiki/core)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88024


Change subject: Document class property and break long lines
..

Document class property and break long lines

Change-Id: Id391dc8911de8b6df0fb95cba58cffee972ca507
---
M includes/specials/SpecialTags.php
1 file changed, 26 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/88024/1

diff --git a/includes/specials/SpecialTags.php 
b/includes/specials/SpecialTags.php
index 7e34e98..ae0932f 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -27,6 +27,10 @@
  * @ingroup SpecialPage
  */
 class SpecialTags extends SpecialPage {
+   /**
+* @var array List of defined tags
+*/
+   public $definedTags;
 
function __construct() {
parent::__construct( 'Tags' );
@@ -55,7 +59,11 @@
$html .= $this-doTagRow( $tag, $hitcount );
}
 
-   $out-addHTML( Xml::tags( 'table', array( 'class' = 'wikitable 
sortable mw-tags-table' ), $html ) );
+   $out-addHTML( Xml::tags(
+   'table',
+   array( 'class' = 'wikitable sortable mw-tags-table' ),
+   $html )
+   );
}
 
function doTagRow( $tag, $hitcount ) {
@@ -66,7 +74,10 @@
$disp = ChangeTags::tagDescription( $tag );
if ( $user-isAllowed( 'editinterface' ) ) {
$disp .= ' ';
-   $editLink = Linker::link( Title::makeTitle( 
NS_MEDIAWIKI, Tag-$tag ), $this-msg( 'tags-edit' )-escaped() );
+   $editLink = Linker::link(
+   Title::makeTitle( NS_MEDIAWIKI, Tag-$tag ),
+   $this-msg( 'tags-edit' )-escaped()
+   );
$disp .= $this-msg( 'parentheses' )-rawParams( 
$editLink )-escaped();
}
$newRow .= Xml::tags( 'td', null, $disp );
@@ -75,16 +86,26 @@
$desc = !$msg-exists() ? '' : $msg-parse();
if ( $user-isAllowed( 'editinterface' ) ) {
$desc .= ' ';
-   $editDescLink = Linker::link( Title::makeTitle( 
NS_MEDIAWIKI, Tag-$tag-description ), $this-msg( 'tags-edit' )-escaped() );
+   $editDescLink = Linker::link(
+   Title::makeTitle( NS_MEDIAWIKI, 
Tag-$tag-description ),
+   $this-msg( 'tags-edit' )-escaped()
+   );
$desc .= $this-msg( 'parentheses' )-rawParams( 
$editDescLink )-escaped();
}
$newRow .= Xml::tags( 'td', null, $desc );
 
-   $active = $this-msg( isset( $this-definedTags[$tag] ) ? 
'tags-active-yes' : 'tags-active-no' )-escaped();
+   $active = isset( $this-definedTags[$tag] ) ? 'tags-active-yes' 
: 'tags-active-no';
+   $active = $this-msg( $active )-escaped();
$newRow .= Xml::tags( 'td', null, $active );
 
$hitcountLabel = $this-msg( 'tags-hitcount' )-numParams( 
$hitcount )-escaped();
-   $hitcountLink = Linker::link( SpecialPage::getTitleFor( 
'Recentchanges' ), $hitcountLabel, array(), array( 'tagfilter' = $tag ) );
+   $hitcountLink = Linker::link(
+   SpecialPage::getTitleFor( 'Recentchanges' ),
+   $hitcountLabel,
+   array(),
+   array( 'tagfilter' = $tag )
+   );
+
// add raw $hitcount for sorting, because tags-hitcount 
contains numbers and letters
$newRow .= Xml::tags( 'td', array( 'data-sort-value' = 
$hitcount ), $hitcountLink );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id391dc8911de8b6df0fb95cba58cffee972ca507
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] warm up db1015 - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88025


Change subject: warm up db1015
..

warm up db1015

Change-Id: I7e97e38b102037fd60dee4bc3c247f1f5f2c9e0c
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/25/88025/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9486a64..862536f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -127,6 +127,7 @@
#'db1022'   = 100, # snapshot
'db1027'   = 400,
'db1040'   = 400,
+   'db1015'   = 100,
),
's7' = array(
'db1041' = 0,
@@ -222,6 +223,7 @@
'db1009' = '10.64.0.13', #do not remove or comment out
'db1010' = '10.64.0.14', #do not remove or comment out
'db1011' = '10.64.0.15', #do not remove or comment out
+   'db1015' = '10.64.0.19', #do not remove or comment out
'db1017' = '10.64.16.6', #do not remove or comment out
'db1018' = '10.64.16.7', #do not remove or comment out
'db1019' = '10.64.16.8', #do not remove or comment out

-- 
To view, visit https://gerrit.wikimedia.org/r/88025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e97e38b102037fd60dee4bc3c247f1f5f2c9e0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add neverett to stats1002, rt 5886 - change (operations/puppet)

2013-10-07 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88026


Change subject: add neverett to stats1002, rt 5886
..

add neverett to stats1002, rt 5886

Change-Id: I703b0fa6bc5b92ba95bbf400146573c5eb143516
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/88026/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a412319..7c4bb71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2739,6 +2739,8 @@
 User|title == ezachte| { groups + [ stats ] }
 User|title == spetrea| { groups + [ stats ] }
 
+include accounts::manybubbles  # rt 5886
+
 sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
 
 # include classes needed for storing and crunching

-- 
To view, visit https://gerrit.wikimedia.org/r/88026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I703b0fa6bc5b92ba95bbf400146573c5eb143516
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] warm up db1015 - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: warm up db1015
..


warm up db1015

Change-Id: I7e97e38b102037fd60dee4bc3c247f1f5f2c9e0c
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Springle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9486a64..862536f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -127,6 +127,7 @@
#'db1022'   = 100, # snapshot
'db1027'   = 400,
'db1040'   = 400,
+   'db1015'   = 100,
),
's7' = array(
'db1041' = 0,
@@ -222,6 +223,7 @@
'db1009' = '10.64.0.13', #do not remove or comment out
'db1010' = '10.64.0.14', #do not remove or comment out
'db1011' = '10.64.0.15', #do not remove or comment out
+   'db1015' = '10.64.0.19', #do not remove or comment out
'db1017' = '10.64.16.6', #do not remove or comment out
'db1018' = '10.64.16.7', #do not remove or comment out
'db1019' = '10.64.16.8', #do not remove or comment out

-- 
To view, visit https://gerrit.wikimedia.org/r/88025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e97e38b102037fd60dee4bc3c247f1f5f2c9e0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@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 neverett to stats1002, rt 5886 - change (operations/puppet)

2013-10-07 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: add neverett to stats1002, rt 5886
..


add neverett to stats1002, rt 5886

Change-Id: I703b0fa6bc5b92ba95bbf400146573c5eb143516
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index a412319..7c4bb71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2739,6 +2739,8 @@
 User|title == ezachte| { groups + [ stats ] }
 User|title == spetrea| { groups + [ stats ] }
 
+include accounts::manybubbles  # rt 5886
+
 sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
 
 # include classes needed for storing and crunching

-- 
To view, visit https://gerrit.wikimedia.org/r/88026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I703b0fa6bc5b92ba95bbf400146573c5eb143516
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] Remove FrontlineSMS configuration - change (translatewiki)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88027


Change subject: Remove FrontlineSMS configuration
..

Remove FrontlineSMS configuration

Doesn't look like it'll ever be used. Could be restored in the future if
needed.

Change-Id: I99d653ac42834d75633b08d054f259bdea9b5014
---
M REPOCONF
M TranslateSettings.php
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
D groups/FrontlineSMS/Checker.php
D groups/FrontlineSMS/FrontlineSMS.yaml
8 files changed, 1 insertion(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/27/88027/1

diff --git a/REPOCONF b/REPOCONF
index 01eaebe..b728627 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -12,7 +12,6 @@
 REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git
 REPO_ETHERPADLITE_BRANCH=develop
 REPO_FREECOL=git://git.code.sf.net/p/freecol/git
-REPO_FRONTLINESMS=git://github.com/frontlinesms/frontlinesms.git
 
REPO_FUDFORUM=svn://svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=git://git.fedorahosted.org/fuel.git
 REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
diff --git a/TranslateSettings.php b/TranslateSettings.php
index de0b991..02d6184 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -391,9 +391,7 @@
 $wgTranslateGroupFiles[] = $GROUPS/Mozilla/MozillaDtd.yaml;
 $wgTranslateGroupFiles[] = $GROUPS/Mozilla/Mozilla.yaml;
 
-# Not yet in use.
-wfAddNamespace( 1248, 'FrontlineSMS' );
-#$wgTranslateGroupFiles[] = $GROUPS/FrontlineSMS/FrontlineSMS.yaml;
+# 1248 is not in use. Can be used for a product.
 
 wfAddNamespace( 1250, 'EtherpadLite' );
 $wgTranslateGroupFiles[] = $GROUPS/EtherpadLite/EtherpadLite.yaml;
diff --git a/bin/repocommit b/bin/repocommit
index 295105a..5103bb5 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -46,7 +46,6 @@
 eol \
 etherpad-lite \
 freecol \
-frontlinesms \
 fuel \
 intuition \
 jquery.uls \
diff --git a/bin/repocreate b/bin/repocreate
index 8863284..e3c6b6f 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -64,13 +64,6 @@
fi
git clone $REPO_FREECOL $PROJECT
 
-elif [ $PROJECT = frontlinesms ]
-then
-   if [ -z $REPO_FRONTLINESMS ]
-   then echo Add REPO_FRONTLINESMS to REPOCONF; exit 1
-   fi
-   git clone $REPO_FRONTLINESMS $PROJECT
-
 elif [ $PROJECT = fudforum ]
 then
if [ -z $REPO_FUDFORUM ]
diff --git a/bin/repoexport b/bin/repoexport
index 7f105ea..de978e6 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -46,11 +46,6 @@
php $EXPORTER --target . --group=out-freecol --lang '*' --skip en,qqq 
$THRESHOLD
php $EXPORTER --target . --group=out-freecol --lang qqq
 
-elif [ $PROJECT = frontlinesms ]
-then
-   php $EXPORTER --target . --group=out-$PROJECT --lang '*' --skip 
en,qqq $THRESHOLD
-   php $EXPORTER --target . --group=out-$PROJECT --lang qqq
-
 elif [ $PROJECT = fudforum ]
 then
php $EXPORTER --target . --group=out-fudforum --lang '*' --skip en 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index ffa5c51..11b674c 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -34,7 +34,6 @@
 commons-ios \
 eol \
 freecol \
-frontlinesms \
 fuel \
 intuition \
 jquery.uls \
diff --git a/groups/FrontlineSMS/Checker.php b/groups/FrontlineSMS/Checker.php
deleted file mode 100644
index 0881d2e..000
--- a/groups/FrontlineSMS/Checker.php
+++ /dev/null
@@ -1,20 +0,0 @@
-?php
-/**
- * Implements MessageChecker for FrontlineSMS.
- *
- * @file
- * @author Niklas Laxström
- * @copyright Copyright © 2010, Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/**
- * Message checks for FrontlineSMS
- *
- * @ingroup MessageCheckers
- */
-class FrontlineSMSMessageChecker extends MessageChecker {
-   protected function FrontlineSMSVariablesCheck( $messages, $code, 
$warnings ) {
-   return parent::parameterCheck( $messages, $code, $warnings, 
'/{[0-9]}/' );
-   }
-}
diff --git a/groups/FrontlineSMS/FrontlineSMS.yaml 
b/groups/FrontlineSMS/FrontlineSMS.yaml
deleted file mode 100644
index bfa0c0a..000
--- a/groups/FrontlineSMS/FrontlineSMS.yaml
+++ /dev/null
@@ -1,42 +0,0 @@

-BASIC:
-  id: out-frontlinesms
-  label: FrontlineSMS
-  icon: wiki://FrontlineSMS-logo.png
-  description: {{int:translate-group-desc-frontlinesms}}
-  namespace: NS_FRONTLINESMS
-  class: FileBasedMessageGroup
-
-FILES:
-  class: JavaFFS
-  sourcePattern: 
%GROUPROOT%/frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages_%CODE%.properties
-  definitionFile: 
%GROUPROOT%/frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages.properties
-  targetPattern: 
frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages_%CODE%.properties
-  codeMap:
-cs:cs_CZ
-es:es_ES
-it:it_IT
-nb:nb_NO
-pl:pl_PL
-sv:sv_SE
-

[MediaWiki-commits] [Gerrit] Remove obsolete comment - change (translatewiki)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88028


Change subject: Remove obsolete comment
..

Remove obsolete comment

Change-Id: Ie3c39d628e61191e4cf3caed4f5e4adfa21362b7
---
M TranslateSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/28/88028/1

diff --git a/TranslateSettings.php b/TranslateSettings.php
index 02d6184..6f1499b 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -396,7 +396,6 @@
 wfAddNamespace( 1250, 'EtherpadLite' );
 $wgTranslateGroupFiles[] = $GROUPS/EtherpadLite/EtherpadLite.yaml;
 
-# Not yet in use.
 wfAddNamespace( 1252, 'Vicuna' );
 $wgTranslateGroupFiles[] = $GROUPS/Vicuna/Vicuna.yaml;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3c39d628e61191e4cf3caed4f5e4adfa21362b7
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update error info in exceptions - change (mediawiki...WikibaseDatabase)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88029


Change subject: Update error info in exceptions
..

Update error info in exceptions

Change-Id: Ie79597852e30e59b045197f4a431634f592982cd
---
M src/MediaWiki/MediaWikiTableBuilder.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDatabase 
refs/changes/29/88029/1

diff --git a/src/MediaWiki/MediaWikiTableBuilder.php 
b/src/MediaWiki/MediaWikiTableBuilder.php
index 6d6b076..5b6a030 100644
--- a/src/MediaWiki/MediaWikiTableBuilder.php
+++ b/src/MediaWiki/MediaWikiTableBuilder.php
@@ -74,7 +74,7 @@
$success = $this-getDB()-query( $sql );
 
if ( $success === false ) {
-   throw new TableCreationFailedException( $table, 
$this-getDB()-lastQuery() );
+   throw new TableCreationFailedException( $table, 
$this-getDB()-lastError() );
}
}
 
@@ -91,7 +91,7 @@
$success = $this-getDB()-dropTable( $tableName, __METHOD__ );
 
if ( $success === false ) {
-   throw new TableDeletionFailedException( $tableName, 
$this-getDB()-lastQuery() );
+   throw new TableDeletionFailedException( $tableName, 
$this-getDB()-lastError() );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie79597852e30e59b045197f4a431634f592982cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove obsolete comment - change (translatewiki)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove obsolete comment
..


Remove obsolete comment

Change-Id: Ie3c39d628e61191e4cf3caed4f5e4adfa21362b7
---
M TranslateSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TranslateSettings.php b/TranslateSettings.php
index 02d6184..6f1499b 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -396,7 +396,6 @@
 wfAddNamespace( 1250, 'EtherpadLite' );
 $wgTranslateGroupFiles[] = $GROUPS/EtherpadLite/EtherpadLite.yaml;
 
-# Not yet in use.
 wfAddNamespace( 1252, 'Vicuna' );
 $wgTranslateGroupFiles[] = $GROUPS/Vicuna/Vicuna.yaml;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c39d628e61191e4cf3caed4f5e4adfa21362b7
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove FrontlineSMS configuration - change (translatewiki)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove FrontlineSMS configuration
..


Remove FrontlineSMS configuration

Doesn't look like it'll ever be used. Could be restored in the future if
needed.

Change-Id: I99d653ac42834d75633b08d054f259bdea9b5014
---
M REPOCONF
M TranslateSettings.php
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
D groups/FrontlineSMS/Checker.php
D groups/FrontlineSMS/FrontlineSMS.yaml
8 files changed, 1 insertion(+), 80 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/REPOCONF b/REPOCONF
index 01eaebe..b728627 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -12,7 +12,6 @@
 REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git
 REPO_ETHERPADLITE_BRANCH=develop
 REPO_FREECOL=git://git.code.sf.net/p/freecol/git
-REPO_FRONTLINESMS=git://github.com/frontlinesms/frontlinesms.git
 
REPO_FUDFORUM=svn://svn.code.sf.net/p/fudforum/code/trunk/install/forum_data/thm/default/i18n
 REPO_FUEL=git://git.fedorahosted.org/fuel.git
 REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
diff --git a/TranslateSettings.php b/TranslateSettings.php
index de0b991..02d6184 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -391,9 +391,7 @@
 $wgTranslateGroupFiles[] = $GROUPS/Mozilla/MozillaDtd.yaml;
 $wgTranslateGroupFiles[] = $GROUPS/Mozilla/Mozilla.yaml;
 
-# Not yet in use.
-wfAddNamespace( 1248, 'FrontlineSMS' );
-#$wgTranslateGroupFiles[] = $GROUPS/FrontlineSMS/FrontlineSMS.yaml;
+# 1248 is not in use. Can be used for a product.
 
 wfAddNamespace( 1250, 'EtherpadLite' );
 $wgTranslateGroupFiles[] = $GROUPS/EtherpadLite/EtherpadLite.yaml;
diff --git a/bin/repocommit b/bin/repocommit
index 295105a..5103bb5 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -46,7 +46,6 @@
 eol \
 etherpad-lite \
 freecol \
-frontlinesms \
 fuel \
 intuition \
 jquery.uls \
diff --git a/bin/repocreate b/bin/repocreate
index 8863284..e3c6b6f 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -64,13 +64,6 @@
fi
git clone $REPO_FREECOL $PROJECT
 
-elif [ $PROJECT = frontlinesms ]
-then
-   if [ -z $REPO_FRONTLINESMS ]
-   then echo Add REPO_FRONTLINESMS to REPOCONF; exit 1
-   fi
-   git clone $REPO_FRONTLINESMS $PROJECT
-
 elif [ $PROJECT = fudforum ]
 then
if [ -z $REPO_FUDFORUM ]
diff --git a/bin/repoexport b/bin/repoexport
index 7f105ea..de978e6 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -46,11 +46,6 @@
php $EXPORTER --target . --group=out-freecol --lang '*' --skip en,qqq 
$THRESHOLD
php $EXPORTER --target . --group=out-freecol --lang qqq
 
-elif [ $PROJECT = frontlinesms ]
-then
-   php $EXPORTER --target . --group=out-$PROJECT --lang '*' --skip 
en,qqq $THRESHOLD
-   php $EXPORTER --target . --group=out-$PROJECT --lang qqq
-
 elif [ $PROJECT = fudforum ]
 then
php $EXPORTER --target . --group=out-fudforum --lang '*' --skip en 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index ffa5c51..11b674c 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -34,7 +34,6 @@
 commons-ios \
 eol \
 freecol \
-frontlinesms \
 fuel \
 intuition \
 jquery.uls \
diff --git a/groups/FrontlineSMS/Checker.php b/groups/FrontlineSMS/Checker.php
deleted file mode 100644
index 0881d2e..000
--- a/groups/FrontlineSMS/Checker.php
+++ /dev/null
@@ -1,20 +0,0 @@
-?php
-/**
- * Implements MessageChecker for FrontlineSMS.
- *
- * @file
- * @author Niklas Laxström
- * @copyright Copyright © 2010, Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/**
- * Message checks for FrontlineSMS
- *
- * @ingroup MessageCheckers
- */
-class FrontlineSMSMessageChecker extends MessageChecker {
-   protected function FrontlineSMSVariablesCheck( $messages, $code, 
$warnings ) {
-   return parent::parameterCheck( $messages, $code, $warnings, 
'/{[0-9]}/' );
-   }
-}
diff --git a/groups/FrontlineSMS/FrontlineSMS.yaml 
b/groups/FrontlineSMS/FrontlineSMS.yaml
deleted file mode 100644
index bfa0c0a..000
--- a/groups/FrontlineSMS/FrontlineSMS.yaml
+++ /dev/null
@@ -1,42 +0,0 @@

-BASIC:
-  id: out-frontlinesms
-  label: FrontlineSMS
-  icon: wiki://FrontlineSMS-logo.png
-  description: {{int:translate-group-desc-frontlinesms}}
-  namespace: NS_FRONTLINESMS
-  class: FileBasedMessageGroup
-
-FILES:
-  class: JavaFFS
-  sourcePattern: 
%GROUPROOT%/frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages_%CODE%.properties
-  definitionFile: 
%GROUPROOT%/frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages.properties
-  targetPattern: 
frontlinesms/plugins/frontlinesms-core/grails-app/i18n/messages_%CODE%.properties
-  codeMap:
-cs:cs_CZ
-es:es_ES
-it:it_IT
-nb:nb_NO
-pl:pl_PL
-sv:sv_SE
-nl-be: nl_BE
-en-gb: en_GB
-en-us:

[MediaWiki-commits] [Gerrit] add TODOs for add/removeIndexSql methods in SchemaBuilders - change (mediawiki...WikibaseDatabase)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: add TODOs for add/removeIndexSql methods in SchemaBuilders
..


add TODOs for add/removeIndexSql methods in SchemaBuilders

Change-Id: I52659a4bdfd2834e1b743c70b9ed6b4629f928e1
---
M src/MySQL/MySQLSchemaSqlBuilder.php
M src/SQLite/SQLiteSchemaSqlBuilder.php
M src/Schema/SchemaModificationSqlBuilder.php
3 files changed, 59 insertions(+), 0 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/MySQL/MySQLSchemaSqlBuilder.php 
b/src/MySQL/MySQLSchemaSqlBuilder.php
index 7b96c3a..a4f0c94 100644
--- a/src/MySQL/MySQLSchemaSqlBuilder.php
+++ b/src/MySQL/MySQLSchemaSqlBuilder.php
@@ -4,6 +4,7 @@
 
 use Wikibase\Database\Escaper;
 use Wikibase\Database\Schema\Definitions\FieldDefinition;
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
 use Wikibase\Database\Schema\SchemaModificationSqlBuilder;
 use Wikibase\Database\TableNameFormatter;
 
@@ -48,4 +49,24 @@
return ALTER TABLE {$tableName} ADD  . 
$this-fieldSqlBuilder-getFieldSQL( $field );
}
 
+   /**
+* @param string $tableName
+* @param string $indexName
+*
+* @return string
+*/
+   public function getRemoveIndexSql( $tableName, $indexName ){
+   //TODO
+   }
+
+   /**
+* @param string $tableName
+* @param IndexDefinition $field
+*
+* @return string
+*/
+   public function getAddIndexSql( $tableName, IndexDefinition $field ){
+   //TODO
+   }
+
 }
diff --git a/src/SQLite/SQLiteSchemaSqlBuilder.php 
b/src/SQLite/SQLiteSchemaSqlBuilder.php
index 942548b..62cb3de 100644
--- a/src/SQLite/SQLiteSchemaSqlBuilder.php
+++ b/src/SQLite/SQLiteSchemaSqlBuilder.php
@@ -6,6 +6,7 @@
 use Wikibase\Database\Escaper;
 use Wikibase\Database\QueryInterface\QueryInterface;
 use Wikibase\Database\Schema\Definitions\FieldDefinition;
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
 use Wikibase\Database\Schema\SchemaModificationSqlBuilder;
 use Wikibase\Database\Schema\TableDefinitionReader;
 use Wikibase\Database\TableNameFormatter;
@@ -76,4 +77,24 @@
return ALTER TABLE {$tableName} ADD COLUMN  . 
$this-fieldSqlBuilder-getFieldSQL( $field );
}
 
+   /**
+* @param string $tableName
+* @param string $indexName
+*
+* @return string
+*/
+   public function getRemoveIndexSql( $tableName, $indexName ){
+   //TODO
+   }
+
+   /**
+* @param string $tableName
+* @param IndexDefinition $field
+*
+* @return string
+*/
+   public function getAddIndexSql( $tableName, IndexDefinition $field ){
+   //TODO
+   }
+
 }
diff --git a/src/Schema/SchemaModificationSqlBuilder.php 
b/src/Schema/SchemaModificationSqlBuilder.php
index 91aa902..bcd23ad 100644
--- a/src/Schema/SchemaModificationSqlBuilder.php
+++ b/src/Schema/SchemaModificationSqlBuilder.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Database\Schema;
 
 use Wikibase\Database\Schema\Definitions\FieldDefinition;
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
 
 /**
  * @since 0.1
@@ -27,4 +28,20 @@
 */
public function getAddFieldSql( $tableName, FieldDefinition $field );
 
+   /**
+* @param string $tableName
+* @param string $indexName
+*
+* @return string
+*/
+   public function getRemoveIndexSql( $tableName, $indexName );
+
+   /**
+* @param string $tableName
+* @param IndexDefinition $field
+*
+* @return string
+*/
+   public function getAddIndexSql( $tableName, IndexDefinition $field );
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/87680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I52659a4bdfd2834e1b743c70b9ed6b4629f928e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.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] Update error info in exceptions - change (mediawiki...WikibaseDatabase)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Update error info in exceptions
..


Update error info in exceptions

Change-Id: Ie79597852e30e59b045197f4a431634f592982cd
---
M src/MediaWiki/MediaWikiTableBuilder.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/MediaWiki/MediaWikiTableBuilder.php 
b/src/MediaWiki/MediaWikiTableBuilder.php
index 6d6b076..5b6a030 100644
--- a/src/MediaWiki/MediaWikiTableBuilder.php
+++ b/src/MediaWiki/MediaWikiTableBuilder.php
@@ -74,7 +74,7 @@
$success = $this-getDB()-query( $sql );
 
if ( $success === false ) {
-   throw new TableCreationFailedException( $table, 
$this-getDB()-lastQuery() );
+   throw new TableCreationFailedException( $table, 
$this-getDB()-lastError() );
}
}
 
@@ -91,7 +91,7 @@
$success = $this-getDB()-dropTable( $tableName, __METHOD__ );
 
if ( $success === false ) {
-   throw new TableDeletionFailedException( $tableName, 
$this-getDB()-lastQuery() );
+   throw new TableDeletionFailedException( $tableName, 
$this-getDB()-lastError() );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie79597852e30e59b045197f4a431634f592982cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@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] Make ChangeOpClaim use guidParser - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88015


Change subject: Make ChangeOpClaim use guidParser
..

Make ChangeOpClaim use guidParser

Change-Id: Ia88d01845897f6eed810213cfb4a9e35b675c9fa
---
M repo/includes/ChangeOp/ChangeOpClaim.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/15/88015/1

diff --git a/repo/includes/ChangeOp/ChangeOpClaim.php 
b/repo/includes/ChangeOp/ChangeOpClaim.php
index 33367e2..6f3e540 100644
--- a/repo/includes/ChangeOp/ChangeOpClaim.php
+++ b/repo/includes/ChangeOp/ChangeOpClaim.php
@@ -7,6 +7,7 @@
 use Wikibase\Entity;
 use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Lib\ClaimGuidValidator;
+use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Summary;
 
 /**
@@ -59,15 +60,17 @@
public function apply( Entity $entity, Summary $summary = null ) {
 
$guidValidator = new ClaimGuidValidator();
+   $guidParser = 
WikibaseRepo::getDefaultInstance()-getClaimGuidParser();
 
if( $this-claim-getGuid() === null ){
$this-claim-setGuid( $this-guidGenerator-newGuid() 
);
}
$guid = $this-claim-getGuid();
+   $guid = $guidParser-parse( $guid );
 
-   if ( $guidValidator-validate( $guid ) === false ) {
+   if ( $guidValidator-validate( $guid-getSerialization() ) === 
false ) {
throw new ChangeOpException( Claim does not have a 
valid GUID );
-   } else if ( strtoupper( $entity-getId()-getPrefixedId() ) !== 
substr( $guid, 0, strpos( $guid, '$' ) ) ){
+   } else if ( !$entity-getId()-equals( $guid-getEntityId() ) ){
throw new ChangeOpException( Claim GUID invalid for 
given entity );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia88d01845897f6eed810213cfb4a9e35b675c9fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@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] Remoove some clutter - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88030


Change subject: Remoove some clutter
..

Remoove some clutter

Change-Id: Ic02b60ceb7833be749cf62eb54d1f152eabe2dc7
---
M WikibaseQuery.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuery 
refs/changes/30/88030/1

diff --git a/WikibaseQuery.php b/WikibaseQuery.php
index 63f02d2..4e9ddf6 100644
--- a/WikibaseQuery.php
+++ b/WikibaseQuery.php
@@ -3,11 +3,6 @@
 /**
  * MediaWiki setup for the Wikibase Query extension.
  *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQuery
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */

-- 
To view, visit https://gerrit.wikimedia.org/r/88030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic02b60ceb7833be749cf62eb54d1f152eabe2dc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove PagedDialog from test files - change (mediawiki...VisualEditor)

2013-10-07 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88031


Change subject: Remove PagedDialog from test files
..

Remove PagedDialog from test files

Fix for patch I5efa2f893f4b which only removed one reference to the file.

Change-Id: I89b9f30ee8309e1cba0ed98a74238ba671b76a59
---
M demos/ve/index.php
M modules/ve/test/index.php
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/31/88031/1

diff --git a/demos/ve/index.php b/demos/ve/index.php
index c6b6f6f..9b041b2 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -278,7 +278,6 @@
script 
src=../../modules/ve/ui/layouts/ve.ui.GridLayout.js/script
script 
src=../../modules/ve/ui/layouts/ve.ui.PanelLayout.js/script
script 
src=../../modules/ve/ui/layouts/ve.ui.StackPanelLayout.js/script
-   script 
src=../../modules/ve/ui/dialogs/ve.ui.PagedDialog.js/script
script 
src=../../modules/ve/ui/tools/ve.ui.AnnotationTool.js/script
script 
src=../../modules/ve/ui/tools/ve.ui.ClearAnnotationTool.js/script
script 
src=../../modules/ve/ui/tools/ve.ui.DialogTool.js/script
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 8ce172d..17c4358 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -223,7 +223,6 @@
script src=../../ve/ui/layouts/ve.ui.GridLayout.js/script
script src=../../ve/ui/layouts/ve.ui.PanelLayout.js/script
script 
src=../../ve/ui/layouts/ve.ui.StackPanelLayout.js/script
-   script src=../../ve/ui/dialogs/ve.ui.PagedDialog.js/script
script 
src=../../ve/ui/tools/ve.ui.AnnotationTool.js/script
script 
src=../../ve/ui/tools/ve.ui.ClearAnnotationTool.js/script
script src=../../ve/ui/tools/ve.ui.DialogTool.js/script

-- 
To view, visit https://gerrit.wikimedia.org/r/88031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89b9f30ee8309e1cba0ed98a74238ba671b76a59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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] Make thanks-confirmation more neutral dropping Are you sure - change (mediawiki...Thanks)

2013-10-07 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88032


Change subject: Make thanks-confirmation more neutral dropping Are you sure
..

Make thanks-confirmation more neutral dropping Are you sure

That are you sure is disturbing, it makes it look something disruptive.
People only wanted some confirmation step, not a dissuading barrier.

Change-Id: I06fa57d7f77b297caf9d3267513365481992b67b
---
M Thanks.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/32/88032/1

diff --git a/Thanks.i18n.php b/Thanks.i18n.php
index 1d9cc98..a180154 100644
--- a/Thanks.i18n.php
+++ b/Thanks.i18n.php
@@ -21,7 +21,7 @@
'thanks-error-invalidrevision' = 'Revision ID is not valid.',
'thanks-error-ratelimited' = You've exceeded your rate limit. Please 
wait some time and try again.,
'thanks-thank-tooltip' = '{{GENDER:$1|Send}} a thank you notification 
to this {{GENDER:$2|user}}',
-   'thanks-confirmation' = 'Are you sure you want to {{GENDER:$1|thank}} 
$2 for this edit?',
+   'thanks-confirmation' = 'Do you want to {{GENDER:$1|thank}} $2 for 
this edit?',
'thanks-thanked-notice' = '$1 was told that you liked 
{{GENDER:$2|his|her|their}} edit.',
'echo-pref-subscription-edit-thank' = 'Thanks me for my edit',
'echo-pref-tooltip-edit-thank' = 'Notify me when someone thanks me for 
an edit I made.',

-- 
To view, visit https://gerrit.wikimedia.org/r/88032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06fa57d7f77b297caf9d3267513365481992b67b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Refactor SetClaimTest - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88016


Change subject: Refactor SetClaimTest
..

Refactor SetClaimTest

This means each test case actually runs as
a seperate test meaning we can get seperate
output for each!

Change-Id: Iab6dcd8f757febdda07c542d2a90c6072673c2b7
---
M repo/tests/phpunit/includes/api/SetClaimTest.php
1 file changed, 59 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/16/88016/1

diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php 
b/repo/tests/phpunit/includes/api/SetClaimTest.php
index 08b7732..dd09006 100644
--- a/repo/tests/phpunit/includes/api/SetClaimTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimTest.php
@@ -1,6 +1,7 @@
 ?php
 
 namespace Wikibase\Test\Api;
+
 use Wikibase\Claim;
 use Wikibase\Claims;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -26,8 +27,6 @@
  *
  * @since 0.4
  *
- * @ingroup WikibaseRepoTest
- *
  * @group API
  * @group Database
  * @group Wikibase
@@ -40,13 +39,14 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Daniel Kinzler
+ * @author Adam Shorland
  */
 class SetClaimTest extends WikibaseApiTestCase {
 
/**
 * @return Snak[]
 */
-   protected function snakProvider() {
+   protected static function snakProvider() {
static $hasProperties = false;
 
$prop42 = new PropertyId( 'P42' );
@@ -81,34 +81,8 @@
return $snaks;
}
 
-   /**
-* @return Claim[]
-*/
-   protected function claimProvider() {
-   $statements = array();
-
-   $snaks = $this-snakProvider();
-   $mainSnak = $snaks[0];
-   $statement = new Statement( $mainSnak );
-   $statements[] = $statement;
-
-   foreach ( $snaks as $snak ) {
-   $statement = clone $statement;
-   $snaks = new SnakList( array( $snak ) );
-   $statement-getReferences()-addReference( new 
Reference( $snaks ) );
-   $statements[] = $statement;
-   }
-
-   $statement = clone $statement;
-   $snaks = new SnakList( $this-snakProvider() );
-   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
-   $statements[] = $statement;
-
-   $statement = clone $statement;
-   $snaks = new SnakList( $this-snakProvider() );
-   $statement-setQualifiers( $snaks );
-   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
-   $statements[] = $statement;
+   public static function provideClaims() {
+   $testCases = array();
 
$ranks = array(
Statement::RANK_DEPRECATED,
@@ -116,49 +90,70 @@
Statement::RANK_PREFERRED
);
 
-   /**
-* @var Statement[] $statements
-*/
-   foreach ( $statements as $statement ) {
+   $snaks = self::snakProvider();
+   $mainSnak = $snaks[0];
+   $statement = new Statement( $mainSnak );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   foreach ( $snaks as $snak ) {
+   $statement = clone $statement;
+   $snaks = new SnakList( array( $snak ) );
+   $statement-getReferences()-addReference( new 
Reference( $snaks ) );
$statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
}
 
-   return $statements;
+   $statement = clone $statement;
+   $snaks = new SnakList( self::snakProvider() );
+   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   $statement = clone $statement;
+   $snaks = new SnakList( self::snakProvider() );
+   $statement-setQualifiers( $snaks );
+   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   return $testCases ;
}
 
-   public function testAddClaim() {
-   foreach ( $this-claimProvider() as $claim ) {
-   $item = Item::newEmpty();
-   $content = new ItemContent( $item );
-   $content-save( '', null, EDIT_NEW );
+   /**
+* @dataProvider

[MediaWiki-commits] [Gerrit] Refactor setclaim to use changeops - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88017


Change subject: Refactor setclaim to use changeops
..

Refactor setclaim to use changeops

This is the final api modules that was not using
changeops! Now it does!

Change-Id: I80dce3af7fec3e4c922ada87646be581873267f9
---
M repo/includes/ChangeOp/ChangeOpClaim.php
M repo/includes/api/ModifyClaim.php
M repo/includes/api/SetClaim.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
4 files changed, 113 insertions(+), 155 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/17/88017/1

diff --git a/repo/includes/ChangeOp/ChangeOpClaim.php 
b/repo/includes/ChangeOp/ChangeOpClaim.php
index 6f3e540..0f4576e 100644
--- a/repo/includes/ChangeOp/ChangeOpClaim.php
+++ b/repo/includes/ChangeOp/ChangeOpClaim.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Wikibase\Claim;
+use Wikibase\Claims;
 use Wikibase\Entity;
 use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Lib\ClaimGuidValidator;
@@ -65,8 +66,7 @@
if( $this-claim-getGuid() === null ){
$this-claim-setGuid( $this-guidGenerator-newGuid() 
);
}
-   $guid = $this-claim-getGuid();
-   $guid = $guidParser-parse( $guid );
+   $guid = $guidParser-parse( $this-claim-getGuid() );
 
if ( $guidValidator-validate( $guid-getSerialization() ) === 
false ) {
throw new ChangeOpException( Claim does not have a 
valid GUID );
@@ -74,8 +74,15 @@
throw new ChangeOpException( Claim GUID invalid for 
given entity );
}
 
-   $entity-addClaim( $this-claim );
-   $this-updateSummary( $summary, 'add' );
+   $claims = new Claims( $entity-getClaims() );
+   if( $claims-hasClaimWithGuid( $guid-getSerialization() ) ){
+   $claims-removeClaimWithGuid( $guid-getSerialization() 
);
+   $this-updateSummary( $summary, 'update' );
+   } else {
+   $this-updateSummary( $summary, 'create' );
+   }
+   $claims-addClaim( $this-claim );
+   $entity-setClaims( $claims );
 
return true;
}
diff --git a/repo/includes/api/ModifyClaim.php 
b/repo/includes/api/ModifyClaim.php
index 3b83d6c..851cbc3 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -39,12 +39,19 @@
protected $claimGuidParser;
 
/**
+* @since 0.5
+*
+* @var SnakValidationHelper
+*/
+   protected $snakValidation;
+
+   /**
 * see ApiBase::__construct()
 */
public function __construct( ApiMain $mainModule, $moduleName, 
$modulePrefix = '' ) {
parent::__construct( $mainModule, $moduleName, $modulePrefix );
 
-   $snakValidation = new SnakValidationHelper(
+   $this-snakValidation = new SnakValidationHelper(
$this,

WikibaseRepo::getDefaultInstance()-getPropertyDataTypeLookup(),

WikibaseRepo::getDefaultInstance()-getDataTypeFactory(),
@@ -57,7 +64,7 @@

WikibaseRepo::getDefaultInstance()-getSnakConstructionService(),
WikibaseRepo::getDefaultInstance()-getEntityIdParser(),

WikibaseRepo::getDefaultInstance()-getClaimGuidValidator(),
-   $snakValidation
+   $this-snakValidation
);
 
$this-claimGuidParser = 
WikibaseRepo::getDefaultInstance()-getClaimGuidParser();
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index beb29ba..bc13bb8 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -2,62 +2,38 @@
 
 namespace Wikibase\Api;
 
+use ApiMain, ApiBase, MWException;
 use DataValues\IllegalValueException;
-use ApiMain;
 use Diff\Comparer\ComparableComparer;
 use Diff\OrderedListDiffer;
-use MWException;
-use ApiBase;
+use FormatJson;
 use Diff\ListDiffer;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
+use Wikibase\ChangeOp\ChangeOpClaim;
+use Wikibase\ChangeOp\ChangeOpException;
+use Wikibase\ClaimDiffer;
+use Wikibase\Claims;
+use Wikibase\ClaimSummaryBuilder;
 use Wikibase\EntityContent;
 use Wikibase\Claim;
 use Wikibase\EntityContentFactory;
-use Wikibase\ClaimDiffer;
-use Wikibase\ClaimSaver;
-use Wikibase\ClaimSummaryBuilder;
+use Wikibase\Lib\ClaimGuidGenerator;
+use Wikibase\Lib\Serializers\SerializerFactory;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Summary;
-use Wikibase\Validators\ValidatorErrorLocalizer;
 
 /**
  * API module for creating or updating an entire Claim.
  *
  * @since 0.4

[MediaWiki-commits] [Gerrit] Accessibility: Make the collapsible sidebar screen reader fr... - change (mediawiki/core)

2013-10-07 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88033


Change subject: Accessibility: Make the collapsible sidebar screen reader 
friendly
..

Accessibility: Make the collapsible sidebar screen reader friendly

Change-Id: Ie928e7b7610f60e505bb75939e1face1cb6e8bcf
---
M skins/vector/collapsibleNav.js
1 file changed, 33 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/88033/1

diff --git a/skins/vector/collapsibleNav.js b/skins/vector/collapsibleNav.js
index 67313c9..45258e5 100644
--- a/skins/vector/collapsibleNav.js
+++ b/skins/vector/collapsibleNav.js
@@ -7,17 +7,28 @@
 
// Use the same function for all navigation headings - don't repeat
function toggle( $element ) {
+   var isCollapsed = $element.parent().is( '.collapsed' );
+
$.cookie(
'vector-nav-' + $element.parent().attr( 'id' ),
-   $element.parent().is( '.collapsed' ),
+   isCollapsed,
{ 'expires': 30, 'path': '/' }
);
+
$element
.parent()
.toggleClass( 'expanded' )
.toggleClass( 'collapsed' )
.find( '.body' )
.slideToggle( 'fast' );
+   isCollapsed = !isCollapsed;
+
+   $element
+   .find( ' a' )
+   .attr( {
+   'aria-pressed': isCollapsed ? 'false' : 'true',
+   'aria-expanded': isCollapsed ? 'false' : 'true'
+   } );
}
 
/* Browser Support */
@@ -61,8 +72,18 @@
.each( function ( i ) {
var id = $(this).attr( 'id' ),
state = $.cookie( 'vector-nav-' + id );
+   $(this).find( 'ul:first' ).attr( 'id', id + 
'-list' );
// Add anchor tag to heading for better 
accessibility
-   $( this ).find( 'h3' ).wrapInner( $( 'a 
href=#/a' ).click( false ) );
+   $( this ).find( 'h3' ).wrapInner(
+   $( 'a' )
+   .attr( {
+   href: '#',
+   'aria-haspopup': 'true',
+   'aria-controls': id + 
'-list',
+   role: 'button'
+   } )
+   .click( false )
+   );
// In the case that we are not showing the new 
version, let's show the languages by default
if (
state === 'true' ||
@@ -75,10 +96,20 @@
.find( '.body' )
.hide() // bug 34450
.show();
+   $(this).find( 'h3  a' )
+   .attr( {
+   'aria-pressed': 'true',
+   'aria-expanded': 'true'
+   } );
} else {
$(this)
.addClass( 'collapsed' )
.removeClass( 'expanded' );
+   $(this).find( 'h3  a' )
+   .attr( {
+   'aria-pressed': 'false',
+   'aria-expanded': 'false'
+   } );
}
// Re-save cookie
if ( state !== null ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/88033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie928e7b7610f60e505bb75939e1face1cb6e8bcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unused ClaimSaver class - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88018


Change subject: Remove unused ClaimSaver class
..

Remove unused ClaimSaver class

Change-Id: Iffdca7762eecb0b716026e562664dc17a298e17a
---
D repo/includes/ClaimSaver.php
1 file changed, 0 insertions(+), 192 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/18/88018/1

diff --git a/repo/includes/ClaimSaver.php b/repo/includes/ClaimSaver.php
deleted file mode 100644
index 9541637..000
--- a/repo/includes/ClaimSaver.php
+++ /dev/null
@@ -1,192 +0,0 @@
-?php
-
-namespace Wikibase;
-
-use User;
-use MWException;
-use Status;
-use ValueParsers\ParseException;
-use Wikibase\Claims;
-use Wikibase\DataModel\Claim\ClaimGuidParsingException;
-use Wikibase\ExceptionWithCode;
-use Wikibase\Repo\WikibaseRepo;
-
-/**
- * Class for updating a claim in the primary storage.
- *
- * TODO: add dedicated tests (now tested though SetClaim API module)
- * FIXME: entity content fetching pulls in global factory
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @since 0.4
- *
- * @ingroup WikibaseRepo
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw  jeroended...@gmail.com 
- * @author Tobias Gritschacher  tobias.gritschac...@wikimedia.de 
- */
-class ClaimSaver {
-   /**
-* @see ApiBase::execute
-*
-* @since 0.4
-*
-* @param Claim $claim
-* @param int|null $baseRevId
-* @param string $token
-* @param User $user
-* @param ClaimSummaryBuilder|null $claimSummaryBuilder
-* @param int $flags
-*
-* @return Status The status. The status value is an array which may 
contain
-* the following fields:
-*
-* -revision: the revision object created by the save
-* -errorFlags: error flags using the EditEntity::XXX_ERROR 
constants
-* -errorCode: error code to use in API output
-*
-* This status object can be used with 
ApiWikibase::handleSaveStatus().
-*/
-   public function saveClaim( Claim $claim, $baseRevId, $token, User $user,
-   ClaimSummaryBuilder $claimSummaryBuilder = null, $flags = 0 ) {
-
-   try {
-   $entityId = $this-getEntityIdForClaim( $claim );
-
-   $content = $this-getEntityContent( $entityId, 
$baseRevId );
-
-   $summary = null;
-
-   if ( $claimSummaryBuilder !== null ) {
-   $summary = 
$claimSummaryBuilder-buildClaimSummary(
-   new Claims( 
$content-getEntity()-getClaims() ),
-   $claim
-   );
-   }
-
-   $this-updateClaim( $content-getEntity(), $claim );
-
-   $status = $this-saveChanges( $content, $baseRevId, 
$token, $user, $summary, $flags );
-   } catch ( ExceptionWithCode $ex ) {
-   // put the error code into the status
-   $value = array( 'errorCode' = $ex-getErrorCode() );
-   $status = Status::newGood();
-   $status-setResult( false, $value );
-   //TODO: add an error message localization key, perhaps 
derived from the error code.
-   }
-
-   return $status;
-   }
-
-   /**
-* @param Claim $claim
-*
-* @return EntityId
-* @throws ExceptionWithCode
-*/
-   protected function getEntityIdForClaim( Claim $claim ) {
-   try {
-   $parser = 
WikibaseRepo::getDefaultInstance()-getClaimGuidParser();
-   return $parser-parse( $claim-getGuid() 
)-getEntityId();
-   }
-   catch( ClaimGuidParsingException $exception ) {
-   //todo fix the error code below to be 'invalid-guid'
-   throw new ExceptionWithCode( $exception-getMessage(), 
'setclaim-invalid-guid' );
-   }
-

[MediaWiki-commits] [Gerrit] Cleanup swift monitor_service entries - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: Cleanup swift monitor_service entries
..


Cleanup swift monitor_service entries

Using the other unused nrpe::monitor_service and a variable to avoid
repetition.

Change-Id: Ib55945cc0dcc468b084cfd25bba6348f63e5d56b
---
M manifests/swift.pp
M modules/nrpe/templates/nrpe_local.cfg.erb
M templates/icinga/checkcommands.cfg.erb
3 files changed, 25 insertions(+), 91 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/swift.pp b/manifests/swift.pp
index 2e8e34a..1a30485 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -236,19 +236,32 @@
 
class monitoring {
require swift::storage::service
+   define monitor_swift_daemon {
+   # nrpe::monitor_service will create nrpe::check command 
definition and a
+   # monitor_service definition which exports to nagios
+   nrpe::monitor_service { $title:
+   description  = $title,
+   nrpe_command = 
/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array='^/usr/bin/python /usr/bin/${title}',
+   }
+   }
+   include nrpe
$nagios_group = swift
-   monitor_service { swift-account-auditor: description = 
swift-account-auditor, check_command = nrpe_check_swift_account_auditor }
-   monitor_service { swift-account-reaper: description = 
swift-account-reaper, check_command = nrpe_check_swift_account_reaper }
-   monitor_service { swift-account-replicator: description = 
swift-account-replicator, check_command = 
nrpe_check_swift_account_replicator }
-   monitor_service { swift-account-server: description = 
swift-account-server, check_command = nrpe_check_swift_account_server }
-   monitor_service { swift-container-auditor: description = 
swift-container-auditor, check_command = 
nrpe_check_swift_container_auditor }
-   monitor_service { swift-container-replicator: description = 
swift-container-replicator, check_command = 
nrpe_check_swift_container_replicator }
-   monitor_service { swift-container-server: description = 
swift-container-server, check_command = nrpe_check_swift_container_server }
-   monitor_service { swift-container-updater: description = 
swift-container-updater, check_command = 
nrpe_check_swift_container_updater }
-   monitor_service { swift-object-auditor: description = 
swift-object-auditor, check_command = nrpe_check_swift_object_auditor }
-   monitor_service { swift-object-replicator: description = 
swift-object-replicator, check_command = 
nrpe_check_swift_object_replicator }
-   monitor_service { swift-object-server: description = 
swift-object-server, check_command = nrpe_check_swift_object_server }
-   monitor_service { swift-object-updater: description = 
swift-object-updater, check_command = nrpe_check_swift_object_updater }
+
+   # RT-2593. Moved here from nrpe_local.cfg
+   monitor_swift_daemon { [
+   'swift-account-auditor',
+   'swift-account-reaper',
+   'swift-account-replicator',
+   'swift-account-server',
+   'swift-container-auditor',
+   'swift-container-replicator',
+   'swift-container-server',
+   'swift-container-updater',
+   'swift-object-auditor',
+   'swift-object-replicator',
+   'swift-object-server',
+   'swift-object-updater',
+   ]: }
}
 
# this class installs swift-drive-audit as a cronjob; it checks the 
disks every 60 minutes
diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb 
b/modules/nrpe/templates/nrpe_local.cfg.erb
index 6892e41..f56f635 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -25,18 +25,3 @@
 command[check_profiler_to_carbon]=/usr/lib/nagios/plugins/check_procs -c 1:1 
--ereg-argument-array='^/usr/bin/python /usr/udpprofile/sbin/profiler-to-carbon'
 command[check_profiling_collector]=/usr/lib/nagios/plugins/check_procs -c 1:20 
-C collector
 command[check_etherpad_lite]=/usr/lib/nagios/plugins/check_procs -c 1:1 
--ereg-argument-array='^node node_modules/ep_etherpad-lite/node/server.js'
-
-# swift process checks (RT-2593)
-command[check_swift_account_auditor]=/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-account-auditor'
-command[check_swift_account_reaper]=/usr/lib/nagios/plugins/check_procs -c 1:

[MediaWiki-commits] [Gerrit] Hide edit notices button properly when none are present - change (mediawiki...VisualEditor)

2013-10-07 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88034


Change subject: Hide edit notices button properly when none are present
..

Hide edit notices button properly when none are present

Fix to Iea2c8df1be64d to prevent exception being thrown if no
edit notices are present.

Change-Id: I3da6d7b848d0a0a2ab1a23a5d9c9c3d4eb629024
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/34/88034/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index e0bf6e3..c1c261a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1281,7 +1281,7 @@
this.toolbarEditNoticesButton.showPopup();
}, this ), 500 );
} else {
-   this.toolbarEditNoticesButton.hide();
+   this.toolbarEditNoticesButton.$button.hide();
}
 
this.toolbarBetaNoticesButton = new ve.ui.PopupButtonWidget( {

-- 
To view, visit https://gerrit.wikimedia.org/r/88034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3da6d7b848d0a0a2ab1a23a5d9c9c3d4eb629024
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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] Update store setup and teardown in EntitiesByPropertyValueAp... - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88035


Change subject: Update store setup and teardown in 
EntitiesByPropertyValueApiTest
..

Update store setup and teardown in EntitiesByPropertyValueApiTest

Change-Id: Ibab0bb678526eb1ed8565ec587e693a2828cc9f0
---
M Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
1 file changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuery 
refs/changes/35/88035/1

diff --git a/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php 
b/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
index c8e8e54..82763db 100644
--- a/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
+++ b/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
@@ -36,28 +36,20 @@
return ExtensionAccess::getWikibaseQuery()-getQueryStore();
}
 
-   protected function reinitializeStore() {
-   $queryStore = $this-getQueryStore();
-   $setup = $queryStore-newSetup();
-
-   $setup-uninstall();
-   $setup-install();
-   }
-
public function setUp() {
parent::setUp();
 
$this-itemId = new ItemId( self::ITEM_ID_STRING );
$this-propertyId = new PropertyId( self::PROPERTY_ID_STRING );
 
-   $this-reinitializeStore();
+   $this-getQueryStore()-newSetup()-install();
 
$this-createNewProperty();
$this-insertNewItem();
}
 
public function tearDown() {
-   $this-reinitializeStore();
+   $this-getQueryStore()-newSetup()-uninstall();
parent::tearDown();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibab0bb678526eb1ed8565ec587e693a2828cc9f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Koyraboro Senni Songhay (ses) - change (translatewiki)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88036


Change subject: Add Koyraboro Senni Songhay (ses)
..

Add Koyraboro Senni Songhay (ses)

Change-Id: Id425153ffa7068f1639067088be682969e55bb77
---
M FallbackSettings.php
M TranslatewikiSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/36/88036/1

diff --git a/FallbackSettings.php b/FallbackSettings.php
index c8cd7ed..d128a9d 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -89,6 +89,7 @@
 $wgTranslateLanguageFallbacks['saz'] = array( 'gu' );
 $wgTranslateLanguageFallbacks['sdc'] = array( 'it' );
 $wgTranslateLanguageFallbacks['se'] = array( 'fi', 'sv', 'nb', 'sma' );
+$wgTranslateLanguageFallbacks['ses'] = array( 'fr' );
 $wgTranslateLanguageFallbacks['shi'] = array( 'ar', 'fr' ); # Robin 2011-09-27
 $wgTranslateLanguageFallbacks['sli'] = array( 'pl', 'szl' );
 $wgTranslateLanguageFallbacks['sly'] = array( 'id' );
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 8457647..4ede6af 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -312,6 +312,7 @@
 $wgExtraLanguageNames['miq'] = 'Mískitu'; # Miskito / Siebrand 2013-07-02
 $wgExtraLanguageNames['abs'] = 'Bahasa Ambon'; # Ambonese Malay / Siebrand 
2013-07-05
 $wgExtraLanguageNames['pbb'] = 'Nasa Yuwe'; # Páez / Siebrand 2013-08-08
+$wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

-- 
To view, visit https://gerrit.wikimedia.org/r/88036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id425153ffa7068f1639067088be682969e55bb77
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add extra ChangeOpClaim tests - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88019


Change subject: Add extra ChangeOpClaim tests
..

Add extra ChangeOpClaim tests

This adds checks for adding claims with
the same guids which was technically possible
before the previous commit.

Change-Id: If50f6a078c85df9fe8796574d500e07b9a1413be
---
M repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/19/88019/1

diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php 
b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
index 2572061..4a98a9c 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
@@ -72,15 +72,18 @@
$claims[]-setGuid( 
'Q666$D8404CDA-25E4-4334-AF13-A3290BC6' );
 
$args = array();
-   //test adding claims with guids from other items
+   //test adding claims with guids from other items(these 
shouldn't be added)
$args[] = array ( $itemEmpty, clone $claims[666] , false );
$args[] = array ( $itemEmpty, clone $claims[777] ,  false );
$args[] = array ( $item666, clone $claims[777] ,  false );
$args[] = array ( $item777, clone $claims[666] ,  false );
-   //test adding the same claims with a null guid (one should be 
created)
+   //test adding the same claims with a null guid (a guid should 
be created)
$args[] = array ( $item777, clone $claims[7770]  , array( 
$claims[777], $claims[7770] ) );
$args[] = array ( $item666, clone $claims[6660]  , array( 
$claims[666], $claims[6660] ) );
-   //test adding the same claims with a correct guid
+   //test adding the same claims with a correct but different guid 
(these should be added)
+   $args[] = array ( $item777, clone $claims[]  , array( 
$claims[777], $claims[7770], $claims[]) );
+   $args[] = array ( $item666, clone $claims[]  , array( 
$claims[666], $claims[6660], $claims[] ) );
+   //test adding the same claims with and id that already exists 
(these shouldn't be added)
$args[] = array ( $item777, clone $claims[]  , array( 
$claims[777], $claims[7770], $claims[]) );
$args[] = array ( $item666, clone $claims[]  , array( 
$claims[666], $claims[6660], $claims[] ) );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If50f6a078c85df9fe8796574d500e07b9a1413be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@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] Remoove some clutter - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Remoove some clutter
..


Remoove some clutter

Change-Id: Ic02b60ceb7833be749cf62eb54d1f152eabe2dc7
---
M WikibaseQuery.php
1 file changed, 0 insertions(+), 5 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  Jeroen De Dauw: Verified



diff --git a/WikibaseQuery.php b/WikibaseQuery.php
index 63f02d2..4e9ddf6 100644
--- a/WikibaseQuery.php
+++ b/WikibaseQuery.php
@@ -3,11 +3,6 @@
 /**
  * MediaWiki setup for the Wikibase Query extension.
  *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQuery
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */

-- 
To view, visit https://gerrit.wikimedia.org/r/88030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic02b60ceb7833be749cf62eb54d1f152eabe2dc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] draft exposed as 'draft-1' instead of 'PD1' - change (labs...grrrit)

2013-10-07 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88037


Change subject: draft exposed as 'draft-1' instead of 'PD1'
..

draft exposed as 'draft-1' instead of 'PD1'

PD is offending in french (that is more or less a pejorative way to
refer to gay people) and I find it unclear. This patch replace the 'PD'
prefix with 'draft-'.

Change-Id: I831dd66aef4f18f0c253b8f871740d2378ce2bd1
---
M src/preprocess.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/37/88037/1

diff --git a/src/preprocess.js b/src/preprocess.js
index 8f1d962..cf39ad8 100644
--- a/src/preprocess.js
+++ b/src/preprocess.js
@@ -38,7 +38,7 @@
 
 exports['draft-published'] = function(message) {
 var ret = {
-type: 'PD' + message.patchSet.number,
+type: 'draft-' + message.patchSet.number,
 user: message.uploader.name,
 'message': message.change.subject,
 repo: formatRepo(message.change.project),

-- 
To view, visit https://gerrit.wikimedia.org/r/88037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I831dd66aef4f18f0c253b8f871740d2378ce2bd1
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] depool db1021 query storm/crash - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88038


Change subject: depool db1021 query storm/crash
..

depool db1021 query storm/crash

Change-Id: I7fe21f16eb7a1c81bae51aaad166f655c5cdd635
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/38/88038/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 862536f..3cb2122 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -118,9 +118,9 @@
's5' = array(
'db1058'   = 0,
#'db1039'   = 0, # was 51fb master
-   'db1005'   = 100, # snapshot
+   'db1005'   = 200, # snapshot
'db1026'   = 400,
-   'db1021'   = 400,
+   #'db1021'   = 400,
),
's6' = array(
'db1006'   = 0,

-- 
To view, visit https://gerrit.wikimedia.org/r/88038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe21f16eb7a1c81bae51aaad166f655c5cdd635
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use ApiWikibase::loadEntityContent - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88020


Change subject: Use ApiWikibase::loadEntityContent
..

Use ApiWikibase::loadEntityContent

Instead of using a method in claimModificationHelper
use the one that already exists in the APIBase!

Also make sure that all users of the method also
load the correct / required baserevid...

Change-Id: I0b5958d3542bfb61b0639955a1e9ef54d7b186aa
---
M repo/includes/api/ClaimModificationHelper.php
M repo/includes/api/CreateClaim.php
M repo/includes/api/ModifyClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetStatementRank.php
11 files changed, 29 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/20/88020/1

diff --git a/repo/includes/api/ClaimModificationHelper.php 
b/repo/includes/api/ClaimModificationHelper.php
index 7b5d9d4..05ee09e 100644
--- a/repo/includes/api/ClaimModificationHelper.php
+++ b/repo/includes/api/ClaimModificationHelper.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Api;
 
+use ApiMain;
 use DataValues\IllegalValueException;
 use InvalidArgumentException;
 use Wikibase\Lib\EntityIdParser;
@@ -80,13 +81,15 @@
/**
 * @since 0.4
 *
-* @param \ApiMain $apiMain
+* @param ApiMain $apiMain
 * @param EntityContentFactory $entityContentFactory
 * @param SnakConstructionService $snakConstructionService
 * @param EntityIdParser $entityIdParser
+* @param ClaimGuidValidator $claimGuidValidator
+* @param SnakValidationHelper $snakValidation
 */
public function __construct(
-   \ApiMain $apiMain,
+   ApiMain $apiMain,
EntityContentFactory $entityContentFactory,
SnakConstructionService $snakConstructionService,
EntityIdParser $entityIdParser,
@@ -206,29 +209,18 @@
$this-apiMain-dieUsage( 'Invalid snak: 
InvalidArgumentException', 'invalid-snak' );
}
 
-   $this-validateSnak( $snak );
+   $this-snakValidation-validateSnak( $snak );
 
return $snak;
-   }
-
-   /**
-* @since 0.4
-*
-* @param Snak $snak
-*/
-   public function validateSnak( Snak $snak ) {
-   $this-snakValidation-validateSnak( $snak );
}
 
/**
 * Parses an entity id string coming from the user
 *
 * @since 0.4
-*
 * @param string $entityIdParam
-*
-* TODO: this could go into an EntityModificationHelper or even in a 
ApiWikibaseHelper
-* as it is useful for almost all API modules
+* @return EntityId
+* @todo this could go into an EntityModificationHelper or even in a 
ApiWikibaseHelper
 */
public function getEntityIdFromString( $entityIdParam ) {
try {
diff --git a/repo/includes/api/CreateClaim.php 
b/repo/includes/api/CreateClaim.php
index 838c14c..72767ee 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -37,7 +37,8 @@
 
$entityId = 
$this-claimModificationHelper-getEntityIdFromString( $params['entity'] );
$entityTitle = $this-claimModificationHelper-getEntityTitle( 
$entityId );
-   $entityContent = $this-getEntityContent( $entityTitle );
+   $baseRevisionId = isset( $params['baserevid'] ) ? intval( 
$params['baserevid'] ) : null;
+   $entityContent = $this-loadEntityContent( $entityTitle, 
$baseRevisionId );
$entity = $entityContent-getEntity();
 
$propertyId = 
$this-claimModificationHelper-getEntityIdFromString( $params['property'] );
diff --git a/repo/includes/api/ModifyClaim.php 
b/repo/includes/api/ModifyClaim.php
index 851cbc3..148f441 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -113,23 +113,6 @@
}
 
/**
-* @since 0.4
-*
-* @param \Title $entityTitle
-*
-* @return EntityContent
-*
-* TODO: this could go into a ApiWikibaseHelper as it is useful for 
almost all API modules
-*/
-   protected function getEntityContent( \Title $entityTitle ) {
-   $params = $this-extractRequestParams();
-   $baseRevisionId = isset( $params['baserevid'] ) ? intval( 
$params['baserevid'] ) : null;
-   $entityContent = $this-loadEntityContent( $entityTitle, 
$baseRevisionId );
-
-   return $entityContent;
-   }
-
-   /**
 * @see

[MediaWiki-commits] [Gerrit] Improve dependency fetching - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88039


Change subject: Improve dependency fetching
..

Improve dependency fetching

Change-Id: If6a0b021a5148b52d2b2db651b3996766e55d691
---
M WikibaseQuery.php
M src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
2 files changed, 12 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuery 
refs/changes/39/88039/1

diff --git a/WikibaseQuery.php b/WikibaseQuery.php
index 4e9ddf6..88aa5a9 100644
--- a/WikibaseQuery.php
+++ b/WikibaseQuery.php
@@ -118,7 +118,9 @@
 
$dependencyManager-registerBuilder(
'byPropertyValueEntityFinder',
-   new 
Wikibase\Query\DIC\Builders\ByPropertyValueEntityFinderBuilder()
+   new 
Wikibase\Query\DIC\Builders\ByPropertyValueEntityFinderBuilder(
+   \Wikibase\Repo\WikibaseRepo::getDefaultInstance()
+   )
);
 
$dependencyManager-registerBuilder(
diff --git 
a/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php 
b/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
index dc76db7..017c453 100644
--- a/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
+++ b/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
@@ -17,6 +17,12 @@
  */
 class ByPropertyValueEntityFinderBuilder extends DependencyBuilder {
 
+   protected $repo;
+
+   public function __construct( WikibaseRepo $repo ) {
+   $this-repo = $repo;
+   }
+
/**
 * @see DependencyBuilder::buildObject
 *
@@ -32,9 +38,9 @@
 
return new ByPropertyValueEntityFinder(
$queryStore-getQueryEngine(),
-   DataValueFactory::singleton(), // TODO: get instance 
from repo factory
-   WikibaseRepo::getDefaultInstance()-getEntityIdParser(),
-   
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter()
+   $this-repo-getDataValueFactory(),
+   $this-repo-getEntityIdParser(),
+   $this-repo-getEntityIdFormatter()
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6a0b021a5148b52d2b2db651b3996766e55d691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update store setup and teardown in EntitiesByPropertyValueAp... - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Update store setup and teardown in 
EntitiesByPropertyValueApiTest
..


Update store setup and teardown in EntitiesByPropertyValueApiTest

Change-Id: Ibab0bb678526eb1ed8565ec587e693a2828cc9f0
---
M Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
1 file changed, 2 insertions(+), 10 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php 
b/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
index c8e8e54..82763db 100644
--- a/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
+++ b/Tests/System/Wikibase/Query/EntitiesByPropertyValueApiTest.php
@@ -36,28 +36,20 @@
return ExtensionAccess::getWikibaseQuery()-getQueryStore();
}
 
-   protected function reinitializeStore() {
-   $queryStore = $this-getQueryStore();
-   $setup = $queryStore-newSetup();
-
-   $setup-uninstall();
-   $setup-install();
-   }
-
public function setUp() {
parent::setUp();
 
$this-itemId = new ItemId( self::ITEM_ID_STRING );
$this-propertyId = new PropertyId( self::PROPERTY_ID_STRING );
 
-   $this-reinitializeStore();
+   $this-getQueryStore()-newSetup()-install();
 
$this-createNewProperty();
$this-insertNewItem();
}
 
public function tearDown() {
-   $this-reinitializeStore();
+   $this-getQueryStore()-newSetup()-uninstall();
parent::tearDown();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibab0bb678526eb1ed8565ec587e693a2828cc9f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@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] depool db1021 query storm/crash - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: depool db1021 query storm/crash
..


depool db1021 query storm/crash

Change-Id: I7fe21f16eb7a1c81bae51aaad166f655c5cdd635
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Springle: Verified; Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 862536f..3cb2122 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -118,9 +118,9 @@
's5' = array(
'db1058'   = 0,
#'db1039'   = 0, # was 51fb master
-   'db1005'   = 100, # snapshot
+   'db1005'   = 200, # snapshot
'db1026'   = 400,
-   'db1021'   = 400,
+   #'db1021'   = 400,
),
's6' = array(
'db1006'   = 0,

-- 
To view, visit https://gerrit.wikimedia.org/r/88038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fe21f16eb7a1c81bae51aaad166f655c5cdd635
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Follow-up 6ec34a3de: Fix bug and exception in edit notice bu... - change (mediawiki...VisualEditor)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up 6ec34a3de: Fix bug and exception in edit notice button
..


Follow-up 6ec34a3de: Fix bug and exception in edit notice button

After 6ec34a3de the edit notice button was no longer hidden by
default if there were no notices. The alert icon was always
visible (when clicked it would show 0 notices).

In addition, on any page (except pages with edit notices) it
would throw a fatal exception at load time because method .hide()
doesn't exist.

As a result, current master shows an incomplete toolbar (e.g. not even
a Save button!)

Change-Id: Ib6e91c4756664c25fbb7403ef54b4fffcc0f9938
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index e0bf6e3..cc2fcb9 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1276,12 +1276,15 @@
'head': true
}
} );
+
+   // Either keep the button shown and show the popup as well, or hide the 
button itself
+   // entirely (so that when it is attached later #attachToolbarButtons it 
will not be visible).
if ( editNoticeCount ) {
setTimeout( ve.bind( function () {
this.toolbarEditNoticesButton.showPopup();
}, this ), 500 );
} else {
-   this.toolbarEditNoticesButton.hide();
+   this.toolbarEditNoticesButton.$.hide();
}
 
this.toolbarBetaNoticesButton = new ve.ui.PopupButtonWidget( {

-- 
To view, visit https://gerrit.wikimedia.org/r/87899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6e91c4756664c25fbb7403ef54b4fffcc0f9938
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@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 Northern Luri (lrc) - change (translatewiki)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88040


Change subject: Add Northern Luri (lrc)
..

Add Northern Luri (lrc)

Change-Id: Ieb01d8255cf884f2360190c322e4e739f0834893
---
M FallbackSettings.php
M TranslatewikiSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/40/88040/1

diff --git a/FallbackSettings.php b/FallbackSettings.php
index d128a9d..5fea5e9 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -54,6 +54,7 @@
 $wgTranslateLanguageFallbacks['lez'] = array( 'ru', 'az' ); # Robin 2011-09-27
 $wgTranslateLanguageFallbacks['lld'] = array( 'it', 'rm', 'fur' ); # Robin 
2011-12-04
 $wgTranslateLanguageFallbacks['lmo'] = array( 'pms', 'eml', 'lij', 'vec' );
+$wgTranslateLanguageFallbacks['lrc'] = array( 'bqi', 'fa' );
 $wgTranslateLanguageFallbacks['mai'] = 'hi';
 $wgTranslateLanguageFallbacks['mdf'] = array( 'myv' );
 $wgTranslateLanguageFallbacks['mfe'] = array( 'fr' ); # Robin 2011-10-18
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 4ede6af..2e4d9c0 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -313,6 +313,7 @@
 $wgExtraLanguageNames['abs'] = 'Bahasa Ambon'; # Ambonese Malay / Siebrand 
2013-07-05
 $wgExtraLanguageNames['pbb'] = 'Nasa Yuwe'; # Páez / Siebrand 2013-08-08
 $wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
+$wgExtraLanguageNames['lrc'] = 'لوری'; # Northern Luri / Siebrand 2013-10-07
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

-- 
To view, visit https://gerrit.wikimedia.org/r/88040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb01d8255cf884f2360190c322e4e739f0834893
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Attempt to fix TravisCI build - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88041


Change subject: Attempt to fix TravisCI build
..

Attempt to fix TravisCI build

Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
---
M .travis.sh
1 file changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuery 
refs/changes/41/88041/1

diff --git a/.travis.sh b/.travis.sh
index 6e8e3b9..2ad5ab5 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,24 +2,27 @@
 
 set -x
 
-originalDirectory=$(pwd)
-
 cd ..
 
 git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git phase3 --depth 1
 
-cd phase3
+cd -
+cd ../phase3/extensions
+
+mkdir WikibaseQuery
+
+cd -
+cp -r * ../phase3/extensions/WikibaseQuery
+
+cd ../phase3
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
 
-composer require wikibase/query:dev-master
+cd extensions/WikibaseQuery
+composer install
 
-# Replace WikibaseQuery with the version that should be tested
-rm -rf WikibaseQuery
-mkdir WikibaseQuery
-cp -r $originalDirectory/* WikibaseQuery
-
+cd ../..
 echo 'require_once( __DIR__ . /vendor/wikibase/wikibase/repo/Wikibase.php 
);'  LocalSettings.php
 echo 'require_once( __DIR__ . 
/vendor/wikibase/wikibase/repo/ExampleSettings.php );'  LocalSettings.php
 echo 'require_once( __DIR__ . /vendor/wikibase/query/WikibaseQuery.php );' 
 LocalSettings.php

-- 
To view, visit https://gerrit.wikimedia.org/r/88041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add mw1072 to dsh groups again since it is back in service - change (operations/puppet)

2013-10-07 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88042


Change subject: add mw1072 to dsh groups again since it is back in service
..

add mw1072 to dsh groups again since it is back in service

Change-Id: Ia8d569e879653fad65ff5bce69c7a34aef00630f
---
M files/dsh/group/apache-eqiad
M files/dsh/group/apaches
M files/dsh/group/mediawiki-installation
M files/dsh/group/mw-eqiad
M files/dsh/group/nagios
5 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/88042/1

diff --git a/files/dsh/group/apache-eqiad b/files/dsh/group/apache-eqiad
index 81770ce..175fb1a 100644
--- a/files/dsh/group/apache-eqiad
+++ b/files/dsh/group/apache-eqiad
@@ -69,7 +69,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/apaches b/files/dsh/group/apaches
index 49e6d88..b4631d2 100644
--- a/files/dsh/group/apaches
+++ b/files/dsh/group/apaches
@@ -244,7 +244,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/mediawiki-installation 
b/files/dsh/group/mediawiki-installation
index e20c300..b6e6517 100644
--- a/files/dsh/group/mediawiki-installation
+++ b/files/dsh/group/mediawiki-installation
@@ -279,7 +279,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad
index c165e70..a7d11e7 100644
--- a/files/dsh/group/mw-eqiad
+++ b/files/dsh/group/mw-eqiad
@@ -70,7 +70,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios
index f745efd..19dcba6 100644
--- a/files/dsh/group/nagios
+++ b/files/dsh/group/nagios
@@ -452,6 +452,7 @@
 db46
 mw1013
 mw1071
+mw1072
 gallium
 es2
 sq76

-- 
To view, visit https://gerrit.wikimedia.org/r/88042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d569e879653fad65ff5bce69c7a34aef00630f
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] mw.ViewPageTarget: Fix incomplete teardown sequence in #deac... - change (mediawiki...VisualEditor)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: mw.ViewPageTarget: Fix incomplete teardown sequence in 
#deactivate
..


mw.ViewPageTarget: Fix incomplete teardown sequence in #deactivate

When deactivating before the surface became active (e.g.
this.active is still false, as case is the case when Parsoid
isn't running), the teardown sequence was incomplete.

Most notable, the page title (h1.firstHeading) was still dimmed
after cancelling the alert for Parsoid error, eventhough
everything else was shown and restored.

* Moved call to #showTableOfContents in #deactivate up for
  consistency with #activate.
* Added call to #restorePageTitle in #deactivate so that the
  title is restored even if the surface didn't activate yet.
* Removed calls to various methods in #tearDownSurface that
  were already called by #deactivate.

Now activate/deactivate and setUpSurface/tearDownSurface are
in balance.

Change-Id: Ibb2fbf0e5ab9b6a028d4e139c13aa7ff8c82be82
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 11 insertions(+), 8 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index e0bf6e3..1ed3dad 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -223,7 +223,9 @@
this.hideTableOfContents();
this.mutePageContent();
this.mutePageTitle();
+
this.saveScrollPosition();
+
this.load();
}
 };
@@ -244,6 +246,7 @@
// User interface changes
this.restorePage();
this.hideSpinner();
+   this.showTableOfContents();
 
if ( this.toolbarCancelButton ) {
// If deactivate is called before a successful 
load, then
@@ -256,17 +259,21 @@
this.resetSaveDialog();
this.hideSaveDialog();
this.detachSaveDialog();
-   // Check we got as far as setting up the surface
+
if ( this.active ) {
+   // If we got as far as setting up the surface, 
tear that down
this.tearDownSurface();
-   } else {
-   this.showPageContent();
}
+
+   // Show/restore components that are otherwise handled 
by tearDownSurface
+   this.showPageContent();
+   this.restorePageTitle();
+
// If there is a load in progress, abort it
if ( this.loading ) {
this.loading.abort();
}
-   this.showTableOfContents();
+
this.deactivating = false;
mw.hook( 've.deactivationComplete' ).fire();
}
@@ -1204,11 +1211,7 @@
this.$document = null;
}
this.tearDownToolbar();
-   this.hideSpinner();
-   this.showPageContent();
-   this.restorePageTitle();
this.restoreDocumentTitle();
-   this.showTableOfContents();
// Destroy surface
if ( this.surface ) {
this.surface.destroy();

-- 
To view, visit https://gerrit.wikimedia.org/r/87888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb2fbf0e5ab9b6a028d4e139c13aa7ff8c82be82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@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 Northern Luri (lrc) - change (translatewiki)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add Northern Luri (lrc)
..


Add Northern Luri (lrc)

Change-Id: Ieb01d8255cf884f2360190c322e4e739f0834893
---
M FallbackSettings.php
M TranslatewikiSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FallbackSettings.php b/FallbackSettings.php
index d128a9d..5fea5e9 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -54,6 +54,7 @@
 $wgTranslateLanguageFallbacks['lez'] = array( 'ru', 'az' ); # Robin 2011-09-27
 $wgTranslateLanguageFallbacks['lld'] = array( 'it', 'rm', 'fur' ); # Robin 
2011-12-04
 $wgTranslateLanguageFallbacks['lmo'] = array( 'pms', 'eml', 'lij', 'vec' );
+$wgTranslateLanguageFallbacks['lrc'] = array( 'bqi', 'fa' );
 $wgTranslateLanguageFallbacks['mai'] = 'hi';
 $wgTranslateLanguageFallbacks['mdf'] = array( 'myv' );
 $wgTranslateLanguageFallbacks['mfe'] = array( 'fr' ); # Robin 2011-10-18
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 4ede6af..2e4d9c0 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -313,6 +313,7 @@
 $wgExtraLanguageNames['abs'] = 'Bahasa Ambon'; # Ambonese Malay / Siebrand 
2013-07-05
 $wgExtraLanguageNames['pbb'] = 'Nasa Yuwe'; # Páez / Siebrand 2013-08-08
 $wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
+$wgExtraLanguageNames['lrc'] = 'لوری'; # Northern Luri / Siebrand 2013-10-07
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

-- 
To view, visit https://gerrit.wikimedia.org/r/88040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb01d8255cf884f2360190c322e4e739f0834893
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Koyraboro Senni Songhay (ses) - change (translatewiki)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add Koyraboro Senni Songhay (ses)
..


Add Koyraboro Senni Songhay (ses)

Change-Id: Id425153ffa7068f1639067088be682969e55bb77
---
M FallbackSettings.php
M TranslatewikiSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FallbackSettings.php b/FallbackSettings.php
index c8cd7ed..d128a9d 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -89,6 +89,7 @@
 $wgTranslateLanguageFallbacks['saz'] = array( 'gu' );
 $wgTranslateLanguageFallbacks['sdc'] = array( 'it' );
 $wgTranslateLanguageFallbacks['se'] = array( 'fi', 'sv', 'nb', 'sma' );
+$wgTranslateLanguageFallbacks['ses'] = array( 'fr' );
 $wgTranslateLanguageFallbacks['shi'] = array( 'ar', 'fr' ); # Robin 2011-09-27
 $wgTranslateLanguageFallbacks['sli'] = array( 'pl', 'szl' );
 $wgTranslateLanguageFallbacks['sly'] = array( 'id' );
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 8457647..4ede6af 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -312,6 +312,7 @@
 $wgExtraLanguageNames['miq'] = 'Mískitu'; # Miskito / Siebrand 2013-07-02
 $wgExtraLanguageNames['abs'] = 'Bahasa Ambon'; # Ambonese Malay / Siebrand 
2013-07-05
 $wgExtraLanguageNames['pbb'] = 'Nasa Yuwe'; # Páez / Siebrand 2013-08-08
+$wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

-- 
To view, visit https://gerrit.wikimedia.org/r/88036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id425153ffa7068f1639067088be682969e55bb77
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mw.ViewPageTarget: Fix broken firstHeading transition - change (mediawiki...VisualEditor)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: mw.ViewPageTarget: Fix broken firstHeading transition
..


mw.ViewPageTarget: Fix broken firstHeading transition

Class ve-init-mw-viewPageTarget-pageTitle added various
transition settings that were never used. Meanwhile, we're doing
fadeTo which sets inline opacity css every X ms until the
animation is finished.

* Changed the inline jQuery animation  to use css transitions
  instead.
* Removed the inexistent and obsolete ms-transition declaration.
* Removed :visible from selector query. This makes the selector
  more performant (since :visible is a proprietary Sizzle keyword)
  and it was obsolete anyway. The classes don't affect display none/hide,
  this is handled naturally by the browser now.

Change-Id: Ibdfb442ff6c743ef16b514a7696796ee27821887
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 20 insertions(+), 5 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 88e8152..d40c1c5 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -7,12 +7,22 @@
 
 /* VisualEditor */
 
-.ve-init-mw-viewPageTarget-pageTitle {
+.ve-init-mw-viewPageTarget-transform {
-webkit-transition: opacity 200ms ease-out;
-moz-transition: opacity 200ms ease-out;
-   -ms-transition: opacity 200ms ease-out;
-o-transition: opacity 200ms ease-out;
transition: opacity 200ms ease-out;
+}
+
+.ve-init-mw-viewPageTarget-transform-muted {
+   opacity: 0.6;
+}
+
+.ve-init-mw-viewPageTarget-transform-hidden {
+   opacity: 0;
+}
+
+.ve-init-mw-viewPageTarget-pageTitle {
cursor: default;
 }
 
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 1ed3dad..866d972 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1893,8 +1893,10 @@
  * @method
  */
 ve.init.mw.ViewPageTarget.prototype.mutePageTitle = function () {
-   $( '#firstHeading, #siteSub:visible' ).fadeTo( 'fast', 0.6 );
-   $( '#contentSub:visible' ).fadeTo( 'fast', 0 );
+   $( '#firstHeading, #siteSub' )
+   .addClass( 've-init-mw-viewPageTarget-transform 
ve-init-mw-viewPageTarget-transform-muted' );
+   $( '#contentSub' )
+   .addClass( 've-init-mw-viewPageTarget-transform 
ve-init-mw-viewPageTarget-transform-hidden' );
 };
 
 /**
@@ -1903,8 +1905,11 @@
  * @method
  */
 ve.init.mw.ViewPageTarget.prototype.restorePageTitle = function () {
-   $( '#firstHeading, #siteSub:visible, #contentSub:visible' ).fadeTo( 
'fast', 1 );
+   var $els = $( '#firstHeading, #siteSub, #contentSub' )
+   .removeClass( 've-init-mw-viewPageTarget-transform-muted 
ve-init-mw-viewPageTarget-transform-hidden' );
+
setTimeout( function () {
+   $els.removeClass( 've-init-mw-viewPageTarget-transform' );
$( '#firstHeading' ).removeClass( 
've-init-mw-viewPageTarget-pageTitle' );
}, 1000 );
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/87891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdfb442ff6c743ef16b514a7696796ee27821887
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@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] repool db1021, warm up - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: repool db1021, warm up
..


repool db1021, warm up

Change-Id: I6c324a963a13a47e8289fc0f2f81e953b828faa7
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Springle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3cb2122..3bb9849 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -120,7 +120,7 @@
#'db1039'   = 0, # was 51fb master
'db1005'   = 200, # snapshot
'db1026'   = 400,
-   #'db1021'   = 400,
+   'db1021'   = 100,
),
's6' = array(
'db1006'   = 0,

-- 
To view, visit https://gerrit.wikimedia.org/r/88043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c324a963a13a47e8289fc0f2f81e953b828faa7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@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] repool db1021, warm up - change (operations/mediawiki-config)

2013-10-07 Thread Springle (Code Review)

Springle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88043


Change subject: repool db1021, warm up
..

repool db1021, warm up

Change-Id: I6c324a963a13a47e8289fc0f2f81e953b828faa7
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/43/88043/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3cb2122..3bb9849 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -120,7 +120,7 @@
#'db1039'   = 0, # was 51fb master
'db1005'   = 200, # snapshot
'db1026'   = 400,
-   #'db1021'   = 400,
+   'db1021'   = 100,
),
's6' = array(
'db1006'   = 0,

-- 
To view, visit https://gerrit.wikimedia.org/r/88043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c324a963a13a47e8289fc0f2f81e953b828faa7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add mw1072 to dsh groups again since it is back in service - change (operations/puppet)

2013-10-07 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: add mw1072 to dsh groups again since it is back in service
..


add mw1072 to dsh groups again since it is back in service

Change-Id: Ia8d569e879653fad65ff5bce69c7a34aef00630f
---
M files/dsh/group/apache-eqiad
M files/dsh/group/apaches
M files/dsh/group/mediawiki-installation
M files/dsh/group/mw-eqiad
M files/dsh/group/nagios
5 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/dsh/group/apache-eqiad b/files/dsh/group/apache-eqiad
index 81770ce..175fb1a 100644
--- a/files/dsh/group/apache-eqiad
+++ b/files/dsh/group/apache-eqiad
@@ -69,7 +69,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/apaches b/files/dsh/group/apaches
index 49e6d88..b4631d2 100644
--- a/files/dsh/group/apaches
+++ b/files/dsh/group/apaches
@@ -244,7 +244,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/mediawiki-installation 
b/files/dsh/group/mediawiki-installation
index e20c300..b6e6517 100644
--- a/files/dsh/group/mediawiki-installation
+++ b/files/dsh/group/mediawiki-installation
@@ -279,7 +279,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad
index c165e70..a7d11e7 100644
--- a/files/dsh/group/mw-eqiad
+++ b/files/dsh/group/mw-eqiad
@@ -70,7 +70,7 @@
 mw1069
 mw1070
 mw1071
-
+mw1072
 mw1073
 mw1074
 mw1075
diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios
index f745efd..19dcba6 100644
--- a/files/dsh/group/nagios
+++ b/files/dsh/group/nagios
@@ -452,6 +452,7 @@
 db46
 mw1013
 mw1071
+mw1072
 gallium
 es2
 sq76

-- 
To view, visit https://gerrit.wikimedia.org/r/88042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d569e879653fad65ff5bce69c7a34aef00630f
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] zuul: statsd sent to tungsten.eqiad.wmnet - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: zuul: statsd sent to tungsten.eqiad.wmnet
..


zuul: statsd sent to tungsten.eqiad.wmnet

Zuul has build in support for statsd.  tungsten.eqiad.wmnet is being
installed statsd, as soon as this patch is merged and Zuul is restarted,
it will emit events to statsd :-)

Change-Id: I1dd4b24e71f7aced00d97696133ec99407506968
---
M manifests/role/zuul.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index d89168f..abe94dc 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -76,7 +76,7 @@
 git_branch   = 'master',
 git_dir  = $role::zuul::configuration::zuul_git_dir,
 push_change_refs = false,
-statsd_host  = '',
+statsd_host  = '10.64.0.18',  # tungsten.eqiad.wmnet
 }
 
 class { 'contint::zuul::git-daemon':

-- 
To view, visit https://gerrit.wikimedia.org/r/86744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dd4b24e71f7aced00d97696133ec99407506968
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] Native digits on 'mw-echo-overlay-title-text' - change (mediawiki...Echo)

2013-10-07 Thread Ebrahim (Code Review)

Ebrahim has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88045


Change subject: Native digits on 'mw-echo-overlay-title-text'
..

Native digits on 'mw-echo-overlay-title-text'

Change-Id: Icdd52ea0267ffbaa0e103070655735eff8423ca1
---
M Echo.php
M modules/overlay/ext.echo.overlay.js
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/45/88045/1

diff --git a/Echo.php b/Echo.php
index d4777f5..223c9f7 100644
--- a/Echo.php
+++ b/Echo.php
@@ -174,6 +174,7 @@
'dependencies' = array(
'ext.echo.desktop',
'mediawiki.util',
+   'mediawiki.language', 
),
'messages' = array(
'echo-overlay-title',
diff --git a/modules/overlay/ext.echo.overlay.js 
b/modules/overlay/ext.echo.overlay.js
index 55ddda8..db781ea 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -123,7 +123,7 @@
 
if ( notifications.index.length  0 ) {
if ( unreadRawTotalCount  
unread.length ) {
-   titleText = mw.msg( 
'echo-overlay-title-overflow', unread.length, unreadTotalCount );
+   titleText = mw.msg( 
'echo-overlay-title-overflow', mw.language.convertNumber( unread.length ), 
unreadTotalCount );
overflow = true;
} else {
titleText =  mw.msg( 
'echo-overlay-title' );

-- 
To view, visit https://gerrit.wikimedia.org/r/88045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdd52ea0267ffbaa0e103070655735eff8423ca1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make ChangeOpClaim use guidParser - change (mediawiki...Wikibase)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Make ChangeOpClaim use guidParser
..


Make ChangeOpClaim use guidParser

Change-Id: Ia88d01845897f6eed810213cfb4a9e35b675c9fa
---
M repo/includes/ChangeOp/ChangeOpClaim.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/ChangeOp/ChangeOpClaim.php 
b/repo/includes/ChangeOp/ChangeOpClaim.php
index 33367e2..6f3e540 100644
--- a/repo/includes/ChangeOp/ChangeOpClaim.php
+++ b/repo/includes/ChangeOp/ChangeOpClaim.php
@@ -7,6 +7,7 @@
 use Wikibase\Entity;
 use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Lib\ClaimGuidValidator;
+use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Summary;
 
 /**
@@ -59,15 +60,17 @@
public function apply( Entity $entity, Summary $summary = null ) {
 
$guidValidator = new ClaimGuidValidator();
+   $guidParser = 
WikibaseRepo::getDefaultInstance()-getClaimGuidParser();
 
if( $this-claim-getGuid() === null ){
$this-claim-setGuid( $this-guidGenerator-newGuid() 
);
}
$guid = $this-claim-getGuid();
+   $guid = $guidParser-parse( $guid );
 
-   if ( $guidValidator-validate( $guid ) === false ) {
+   if ( $guidValidator-validate( $guid-getSerialization() ) === 
false ) {
throw new ChangeOpException( Claim does not have a 
valid GUID );
-   } else if ( strtoupper( $entity-getId()-getPrefixedId() ) !== 
substr( $guid, 0, strpos( $guid, '$' ) ) ){
+   } else if ( !$entity-getId()-equals( $guid-getEntityId() ) ){
throw new ChangeOpException( Claim GUID invalid for 
given entity );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia88d01845897f6eed810213cfb4a9e35b675c9fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.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] Refactor SetClaimTest - change (mediawiki...Wikibase)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Refactor SetClaimTest
..


Refactor SetClaimTest

This means each test case actually runs as
a seperate test meaning we can get seperate
output for each!

Change-Id: Iab6dcd8f757febdda07c542d2a90c6072673c2b7
---
M repo/tests/phpunit/includes/api/SetClaimTest.php
1 file changed, 59 insertions(+), 64 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php 
b/repo/tests/phpunit/includes/api/SetClaimTest.php
index 08b7732..dd09006 100644
--- a/repo/tests/phpunit/includes/api/SetClaimTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimTest.php
@@ -1,6 +1,7 @@
 ?php
 
 namespace Wikibase\Test\Api;
+
 use Wikibase\Claim;
 use Wikibase\Claims;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -26,8 +27,6 @@
  *
  * @since 0.4
  *
- * @ingroup WikibaseRepoTest
- *
  * @group API
  * @group Database
  * @group Wikibase
@@ -40,13 +39,14 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Daniel Kinzler
+ * @author Adam Shorland
  */
 class SetClaimTest extends WikibaseApiTestCase {
 
/**
 * @return Snak[]
 */
-   protected function snakProvider() {
+   protected static function snakProvider() {
static $hasProperties = false;
 
$prop42 = new PropertyId( 'P42' );
@@ -81,34 +81,8 @@
return $snaks;
}
 
-   /**
-* @return Claim[]
-*/
-   protected function claimProvider() {
-   $statements = array();
-
-   $snaks = $this-snakProvider();
-   $mainSnak = $snaks[0];
-   $statement = new Statement( $mainSnak );
-   $statements[] = $statement;
-
-   foreach ( $snaks as $snak ) {
-   $statement = clone $statement;
-   $snaks = new SnakList( array( $snak ) );
-   $statement-getReferences()-addReference( new 
Reference( $snaks ) );
-   $statements[] = $statement;
-   }
-
-   $statement = clone $statement;
-   $snaks = new SnakList( $this-snakProvider() );
-   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
-   $statements[] = $statement;
-
-   $statement = clone $statement;
-   $snaks = new SnakList( $this-snakProvider() );
-   $statement-setQualifiers( $snaks );
-   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
-   $statements[] = $statement;
+   public static function provideClaims() {
+   $testCases = array();
 
$ranks = array(
Statement::RANK_DEPRECATED,
@@ -116,49 +90,70 @@
Statement::RANK_PREFERRED
);
 
-   /**
-* @var Statement[] $statements
-*/
-   foreach ( $statements as $statement ) {
+   $snaks = self::snakProvider();
+   $mainSnak = $snaks[0];
+   $statement = new Statement( $mainSnak );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   foreach ( $snaks as $snak ) {
+   $statement = clone $statement;
+   $snaks = new SnakList( array( $snak ) );
+   $statement-getReferences()-addReference( new 
Reference( $snaks ) );
$statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
}
 
-   return $statements;
+   $statement = clone $statement;
+   $snaks = new SnakList( self::snakProvider() );
+   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   $statement = clone $statement;
+   $snaks = new SnakList( self::snakProvider() );
+   $statement-setQualifiers( $snaks );
+   $statement-getReferences()-addReference( new Reference( 
$snaks ) );
+   $statement-setRank( $ranks[array_rand( $ranks )] );
+   $testCases[] = array( $statement );
+
+   return $testCases ;
}
 
-   public function testAddClaim() {
-   foreach ( $this-claimProvider() as $claim ) {
-   $item = Item::newEmpty();
-   $content = new ItemContent( $item );
-   $content-save( '', null, EDIT_NEW );
+   /**
+* @dataProvider provideClaims
+*/
+   public function

[MediaWiki-commits] [Gerrit] Misc. CSS typo fixes; Firefox compatibility fixes - change (wikimedia...modifications)

2013-10-07 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Misc. CSS typo fixes; Firefox compatibility fixes
..


Misc. CSS typo fixes; Firefox compatibility fixes

Add a standard border-radius property (supported since Firefox 4)
to deprecated -moz-border-radius (required for Firefox 3.x and
older, property not supported anymore since Firefox 13).

Change-Id: Ib73b7052c68507ff434764163b81624c1560ae3c
---
M skins/contrib/Wikimedia/global.css
M skins/contrib/Wikimedia/show_bug.css
M skins/contrib/Wikimedia/vector.css
3 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Aklapper: Looks good to me, but someone else must approve
  Dzahn: Verified; Looks good to me, approved



diff --git a/skins/contrib/Wikimedia/global.css 
b/skins/contrib/Wikimedia/global.css
index be0b06a..cd8b31d 100644
--- a/skins/contrib/Wikimedia/global.css
+++ b/skins/contrib/Wikimedia/global.css
@@ -66,6 +66,8 @@
 color: #fff;
 -moz-border-radius-topleft: 5px;
 -moz-border-radius-topright: 5px;
+border-top-left-radius: 5px;
+border-top-right-radius: 5px;
 font-size: 110%;
 margin: 0;
 padding: 0.5em;
diff --git a/skins/contrib/Wikimedia/show_bug.css 
b/skins/contrib/Wikimedia/show_bug.css
index 3ba61c6..8c29694 100644
--- a/skins/contrib/Wikimedia/show_bug.css
+++ b/skins/contrib/Wikimedia/show_bug.css
@@ -2,11 +2,11 @@
 margin: 8px 0; 
 padding: 0.3em 0.3em 0.3em 0.5em; 
 -moz-border-radius: 0.5em; 
+border-radius: 0.5em;
 font-size: 105%; 
 font-weight: bold;
 background:transparent url(images/block-base.png) repeat-x scroll center 
bottom;
 border: 1px solid silver;
-repeat: repeat-x;
 line-height: 1.75em;
 }
 
@@ -63,7 +63,7 @@
 border: 1px solid silver;
 }
 .bz_comment_text {
-font-size: 1em;;
+font-size: 1em;
 font-family: monospace, Courier New;
 }
 #duplicate_settings, #votes_container {
diff --git a/skins/contrib/Wikimedia/vector.css 
b/skins/contrib/Wikimedia/vector.css
index ae3b26f..af3ea70 100644
--- a/skins/contrib/Wikimedia/vector.css
+++ b/skins/contrib/Wikimedia/vector.css
@@ -44,7 +44,7 @@
top: 0;
right: 0;
width: 100%;
-   background-color:: #F3F3F3;
+   background-color: #F3F3F3;
 }
 #head h5 {
margin: 0;

-- 
To view, visit https://gerrit.wikimedia.org/r/86884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib73b7052c68507ff434764163b81624c1560ae3c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove custom CSS for duplicates.cgi - change (wikimedia...modifications)

2013-10-07 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Remove custom CSS for duplicates.cgi
..


Remove custom CSS for duplicates.cgi

It's an ancient 1:1 copy of upstream CSS and there is no difference
between using it or the upstream default one (which is the fallback
anyway).

Bug: 54823
Change-Id: Ida5b2862e78d8762287773c3bd99b747b678a8f3
---
D skins/contrib/Wikimedia/duplicates.css
1 file changed, 0 insertions(+), 34 deletions(-)

Approvals:
  Aklapper: Looks good to me, but someone else must approve
  Dzahn: Verified; Looks good to me, approved



diff --git a/skins/contrib/Wikimedia/duplicates.css 
b/skins/contrib/Wikimedia/duplicates.css
deleted file mode 100644
index 9948b78..000
--- a/skins/contrib/Wikimedia/duplicates.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an AS
- * IS basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Bugzilla Bug Tracking System.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): Myk Melez m...@mozilla.org
- */
-
-tree#results-tree {
-  margin-right: 0px;
-  border-right-width: 0px;
-  margin-left: 0px;
-  border-left-width: 0px;
-}
-
-treechildren:-moz-tree-cell-text(resolution-FIXED) { 
-  text-decoration: line-through;
-}
-
-treecol#id_column { width: 6em; }
-treecol#duplicate_count_column { width: 5em; }
-treecol#duplicate_delta_column { width: 5em; }

-- 
To view, visit https://gerrit.wikimedia.org/r/87057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida5b2862e78d8762287773c3bd99b747b678a8f3
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Native digits on 'project-statstext' - change (mediawiki...TwnMainPage)

2013-10-07 Thread Ebrahim (Code Review)

Ebrahim has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88047


Change subject: Native digits on 'project-statstext'
..

Native digits on 'project-statstext'

Change-Id: I831921178c65cf561e2b61cff5b014a575494f00
---
M Resources.php
M resources/js/ext.translate.mainpage.js
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage 
refs/changes/47/88047/1

diff --git a/Resources.php b/Resources.php
index a64e650..bab8e8a 100644
--- a/Resources.php
+++ b/Resources.php
@@ -20,6 +20,7 @@
'ext.translate.statsbar',
'mediawiki.util',
'mediawiki.Uri',
+   'mediawiki.language',
),
'messages' = array(
'twnmp-show-more-projects',
diff --git a/resources/js/ext.translate.mainpage.js 
b/resources/js/ext.translate.mainpage.js
index 8f80ade..c3a472b 100644
--- a/resources/js/ext.translate.mainpage.js
+++ b/resources/js/ext.translate.mainpage.js
@@ -95,9 +95,11 @@
$tile.find( '.project-statstext' )
.append(
$( 'span' ).addClass( 
'translate' )
-   .text( mw.msg( 
'percent', Math.round( translated ) ) ),
+   .text( 
mw.language.convertNumber( 
+   mw.msg( 
'percent', Math.round( translated ) ) ) ),
$( 'span' 
).addClass('proofread')
-   .text( mw.msg( 
'percent', Math.round( proofread ) ) )
+   .text( 
mw.language.convertNumber(
+   mw.msg( 
'percent', Math.round( proofread ) ) ) )
);
} );
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/88047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I831921178c65cf561e2b61cff5b014a575494f00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove use of 2 deprecated js methods - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88046


Change subject: Remove use of 2 deprecated js methods
..

Remove use of 2 deprecated js methods

site.getGlobalSiteId()
and
wikibase.getSiteByGlobalId()

Change-Id: I709c91169cc98a1d683982cdbf4649447c12c422
---
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
M lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js
M repo/resources/wikibase.special/wikibase.special.itemByTitle.js
3 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/46/88046/1

diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js 
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 75afd48..27f5e8a 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -181,7 +181,7 @@
sites = wb.getSitesOfGroup( siteGroup );
 
for( site in sites ) {
-   if ( sites[ site ].getGlobalSiteId() !== currentSiteId 
) {
+   if ( sites[ site ].getId() !== currentSiteId ) {
linkableSites[ site ] = sites[ site ];
}
}
@@ -327,7 +327,7 @@
*/
_onSecondStep: function() {
if ( $( '#wbclient-linkItem-Site' ).siteselector( 
'getSelectedSite' ) ) {
-   this.targetSite = $( '#wbclient-linkItem-Site' 
).siteselector( 'getSelectedSite' ).getGlobalSiteId();
+   this.targetSite = $( '#wbclient-linkItem-Site' 
).siteselector( 'getSelectedSite' ).getId();
} else {
// This should never happen because the button 
shouldn't be enabled if the site isn't valid
// ...keeping this for sanity and paranoia
@@ -390,7 +390,7 @@
.find( 'table' )
.append(
this._siteLinkRow(
-   wb.getSiteByGlobalId( 
entity.sitelinks[ i ].site ),
+   wb.getSite( 
entity.sitelinks[ i ].site ),
entity.sitelinks[ i ]
)
);
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js
index d4741cc..7ed347e 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js
@@ -129,7 +129,7 @@
 */
_getValueFromApiResponse: function( response ) {
var siteId = this._interfaces.siteId.getSelectedSite().getId(),
-   normalizedTitle = response[ this.API_VALUE_KEY ][ 
this._interfaces.siteId.getSelectedSite().getGlobalSiteId() ].title;
+   normalizedTitle = response[ this.API_VALUE_KEY ][ 
this._interfaces.siteId.getSelectedSite().getId() ].title;
 
return [ siteId, normalizedTitle ];
},
@@ -138,7 +138,7 @@
 * @see 
wikibase.ui.PropertyEditTool.EditableValue._setRevisionIdFromApiResponse
 */
_setRevisionIdFromApiResponse: function( response ) {
-   wb.getRevisionStore().setSitelinksRevision( response.lastrevid, 
this._interfaces.siteId.getSelectedSite().getGlobalSiteId() );
+   wb.getRevisionStore().setSitelinksRevision( response.lastrevid, 
this._interfaces.siteId.getSelectedSite().getId() );
return true;
},
 
@@ -213,7 +213,7 @@
site = wb.getSite( 
self._interfaces.siteId.getValue() );
 
if( page !== ''  site !== null ) {
-   var url = response.entity.sitelinks[ 
site.getGlobalSiteId() ].url,
+   var url = response.entity.sitelinks[ 
site.getId() ].url,
oldFn = site.getUrlTo;
 
self._interfaces.siteId.setOption( 
'siteId', site.getId() );
@@ -243,8 +243,8 @@
queryApi: function( apiAction ) {
return this._api.setSitelink(
mw.config.get( 'wbEntityId' ),
-   wb.getRevisionStore().getSitelinksRevision( 
this.siteIdInterface.getSelectedSite().getGlobalSiteId() ),
-   
this.siteIdInterface.getSelectedSite().getGlobalSiteId(),
+   wb.getRevisionStore().getSitelinksRevision( 
this.siteIdInterface.getSelectedSite().getId() ),
+

[MediaWiki-commits] [Gerrit] (bug 53796) Add numeric validation for globe precision - change (mediawiki...Wikibase)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: (bug 53796) Add numeric validation for globe precision
..


(bug 53796) Add numeric validation for globe precision

Change-Id: I6dc1aa81206f0d1a3a5b14389f0eb7fdeae97406
---
M lib/WikibaseLib.classes.php
A lib/includes/Validators/NumberValidator.php
M lib/includes/WikibaseDataTypeBuilders.php
A lib/tests/phpunit/Validators/NumberValidatorTest.php
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
5 files changed, 129 insertions(+), 6 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index ca402ab..b8f1716 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -186,6 +186,7 @@
'Wikibase\Validators\DataValueValidator' = 
'includes/Validators/DataValueValidator.php',
'Wikibase\Validators\EntityExistsValidator' = 
'includes/Validators/EntityExistsValidator.php',
'Wikibase\Validators\EntityIdValidator' = 
'includes/Validators/EntityIdValidator.php',
+   'Wikibase\Validators\NumberValidator' = 
'includes/Validators/NumberValidator.php',
'Wikibase\Validators\RegexValidator' = 
'includes/Validators/RegexValidator.php',
'Wikibase\Validators\StringLengthValidator' = 
'includes/Validators/StringLengthValidator.php',
'Wikibase\Validators\TypeValidator' = 
'includes/Validators/TypeValidator.php',
diff --git a/lib/includes/Validators/NumberValidator.php 
b/lib/includes/Validators/NumberValidator.php
new file mode 100644
index 000..85442a0
--- /dev/null
+++ b/lib/includes/Validators/NumberValidator.php
@@ -0,0 +1,43 @@
+?php
+namespace Wikibase\Validators;
+
+use ValueValidators\Error;
+use ValueValidators\Result;
+use ValueValidators\ValueValidator;
+
+/**
+ * @license GPL 2+
+ *
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class NumberValidator implements ValueValidator {
+
+   /**
+* @see ValueValidator::validate()
+*
+* @param mixed $value The value to validate
+*
+* @return Result
+* @throws InvalidArgumentException
+*/
+   public function validate( $value ) {
+   $isValid = ( is_float( $value ) || is_int( $value ) );
+
+   if ( $isValid ) {
+   return Result::newSuccess();
+   }
+
+   return Result::newError( array(
+   Error::newError( 'Bad type, expected an integer or 
float value', null, 'bad-type' )
+   ) );
+   }
+
+   /**
+* @see ValueValidator::setOptions()
+*
+* @param array $options
+*/
+   public function setOptions( array $options ) {
+   // Do nothing. This method shouldn't even be in the interface.
+   }
+}
diff --git a/lib/includes/WikibaseDataTypeBuilders.php 
b/lib/includes/WikibaseDataTypeBuilders.php
index 5177595..22dc925 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -10,6 +10,7 @@
 use Wikibase\Validators\DataFieldValidator;
 use Wikibase\Validators\DataValueValidator;
 use Wikibase\Validators\EntityExistsValidator;
+use Wikibase\Validators\NumberValidator;
 use Wikibase\Validators\RegexValidator;
 use Wikibase\Validators\StringLengthValidator;
 use Wikibase\Validators\TypeValidator;
@@ -173,6 +174,13 @@
$globeIdValidators[] = $urlValidator = 
$this-buildUrlValidator( array( 'http', 'https' ), 255 );
//TODO: enforce well known reference globes from config
 
+   $precisionValidators = array();
+   $precisionValidators[] = new NumberValidator();
+
+   $validators[] = new DataFieldValidator( 'precision',
+   new CompositeValidator( $precisionValidators, true )
+   );
+
$validators[] = new DataFieldValidator( 'globe', // Note: 
validate the 'calendarmodel' field
new CompositeValidator( $globeIdValidators, true ) 
//Note: each validator is fatal
);
diff --git a/lib/tests/phpunit/Validators/NumberValidatorTest.php 
b/lib/tests/phpunit/Validators/NumberValidatorTest.php
new file mode 100644
index 000..4e5baf4
--- /dev/null
+++ b/lib/tests/phpunit/Validators/NumberValidatorTest.php
@@ -0,0 +1,49 @@
+?php
+
+namespace Wikibase\Test\Validators;
+
+use DataValues\NumberValue;
+use DataValues\StringValue;
+use Wikibase\Validators\NumberValidator;
+use Wikibase\Validators\ValidatorErrorLocalizer;
+
+/**
+ * @covers Wikibase\Validators\NumericValidator
+ *
+ * @license GPL 2+
+ *
+ * @ingroup WikibaseLib
+ * @ingroup Test
+ *
+ * @group WikibaseLib
+ * @group Wikibase
+ * @group WikibaseValidators
+ *
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class

[MediaWiki-commits] [Gerrit] Attempt to fix TravisCI build - change (mediawiki...WikibaseQuery)

2013-10-07 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Attempt to fix TravisCI build
..


Attempt to fix TravisCI build

Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
(cherry picked from commit 826a3c1828c25aea515b40bc5786bfd4ece32c14)
---
M .travis.sh
1 file changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Jeroen De Dauw: Verified; Looks good to me, approved



diff --git a/.travis.sh b/.travis.sh
index 6e8e3b9..2ad5ab5 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,24 +2,27 @@
 
 set -x
 
-originalDirectory=$(pwd)
-
 cd ..
 
 git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git phase3 --depth 1
 
-cd phase3
+cd -
+cd ../phase3/extensions
+
+mkdir WikibaseQuery
+
+cd -
+cp -r * ../phase3/extensions/WikibaseQuery
+
+cd ../phase3
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
 
-composer require wikibase/query:dev-master
+cd extensions/WikibaseQuery
+composer install
 
-# Replace WikibaseQuery with the version that should be tested
-rm -rf WikibaseQuery
-mkdir WikibaseQuery
-cp -r $originalDirectory/* WikibaseQuery
-
+cd ../..
 echo 'require_once( __DIR__ . /vendor/wikibase/wikibase/repo/Wikibase.php 
);'  LocalSettings.php
 echo 'require_once( __DIR__ . 
/vendor/wikibase/wikibase/repo/ExampleSettings.php );'  LocalSettings.php
 echo 'require_once( __DIR__ . /vendor/wikibase/query/WikibaseQuery.php );' 
 LocalSettings.php

-- 
To view, visit https://gerrit.wikimedia.org/r/88041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@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] fix the last CSS validator warning in vector.css. Same colo... - change (wikimedia...modifications)

2013-10-07 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88049


Change subject: fix the last CSS validator warning in vector.css. Same color 
for background-color and color for hr
..

fix the last CSS validator warning in vector.css.
Same color for background-color and color for hr

Change-Id: Id0c1f4eb4994e1992efe5d357108b98b3daecbec
---
M skins/contrib/Wikimedia/vector.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications 
refs/changes/49/88049/1

diff --git a/skins/contrib/Wikimedia/vector.css 
b/skins/contrib/Wikimedia/vector.css
index af3ea70..f125402 100644
--- a/skins/contrib/Wikimedia/vector.css
+++ b/skins/contrib/Wikimedia/vector.css
@@ -377,7 +377,7 @@
 }
 hr {
height: 1px;
-   color: #aaa;
+   color: #fff;
background-color: #aaa;
border: 0;
margin: .2em 0 .2em 0;

-- 
To view, visit https://gerrit.wikimedia.org/r/88049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0c1f4eb4994e1992efe5d357108b98b3daecbec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Dzahn dz...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix the last CSS validator warning in vector.css. Same colo... - change (wikimedia...modifications)

2013-10-07 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: fix the last CSS validator warning in vector.css. Same color 
for background-color and color for hr
..


fix the last CSS validator warning in vector.css.
Same color for background-color and color for hr

Change-Id: Id0c1f4eb4994e1992efe5d357108b98b3daecbec
---
M skins/contrib/Wikimedia/vector.css
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Dzahn: Verified; Looks good to me, approved



diff --git a/skins/contrib/Wikimedia/vector.css 
b/skins/contrib/Wikimedia/vector.css
index af3ea70..f125402 100644
--- a/skins/contrib/Wikimedia/vector.css
+++ b/skins/contrib/Wikimedia/vector.css
@@ -377,7 +377,7 @@
 }
 hr {
height: 1px;
-   color: #aaa;
+   color: #fff;
background-color: #aaa;
border: 0;
margin: .2em 0 .2em 0;

-- 
To view, visit https://gerrit.wikimedia.org/r/88049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0c1f4eb4994e1992efe5d357108b98b3daecbec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 55348) Handle formatting of undeserializable values - change (mediawiki...Wikibase)

2013-10-07 Thread Aude (Code Review)

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88050


Change subject: (bug 55348) Handle formatting of undeserializable values
..

(bug 55348) Handle formatting of undeserializable values

this is a super simple solution that unbreaks diff display

It would be nice to display the more details about the bad value

Change-Id: I0eaa6a2b49b21e9ead1a0c6f3ebdd6616479b458
---
M lib/WikibaseLib.classes.php
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/UnDeserializableValueFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
A lib/tests/phpunit/formatters/UnDeserializableValueFormatterTest.php
5 files changed, 111 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/50/88050/1

diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index ca402ab..a884676 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -103,6 +103,7 @@
'Wikibase\Lib\SnakFormatter' = 
'includes/formatters/SnakFormatter.php',
'Wikibase\Lib\OutputFormatSnakFormatterFactory' = 
'includes/formatters/OutputFormatSnakFormatterFactory.php',
'Wikibase\Lib\OutputFormatValueFormatterFactory' = 
'includes/formatters/OutputFormatValueFormatterFactory.php',
+   'Wikibase\Lib\UnDeserializableValueFormatter' = 
'includes/formatters/UnDeserializableValueFormatter.php',
'Wikibase\Lib\WikibaseSnakFormatterBuilders' = 
'includes/formatters/WikibaseSnakFormatterBuilders.php',
 
// includes/IO
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index 79c056f..432100e 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -53,6 +53,7 @@
'wikibase-sitelinks-siteid-columnheading' = 'Code',
'wikibase-sitelinks-link-columnheading' = 'Linked article',
'wikibase-tooltip-error-details' = 'Details',
+   'wikibase-undeserializable-value' = 'Undeserializable value',
'wikibase-validator-bad-type' = '$2 instead of $1',
'wikibase-validator-too-long' = 'Must be no more than {{PLURAL:$1|one 
character|$1 characters}} long',
'wikibase-validator-too-short' = 'Must be at least {{PLURAL:$1|one 
character|$1 characters}} long',
@@ -155,6 +156,7 @@
'wikibase-sitelinks-link-columnheading' = 'Site links table column 
heading for the column containg the title/link of/to the referenced (wiki) 
page.',
'wikibase-tooltip-error-details' = 'Link within an error tooltip that 
will unfold additional information regarding the error (i.e. the more specific 
error message returned from the underlying API).
 {{Identical|Detail}}',
+   'wikibase-undeserializable-value' = 'Message to display for any data 
values that are invalid and cannot be deserialized.  The message is displayed 
in such places as when users view a diff.',
'wikibase-validator-bad-type' = 'Input validation error shown when the 
input has the wrong type.
 
 Parameters:
@@ -830,6 +832,7 @@
  * @author Se4598
  */
 $messages['de'] = array(
+   'wikibase-undeserializable-value' = 'Undeserializable value de!!!',
'wikibase-lib-desc' = 'Stellt dem Repositorium strukturierter Daten 
Funktionen bereit',
'wikibase-entity-item' = 'Datenobjekt',
'wikibase-entity-property' = 'Eigenschaft',
diff --git a/lib/includes/formatters/UnDeserializableValueFormatter.php 
b/lib/includes/formatters/UnDeserializableValueFormatter.php
new file mode 100644
index 000..47eddcf
--- /dev/null
+++ b/lib/includes/formatters/UnDeserializableValueFormatter.php
@@ -0,0 +1,57 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Message;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for UnDeserializableValue
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class UnDeserializableValueFormatter extends ValueFormatterBase {
+
+   const MESSAGE = 'message';
+
+   /**
+* @param FormatterOptions $options
+*/
+   public function __construct( FormatterOptions $options ) {
+   $this-options = $options;
+
+   $this-options-defaultOption(
+   self::OPT_LANG,
+   'en'
+   );
+
+   $this-options-defaultOption(
+   self::MESSAGE,
+   new Message( 'wikibase-undeserializable-value' )
+   );
+   }
+
+   /**
+* Formats an UnDeserializableValue
+*
+* @since 0.5
+*
+* @param UnDeserializableValue
+*
+* @return string
+*/
+   public function format( $dataValue ) {
+   $langCode = $this-options-getOption( self::OPT_LANG );
+
+   $msg =

[MediaWiki-commits] [Gerrit] Reword thanks-confirmation and thanks-thanked-notice - change (mediawiki...Thanks)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Reword thanks-confirmation and thanks-thanked-notice
..


Reword thanks-confirmation and thanks-thanked-notice

* Make thanks-confirmation more neutral dropping Are you sure:
  That are you sure is disturbing, it makes it look something disruptive.
  People only wanted some confirmation step, not a dissuading barrier.
* Reword thanks-thanked-notice from told to notified per Siebrand.

Change-Id: I06fa57d7f77b297caf9d3267513365481992b67b
---
M Thanks.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Thanks.i18n.php b/Thanks.i18n.php
index 1d9cc98..31a90b0 100644
--- a/Thanks.i18n.php
+++ b/Thanks.i18n.php
@@ -21,8 +21,8 @@
'thanks-error-invalidrevision' = 'Revision ID is not valid.',
'thanks-error-ratelimited' = You've exceeded your rate limit. Please 
wait some time and try again.,
'thanks-thank-tooltip' = '{{GENDER:$1|Send}} a thank you notification 
to this {{GENDER:$2|user}}',
-   'thanks-confirmation' = 'Are you sure you want to {{GENDER:$1|thank}} 
$2 for this edit?',
-   'thanks-thanked-notice' = '$1 was told that you liked 
{{GENDER:$2|his|her|their}} edit.',
+   'thanks-confirmation' = 'Do you want to {{GENDER:$1|thank}} $2 for 
this edit?',
+   'thanks-thanked-notice' = '$1 was notified that you liked 
{{GENDER:$2|his|her|their}} edit.',
'echo-pref-subscription-edit-thank' = 'Thanks me for my edit',
'echo-pref-tooltip-edit-thank' = 'Notify me when someone thanks me for 
an edit I made.',
'echo-category-title-edit-thank' = 'Thanks',

-- 
To view, visit https://gerrit.wikimedia.org/r/88032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I06fa57d7f77b297caf9d3267513365481992b67b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve dependency fetching - change (mediawiki...WikibaseQuery)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Improve dependency fetching
..


Improve dependency fetching

Change-Id: If6a0b021a5148b52d2b2db651b3996766e55d691
---
M WikibaseQuery.php
M src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
2 files changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikibaseQuery.php b/WikibaseQuery.php
index 4e9ddf6..88aa5a9 100644
--- a/WikibaseQuery.php
+++ b/WikibaseQuery.php
@@ -118,7 +118,9 @@
 
$dependencyManager-registerBuilder(
'byPropertyValueEntityFinder',
-   new 
Wikibase\Query\DIC\Builders\ByPropertyValueEntityFinderBuilder()
+   new 
Wikibase\Query\DIC\Builders\ByPropertyValueEntityFinderBuilder(
+   \Wikibase\Repo\WikibaseRepo::getDefaultInstance()
+   )
);
 
$dependencyManager-registerBuilder(
diff --git 
a/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php 
b/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
index dc76db7..017c453 100644
--- a/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
+++ b/src/Wikibase/Query/DIC/Builders/ByPropertyValueEntityFinderBuilder.php
@@ -17,6 +17,12 @@
  */
 class ByPropertyValueEntityFinderBuilder extends DependencyBuilder {
 
+   protected $repo;
+
+   public function __construct( WikibaseRepo $repo ) {
+   $this-repo = $repo;
+   }
+
/**
 * @see DependencyBuilder::buildObject
 *
@@ -32,9 +38,9 @@
 
return new ByPropertyValueEntityFinder(
$queryStore-getQueryEngine(),
-   DataValueFactory::singleton(), // TODO: get instance 
from repo factory
-   WikibaseRepo::getDefaultInstance()-getEntityIdParser(),
-   
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter()
+   $this-repo-getDataValueFactory(),
+   $this-repo-getEntityIdParser(),
+   $this-repo-getEntityIdFormatter()
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/88039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6a0b021a5148b52d2b2db651b3996766e55d691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuery
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.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] Introducing EntityIdLinkFormatter - change (mediawiki...Wikibase)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Introducing EntityIdLinkFormatter
..


Introducing EntityIdLinkFormatter

Change-Id: If9368d42acdd4771f601898fe8ebaaad70042bdf
---
M lib/WikibaseLib.classes.php
M lib/includes/formatters/EntityIdLabelFormatter.php
A lib/includes/formatters/EntityIdLinkFormatter.php
A lib/includes/formatters/EntityIdTitleFormatter.php
A lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
A lib/tests/phpunit/formatters/EntityIdTitleFormatterTest.php
6 files changed, 267 insertions(+), 5 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index ca402ab..71345c5 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -95,6 +95,8 @@
'Wikibase\Lib\DispatchingValueFormatter' = 
'includes/formatters/DispatchingValueFormatter.php',
'Wikibase\Lib\EntityIdFormatter' = 
'includes/formatters/EntityIdFormatter.php',
'Wikibase\Lib\EntityIdLabelFormatter' = 
'includes/formatters/EntityIdLabelFormatter.php',
+   'Wikibase\Lib\EntityIdTitleFormatter' = 
'includes/formatters/EntityIdTitleFormatter.php',
+   'Wikibase\Lib\EntityIdLinkFormatter' = 
'includes/formatters/EntityIdLinkFormatter.php',
'Wikibase\Lib\MwTimeIsoFormatter' = 
'includes/formatters/MwTimeIsoFormatter.php',
'Wikibase\Lib\EscapingValueFormatter' = 
'includes/formatters/EscapingValueFormatter.php',
'Wikibase\Lib\FormattingException' = 
'includes/formatters/FormattingException.php',
diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php 
b/lib/includes/formatters/EntityIdLabelFormatter.php
index 9fda460..6b98b9f 100644
--- a/lib/includes/formatters/EntityIdLabelFormatter.php
+++ b/lib/includes/formatters/EntityIdLabelFormatter.php
@@ -14,18 +14,14 @@
 /**
  * @since 0.4
  *
- * @file
- * @ingroup WikibaseLib
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Katie Filbert  aude.w...@gmail.com 
  * @author Daniel Kinzler
  *
- * @todo: once this is no longer used directly, rename it to 
EntityIdValueFormatter
  * @todo: add support for language fallback chains
  */
-class EntityIdLabelFormatter extends ValueFormatterBase {
+class EntityIdLabelFormatter extends EntityIdFormatter {
 
/**
 * Whether we should try to find the label of the entity
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php 
b/lib/includes/formatters/EntityIdLinkFormatter.php
new file mode 100644
index 000..b8f3463
--- /dev/null
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -0,0 +1,35 @@
+?php
+
+namespace Wikibase\Lib;
+use InvalidArgumentException;
+use RuntimeException;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdValue;
+
+/**
+ * Formats entity IDs by generating a wiki link to the corresponding page 
title.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class EntityIdLinkFormatter extends EntityIdTitleFormatter {
+
+   /**
+* Format an EntityId data value
+*
+* @param EntityId|EntityIdValue $value The value to format
+*
+* @return string
+*
+* @throws InvalidArgumentException
+*/
+   public function format( $value ) {
+   $title = parent::format( $value );
+
+   return [[$title]];
+   }
+
+}
+
diff --git a/lib/includes/formatters/EntityIdTitleFormatter.php 
b/lib/includes/formatters/EntityIdTitleFormatter.php
new file mode 100644
index 000..fa3fe93
--- /dev/null
+++ b/lib/includes/formatters/EntityIdTitleFormatter.php
@@ -0,0 +1,59 @@
+?php
+
+namespace Wikibase\Lib;
+
+use InvalidArgumentException;
+use ValueFormatters\FormatterOptions;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\EntityTitleLookup;
+
+/**
+ * Formats entity IDs by generating the corresponding page title.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class EntityIdTitleFormatter extends EntityIdFormatter {
+
+   /**
+* @var EntityTitleLookup
+*/
+   protected $titleLookup;
+
+   /**
+* @param FormatterOptions $options
+* @param EntityTitleLookup $titleLookup
+*/
+   public function __construct( FormatterOptions $options, 
EntityTitleLookup $titleLookup ) {
+   parent::__construct( $options );
+
+   $this-titleLookup = $titleLookup;
+   }
+
+   /**
+* Format an EntityId data value
+*
+* @param EntityId|EntityIdValue $value The value to format
+*
+* @return string
+*
+* @throws InvalidArgumentException
+*/
+   public function format(

[MediaWiki-commits] [Gerrit] (bug 55348) Handle formatting of undeserializable values - change (mediawiki...Wikibase)

2013-10-07 Thread Aude (Code Review)

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88051


Change subject: (bug 55348) Handle formatting of undeserializable values
..

(bug 55348) Handle formatting of undeserializable values

this is a super simple solution that unbreaks diff display

It would be nice to display the more details about the bad value

Change-Id: I0eaa6a2b49b21e9ead1a0c6f3ebdd6616479b458
---
M lib/WikibaseLib.classes.php
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/UnDeserializableValueFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
A lib/tests/phpunit/formatters/UnDeserializableValueFormatterTest.php
5 files changed, 110 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/51/88051/1

diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index 0979264..3479866 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -101,6 +101,7 @@
'Wikibase\Lib\PropertyValueSnakFormatter' = 
'includes/formatters/PropertyValueSnakFormatter.php',
'Wikibase\Lib\SnakFormatter' = 
'includes/formatters/SnakFormatter.php',
'Wikibase\Lib\SnakFormatterFactory' = 
'includes/formatters/SnakFormatterFactory.php',
+   'Wikibase\Lib\UnDeserializableValueFormatter' = 
'includes/formatters/UnDeserializableValueFormatter.php',
'Wikibase\Lib\WikibaseSnakFormatterBuilders' = 
'includes/formatters/WikibaseSnakFormatterBuilders.php',
 
// includes/IO
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index aef9472..839998b 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -53,6 +53,7 @@
'wikibase-sitelinks-siteid-columnheading' = 'Code',
'wikibase-sitelinks-link-columnheading' = 'Linked article',
'wikibase-tooltip-error-details' = 'Details',
+   'wikibase-undeserializable-value' = 'Value cannot be deserialized',
'wikibase-validator-bad-type' = '$2 instead of $1',
'wikibase-validator-too-long' = 'Must be no more than {{PLURAL:$1|one 
character|$1 characters}} long',
'wikibase-validator-too-short' = 'Must be at least {{PLURAL:$1|one 
character|$1 characters}} long',
@@ -155,6 +156,7 @@
'wikibase-sitelinks-link-columnheading' = 'Site links table column 
heading for the column containg the title/link of/to the referenced (wiki) 
page.',
'wikibase-tooltip-error-details' = 'Link within an error tooltip that 
will unfold additional information regarding the error (i.e. the more specific 
error message returned from the underlying API).
 {{Identical|Details}}',
+   'wikibase-undeserializable-value' = 'Message to display for any data 
values that are invalid and cannot be deserialized.  The message is displayed 
in such places as when users view a diff.',
'wikibase-validator-bad-type' = 'Input validation error shown when the 
input has the wrong type.
 
 Parameters:
diff --git a/lib/includes/formatters/UnDeserializableValueFormatter.php 
b/lib/includes/formatters/UnDeserializableValueFormatter.php
new file mode 100644
index 000..47eddcf
--- /dev/null
+++ b/lib/includes/formatters/UnDeserializableValueFormatter.php
@@ -0,0 +1,57 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Message;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for UnDeserializableValue
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class UnDeserializableValueFormatter extends ValueFormatterBase {
+
+   const MESSAGE = 'message';
+
+   /**
+* @param FormatterOptions $options
+*/
+   public function __construct( FormatterOptions $options ) {
+   $this-options = $options;
+
+   $this-options-defaultOption(
+   self::OPT_LANG,
+   'en'
+   );
+
+   $this-options-defaultOption(
+   self::MESSAGE,
+   new Message( 'wikibase-undeserializable-value' )
+   );
+   }
+
+   /**
+* Formats an UnDeserializableValue
+*
+* @since 0.5
+*
+* @param UnDeserializableValue
+*
+* @return string
+*/
+   public function format( $dataValue ) {
+   $langCode = $this-options-getOption( self::OPT_LANG );
+
+   $msg = $this-options-getOption( self::MESSAGE );
+   $msg = $msg-inLanguage( $langCode );
+
+   return $msg-text();
+   }
+
+}
diff --git a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php 
b/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
index ce9f897..bcd2bd4 100644
--- a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php

[MediaWiki-commits] [Gerrit] Add logic and tests for getRemoveIndexSql - change (mediawiki...WikibaseDatabase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88053


Change subject: Add logic and tests for getRemoveIndexSql
..

Add logic and tests for getRemoveIndexSql

Change-Id: Ifbca2d9f98f73e66740e1126c76283511fdf2745
---
M src/MySQL/MySQLSchemaSqlBuilder.php
M src/SQLite/SQLiteSchemaSqlBuilder.php
M tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
M tests/phpunit/SQLite/SQLiteSchemaSqlBuilderTest.php
4 files changed, 22 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDatabase 
refs/changes/53/88053/1

diff --git a/src/MySQL/MySQLSchemaSqlBuilder.php 
b/src/MySQL/MySQLSchemaSqlBuilder.php
index a4f0c94..30c0ab1 100644
--- a/src/MySQL/MySQLSchemaSqlBuilder.php
+++ b/src/MySQL/MySQLSchemaSqlBuilder.php
@@ -56,7 +56,8 @@
 * @return string
 */
public function getRemoveIndexSql( $tableName, $indexName ){
-   //TODO
+   $tableName = $this-tableNameFormatter-formatTableName( 
$tableName );
+   return DROP INDEX {$indexName} ON {$tableName};
}
 
/**
diff --git a/src/SQLite/SQLiteSchemaSqlBuilder.php 
b/src/SQLite/SQLiteSchemaSqlBuilder.php
index 003091a..564b8fa 100644
--- a/src/SQLite/SQLiteSchemaSqlBuilder.php
+++ b/src/SQLite/SQLiteSchemaSqlBuilder.php
@@ -86,7 +86,8 @@
 * @return string
 */
public function getRemoveIndexSql( $tableName, $indexName ){
-   //TODO
+   $tableName = $this-tableNameFormatter-formatTableName( 
$tableName );
+   return DROP INDEX IF EXISTS {$tableName}.{$indexName};
}
 
/**
diff --git a/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php 
b/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
index 1094833..7580d98 100644
--- a/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
@@ -44,4 +44,10 @@
$this-assertEquals( 'ALTER TABLE tableName ADD intField INT 
DEFAULT 42 NOT NULL', $sql );
}
 
+   public function testGetRemoveIndexSql(){
+   $instance = $this-newInstance();
+   $sql = $instance-getRemoveIndexSql( 'tableName', 'indexName' );
+   $this-assertEquals( DROP INDEX indexName ON tableName, $sql 
);
+   }
+
 }
\ No newline at end of file
diff --git a/tests/phpunit/SQLite/SQLiteSchemaSqlBuilderTest.php 
b/tests/phpunit/SQLite/SQLiteSchemaSqlBuilderTest.php
index 48cab7a..57d7f58 100644
--- a/tests/phpunit/SQLite/SQLiteSchemaSqlBuilderTest.php
+++ b/tests/phpunit/SQLite/SQLiteSchemaSqlBuilderTest.php
@@ -19,7 +19,7 @@
  */
 class SQLiteSchemaSqlBuilderTest extends \PHPUnit_Framework_TestCase {
 
-   private function newInstance( $existingDefinition ) {
+   private function newInstance( $existingDefinition = null ) {
$mockEscaper = $this-getMock( 'Wikibase\Database\Escaper' );
$mockEscaper-expects( $this-any() )
-method( 'getEscapedValue' )
@@ -34,7 +34,7 @@
-getMockBuilder( 
'Wikibase\Database\SQLite\SQLiteTableDefinitionReader' )
-disableOriginalConstructor()
-getMock();
-   $mockQueryInterface-expects( $this-atLeastOnce() )
+   $mockQueryInterface-expects( $this-any() )
-method( 'readDefinition' )
-will( $this-returnValue( $existingDefinition ) );
 
@@ -70,4 +70,14 @@
$this-assertEquals( 'ALTER TABLE tableName RENAME TO 
tableName_tmp;CREATE TABLE tableName (primaryField INT NOT NULL, intField INT 
DEFAULT 42 NOT NULL);CREATE INDEX INDEX ON tableName 
(intField,primaryField);INSERT INTO tableName(primaryField, intField) SELECT 
primaryField, intField FROM tableName_tmp;DROP TABLE tableName_tmp;', $sql );
}
 
+   public function testGetRemoveFieldSql(){
+   $this-markTestIncomplete( 'testme!' ); //TODO complete the 
test!
+   }
+
+   public function testGetRemoveIndexSql(){
+   $instance = $this-newInstance( );
+   $sql = $instance-getRemoveIndexSql( 'tableName', 'textField' );
+   $this-assertEquals( DROP INDEX IF EXISTS 
tableName.textField, $sql );
+   }
+
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/88053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbca2d9f98f73e66740e1126c76283511fdf2745
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename ChangeOp test dir and fix @covers tags - change (mediawiki...Wikibase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88052


Change subject: Rename ChangeOp test dir and fix @covers tags
..

Rename ChangeOp test dir and fix @covers tags

Change-Id: Ibf69747ec39570b8e10046673d7d3fc6c61a7d11
---
R repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
11 files changed, 15 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/52/88052/1

diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
index 9839aac..1fd16c6 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
@@ -8,7 +8,7 @@
 use InvalidArgumentException;
 
 /**
- * @covers Wikibase\ChangeOpAliases
+ * @covers Wikibase\ChangeOp\ChangeOpAliases
  *
  * @since 0.4
  *
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
index 2572061..d7f79c7 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
@@ -15,7 +15,7 @@
 use Wikibase\SnakObject;
 
 /**
- * @covers Wikibase\ChangeOpModifyClaim
+ * @covers Wikibase\ChangeOp\ChangeOpModifyClaim
  *
  * @since 0.4
  *
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
index 4b2f273..a85b288 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
@@ -9,7 +9,7 @@
 use Wikibase\Summary;
 
 /**
- * @covers Wikibase\ChangeOpDescription
+ * @covers Wikibase\ChangeOp\ChangeOpDescription
  *
  * @since 0.4
  *
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
index 1db59c9..d635d2d 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
@@ -9,7 +9,7 @@
 use InvalidArgumentException;
 
 /**
- * @covers Wikibase\ChangeOpLabel
+ * @covers Wikibase\ChangeOp\ChangeOpLabel
  *
  * @since 0.4
  *
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index 963d1bc..95ec3f5 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -14,7 +14,7 @@
 use InvalidArgumentException;
 
 /**
- * @covers Wikibase\ChangeOpMainSnak
+ * @covers Wikibase\ChangeOp\ChangeOpMainSnak
  *
  * @since 0.4
  *
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
index 55290df..a77b002 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
@@ -12,7 +12,7 @@
 use InvalidArgumentException;
 
 /**
- * @covers Wikibase\ChangeOpQualifier
+ * @covers Wikibase\ChangeOp\ChangeOpQualifier
  *
  * @since 0.4
  *
diff --git

[MediaWiki-commits] [Gerrit] Introducing IndexSqlBuilders - change (mediawiki...WikibaseDatabase)

2013-10-07 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88054


Change subject: Introducing IndexSqlBuilders
..

Introducing IndexSqlBuilders

Change-Id: I5e9b15462182617f92755debb4baf7178015cdbb
---
A src/MySQL/MySQLIndexSqlBuilde.php
M src/MySQL/MySQLSchemaSqlBuilder.php
A src/SQLite/SQLiteIndexSqlBuilde.php
M src/SQLite/SQLiteSchemaSqlBuilder.php
A src/Schema/IndexSqlBuilder.php
M src/Schema/SchemaModificationSqlBuilder.php
6 files changed, 67 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDatabase 
refs/changes/54/88054/1

diff --git a/src/MySQL/MySQLIndexSqlBuilde.php 
b/src/MySQL/MySQLIndexSqlBuilde.php
new file mode 100644
index 000..4b02de8
--- /dev/null
+++ b/src/MySQL/MySQLIndexSqlBuilde.php
@@ -0,0 +1,19 @@
+?php
+
+namespace Wikibase\Database\MySQL;
+
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
+use Wikibase\Database\Schema\IndexSqlBuilder;
+
+/**
+ * @since 0.1
+ * @licence GNU GPL v2+
+ * @author Adam Shorland
+ */
+class MySQLIndexSqlBuilder extends IndexSqlBuilder {
+
+   public function getIndexSQL( IndexDefinition $field ){
+   //TODO
+   }
+
+}
\ No newline at end of file
diff --git a/src/MySQL/MySQLSchemaSqlBuilder.php 
b/src/MySQL/MySQLSchemaSqlBuilder.php
index a4f0c94..5db7acc 100644
--- a/src/MySQL/MySQLSchemaSqlBuilder.php
+++ b/src/MySQL/MySQLSchemaSqlBuilder.php
@@ -61,11 +61,11 @@
 
/**
 * @param string $tableName
-* @param IndexDefinition $field
+* @param IndexDefinition $index
 *
 * @return string
 */
-   public function getAddIndexSql( $tableName, IndexDefinition $field ){
+   public function getAddIndexSql( $tableName, IndexDefinition $index ){
//TODO
}
 
diff --git a/src/SQLite/SQLiteIndexSqlBuilde.php 
b/src/SQLite/SQLiteIndexSqlBuilde.php
new file mode 100644
index 000..598dce0
--- /dev/null
+++ b/src/SQLite/SQLiteIndexSqlBuilde.php
@@ -0,0 +1,19 @@
+?php
+
+namespace Wikibase\Database\SQLite;
+
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
+use Wikibase\Database\Schema\IndexSqlBuilder;
+
+/**
+ * @since 0.1
+ * @licence GNU GPL v2+
+ * @author Adam Shorland
+ */
+class SQLiteIndexSqlBuilder extends IndexSqlBuilder {
+
+   public function getIndexSQL( IndexDefinition $field ){
+   //TODO
+   }
+
+}
\ No newline at end of file
diff --git a/src/SQLite/SQLiteSchemaSqlBuilder.php 
b/src/SQLite/SQLiteSchemaSqlBuilder.php
index 003091a..4246d41 100644
--- a/src/SQLite/SQLiteSchemaSqlBuilder.php
+++ b/src/SQLite/SQLiteSchemaSqlBuilder.php
@@ -91,11 +91,11 @@
 
/**
 * @param string $tableName
-* @param IndexDefinition $field
+* @param IndexDefinition $index
 *
 * @return string
 */
-   public function getAddIndexSql( $tableName, IndexDefinition $field ){
+   public function getAddIndexSql( $tableName, IndexDefinition $index ){
//TODO
}
 
diff --git a/src/Schema/IndexSqlBuilder.php b/src/Schema/IndexSqlBuilder.php
new file mode 100644
index 000..b5eb399
--- /dev/null
+++ b/src/Schema/IndexSqlBuilder.php
@@ -0,0 +1,23 @@
+?php
+
+namespace Wikibase\Database\Schema;
+
+use Wikibase\Database\Schema\Definitions\IndexDefinition;
+
+/**
+ * @since 0.1
+ * @licence GNU GPL v2+
+ * @author Adam Shorland
+ */
+abstract class IndexSqlBuilder {
+
+   /**
+* @since 0.1
+*
+* @param IndexDefinition $field
+*
+* @return string The SQL for creating the index
+*/
+   public abstract function getIndexSQL( IndexDefinition $field );
+
+}
\ No newline at end of file
diff --git a/src/Schema/SchemaModificationSqlBuilder.php 
b/src/Schema/SchemaModificationSqlBuilder.php
index bcd23ad..c44e0df 100644
--- a/src/Schema/SchemaModificationSqlBuilder.php
+++ b/src/Schema/SchemaModificationSqlBuilder.php
@@ -38,10 +38,10 @@
 
/**
 * @param string $tableName
-* @param IndexDefinition $field
+* @param IndexDefinition $index
 *
 * @return string
 */
-   public function getAddIndexSql( $tableName, IndexDefinition $field );
+   public function getAddIndexSql( $tableName, IndexDefinition $index );
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/88054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e9b15462182617f92755debb4baf7178015cdbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 55348) Handle formatting of undeserializable values - change (mediawiki...Wikibase)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: (bug 55348) Handle formatting of undeserializable values
..


(bug 55348) Handle formatting of undeserializable values

this is a super simple solution that unbreaks diff display

It would be nice to display the more details about the bad value

Change-Id: I0eaa6a2b49b21e9ead1a0c6f3ebdd6616479b458
---
M lib/WikibaseLib.classes.php
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/UnDeserializableValueFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
A lib/tests/phpunit/formatters/UnDeserializableValueFormatterTest.php
5 files changed, 110 insertions(+), 0 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index ca402ab..a884676 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -103,6 +103,7 @@
'Wikibase\Lib\SnakFormatter' = 
'includes/formatters/SnakFormatter.php',
'Wikibase\Lib\OutputFormatSnakFormatterFactory' = 
'includes/formatters/OutputFormatSnakFormatterFactory.php',
'Wikibase\Lib\OutputFormatValueFormatterFactory' = 
'includes/formatters/OutputFormatValueFormatterFactory.php',
+   'Wikibase\Lib\UnDeserializableValueFormatter' = 
'includes/formatters/UnDeserializableValueFormatter.php',
'Wikibase\Lib\WikibaseSnakFormatterBuilders' = 
'includes/formatters/WikibaseSnakFormatterBuilders.php',
 
// includes/IO
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index 79c056f..aeec86b 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -53,6 +53,7 @@
'wikibase-sitelinks-siteid-columnheading' = 'Code',
'wikibase-sitelinks-link-columnheading' = 'Linked article',
'wikibase-tooltip-error-details' = 'Details',
+   'wikibase-undeserializable-value' = 'Value cannot be deserialized',
'wikibase-validator-bad-type' = '$2 instead of $1',
'wikibase-validator-too-long' = 'Must be no more than {{PLURAL:$1|one 
character|$1 characters}} long',
'wikibase-validator-too-short' = 'Must be at least {{PLURAL:$1|one 
character|$1 characters}} long',
@@ -155,6 +156,7 @@
'wikibase-sitelinks-link-columnheading' = 'Site links table column 
heading for the column containg the title/link of/to the referenced (wiki) 
page.',
'wikibase-tooltip-error-details' = 'Link within an error tooltip that 
will unfold additional information regarding the error (i.e. the more specific 
error message returned from the underlying API).
 {{Identical|Detail}}',
+   'wikibase-undeserializable-value' = 'Message to display for any data 
values that are invalid and cannot be deserialized.  The message is displayed 
in such places as when users view a diff.',
'wikibase-validator-bad-type' = 'Input validation error shown when the 
input has the wrong type.
 
 Parameters:
diff --git a/lib/includes/formatters/UnDeserializableValueFormatter.php 
b/lib/includes/formatters/UnDeserializableValueFormatter.php
new file mode 100644
index 000..47eddcf
--- /dev/null
+++ b/lib/includes/formatters/UnDeserializableValueFormatter.php
@@ -0,0 +1,57 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Message;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for UnDeserializableValue
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class UnDeserializableValueFormatter extends ValueFormatterBase {
+
+   const MESSAGE = 'message';
+
+   /**
+* @param FormatterOptions $options
+*/
+   public function __construct( FormatterOptions $options ) {
+   $this-options = $options;
+
+   $this-options-defaultOption(
+   self::OPT_LANG,
+   'en'
+   );
+
+   $this-options-defaultOption(
+   self::MESSAGE,
+   new Message( 'wikibase-undeserializable-value' )
+   );
+   }
+
+   /**
+* Formats an UnDeserializableValue
+*
+* @since 0.5
+*
+* @param UnDeserializableValue
+*
+* @return string
+*/
+   public function format( $dataValue ) {
+   $langCode = $this-options-getOption( self::OPT_LANG );
+
+   $msg = $this-options-getOption( self::MESSAGE );
+   $msg = $msg-inLanguage( $langCode );
+
+   return $msg-text();
+   }
+
+}
diff --git a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php 
b/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
index 7f364cc..61791ab 100644
--- a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
+++

[MediaWiki-commits] [Gerrit] Fix the wrong position of ULS icon for languages like hi, bo - change (mediawiki...TwnMainPage)

2013-10-07 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88055


Change subject: Fix the wrong position of ULS icon for languages like hi, bo
..

Fix the wrong position of ULS icon for languages like hi, bo

Add an explicit line height for the element of ULS, login link etc

Change-Id: Id331dcda8d346f000d2aaa7e957bc5585a81ecc2
---
M resources/css/ext.translate.mainpage.css
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage 
refs/changes/55/88055/1

diff --git a/resources/css/ext.translate.mainpage.css 
b/resources/css/ext.translate.mainpage.css
index ac8de45..4f8bed5 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -23,6 +23,7 @@
 .twn-mainpage-header .twn-mainpage-personal-actions {
padding-right: 20px;
text-align: right;
+   line-height: 1em;
 }
 
 .twn-mainpage-header .uls-trigger {

-- 
To view, visit https://gerrit.wikimedia.org/r/88055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id331dcda8d346f000d2aaa7e957bc5585a81ecc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 55348) Handle formatting of undeserializable values - change (mediawiki...Wikibase)

2013-10-07 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has submitted this change and it was merged.

Change subject: (bug 55348) Handle formatting of undeserializable values
..


(bug 55348) Handle formatting of undeserializable values

this is a super simple solution that unbreaks diff display

It would be nice to display the more details about the bad value

Change-Id: I0eaa6a2b49b21e9ead1a0c6f3ebdd6616479b458
---
M lib/WikibaseLib.classes.php
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/UnDeserializableValueFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
A lib/tests/phpunit/formatters/UnDeserializableValueFormatterTest.php
5 files changed, 110 insertions(+), 0 deletions(-)

Approvals:
  Daniel Kinzler: Verified; Looks good to me, approved



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index 0979264..3479866 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -101,6 +101,7 @@
'Wikibase\Lib\PropertyValueSnakFormatter' = 
'includes/formatters/PropertyValueSnakFormatter.php',
'Wikibase\Lib\SnakFormatter' = 
'includes/formatters/SnakFormatter.php',
'Wikibase\Lib\SnakFormatterFactory' = 
'includes/formatters/SnakFormatterFactory.php',
+   'Wikibase\Lib\UnDeserializableValueFormatter' = 
'includes/formatters/UnDeserializableValueFormatter.php',
'Wikibase\Lib\WikibaseSnakFormatterBuilders' = 
'includes/formatters/WikibaseSnakFormatterBuilders.php',
 
// includes/IO
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index aef9472..839998b 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -53,6 +53,7 @@
'wikibase-sitelinks-siteid-columnheading' = 'Code',
'wikibase-sitelinks-link-columnheading' = 'Linked article',
'wikibase-tooltip-error-details' = 'Details',
+   'wikibase-undeserializable-value' = 'Value cannot be deserialized',
'wikibase-validator-bad-type' = '$2 instead of $1',
'wikibase-validator-too-long' = 'Must be no more than {{PLURAL:$1|one 
character|$1 characters}} long',
'wikibase-validator-too-short' = 'Must be at least {{PLURAL:$1|one 
character|$1 characters}} long',
@@ -155,6 +156,7 @@
'wikibase-sitelinks-link-columnheading' = 'Site links table column 
heading for the column containg the title/link of/to the referenced (wiki) 
page.',
'wikibase-tooltip-error-details' = 'Link within an error tooltip that 
will unfold additional information regarding the error (i.e. the more specific 
error message returned from the underlying API).
 {{Identical|Details}}',
+   'wikibase-undeserializable-value' = 'Message to display for any data 
values that are invalid and cannot be deserialized.  The message is displayed 
in such places as when users view a diff.',
'wikibase-validator-bad-type' = 'Input validation error shown when the 
input has the wrong type.
 
 Parameters:
diff --git a/lib/includes/formatters/UnDeserializableValueFormatter.php 
b/lib/includes/formatters/UnDeserializableValueFormatter.php
new file mode 100644
index 000..47eddcf
--- /dev/null
+++ b/lib/includes/formatters/UnDeserializableValueFormatter.php
@@ -0,0 +1,57 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Message;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for UnDeserializableValue
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert  aude.w...@gmail.com 
+ */
+class UnDeserializableValueFormatter extends ValueFormatterBase {
+
+   const MESSAGE = 'message';
+
+   /**
+* @param FormatterOptions $options
+*/
+   public function __construct( FormatterOptions $options ) {
+   $this-options = $options;
+
+   $this-options-defaultOption(
+   self::OPT_LANG,
+   'en'
+   );
+
+   $this-options-defaultOption(
+   self::MESSAGE,
+   new Message( 'wikibase-undeserializable-value' )
+   );
+   }
+
+   /**
+* Formats an UnDeserializableValue
+*
+* @since 0.5
+*
+* @param UnDeserializableValue
+*
+* @return string
+*/
+   public function format( $dataValue ) {
+   $langCode = $this-options-getOption( self::OPT_LANG );
+
+   $msg = $this-options-getOption( self::MESSAGE );
+   $msg = $msg-inLanguage( $langCode );
+
+   return $msg-text();
+   }
+
+}
diff --git a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php 
b/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
index ce9f897..bcd2bd4 100644
--- a/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
+++

[MediaWiki-commits] [Gerrit] swift: add statsd support to proxy-server - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88058


Change subject: swift: add statsd support to proxy-server
..

swift: add statsd support to proxy-server

Enable statsd support, starting with proxies (object/account servers to
follow). Point to the newly provisioned tungsten as our working statsd
server.

The abstraction layers aren't very good but this is needed to remove the
logtailer machinery, which is a tad more important :-)

Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
---
M manifests/role/swift.pp
M templates/swift/proxy-server.conf.erb
2 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/88058/1

diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 032839c..bc01362 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -41,6 +41,8 @@
proxy_address = http://ms-fe.pmtpa.wmnet;,
num_workers = $::processorcount,
memcached_servers = [ 
ms-fe1.pmtpa.wmnet:11211, ms-fe2.pmtpa.wmnet:11211, 
ms-fe3.pmtpa.wmnet:11211, ms-fe4.pmtpa.wmnet:11211 ],
+   statsd_host = '10.64.0.18',  # 
tungsten.eqiad.wmnet
+   statsd_metric_prefix = 
swift.pmtpa.${::hostname},
auth_backend = 'swauth',
super_admin_key = 
$passwords::swift::pmtpa-prod::super_admin_key,
rewrite_account = 
AUTH_43651b15-ed7a-40b6-b745-47666abf8dfe,
@@ -91,6 +93,8 @@
proxy_address = http://ms-fe.eqiad.wmnet;,
num_workers = $::processorcount,
memcached_servers = [ 
ms-fe1001.eqiad.wmnet:11211, ms-fe1002.eqiad.wmnet:11211, 
ms-fe1003.eqiad.wmnet:11211, ms-fe1004.eqiad.wmnet:11211 ],
+   statsd_host = '10.64.0.18',  # 
tungsten.eqiad.wmnet
+   statsd_metric_prefix = 
swift.eqiad.${::hostname},
auth_backend = 'tempauth',
super_admin_key = 
$passwords::swift::eqiad-prod::super_admin_key,
rewrite_account = 'AUTH_mw',
diff --git a/templates/swift/proxy-server.conf.erb 
b/templates/swift/proxy-server.conf.erb
index fb4c448..fb232cf 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -4,13 +4,12 @@
 bind_port = %= @bind_port %
 workers = %= @num_workers %
 user = swift
-# You can enable default statsD logging here and/or override it in sections
-# below:
-## statsd logging disabled for the initial releas of 1.5.0
-#log_statsd_host = localhost
-#log_statsd_port = 8125
-#log_statsd_default_sample_rate = 1
-#log_statsd_metric_prefix =
+% if @statsd_host -%
+log_statsd_host = %= @statsd_host %
+% end -%
+% if @statsd_metric_prefix -%
+log_statsd_metric_prefix = %= @statsd_metric_prefix %
+% end -%
 
 [pipeline:main]
 % if @auth_backend == 'swauth' -%

-- 
To view, visit https://gerrit.wikimedia.org/r/88058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] swift: inline swift::proxy::config - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88057


Change subject: swift: inline swift::proxy::config
..

swift: inline swift::proxy::config

Despite what the comments say, swift::proxy::config is only used by
swift::proxy. Having it external makes us jump through some hoops
(virtual resources, scope.lookupvar etc.) that are unnecessary, so just
inline it and cleanup.

Change-Id: Idf1dad8f7fae8f9b5fd7bedad97b15b64f85776e
---
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
3 files changed, 43 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/88057/1

diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 222cd2d..032839c 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -36,7 +36,7 @@
}
}
class proxy inherits role::swift::pmtpa-prod {
-   class { ::swift::proxy::config:
+   class { ::swift::proxy:
bind_port = 80,
proxy_address = http://ms-fe.pmtpa.wmnet;,
num_workers = $::processorcount,
@@ -49,7 +49,6 @@
shard_container_list = 
wikipedia-commons-local-thumb,wikipedia-de-local-thumb,wikipedia-en-local-thumb,wikipedia-fi-local-thumb,wikipedia-fr-local-thumb,wikipedia-he-local-thumb,wikipedia-hu-local-thumb,wikipedia-id-local-thumb,wikipedia-it-local-thumb,wikipedia-ja-local-thumb,wikipedia-ro-local-thumb,wikipedia-ru-local-thumb,wikipedia-th-local-thumb,wikipedia-tr-local-thumb,wikipedia-uk-local-thumb,wikipedia-zh-local-thumb,wikipedia-commons-local-public,wikipedia-de-local-public,wikipedia-en-local-public,wikipedia-fi-local-public,wikipedia-fr-local-public,wikipedia-he-local-public,wikipedia-hu-local-public,wikipedia-id-local-public,wikipedia-it-local-public,wikipedia-ja-local-public,wikipedia-ro-local-public,wikipedia-ru-local-public,wikipedia-th-local-public,wikipedia-tr-local-public,wikipedia-uk-local-public,wikipedia-zh-local-public,wikipedia-commons-local-temp,wikipedia-de-local-temp,wikipedia-en-local-temp,wikipedia-fi-local-temp,wikipedia-fr-local-temp,wikipedia-he-local-temp,wikipedia-hu-local-temp,wikipedia-id-local-temp,wikipedia-it-local-temp,wikipedia-ja-local-temp,wikipedia-ro-local-temp,wikipedia-ru-local-temp,wikipedia-th-local-temp,wikipedia-tr-local-temp,wikipedia-uk-local-temp,wikipedia-zh-local-temp,wikipedia-commons-local-transcoded,wikipedia-de-local-transcoded,wikipedia-en-local-transcoded,wikipedia-fi-local-transcoded,wikipedia-fr-local-transcoded,wikipedia-he-local-transcoded,wikipedia-hu-local-transcoded,wikipedia-id-local-transcoded,wikipedia-it-local-transcoded,wikipedia-ja-local-transcoded,wikipedia-ro-local-transcoded,wikipedia-ru-local-transcoded,wikipedia-th-local-transcoded,wikipedia-tr-local-transcoded,wikipedia-uk-local-transcoded,wikipedia-zh-local-transcoded,global-data-math-render,
backend_url_format = sitelang
}
-   include ::swift::proxy
class { '::swift::proxy::monitoring':
host = 'ms-fe.pmtpa.wmnet',
}
@@ -87,7 +86,7 @@
}
}
class proxy inherits role::swift::eqiad-prod {
-   class { ::swift::proxy::config:
+   class { ::swift::proxy:
bind_port = 80,
proxy_address = http://ms-fe.eqiad.wmnet;,
num_workers = $::processorcount,
@@ -100,7 +99,6 @@
shard_container_list =

[MediaWiki-commits] [Gerrit] swift: swift-ganglia-report-global-stats for eqiad - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88056


Change subject: swift: swift-ganglia-report-global-stats for eqiad
..

swift: swift-ganglia-report-global-stats for eqiad

Fix the hardcoded ms-fe.pmtpa.wmnet in the script. The mechanism 
script desperately needs to be rewritten but let's do that as a later
step; let's fix feature parity of pmtpa/eqiad first.

Change-Id: I207647b7bec510429978c540730c2a863d964cbe
---
M files/swift/swift-ganglia-report-global-stats
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/88056/1

diff --git a/files/swift/swift-ganglia-report-global-stats 
b/files/swift/swift-ganglia-report-global-stats
index 2125c20..8c6d032 100755
--- a/files/swift/swift-ganglia-report-global-stats
+++ b/files/swift/swift-ganglia-report-global-stats
@@ -14,8 +14,7 @@
 headers['X-Auth-User'] = username
 headers['X-Auth-Key'] = password
 headers['User-Agent'] = 'swiftgangliastats'
-headers['Host'] = 'upload.wikimedia.org'
-req = urllib2.Request('http://ms-fe.pmtpa.wmnet/auth/v1.0', 
headers=headers)
+req = urllib2.Request('http://localhost/auth/v1.0', headers=headers)
 try:
 resp = urllib2.urlopen(req)
 except urllib2.HTTPError, e:
@@ -35,8 +34,7 @@
 headers['X-Auth-Token'] = token
 headers['X-Auth-User'] = username
 headers['User-Agent'] = 'swiftgangliastats'
-# HEAD /v1/AUTH_xxdx---- HTTP/1.0 204 - - 
mw%3Athumbnail%2CAUTH_xx
-url = 'http://ms-fe.pmtpa.wmnet/v1/%s' % authid
+url = 'http://localhost/v1/%s' % authid
 req = HEADRequest(url, headers=headers)
 try:
 resp = urllib2.urlopen(req)
@@ -86,7 +84,7 @@
 
 # submits the metric to ganglia using gmetric, returns the exit code of gmetric
 def submit_to_ganglia(name, value, units, valtype='int32',
-conf='/etc/ganglia/gmond.conf', spoof='Swift pmtpa prod:Swift 
pmtpa prod'):
+conf='/etc/ganglia/gmond.conf', spoof):
 retcode = subprocess.call(['/usr/bin/gmetric', '--name', name, '--type', 
valtype, '--conf', conf,
 '--spoof', spoof, '--value', str(value), '--units', units])
 return retcode
@@ -159,4 +157,4 @@
 if __name__ == '__main__':
 main()
 
-# vim: set nu list expandtab tabstop=4 shiftwidth=4 autoindent:
+# vim: set expandtab tabstop=4 shiftwidth=4 autoindent:

-- 
To view, visit https://gerrit.wikimedia.org/r/88056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I207647b7bec510429978c540730c2a863d964cbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] swift: swift-ganglia-report-global-stats for eqiad - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: swift: swift-ganglia-report-global-stats for eqiad
..


swift: swift-ganglia-report-global-stats for eqiad

Fix the hardcoded ms-fe.pmtpa.wmnet in the script. The mechanism 
script desperately needs to be rewritten but let's do that as a later
step; let's fix feature parity of pmtpa/eqiad first.

Change-Id: I207647b7bec510429978c540730c2a863d964cbe
---
M files/swift/swift-ganglia-report-global-stats
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/swift/swift-ganglia-report-global-stats 
b/files/swift/swift-ganglia-report-global-stats
index 2125c20..8c6d032 100755
--- a/files/swift/swift-ganglia-report-global-stats
+++ b/files/swift/swift-ganglia-report-global-stats
@@ -14,8 +14,7 @@
 headers['X-Auth-User'] = username
 headers['X-Auth-Key'] = password
 headers['User-Agent'] = 'swiftgangliastats'
-headers['Host'] = 'upload.wikimedia.org'
-req = urllib2.Request('http://ms-fe.pmtpa.wmnet/auth/v1.0', 
headers=headers)
+req = urllib2.Request('http://localhost/auth/v1.0', headers=headers)
 try:
 resp = urllib2.urlopen(req)
 except urllib2.HTTPError, e:
@@ -35,8 +34,7 @@
 headers['X-Auth-Token'] = token
 headers['X-Auth-User'] = username
 headers['User-Agent'] = 'swiftgangliastats'
-# HEAD /v1/AUTH_xxdx---- HTTP/1.0 204 - - 
mw%3Athumbnail%2CAUTH_xx
-url = 'http://ms-fe.pmtpa.wmnet/v1/%s' % authid
+url = 'http://localhost/v1/%s' % authid
 req = HEADRequest(url, headers=headers)
 try:
 resp = urllib2.urlopen(req)
@@ -86,7 +84,7 @@
 
 # submits the metric to ganglia using gmetric, returns the exit code of gmetric
 def submit_to_ganglia(name, value, units, valtype='int32',
-conf='/etc/ganglia/gmond.conf', spoof='Swift pmtpa prod:Swift 
pmtpa prod'):
+conf='/etc/ganglia/gmond.conf', spoof):
 retcode = subprocess.call(['/usr/bin/gmetric', '--name', name, '--type', 
valtype, '--conf', conf,
 '--spoof', spoof, '--value', str(value), '--units', units])
 return retcode
@@ -159,4 +157,4 @@
 if __name__ == '__main__':
 main()
 
-# vim: set nu list expandtab tabstop=4 shiftwidth=4 autoindent:
+# vim: set expandtab tabstop=4 shiftwidth=4 autoindent:

-- 
To view, visit https://gerrit.wikimedia.org/r/88056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I207647b7bec510429978c540730c2a863d964cbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] swift: add statsd support to proxy-server - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: swift: add statsd support to proxy-server
..


swift: add statsd support to proxy-server

Enable statsd support, starting with proxies (object/account servers to
follow). Point to the newly provisioned tungsten as our working statsd
server.

The abstraction layers aren't very good but this is needed to remove the
logtailer machinery, which is a tad more important :-)

Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
---
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
3 files changed, 10 insertions(+), 8 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 032839c..bc01362 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -41,6 +41,8 @@
proxy_address = http://ms-fe.pmtpa.wmnet;,
num_workers = $::processorcount,
memcached_servers = [ 
ms-fe1.pmtpa.wmnet:11211, ms-fe2.pmtpa.wmnet:11211, 
ms-fe3.pmtpa.wmnet:11211, ms-fe4.pmtpa.wmnet:11211 ],
+   statsd_host = '10.64.0.18',  # 
tungsten.eqiad.wmnet
+   statsd_metric_prefix = 
swift.pmtpa.${::hostname},
auth_backend = 'swauth',
super_admin_key = 
$passwords::swift::pmtpa-prod::super_admin_key,
rewrite_account = 
AUTH_43651b15-ed7a-40b6-b745-47666abf8dfe,
@@ -91,6 +93,8 @@
proxy_address = http://ms-fe.eqiad.wmnet;,
num_workers = $::processorcount,
memcached_servers = [ 
ms-fe1001.eqiad.wmnet:11211, ms-fe1002.eqiad.wmnet:11211, 
ms-fe1003.eqiad.wmnet:11211, ms-fe1004.eqiad.wmnet:11211 ],
+   statsd_host = '10.64.0.18',  # 
tungsten.eqiad.wmnet
+   statsd_metric_prefix = 
swift.eqiad.${::hostname},
auth_backend = 'tempauth',
super_admin_key = 
$passwords::swift::eqiad-prod::super_admin_key,
rewrite_account = 'AUTH_mw',
diff --git a/manifests/swift.pp b/manifests/swift.pp
index fa8f168..4f1aa9a 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -35,7 +35,6 @@
'swift-doc',
'python-swift',
'python-swiftclient',
-   'python-ss-statsd',
]:
ensure = present;
}
diff --git a/templates/swift/proxy-server.conf.erb 
b/templates/swift/proxy-server.conf.erb
index 43f784a..760213a 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -4,13 +4,12 @@
 bind_port = %= @bind_port %
 workers = %= @num_workers %
 user = swift
-# You can enable default statsD logging here and/or override it in sections
-# below:
-## statsd logging disabled for the initial releas of 1.5.0
-#log_statsd_host = localhost
-#log_statsd_port = 8125
-#log_statsd_default_sample_rate = 1
-#log_statsd_metric_prefix =
+% if @statsd_host -%
+log_statsd_host = %= @statsd_host %
+% end -%
+% if @statsd_metric_prefix -%
+log_statsd_metric_prefix = %= @statsd_metric_prefix %
+% end -%
 
 [pipeline:main]
 % if @auth_backend == 'swauth' -%

-- 
To view, visit https://gerrit.wikimedia.org/r/88058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] swift: inline swift::proxy::config - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: swift: inline swift::proxy::config
..


swift: inline swift::proxy::config

Despite what the comments say, swift::proxy::config is only used by
swift::proxy. Having it external makes us jump through some hoops
(virtual resources, scope.lookupvar etc.) that are unnecessary, so just
inline it and cleanup.

Change-Id: Idf1dad8f7fae8f9b5fd7bedad97b15b64f85776e
---
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
3 files changed, 43 insertions(+), 64 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 222cd2d..032839c 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -36,7 +36,7 @@
}
}
class proxy inherits role::swift::pmtpa-prod {
-   class { ::swift::proxy::config:
+   class { ::swift::proxy:
bind_port = 80,
proxy_address = http://ms-fe.pmtpa.wmnet;,
num_workers = $::processorcount,
@@ -49,7 +49,6 @@
shard_container_list = 
wikipedia-commons-local-thumb,wikipedia-de-local-thumb,wikipedia-en-local-thumb,wikipedia-fi-local-thumb,wikipedia-fr-local-thumb,wikipedia-he-local-thumb,wikipedia-hu-local-thumb,wikipedia-id-local-thumb,wikipedia-it-local-thumb,wikipedia-ja-local-thumb,wikipedia-ro-local-thumb,wikipedia-ru-local-thumb,wikipedia-th-local-thumb,wikipedia-tr-local-thumb,wikipedia-uk-local-thumb,wikipedia-zh-local-thumb,wikipedia-commons-local-public,wikipedia-de-local-public,wikipedia-en-local-public,wikipedia-fi-local-public,wikipedia-fr-local-public,wikipedia-he-local-public,wikipedia-hu-local-public,wikipedia-id-local-public,wikipedia-it-local-public,wikipedia-ja-local-public,wikipedia-ro-local-public,wikipedia-ru-local-public,wikipedia-th-local-public,wikipedia-tr-local-public,wikipedia-uk-local-public,wikipedia-zh-local-public,wikipedia-commons-local-temp,wikipedia-de-local-temp,wikipedia-en-local-temp,wikipedia-fi-local-temp,wikipedia-fr-local-temp,wikipedia-he-local-temp,wikipedia-hu-local-temp,wikipedia-id-local-temp,wikipedia-it-local-temp,wikipedia-ja-local-temp,wikipedia-ro-local-temp,wikipedia-ru-local-temp,wikipedia-th-local-temp,wikipedia-tr-local-temp,wikipedia-uk-local-temp,wikipedia-zh-local-temp,wikipedia-commons-local-transcoded,wikipedia-de-local-transcoded,wikipedia-en-local-transcoded,wikipedia-fi-local-transcoded,wikipedia-fr-local-transcoded,wikipedia-he-local-transcoded,wikipedia-hu-local-transcoded,wikipedia-id-local-transcoded,wikipedia-it-local-transcoded,wikipedia-ja-local-transcoded,wikipedia-ro-local-transcoded,wikipedia-ru-local-transcoded,wikipedia-th-local-transcoded,wikipedia-tr-local-transcoded,wikipedia-uk-local-transcoded,wikipedia-zh-local-transcoded,global-data-math-render,
backend_url_format = sitelang
}
-   include ::swift::proxy
class { '::swift::proxy::monitoring':
host = 'ms-fe.pmtpa.wmnet',
}
@@ -87,7 +86,7 @@
}
}
class proxy inherits role::swift::eqiad-prod {
-   class { ::swift::proxy::config:
+   class { ::swift::proxy:
bind_port = 80,
proxy_address = http://ms-fe.eqiad.wmnet;,
num_workers = $::processorcount,
@@ -100,7 +99,6 @@
shard_container_list =

[MediaWiki-commits] [Gerrit] Fix the wrong position of ULS icon for languages like hi, bo - change (mediawiki...TwnMainPage)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix the wrong position of ULS icon for languages like hi, bo
..


Fix the wrong position of ULS icon for languages like hi, bo

Add an explicit line height for the element of ULS, login link etc

Change-Id: Id331dcda8d346f000d2aaa7e957bc5585a81ecc2
---
M resources/css/ext.translate.mainpage.css
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Pginer: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/css/ext.translate.mainpage.css 
b/resources/css/ext.translate.mainpage.css
index ac8de45..4f8bed5 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -23,6 +23,7 @@
 .twn-mainpage-header .twn-mainpage-personal-actions {
padding-right: 20px;
text-align: right;
+   line-height: 1em;
 }
 
 .twn-mainpage-header .uls-trigger {

-- 
To view, visit https://gerrit.wikimedia.org/r/88055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id331dcda8d346f000d2aaa7e957bc5585a81ecc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove language that has fallback. - change (mediawiki...WikimediaMessages)

2013-10-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88059


Change subject: Remove language that has fallback.
..

Remove language that has fallback.

Change-Id: I0ee489779cc6a511de95bdd9070c6f9eff1d4b99
---
M WikimediaCCLicenseTexts.i18n.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/59/88059/1

diff --git a/WikimediaCCLicenseTexts.i18n.php b/WikimediaCCLicenseTexts.i18n.php
index bebe597..4b33249 100644
--- a/WikimediaCCLicenseTexts.i18n.php
+++ b/WikimediaCCLicenseTexts.i18n.php
@@ -14964,13 +14964,6 @@
'wm-license-cc-pd-mark-text' = 'Kjo skedë është identifikuar si e lirë 
e kufizimeve të panjohura në ligjin e të drejtave të autorit, duke përfshirë të 
gjitha të drejtat e lidhura dhe fqinje.',
 );
 
-/** Serbian (Српски / Srpski)
- * @author Multichill
- */
-$messages['sr'] = array(
-   'wm-license-cc-wiki-link' = 'w:sr:Кријејтив комонс',
-);
-
 /** Serbian (Cyrillic script) (српски (ћирилица)‎)
  * @author Milicevic01
  * @author Rancher

-- 
To view, visit https://gerrit.wikimedia.org/r/88059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ee489779cc6a511de95bdd9070c6f9eff1d4b99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] swift: fixup to statsd commit - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88060


Change subject: swift: fixup to statsd commit
..

swift: fixup to statsd commit

Need to add class parameters before using them, obviously :)

Change-Id: I6e8bbf2357adf2be18d31c67c640262e45d7398a
---
M manifests/swift.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/88060/1

diff --git a/manifests/swift.pp b/manifests/swift.pp
index 4f1aa9a..a10e65a6 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -93,6 +93,8 @@
$proxy_address,
$memcached_servers,
$num_workers,
+   $statsd_host,
+   $statsd_metric_prefix,
$auth_backend,
$super_admin_key,
$rewrite_account,

-- 
To view, visit https://gerrit.wikimedia.org/r/88060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e8bbf2357adf2be18d31c67c640262e45d7398a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] swift: fixup to statsd commit - change (operations/puppet)

2013-10-07 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: swift: fixup to statsd commit
..


swift: fixup to statsd commit

Need to add class parameters before using them, obviously :)

Change-Id: I6e8bbf2357adf2be18d31c67c640262e45d7398a
---
M manifests/swift.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/manifests/swift.pp b/manifests/swift.pp
index 4f1aa9a..a10e65a6 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -93,6 +93,8 @@
$proxy_address,
$memcached_servers,
$num_workers,
+   $statsd_host,
+   $statsd_metric_prefix,
$auth_backend,
$super_admin_key,
$rewrite_account,

-- 
To view, visit https://gerrit.wikimedia.org/r/88060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e8bbf2357adf2be18d31c67c640262e45d7398a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove language that has fallback - change (mediawiki...WikimediaMessages)

2013-10-07 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove language that has fallback
..


Remove language that has fallback

Part of thread on translatewiki.net:
https://translatewiki.net/wiki/Thread:Support/Request_for_deletion

Change-Id: I0ee489779cc6a511de95bdd9070c6f9eff1d4b99
---
M WikimediaCCLicenseTexts.i18n.php
1 file changed, 0 insertions(+), 7 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikimediaCCLicenseTexts.i18n.php b/WikimediaCCLicenseTexts.i18n.php
index bebe597..4b33249 100644
--- a/WikimediaCCLicenseTexts.i18n.php
+++ b/WikimediaCCLicenseTexts.i18n.php
@@ -14964,13 +14964,6 @@
'wm-license-cc-pd-mark-text' = 'Kjo skedë është identifikuar si e lirë 
e kufizimeve të panjohura në ligjin e të drejtave të autorit, duke përfshirë të 
gjitha të drejtat e lidhura dhe fqinje.',
 );
 
-/** Serbian (Српски / Srpski)
- * @author Multichill
- */
-$messages['sr'] = array(
-   'wm-license-cc-wiki-link' = 'w:sr:Кријејтив комонс',
-);
-
 /** Serbian (Cyrillic script) (српски (ћирилица)‎)
  * @author Milicevic01
  * @author Rancher

-- 
To view, visit https://gerrit.wikimedia.org/r/88059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ee489779cc6a511de95bdd9070c6f9eff1d4b99
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 5 >

1 - 100 of 439 matches

Mail list logo