[MediaWiki-commits] [Gerrit] Improve initialization of ext.inputBox.js - change (mediawiki...InputBox)

[jenkins-bot (Code Review)]

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

Change subject: Improve initialization of ext.inputBox.js
..


Improve initialization of ext.inputBox.js

Change-Id: I45b6a6106ece16f069907076a8f1f635d95fd2df
---
M resources/ext.inputBox.js
1 file changed, 9 insertions(+), 12 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/ext.inputBox.js b/resources/ext.inputBox.js
index 9f9ac39..80253b4 100644
--- a/resources/ext.inputBox.js
+++ b/resources/ext.inputBox.js
@@ -8,10 +8,8 @@
 ( function ( $, mw ) {
'use strict';
mw.hook( 'wikipage.content' ).add( function( $content ) {
-   var onChange,
-   events = 'keyup input change';
-
-   onChange = function() {
+   var $input = $content.find( '.createboxInput' ),
+   onChange = function() {
var $textbox = $( this ),
$submit = $textbox.data( 'form-submit' );
 
@@ -21,13 +19,12 @@
}
 
$submit.prop( 'disabled', $textbox.val().length  1 );
-   };
+   }, i;
 
-   $content
-   .find( '.createboxInput' )
-   .on( events, onChange )
-   .trigger( 'keyup' )
-   .off( events, onChange )
-   .on( events, $.debounce( 50, onChange ) );
+   for ( i = 0; i  $input.length; i++ ) {
+   onChange.call( $input.get( i ) );
+   }
+
+   $input.on( 'keyup input change', $.debounce( 50, onChange ) );
   } );
-}( jQuery, mediaWiki ) );
\ No newline at end of file
+}( jQuery, mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45b6a6106ece16f069907076a8f1f635d95fd2df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Adjust h3 size to keep it smaller than h2 across normal plat... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Adjust h3 size to keep it smaller than h2 across normal 
platforms
..


Adjust h3 size to keep it smaller than h2 across normal platforms

Some platforms (especially certain linux distros) use slightly wider
sans-serifs than others by default. Bolding these wider fonts has a
more significant size impact than with narrower ones, so because the
h3 is bold and the h2 is not, a little more distance between their
defined sizes should ensure that the h3 will remain smaller than the
h2 regardless of platform.

Bug: 6
Change-Id: I667c60f553d67e5208c708446f13b0773ad11ace
---
M resources/src/mediawiki.skinning/elements.css
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki.skinning/elements.css 
b/resources/src/mediawiki.skinning/elements.css
old mode 100644
new mode 100755
index 392a2a6..11962f8
--- a/resources/src/mediawiki.skinning/elements.css
+++ b/resources/src/mediawiki.skinning/elements.css
@@ -112,7 +112,7 @@
 }
 
 h3 {
-   font-size: 132%;
+   font-size: 128%;
 }
 
 h4 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I667c60f553d67e5208c708446f13b0773ad11ace
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Isarra zhoris...@gmail.com
Gerrit-Reviewer: Amgine amg...@wikimedians.ca
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Edokter er...@darcoury.nl
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Wctaiwan wctai...@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] Use unicode for Request params - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Use unicode for Request params
..

Use unicode for Request params

Request.http_params optionally decodes values in the params dict,
and then always re-encodes params each time it is called.  As a result
the type of the values differs throughout the life of the Request
object.

http_params is split into __setitem__, _add_defaults and _http_param_string.

__setitem__ forces all param values to always be unicode
(or str for ascii in Python 2), and be stored as a list
for each key.

_add_defaults adds param values to the pending request.  It now only
peforms these additions the first invocation, and is a noop when invoked
again.

_http_param_string prepares a URL for the site's API, but does not store
the encoded values in the Request object's state.

Request.action is added as this parameter is mandatory, may only have
one value, and is frequently used in the logic.

Change-Id: Id13622e72623024166cec4ac0a5c9c4b3d511755
---
M pywikibot/data/api.py
M tests/api_tests.py
M tox.ini
3 files changed, 82 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/03/164903/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 63e47cb..39742b9 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -27,7 +27,7 @@
 
 import pywikibot
 from pywikibot import config, login
-from pywikibot.tools import MediaWikiVersion as LV
+from pywikibot.tools import MediaWikiVersion as LV, deprecated
 from pywikibot.exceptions import Server504Error, FatalServerError, Error
 
 import sys
@@ -91,6 +91,7 @@
 
 
 class EnableSSLSiteWrapper(object):
+
 Wrapper to change the site protocol to https.
 
 def __init__(self, site):
@@ -188,12 +189,13 @@
 self.params = {}
 if action not in kwargs:
 raise ValueError('action' specification missing from Request.)
+self.action = kwargs['action']
 self.update(**kwargs)
 self._warning_handler = None
 # Actions that imply database updates on the server, used for various
 # things like throttling or skipping actions when we're in simulation
 # mode
-self.write = self.params[action] in (
+self.write = self.action in (
 edit, move, rollback, delete, undelete,
 protect, block, unblock, watch, patrol,
 import, userrights, upload, emailuser,
@@ -216,13 +218,13 @@
 # This situation is only tripped when one of the first actions
 # on the site is a write action and the extension isn't installed.
 if ((self.write and LV(self.site.version()) = LV(1.23)) or
-(self.params['action'] == 'edit' and
+(self.action == 'edit' and
  self.site.has_extension('AssertEdit'))):
 pywikibot.debug(uAdding user assertion, _logger)
 self.params[assert] = user  # make sure user is logged in
 
 if (self.site.protocol() == 'http' and (config.use_SSL_always or (
-self.params[action] == login and config.use_SSL_onlogin))
+self.action == 'login' and config.use_SSL_onlogin))
 and self.site.family.name in config.available_ssl_project):
 self.site = EnableSSLSiteWrapper(self.site)
 
@@ -231,6 +233,27 @@
 return self.params[key]
 
 def __setitem__(self, key, value):
+Set MediaWiki API request parameter.
+
+@param key: param key
+@type key: basestring
+@param value: param value
+@type value: list of unicode, unicode, or str in site encoding
+Any string type may use a |-separated list
+
+# Allow site encoded bytes (note: str is a subclass of bytes in py2)
+if isinstance(value, bytes):
+value = value.decode(self.site.encoding())
+
+if isinstance(value, basestring):
+value = value.split(|)
+
+try:
+iter(value)
+except TypeError:
+# convert any non-iterable value into a single-element list
+value = [str(value)]
+
 self.params[key] = value
 
 def __delitem__(self, key):
@@ -272,29 +295,21 @@
 except TypeError:
 self.mime_params = {} if value else None
 
+@deprecated('_http_param_string')
 def http_params(self):
-Return the parameters formatted for inclusion in an HTTP request.
+Return the parameters formatted for inclusion in an HTTP request.
+self._add_defaults()
+return self._http_param_string()
 
-self.params MUST be either
-   list of unicode
-   unicode (may be |-separated list)
-   str in site encoding (may be |-separated list)
-
+def _add_defaults(self):
+if hasattr(self, '__defaulted'):
+return
+
   

[MediaWiki-commits] [Gerrit] build: Clean up Grunt config and add missing csscomb run - change (oojs/ui)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: build: Clean up Grunt config and add missing csscomb run
..

build: Clean up Grunt config and add missing csscomb run

Follows-up 953c46c4cdaf89d79c5.

* Fix csscomb configuration to include stylesheets not currently
  being cleaned up:
  - oojs-ui-mediawiki*.css
  - oojs-ui-*.svg.css
  - oojs-ui-*.svg.rtl.css

* Simplified csscomb conf using Grunt file expand pattern.

* Phase out extra 'dist-temp' directory in repository root.
  Handle inside 'dist/' instead.

* Trim duplicate slashes in 'copy' task
  Running copy:lessTemp
  - Reading src/styles/Dialog.less...OK
  - Writing dist/tmp//styles/Dialog.less...OK
  Running copy:svg (copy) task
  - Reading dist/tmp/themes/apex/images/icons/add.svg...OK
  - Writing dist//themes/apex/images/icons/add.svg...OK

* Rename colorize-svg task config 'files.src' to 'srcDir'.

  The 'files' config is reserved in Grunt for a specific kind of
  value (string pattern, array of strings patterns or array of
  descriptor objects). Most of our file tasks use this pattern
  (jshint, jscs, less, uglify, svg2png, etc.).

  However colorize-svg, as it is, does not use this pattern. It uses
  a plain object with a 'src' and 'dest' directory path.
  The 'task.files' iterator is ignored by 'colorize-svg' as it
  accesses the unprocessed 'task.data.files' directly.
  In '--verbose' mode, Grunt shows a notice for File: [no files]
  indicating the pattern is invalid and didn't match any files.

  Either it needs to be changed to an array of objects, and match
  files (not directories), or stop using the reserved property (so
  that Grunt doesn't waste time processing the invalid values, only
  to be ignored).

  http://gruntjs.com/api/inside-tasks#inside-multi-tasks
  http://gruntjs.com/configuring-tasks#options

* Simplify fileExists task (one run instead of four separate).

* Simplify file task configuration where the 'files' array contains
  a single object (pass it as the object directly).
  Also remove redundant 'cwd' properties.

* Fix incorrect documentation of VariantList#getVariant.

* Fix copy/paste documentation of Destination#getStylesheetPath.

Change-Id: Iadc1d2bb5cd1dfb00f71e1aa7deae654d5f5ad27
---
M .gitignore
M Gruntfile.js
M build/tasks/colorize-svg.js
3 files changed, 45 insertions(+), 85 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/164904/1

diff --git a/.gitignore b/.gitignore
index 2ba97a4..7a41fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /dist/*
-/dist-temp/*
 /docs
 node_modules
 npm-debug.log
diff --git a/Gruntfile.js b/Gruntfile.js
index e8f54f1..283504b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,7 +42,7 @@
var distFile, target, module;
// We compile LESS copied to a different directory
function fixLessDirectory( fileName ) {
-   return fileName.replace( /^src\//, 'dist-temp/' );
+   return fileName.replace( /^src\//, 'dist/tmp/' );
}
for ( module in styleTargets ) {
for ( target in lessFiles ) {
@@ -84,20 +84,15 @@
 
// Build
clean: {
-   dist: 'dist/*',
-   temp: 'dist-temp/*'
+   build: 'dist/*',
+   tmp: 'dist/tmp'
},
fileExists: {
-   code: modules['oojs-ui'].scripts,
-   apex: [].concat(
+   src: modules['oojs-ui'].scripts.concat(
originalLessFiles['dist/oojs-ui-apex.css'],
-   originalLessFiles['dist/oojs-ui-apex.svg.css']
-   ),
-   minerva: [].concat(
+   originalLessFiles['dist/oojs-ui-apex.svg.css'],
originalLessFiles['dist/oojs-ui-minerva.css'],
-   
originalLessFiles['dist/oojs-ui-minerva.svg.css']
-   ),
-   mediawiki: [].concat(
+   
originalLessFiles['dist/oojs-ui-minerva.svg.css'],
originalLessFiles['dist/oojs-ui-mediawiki.css'],

originalLessFiles['dist/oojs-ui-mediawiki.svg.css']
)
@@ -128,14 +123,10 @@
report: 'gzip'
},
js: {
-   files: [ {
-   expand: true,
-   cwd: 'dist/',
-   src: '*.js',
-   dest: 'dist/',
-   ext: '.min.js',
-  

[MediaWiki-commits] [Gerrit] InsertFile JavaApplet changes - change (mediawiki...BlueSpiceExtensions)

[Tweichart (Code Review)]

Tweichart has uploaded a new change for review.

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

Change subject: InsertFile JavaApplet changes
..

InsertFile JavaApplet changes

* signed java applet
* moved .class to .jar to sign
* added .crt file for import
* decompiled .class toi make changes in the applet
* removed some unnecessary code from the applet
* changed return value to a json string
* applet inclusion in js changed
* return values are now handled in the return method in js, no js will be 
called from within the applet

Change-Id: Ia989924e8f588a436b4a11a542c4ea9c0c841d72
---
M InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
A InsertLink/vendor/HWFileChooserApplet.jar
A InsertLink/vendor/src/HWFileChooserApplet.java
A InsertLink/vendor/src/insertLink
A InsertLink/vendor/src/insertLink.crt
5 files changed, 72 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/05/164905/1

diff --git a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js 
b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
index d55cb72..82a4b86 100644
--- a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
+++ b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
@@ -17,18 +17,7 @@
beforeInitComponent: function() {
this.setTitle( mw.message('bs-insertlink-tab-ext-file').plain() 
);
this.on( 'beforeactivate', function(){
-   oApplet = document.createElement('applet');
-   oBody = document.getElementsByTagName('body')[0];
-   oApplet.setAttribute('code', 
'HWFileChooserApplet.class');
-   oApplet.setAttribute('id', 'HWFileChooserApplet');
-   oApplet.setAttribute('name', 'HWFileChooserApplet');
-   oApplet.setAttribute('scriptable', 'true');
-   oApplet.setAttribute('mayscript', 'true');
-   oApplet.setAttribute('codebase', 
wgScriptPath+'/extensions/BlueSpiceExtensions/InsertLink/resources/');
-   oApplet.setAttribute('style', 
'width:0px;height:0px;padding:0;margin:0;');
-   oApplet.setAttribute('height', '1');
-   oApplet.setAttribute('width', '1');
-   oBody.appendChild(oApplet);
+   $(body).append('applet id=HWFileChooserApplet 
name=HWFileChooserApplet archive=' + wgScriptPath + 
'/extensions/BlueSpiceExtensions/InsertLink/vendor/HWFileChooserApplet.jar 
code=biz.hallowelt.InsertLink.HWFileChooserApplet.class width=1 height=1 
MAYSCRIPT/applet');
}, this);
 
this.tfTargetUrl = Ext.create( 'Ext.form.field.Text', {
@@ -42,11 +31,14 @@
id: 'inputSearchFile',
text: 
mw.message('bs-insertlink-label-searchfile').plain(),
handler: function(){
-   
document.HWFileChooserApplet.openDialog('onFileDialogFile', 
'onFileDialogCancel');
+   var result = 
document.getElementById('HWFileChooserApplet').openDialog();
+   result = $.parseJSON(result);
+   if (result.success)
+   
Ext.getCmp('BSInserLinkTargetUrl').setValue(result.path);
},
width: '25%'
});
-   
+
this.fcTargetFields = Ext.create('Ext.form.FieldContainer', {
 layout: 'hbox'
});
@@ -111,7 +103,7 @@
target = target.replace(/\\/g, '/');
target = target.replace(/ /g, '%20');
 
-   return { 
+   return {
title: title,
href: 'file:///' + target,
type: '',
diff --git a/InsertLink/vendor/HWFileChooserApplet.jar 
b/InsertLink/vendor/HWFileChooserApplet.jar
new file mode 100644
index 000..42ac1d1
--- /dev/null
+++ b/InsertLink/vendor/HWFileChooserApplet.jar
Binary files differ
diff --git a/InsertLink/vendor/src/HWFileChooserApplet.java 
b/InsertLink/vendor/src/HWFileChooserApplet.java
new file mode 100644
index 000..e14af73
--- /dev/null
+++ b/InsertLink/vendor/src/HWFileChooserApplet.java
@@ -0,0 +1,65 @@
+package biz.hallowelt.InsertLink;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import javax.swing.JApplet;
+/**
+ * for testing, comes along with code in init method
+ */
+/*import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;*/
+
+public class HWFileChooserApplet extends JApplet
+{
+  private Frame m_parent;
+  private FileDialog m_fileDialog;
+  private static final long serialVersionUID = -2662327150714792175L;
+  
+  
+  public void init() {
+ 

[MediaWiki-commits] [Gerrit] [WIP] macro/npm: Set CHROME_BIN to chromium-browser - change (integration/jenkins-job-builder-config)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: [WIP] macro/npm: Set CHROME_BIN to chromium-browser
..

[WIP] macro/npm: Set CHROME_BIN to chromium-browser

For projects using karma-chrome-launcher, set CHROME_BIN to Chromium.

By default Karma looks for google-chrome instead of chromium-browser.

Change-Id: I969a8ff360b01bfe93a030e4db8fc7e1bd1069c8
---
M macro.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/06/164906/1

diff --git a/macro.yaml b/macro.yaml
index 7920623..abbf35e 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -196,10 +196,15 @@
 # directory in the workspace, and run associated 'scripts' commands as
 # specified in the package.json file (install and test).
 #
+#
+# Set CHROME_BIN for projects using karma-chrome-launcher as our slaves have
+# Chromium instead of Chrome.
+#
 - builder:
 name: npm
 builders:
 - shell: |
+export CHROME_BIN=`which chromium-browser`
 node --version
 npm --version
 npm install
@@ -209,6 +214,7 @@
 name: npm-in
 builders:
 - shell: |
+export CHROME_BIN=`which chromium-browser`
 cd {dir}
 npm --version
 npm install

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I969a8ff360b01bfe93a030e4db8fc7e1bd1069c8
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor-qunit - change (integration/zuul-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Enable VisualEditor-qunit
..

Enable VisualEditor-qunit

On review of JJB change https://gerrit.wikimedia.org/r/#/c/163837/ the
job should only be triggered for mediawiki/extensions/VisualEditor which
is where the integration work is being done.  No point in triggering the
job from upstream repository VisualEditor/VisualEditor.

Change-Id: I6218a0bd3d06d13b794b5c03dbf4b4e064cc0193
---
M layout.yaml
1 file changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/layout.yaml b/layout.yaml
index b4b8d66..7ce4073 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1532,12 +1532,6 @@
   - name: 'mwext-VisualEditor-sync-gerrit'
 branch: ^master$
 
-  # Experimental https://gerrit.wikimedia.org/r/163837
-  # Once made voting remove it from experimental pipeline and uncomment it from
-  # the test and gate-and-submit pipelines.
-  - name: 'VisualEditor-qunit'
-voting: false
-
   # FIXME: work in progress
   - name: sartoris-sphinx-doc
 voting: false
@@ -5486,15 +5480,13 @@
   - mwext-VisualEditor-npm
   - mwext-VisualEditor-lint
   - mwext-VisualEditor-doc-test
-  #- VisualEditor-qunit
+  - VisualEditor-qunit
 gate-and-submit:
   - mediawiki-gate
   - mwext-VisualEditor-npm
   - mwext-VisualEditor-lint
   - mwext-VisualEditor-doc-test
   - experiment-gating-dependencies
-  #- VisualEditor-qunit
-experimental:
   - VisualEditor-qunit
 postmerge:
   - mwext-VisualEditor-doc-publish
@@ -5817,14 +5809,10 @@
   - VisualEditor-npm
   - VisualEditor-ruby1.9.3lint
   - VisualEditor-jsduck
-  #- VisualEditor-qunit
 gate-and-submit:
   - VisualEditor-npm
   - VisualEditor-ruby1.9.3lint
   - VisualEditor-jsduck
-  #- VisualEditor-qunit
-experimental:
-  - VisualEditor-qunit
 
   - name: wikimedia/bots/jouncebot
 check-voter:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6218a0bd3d06d13b794b5c03dbf4b4e064cc0193
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] First version of automated deployment tool - change (mediawiki...Teahouse)

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review.

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

Change subject: First version of automated deployment tool
..

First version of automated deployment tool

The Gadgetize.php maintenance script makes it easier to deploy a set of
source code files to a MediaWiki installation.

Change-Id: I3a06c4305253ffab0e076b8360b15600618d09df
---
A assets/MediaWiki_Gadget-teahouse.wiki
M gadgetize.json
M maintenance/Gadgetize.php
3 files changed, 215 insertions(+), 18 deletions(-)


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

diff --git a/assets/MediaWiki_Gadget-teahouse.wiki 
b/assets/MediaWiki_Gadget-teahouse.wiki
new file mode 100644
index 000..7391e1e
--- /dev/null
+++ b/assets/MediaWiki_Gadget-teahouse.wiki
@@ -0,0 +1 @@
+Wikipedia Teahouse - Wikimedia Deutschland e.V., Hallo Welt! - Medienwerkstatt 
GmbH, [[mw:User:Osnard|Robert Vogel]]
\ No newline at end of file
diff --git a/gadgetize.json b/gadgetize.json
index 6405a8b..5482a1c 100644
--- a/gadgetize.json
+++ b/gadgetize.json
@@ -1,20 +1,19 @@
 {
-  _includeI18N: true, //Maybe better make two properties: One for config and 
one for assets?
- 
-  MediaWiki:teahouse.js: [
-resources/teahouse.apiStore.js,
-resources/teahouse.dialog.js,
-resources/teahouse.button.js,
-resources/teahouse.init.js
-  ],
- 
-  MediaWiki:teahouse.css: [
-resources/teahouse.dialog.css,
-resources/teahouse.button.css
-  ],
- 
-  Template:Pending_Question: assets/Template_Pending_Questions.wiki,
-  Template:Answered_Question: assets/Template_Answered_Questions.wiki,
-  Module:Teahouse_Questions: assets/Module_Teahouse_Questions.lua,
-  Help:Teahouse: assets/Help_Teahouse.wiki
+   MediaWiki:Gadget-teahouse: [assets/MediaWiki_Gadget-teahouse.wiki],
+
+   MediaWiki:Gadget-teahouse/main.js: [
+   resources/mediawiki.teahouse.js,
+   resources/mediawiki.teahouse.QuestionDialog.js,
+   resources/mediawiki.teahouse.gadget.js
+   ],
+
+   MediaWiki:Gadget-teahouse/teahouse.css: [
+   resources/mediawiki.teahouse.dialog.css,
+   resources/mediawiki.teahouse.button.css
+   ],
+
+   Template:Pending_Question:  [ 
assets/Template_Pending_Questions.wiki ],
+   Template:Answered_Question: [ 
assets/Template_Answered_Questions.wiki ],
+   Module:Teahouse_Questions:  [ assets/Module_Teahouse_Questions.lua 
],
+   Help:Teahouse: [ assets/Help_Teahouse.wiki ]
 }
\ No newline at end of file
diff --git a/maintenance/Gadgetize.php b/maintenance/Gadgetize.php
index e69de29..565fbf8 100644
--- a/maintenance/Gadgetize.php
+++ b/maintenance/Gadgetize.php
@@ -0,0 +1,197 @@
+?php
+
+require_once( dirname(dirname(dirname(__DIR__))) . 
'/maintenance/Maintenance.php' );
+
+class Gadgetize extends Maintenance {
+
+   public function __construct() {
+   parent::__construct();
+
+   $this-addOption('targetapi', 'Absolute path the target wiki\'s 
api.php', true, true);
+   $this-addOption('u', 'A valid username on the target wiki with 
sufficient write permissions', true, true);
+   $this-addOption('p', 'The users password for API login. If not 
provided as argument you will be promted for it', false, true);
+   $this-addOption('config', 'Path to the JSON file with the 
configuration', false, true);
+
+   }
+
+   private $apiUrl = '';
+   private $username = '';
+   private $password = '';
+   private $config = '';
+   private $configArray = null;
+   private $cookieJar = null;
+   private $token = null;
+   private $edittoken = null;
+
+   public function execute() {
+   $this-apiUrl = $this-getOption( 'targetapi' );
+   $this-username = $this-getOption( 'u' );
+   if( empty($this-username) ) {
+   $this-error( 'username can not be empty');
+   return;
+   }
+   $this-password = $this-getOption( 'p' );
+   if( $this-password === null ) {
+   $this-password = $this-readconsole('Password for user 
'.$this-username.': ');
+   }
+   if( empty($this-password) ) {
+   $this-error( 'password can not be empty');
+   return;
+   }
+
+   $this-config = $this-getOption( 'config', 
getcwd().'/gadgetize.json' );
+   $this-configArray = FormatJson::decode(
+   file_get_contents( $this-config ),
+   true
+   );
+
+   if( $this-configArray === null ) {
+   $this-error( 'Config file could not be read');
+   return;
+   }
+
+   if( !$this-doAPILogin() ) {
+   $this-error( 

[MediaWiki-commits] [Gerrit] First version of automated deployment tool - change (mediawiki...Teahouse)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: First version of automated deployment tool
..


First version of automated deployment tool

The Gadgetize.php maintenance script makes it easier to deploy a set of
source code files to a MediaWiki installation.

Change-Id: I3a06c4305253ffab0e076b8360b15600618d09df
---
A assets/MediaWiki_Gadget-teahouse.wiki
M gadgetize.json
M maintenance/Gadgetize.php
3 files changed, 215 insertions(+), 18 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/assets/MediaWiki_Gadget-teahouse.wiki 
b/assets/MediaWiki_Gadget-teahouse.wiki
new file mode 100644
index 000..7391e1e
--- /dev/null
+++ b/assets/MediaWiki_Gadget-teahouse.wiki
@@ -0,0 +1 @@
+Wikipedia Teahouse - Wikimedia Deutschland e.V., Hallo Welt! - Medienwerkstatt 
GmbH, [[mw:User:Osnard|Robert Vogel]]
\ No newline at end of file
diff --git a/gadgetize.json b/gadgetize.json
index 6405a8b..5482a1c 100644
--- a/gadgetize.json
+++ b/gadgetize.json
@@ -1,20 +1,19 @@
 {
-  _includeI18N: true, //Maybe better make two properties: One for config and 
one for assets?
- 
-  MediaWiki:teahouse.js: [
-resources/teahouse.apiStore.js,
-resources/teahouse.dialog.js,
-resources/teahouse.button.js,
-resources/teahouse.init.js
-  ],
- 
-  MediaWiki:teahouse.css: [
-resources/teahouse.dialog.css,
-resources/teahouse.button.css
-  ],
- 
-  Template:Pending_Question: assets/Template_Pending_Questions.wiki,
-  Template:Answered_Question: assets/Template_Answered_Questions.wiki,
-  Module:Teahouse_Questions: assets/Module_Teahouse_Questions.lua,
-  Help:Teahouse: assets/Help_Teahouse.wiki
+   MediaWiki:Gadget-teahouse: [assets/MediaWiki_Gadget-teahouse.wiki],
+
+   MediaWiki:Gadget-teahouse/main.js: [
+   resources/mediawiki.teahouse.js,
+   resources/mediawiki.teahouse.QuestionDialog.js,
+   resources/mediawiki.teahouse.gadget.js
+   ],
+
+   MediaWiki:Gadget-teahouse/teahouse.css: [
+   resources/mediawiki.teahouse.dialog.css,
+   resources/mediawiki.teahouse.button.css
+   ],
+
+   Template:Pending_Question:  [ 
assets/Template_Pending_Questions.wiki ],
+   Template:Answered_Question: [ 
assets/Template_Answered_Questions.wiki ],
+   Module:Teahouse_Questions:  [ assets/Module_Teahouse_Questions.lua 
],
+   Help:Teahouse: [ assets/Help_Teahouse.wiki ]
 }
\ No newline at end of file
diff --git a/maintenance/Gadgetize.php b/maintenance/Gadgetize.php
index e69de29..565fbf8 100644
--- a/maintenance/Gadgetize.php
+++ b/maintenance/Gadgetize.php
@@ -0,0 +1,197 @@
+?php
+
+require_once( dirname(dirname(dirname(__DIR__))) . 
'/maintenance/Maintenance.php' );
+
+class Gadgetize extends Maintenance {
+
+   public function __construct() {
+   parent::__construct();
+
+   $this-addOption('targetapi', 'Absolute path the target wiki\'s 
api.php', true, true);
+   $this-addOption('u', 'A valid username on the target wiki with 
sufficient write permissions', true, true);
+   $this-addOption('p', 'The users password for API login. If not 
provided as argument you will be promted for it', false, true);
+   $this-addOption('config', 'Path to the JSON file with the 
configuration', false, true);
+
+   }
+
+   private $apiUrl = '';
+   private $username = '';
+   private $password = '';
+   private $config = '';
+   private $configArray = null;
+   private $cookieJar = null;
+   private $token = null;
+   private $edittoken = null;
+
+   public function execute() {
+   $this-apiUrl = $this-getOption( 'targetapi' );
+   $this-username = $this-getOption( 'u' );
+   if( empty($this-username) ) {
+   $this-error( 'username can not be empty');
+   return;
+   }
+   $this-password = $this-getOption( 'p' );
+   if( $this-password === null ) {
+   $this-password = $this-readconsole('Password for user 
'.$this-username.': ');
+   }
+   if( empty($this-password) ) {
+   $this-error( 'password can not be empty');
+   return;
+   }
+
+   $this-config = $this-getOption( 'config', 
getcwd().'/gadgetize.json' );
+   $this-configArray = FormatJson::decode(
+   file_get_contents( $this-config ),
+   true
+   );
+
+   if( $this-configArray === null ) {
+   $this-error( 'Config file could not be read');
+   return;
+   }
+
+   if( !$this-doAPILogin() ) {
+   $this-error( 'Authentication failed' );
+   return;
+   

[MediaWiki-commits] [Gerrit] Minor changes for further development - change (mediawiki...Teahouse)

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review.

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

Change subject: Minor changes for further development
..

Minor changes for further development

Nothing important to see here.

Change-Id: I63298efb9306391d74324e5b69085b41ee218eff
---
M Teahouse.php
A resources/mediawiki.teahouse.gadget.development.js
M resources/mediawiki.teahouse.gadget.js
M resources/mediawiki.teahouse.js
4 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Teahouse 
refs/changes/09/164909/1

diff --git a/Teahouse.php b/Teahouse.php
index bfce93f..233e27e 100644
--- a/Teahouse.php
+++ b/Teahouse.php
@@ -35,7 +35,8 @@
 $wgResourceModules['ext.teahouse'] = array(
'scripts' = array(
'mediawiki.teahouse.js',
-   'mediawiki.teahouse.gadget.js'
+   //'mediawiki.teahouse.gadget.js',
+   'mediawiki.teahouse.gadget.development.js'
),
'messages' = array(
'th-button-text',
diff --git a/resources/mediawiki.teahouse.gadget.development.js 
b/resources/mediawiki.teahouse.gadget.development.js
new file mode 100644
index 000..4fa0e54
--- /dev/null
+++ b/resources/mediawiki.teahouse.gadget.development.js
@@ -0,0 +1,4 @@
+mw.teahouse.init({
+   linkLabel: 'Frage stellen',
+   linkDescription: 'Hier klicken um der Community eine Frage über die 
Wikipedia zu stellen'
+});
\ No newline at end of file
diff --git a/resources/mediawiki.teahouse.gadget.js 
b/resources/mediawiki.teahouse.gadget.js
index 4fa0e54..caca84b 100644
--- a/resources/mediawiki.teahouse.gadget.js
+++ b/resources/mediawiki.teahouse.gadget.js
@@ -1,4 +1 @@
-mw.teahouse.init({
-   linkLabel: 'Frage stellen',
-   linkDescription: 'Hier klicken um der Community eine Frage über die 
Wikipedia zu stellen'
-});
\ No newline at end of file
+mw.teahouse.init();
\ No newline at end of file
diff --git a/resources/mediawiki.teahouse.js b/resources/mediawiki.teahouse.js
index bf3ff3e..d00d189 100644
--- a/resources/mediawiki.teahouse.js
+++ b/resources/mediawiki.teahouse.js
@@ -6,7 +6,7 @@
 */
var _config = {
basePage: 'Project:Teahouse',
-   linkLabel: 'Ask a question', //We make this a setting because 
involving
+   linkLabel: 'Ask your question', //We make this a setting 
because involving
//the I18N system for just one entry that is almost always 
needed is
//a waste of resources
linkDescription: 'Click here to submit a question about 
Wikipedia to the community'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63298efb9306391d74324e5b69085b41ee218eff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Teahouse
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Minor changes for further development - change (mediawiki...Teahouse)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: Minor changes for further development
..


Minor changes for further development

Nothing important to see here.

Change-Id: I63298efb9306391d74324e5b69085b41ee218eff
---
M Teahouse.php
A resources/mediawiki.teahouse.gadget.development.js
M resources/mediawiki.teahouse.gadget.js
M resources/mediawiki.teahouse.js
4 files changed, 8 insertions(+), 6 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/Teahouse.php b/Teahouse.php
index bfce93f..233e27e 100644
--- a/Teahouse.php
+++ b/Teahouse.php
@@ -35,7 +35,8 @@
 $wgResourceModules['ext.teahouse'] = array(
'scripts' = array(
'mediawiki.teahouse.js',
-   'mediawiki.teahouse.gadget.js'
+   //'mediawiki.teahouse.gadget.js',
+   'mediawiki.teahouse.gadget.development.js'
),
'messages' = array(
'th-button-text',
diff --git a/resources/mediawiki.teahouse.gadget.development.js 
b/resources/mediawiki.teahouse.gadget.development.js
new file mode 100644
index 000..4fa0e54
--- /dev/null
+++ b/resources/mediawiki.teahouse.gadget.development.js
@@ -0,0 +1,4 @@
+mw.teahouse.init({
+   linkLabel: 'Frage stellen',
+   linkDescription: 'Hier klicken um der Community eine Frage über die 
Wikipedia zu stellen'
+});
\ No newline at end of file
diff --git a/resources/mediawiki.teahouse.gadget.js 
b/resources/mediawiki.teahouse.gadget.js
index 4fa0e54..caca84b 100644
--- a/resources/mediawiki.teahouse.gadget.js
+++ b/resources/mediawiki.teahouse.gadget.js
@@ -1,4 +1 @@
-mw.teahouse.init({
-   linkLabel: 'Frage stellen',
-   linkDescription: 'Hier klicken um der Community eine Frage über die 
Wikipedia zu stellen'
-});
\ No newline at end of file
+mw.teahouse.init();
\ No newline at end of file
diff --git a/resources/mediawiki.teahouse.js b/resources/mediawiki.teahouse.js
index bf3ff3e..d00d189 100644
--- a/resources/mediawiki.teahouse.js
+++ b/resources/mediawiki.teahouse.js
@@ -6,7 +6,7 @@
 */
var _config = {
basePage: 'Project:Teahouse',
-   linkLabel: 'Ask a question', //We make this a setting because 
involving
+   linkLabel: 'Ask your question', //We make this a setting 
because involving
//the I18N system for just one entry that is almost always 
needed is
//a waste of resources
linkDescription: 'Click here to submit a question about 
Wikipedia to the community'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63298efb9306391d74324e5b69085b41ee218eff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Teahouse
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Fix reference snaks handling in ClaimHtmlGenerator - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Fix reference snaks handling in ClaimHtmlGenerator
..

Fix reference snaks handling in ClaimHtmlGenerator

If we pass $reference-getSnaks() as a constructor param
for ByPropertyIdArray, then in some situations the snaks
in the reference itself are getting cast to array and then
HashArray-setElement() has an array instead of SnakList
which causes an uncaught exception.

Instead storing $snaks as a local variable and converting
that to an array, when instantiating the ByPropertyIdArray,
then this issue is avoided and the code will be more robust.

Bug: 71479
Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
(cherry picked from commit 93e2dfb282e8997274b28b0d8f134bb9369187bc)
---
M repo/includes/ClaimHtmlGenerator.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/repo/includes/ClaimHtmlGenerator.php 
b/repo/includes/ClaimHtmlGenerator.php
index 165f8e0..1ce9220 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -121,7 +121,7 @@
 * @return string
 */
protected function getHtmlForQualifiers( Snaks $qualifiers, array 
$entityInfo ) {
-   $qualifiersByProperty = new ByPropertyIdArray( $qualifiers );
+   $qualifiersByProperty = new ByPropertyIdArray( 
iterator_to_array( $qualifiers ) );
$qualifiersByProperty-buildIndex();
 
$snaklistviewsHtml = '';
@@ -171,7 +171,9 @@
 * @return string
 */
protected function getHtmlForReference( $reference, array $entityInfo ) 
{
-   $referenceSnaksByProperty = new ByPropertyIdArray( 
$reference-getSnaks() );
+   $snaks = $reference-getSnaks();
+
+   $referenceSnaksByProperty = new ByPropertyIdArray( 
iterator_to_array( $snaks ) );
$referenceSnaksByProperty-buildIndex();
 
$snaklistviewsHtml = '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Pass string to wfTemplate in FingerprintView instead of Message - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Pass string to wfTemplate in FingerprintView instead of Message
..

Pass string to wfTemplate in FingerprintView instead of Message

there might be more weirdness going on but this appears to be
at least a contributing factor for the issues with Q72 *not*
rendering (or purging).

Bug: 71479
Change-Id: I4ec913a23d72af76dbf80dd1e239e00819ca52e7
(cherry picked from commit c48f4ec4b800975aab84a6df1afd67b2e077)
---
M repo/includes/View/FingerprintView.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/View/FingerprintView.php 
b/repo/includes/View/FingerprintView.php
index e4326ea..34dafec 100644
--- a/repo/includes/View/FingerprintView.php
+++ b/repo/includes/View/FingerprintView.php
@@ -75,7 +75,7 @@
 
if ( $entityId !== null ) {
$id = $entityId-getSerialization();
-   $idInParentheses = wfMessage( 'parentheses', $id );
+   $idInParentheses = wfMessage( 'parentheses', $id 
)-text();
}
 
if ( $hasLabel ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ec913a23d72af76dbf80dd1e239e00819ca52e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] First initialize sitelinklistview, then attach events - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: First initialize sitelinklistview, then attach events
..

First initialize sitelinklistview, then attach events

This improves performance substantially with a lot of sitelinks.

Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
(cherry picked from commit 40a149bb38aad093aca04e5273c493f3c5120103)
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 18 insertions(+), 18 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index fce3526..ba1748c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
 
// Encapsulate sitelinkviews by suppressing their events:
this.$listview
+   .listview( {
+   listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
+   listItemWidget: listItemWidget,
+   listItemWidgetValueAccessor: 'value',
+   newItemOptionsFn: function( value ) {
+   return {
+   value: value,
+   getAllowedSiteIds: function() {
+   return 
self._getUnusedAllowedSiteIds();
+   },
+   entityStore: 
self.options.entityStore
+   };
+   }
+   } ),
+   value: self.options.value || null,
+   listItemNodeName: 'TR'
+   } )
.on( prefix + 'change.' + this.widgetName, function( event ) {
event.stopPropagation();
self._trigger( 'change' );
@@ -179,24 +196,7 @@
self._refreshTableHeader();
self._trigger( 'change' );
}
-   )
-   .listview( {
-   listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
-   listItemWidget: listItemWidget,
-   listItemWidgetValueAccessor: 'value',
-   newItemOptionsFn: function( value ) {
-   return {
-   value: value,
-   getAllowedSiteIds: function() {
-   return 
self._getUnusedAllowedSiteIds();
-   },
-   entityStore: 
self.options.entityStore
-   };
-   }
-   } ),
-   value: self.options.value || null,
-   listItemNodeName: 'TR'
-   } );
+   );
},
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Fix editing of properties, once again - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Fix editing of properties, once again
..

Fix editing of properties, once again

the better solution would be to properly split the entityview
into a propertyview and itemview, but that is too much for
something we want to backport.

Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
(cherry picked from commit ed085a86471daa9c09a69179b38fb7733adcbb24)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 14 insertions(+), 9 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f323c34..1272bd6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -366,15 +366,20 @@
if( this.$fingerprints ) {
this.$fingerprints.data( 'fingerprintgroupview' 
)[state]();
}
-   this.$claims.data( 'claimgrouplistview' )[state]();
-   // TODO: Resolve integration of referenceviews
-   this.$claims.find( '.wb-statement-references' ).each( 
function() {
-   var $listview = $( this ).children( 
':wikibase-listview' );
-   if( $listview.length ) {
-   $listview.data( 'listview' )[state]();
-   }
-   } );
-   if( this.$siteLinks.length  0 ) {
+
+   // horrible, horrible hack until we have proper item and 
property views
+   if( this.$claims ) {
+   this.$claims.data( 'claimgrouplistview' )[state]();
+   // TODO: Resolve integration of referenceviews
+   this.$claims.find( '.wb-statement-references' ).each( 
function() {
+   var $listview = $( this ).children( 
':wikibase-listview' );
+   if( $listview.length ) {
+   $listview.data( 'listview' )[state]();
+   }
+   } );
+   }
+
+   if( this.$siteLinks  this.$siteLinks.length  0 ) {
this.$siteLinks.data( 'sitelinkgrouplistview' 
)[state]();
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix jjb diff job not comparing parent patchset - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Fix jjb diff job not comparing parent patchset
..

Fix jjb diff job not comparing parent patchset

When a patchset is proposed and has an uncommited parent, Zuul creates a
merge commit of the two patchests on the tip of master.  HEAD^ ends up
referring to master when we really care about the parent patchset.

Lame ascii graph:

* Zuul merge commit
| * Patch 2
| * Patch 1
|/
* master

The diff of Patch 2 should be done with Patch 1.

rev-parse 'Zuul merge commit'^1  - master
rev-parse 'Zuul merge commit'^2  - Patch 1

In case the serie of patches is fast forward, Zuul craft a reference to
Patch 2:

* Patch 2
* Patch 1
* master

In this case:

rev-parse HEAD^2  - git exits 128

So || to fallback to ^1:

rev-parse HEAD^1  - Patch 1

Change-Id: I76826de23bfcb870d7d64d09504413858fe6a3bc
---
M integration.yaml
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/15/164915/1

diff --git a/integration.yaml b/integration.yaml
index 6ee8d0b..faa4734 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -90,8 +90,12 @@
 echo Generating config for proposed patchset...
 tox -e venv -- jenkins-jobs test $WORKSPACE/config -o 
$WORKSPACE/output-proposed
 
-echo Generating reference config from parent...
-(cd $WORKSPACE/config; git checkout HEAD^)
+echo Generating reference config from parent patchset...
+# In case of a Zuul merge commit, the parent patchset we care about is
+# the second parent which can be refered to as HEAD^2. Though if the
+# patch is fast forwarded it does not exist and we need the first
+# parent ie HEAD^1
+(cd $WORKSPACE/config; git checkout HEAD^2 || git checkout HEAD^1)
 tox -e venv -- jenkins-jobs test $WORKSPACE/config -o 
$WORKSPACE/output-parent
 
 echo 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76826de23bfcb870d7d64d09504413858fe6a3bc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] End stats.wikimedia.org certificate in newline - change (operations/puppet)

[QChris (Code Review)]

QChris has uploaded a new change for review.

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

Change subject: End stats.wikimedia.org certificate in newline
..

End stats.wikimedia.org certificate in newline

Without the newline, the certificates get concatenated directly, which
makes apache fail.

Bug: 71686
RT: 8554
Change-Id: I1c4d5a05df04111a4efaab50259433123902ac1c
---
M files/ssl/stats.wikimedia.org.crt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/164914/1

diff --git a/files/ssl/stats.wikimedia.org.crt 
b/files/ssl/stats.wikimedia.org.crt
index 99b215b..625200a 100644
--- a/files/ssl/stats.wikimedia.org.crt
+++ b/files/ssl/stats.wikimedia.org.crt
@@ -27,4 +27,4 @@
 kCgSr4kmQIvNUCZLqk3280eBmvR/nXWJnKI3bzI2fc+UlpsmB7EKzP8q6uKpjPiv
 s49vbxSKPItO0aIIPbT32Dj0Gk3JT3QkPpV1HqzuJ1oLfewIY77i6up48AYoX0tv
 jIkEC5kCStZy+Ud37Gw784K3q2+V48NM61++u6V0n18=
--END CERTIFICATE-
\ No newline at end of file
+-END CERTIFICATE-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c4d5a05df04111a4efaab50259433123902ac1c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at

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

[MediaWiki-commits] [Gerrit] Fix / use dieException in SetClaim - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix / use dieException in SetClaim
..


Fix / use dieException in SetClaim

dieException is here because of bug 71479
which is being investigated.

Change-Id: I6e402de523cebdd35e68d0ea958720f3e9266cef
---
M repo/includes/api/SetClaim.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aude: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 3107534..d3a898d 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -88,7 +88,7 @@
wfDebugLog( 'wikibase-debug', Failed to set claim on 
entity $prefixedId: 
. var_export( $params, true ) );
 
-   $this-dieError( 'Failed to save claim.' );
+   $this-dieException( $ex, 'invalid-claim' );
}
 
$this-getResultBuilder()-markSuccess();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e402de523cebdd35e68d0ea958720f3e9266cef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] End stats.wikimedia.org certificate in newline - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: End stats.wikimedia.org certificate in newline
..


End stats.wikimedia.org certificate in newline

Without the newline, the certificates get concatenated directly, which
makes apache fail.

Bug: 71686
RT: 8554
Change-Id: I1c4d5a05df04111a4efaab50259433123902ac1c
---
M files/ssl/stats.wikimedia.org.crt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/files/ssl/stats.wikimedia.org.crt 
b/files/ssl/stats.wikimedia.org.crt
index 99b215b..625200a 100644
--- a/files/ssl/stats.wikimedia.org.crt
+++ b/files/ssl/stats.wikimedia.org.crt
@@ -27,4 +27,4 @@
 kCgSr4kmQIvNUCZLqk3280eBmvR/nXWJnKI3bzI2fc+UlpsmB7EKzP8q6uKpjPiv
 s49vbxSKPItO0aIIPbT32Dj0Gk3JT3QkPpV1HqzuJ1oLfewIY77i6up48AYoX0tv
 jIkEC5kCStZy+Ud37Gw784K3q2+V48NM61++u6V0n18=
--END CERTIFICATE-
\ No newline at end of file
+-END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c4d5a05df04111a4efaab50259433123902ac1c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] Stop sending mail to the IMAP server (sanger) - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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

Change subject: Stop sending mail to the IMAP server (sanger)
..

Stop sending mail to the IMAP server (sanger)

Change-Id: I1eb1ae65263aac343625129609f0a93e345ac677
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/164916/1

diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb 
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index ec4e868..514c2f0 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -486,7 +486,6 @@
local_part_suffix_optional
transport = remote_smtp
route_list = *  aspmx.l.google.com
-   unseen
 
 # LDAP accounts
 ldap_account:
@@ -520,16 +519,6 @@

{user=cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org pass=LDAPPASSWORD \

ldap:///ou=people,dc=corp,dc=wikimedia,dc=org?mail?sub?((objectClass=inetOrgPerson)(initials=${quote_ldap:$local_part}@$domain)(x121Address=1))}
 \
{$value}fail}
-
-# Send mail for IMAP accounts to the IMAP server
-imap:
-   driver = manualroute
-   domains = wikimedia.org
-   local_parts = lsearch;CONFDIR/imap_accounts
-   local_part_suffix = +*
-   local_part_suffix_optional
-   transport = remote_smtp
-   route_list = *  sanger.wikimedia.org
 
 # send phabricator.wm.org emails to Phabricator
 phabricator:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb1ae65263aac343625129609f0a93e345ac677
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Stop sending mail to the IMAP server (sanger) - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Stop sending mail to the IMAP server (sanger)
..


Stop sending mail to the IMAP server (sanger)

Change-Id: I1eb1ae65263aac343625129609f0a93e345ac677
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb 
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index ec4e868..514c2f0 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -486,7 +486,6 @@
local_part_suffix_optional
transport = remote_smtp
route_list = *  aspmx.l.google.com
-   unseen
 
 # LDAP accounts
 ldap_account:
@@ -520,16 +519,6 @@

{user=cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org pass=LDAPPASSWORD \

ldap:///ou=people,dc=corp,dc=wikimedia,dc=org?mail?sub?((objectClass=inetOrgPerson)(initials=${quote_ldap:$local_part}@$domain)(x121Address=1))}
 \
{$value}fail}
-
-# Send mail for IMAP accounts to the IMAP server
-imap:
-   driver = manualroute
-   domains = wikimedia.org
-   local_parts = lsearch;CONFDIR/imap_accounts
-   local_part_suffix = +*
-   local_part_suffix_optional
-   transport = remote_smtp
-   route_list = *  sanger.wikimedia.org
 
 # send phabricator.wm.org emails to Phabricator
 phabricator:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1eb1ae65263aac343625129609f0a93e345ac677
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Move TimestampException to exception directory - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Move TimestampException to exception directory
..

Move TimestampException to exception directory

Change-Id: Id3829cbd155636839a272dc7e28e45bee7b87e8b
---
M includes/AutoLoader.php
R includes/exception/TimestampException.php
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/164917/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 50fcd61..2a45fc3 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -164,7 +164,6 @@
'StubObject' = 'includes/StubObject.php',
'StubUserLang' = 'includes/StubObject.php',
'MWTimestamp' = 'includes/MWTimestamp.php',
-   'TimestampException' = 'includes/TimestampException.php',
'Title' = 'includes/Title.php',
'TitleArray' = 'includes/TitleArray.php',
'TitleArrayFromResult' = 'includes/TitleArrayFromResult.php',
@@ -500,6 +499,7 @@
'UserBlockedError' = 'includes/exception/UserBlockedError.php',
'UserNotLoggedIn' = 'includes/exception/UserNotLoggedIn.php',
'ThrottledError' = 'includes/exception/ThrottledError.php',
+   'TimestampException' = 'includes/exception/TimestampException.php',
'ReadOnlyError' = 'includes/exception/ReadOnlyError.php',
'PermissionsError' = 'includes/exception/PermissionsError.php',
'MWException' = 'includes/exception/MWException.php',
diff --git a/includes/TimestampException.php 
b/includes/exception/TimestampException.php
similarity index 100%
rename from includes/TimestampException.php
rename to includes/exception/TimestampException.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3829cbd155636839a272dc7e28e45bee7b87e8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add tracking categories for files with attribution problems - change (operations/mediawiki-config)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add tracking categories for files with attribution problems
..

Add tracking categories for files with attribution problems

See I43ed79b6a54cd31820ecae8139e29c5880f5dd1b

Change-Id: I3b01d304094ee013acd9415a51d790666d408f36
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/859
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 36d6aa6..01e1299 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1914,6 +1914,7 @@
 
 if ( $wmgUseCommonsMetadata ) {
require_once( $IP/extensions/CommonsMetadata/CommonsMetadata.php );
+   $wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
 }
 
 if ( $wmgUseGWToolset ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e248e27..0cbbd35 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11034,6 +11034,10 @@
'labswiki' = false,
 ),
 
+'wmgCommonsMetadataSetTrackingCategories' = array(
+   'default' = true,
+),
+
 // NOTE: Extension:Popups has a hard dependency on TextExtracts and PageImages.
 // @todo The pattern everywhere but loginwiki and votewiki repeats 32 times 
in this file.
 'wmgUsePopups' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b01d304094ee013acd9415a51d790666d408f36
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix reference snaks handling in ClaimHtmlGenerator - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix reference snaks handling in ClaimHtmlGenerator
..


Fix reference snaks handling in ClaimHtmlGenerator

If we pass $reference-getSnaks() as a constructor param
for ByPropertyIdArray, then in some situations the snaks
in the reference itself are getting cast to array and then
HashArray-setElement() has an array instead of SnakList
which causes an uncaught exception.

Instead storing $snaks as a local variable and converting
that to an array, when instantiating the ByPropertyIdArray,
then this issue is avoided and the code will be more robust.

Bug: 71479
Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
(cherry picked from commit 93e2dfb282e8997274b28b0d8f134bb9369187bc)
---
M repo/includes/ClaimHtmlGenerator.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/repo/includes/ClaimHtmlGenerator.php 
b/repo/includes/ClaimHtmlGenerator.php
index 165f8e0..1ce9220 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -121,7 +121,7 @@
 * @return string
 */
protected function getHtmlForQualifiers( Snaks $qualifiers, array 
$entityInfo ) {
-   $qualifiersByProperty = new ByPropertyIdArray( $qualifiers );
+   $qualifiersByProperty = new ByPropertyIdArray( 
iterator_to_array( $qualifiers ) );
$qualifiersByProperty-buildIndex();
 
$snaklistviewsHtml = '';
@@ -171,7 +171,9 @@
 * @return string
 */
protected function getHtmlForReference( $reference, array $entityInfo ) 
{
-   $referenceSnaksByProperty = new ByPropertyIdArray( 
$reference-getSnaks() );
+   $snaks = $reference-getSnaks();
+
+   $referenceSnaksByProperty = new ByPropertyIdArray( 
iterator_to_array( $snaks ) );
$referenceSnaksByProperty-buildIndex();
 
$snaklistviewsHtml = '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] * Add extra language Inari Saami (smn) - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: * Add extra language Inari Saami (smn)
..

* Add extra language Inari Saami (smn)

As requested in
https://translatewiki.net/wiki/Thread:Support/Requesting_the_addition_of_Inari_S%C3%A1mi_for_translations

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/19/164919/1

diff --git a/FallbackSettings.php b/FallbackSettings.php
index 0a6ffd8..e9eb63d 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -103,6 +103,7 @@
 $wgTranslateLanguageFallbacks['sli'] = array( 'pl', 'szl' );
 $wgTranslateLanguageFallbacks['sly'] = array( 'id' );
 $wgTranslateLanguageFallbacks['sma'] = array( 'sv', 'nb', 'se' );
+$wgTranslateLanguageFallbacks['smn'] = array( 'fi', 'sma' );
 $wgTranslateLanguageFallbacks['sv'] = array( 'da', 'nb', 'nn' ); # Siebrand 
2008-03-23
 $wgTranslateLanguageFallbacks['swb'] = 'sw';
 $wgTranslateLanguageFallbacks['tet'] = 'pt';
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 36f3d10..1b0ef4b 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -332,6 +332,7 @@
 $wgExtraLanguageNames['jdt-cyrl'] = 'жугьури'; # Judeo-Tat / Siebrand 
2014-06-17
 $wgExtraLanguageNames['kjh'] = 'хакас'; # Khakas / Amire80 2014-06-17
 $wgExtraLanguageNames['cnh'] = 'Lai holh'; # Haka Chin / Siebrand 2014-08-06
+$wgExtraLanguageNames['smn'] = 'Anarâškielâ'; # Inari Saami / Siebrand 
2014-10-06
 
 $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/164919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df4197bcfe66ff2d0a2a7b3d072e04c6fabab22
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl

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

[MediaWiki-commits] [Gerrit] Fix editing of properties, once again - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix editing of properties, once again
..


Fix editing of properties, once again

the better solution would be to properly split the entityview
into a propertyview and itemview, but that is too much for
something we want to backport.

Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
(cherry picked from commit ed085a86471daa9c09a69179b38fb7733adcbb24)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 14 insertions(+), 9 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f323c34..1272bd6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -366,15 +366,20 @@
if( this.$fingerprints ) {
this.$fingerprints.data( 'fingerprintgroupview' 
)[state]();
}
-   this.$claims.data( 'claimgrouplistview' )[state]();
-   // TODO: Resolve integration of referenceviews
-   this.$claims.find( '.wb-statement-references' ).each( 
function() {
-   var $listview = $( this ).children( 
':wikibase-listview' );
-   if( $listview.length ) {
-   $listview.data( 'listview' )[state]();
-   }
-   } );
-   if( this.$siteLinks.length  0 ) {
+
+   // horrible, horrible hack until we have proper item and 
property views
+   if( this.$claims ) {
+   this.$claims.data( 'claimgrouplistview' )[state]();
+   // TODO: Resolve integration of referenceviews
+   this.$claims.find( '.wb-statement-references' ).each( 
function() {
+   var $listview = $( this ).children( 
':wikibase-listview' );
+   if( $listview.length ) {
+   $listview.data( 'listview' )[state]();
+   }
+   } );
+   }
+
+   if( this.$siteLinks  this.$siteLinks.length  0 ) {
this.$siteLinks.data( 'sitelinkgrouplistview' 
)[state]();
}
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Pass string to wfTemplate in FingerprintView instead of Message - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Pass string to wfTemplate in FingerprintView instead of Message
..


Pass string to wfTemplate in FingerprintView instead of Message

there might be more weirdness going on but this appears to be
at least a contributing factor for the issues with Q72 *not*
rendering (or purging).

Bug: 71479
Change-Id: I4ec913a23d72af76dbf80dd1e239e00819ca52e7
(cherry picked from commit c48f4ec4b800975aab84a6df1afd67b2e077)
---
M repo/includes/View/FingerprintView.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/includes/View/FingerprintView.php 
b/repo/includes/View/FingerprintView.php
index e4326ea..34dafec 100644
--- a/repo/includes/View/FingerprintView.php
+++ b/repo/includes/View/FingerprintView.php
@@ -75,7 +75,7 @@
 
if ( $entityId !== null ) {
$id = $entityId-getSerialization();
-   $idInParentheses = wfMessage( 'parentheses', $id );
+   $idInParentheses = wfMessage( 'parentheses', $id 
)-text();
}
 
if ( $hasLabel ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ec913a23d72af76dbf80dd1e239e00819ca52e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] First initialize sitelinklistview, then attach events - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: First initialize sitelinklistview, then attach events
..


First initialize sitelinklistview, then attach events

This improves performance substantially with a lot of sitelinks.

Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
(cherry picked from commit 40a149bb38aad093aca04e5273c493f3c5120103)
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 18 insertions(+), 18 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index fce3526..ba1748c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
 
// Encapsulate sitelinkviews by suppressing their events:
this.$listview
+   .listview( {
+   listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
+   listItemWidget: listItemWidget,
+   listItemWidgetValueAccessor: 'value',
+   newItemOptionsFn: function( value ) {
+   return {
+   value: value,
+   getAllowedSiteIds: function() {
+   return 
self._getUnusedAllowedSiteIds();
+   },
+   entityStore: 
self.options.entityStore
+   };
+   }
+   } ),
+   value: self.options.value || null,
+   listItemNodeName: 'TR'
+   } )
.on( prefix + 'change.' + this.widgetName, function( event ) {
event.stopPropagation();
self._trigger( 'change' );
@@ -179,24 +196,7 @@
self._refreshTableHeader();
self._trigger( 'change' );
}
-   )
-   .listview( {
-   listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
-   listItemWidget: listItemWidget,
-   listItemWidgetValueAccessor: 'value',
-   newItemOptionsFn: function( value ) {
-   return {
-   value: value,
-   getAllowedSiteIds: function() {
-   return 
self._getUnusedAllowedSiteIds();
-   },
-   entityStore: 
self.options.entityStore
-   };
-   }
-   } ),
-   value: self.options.value || null,
-   listItemNodeName: 'TR'
-   } );
+   );
},
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] * Add extra language Inari Saami (smn) - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: * Add extra language Inari Saami (smn)
..


* Add extra language Inari Saami (smn)

As requested in
https://translatewiki.net/wiki/Thread:Support/Requesting_the_addition_of_Inari_S%C3%A1mi_for_translations

Change-Id: I8df4197bcfe66ff2d0a2a7b3d072e04c6fabab22
---
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 0a6ffd8..e9eb63d 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -103,6 +103,7 @@
 $wgTranslateLanguageFallbacks['sli'] = array( 'pl', 'szl' );
 $wgTranslateLanguageFallbacks['sly'] = array( 'id' );
 $wgTranslateLanguageFallbacks['sma'] = array( 'sv', 'nb', 'se' );
+$wgTranslateLanguageFallbacks['smn'] = array( 'fi', 'sma' );
 $wgTranslateLanguageFallbacks['sv'] = array( 'da', 'nb', 'nn' ); # Siebrand 
2008-03-23
 $wgTranslateLanguageFallbacks['swb'] = 'sw';
 $wgTranslateLanguageFallbacks['tet'] = 'pt';
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 36f3d10..1b0ef4b 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -332,6 +332,7 @@
 $wgExtraLanguageNames['jdt-cyrl'] = 'жугьури'; # Judeo-Tat / Siebrand 
2014-06-17
 $wgExtraLanguageNames['kjh'] = 'хакас'; # Khakas / Amire80 2014-06-17
 $wgExtraLanguageNames['cnh'] = 'Lai holh'; # Haka Chin / Siebrand 2014-08-06
+$wgExtraLanguageNames['smn'] = 'Anarâškielâ'; # Inari Saami / Siebrand 
2014-10-06
 
 $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/164919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8df4197bcfe66ff2d0a2a7b3d072e04c6fabab22
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [WIP] build: Use Chrome instead of PhantomJS - change (oojs/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: [WIP] build: Use Chrome instead of PhantomJS
..

[WIP] build: Use Chrome instead of PhantomJS

Change-Id: I3a60691cd213ec70aa836090c6e562fc74c521c7
---
M Gruntfile.js
1 file changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/21/164921/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 5d4b17d..9f3ceda 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -98,7 +98,8 @@
},
captureTimeout: 9
},
-   // Run in batches due lack of concurrency limit 
(https://github.com/karma-runner/karma-sauce-launcher/issues/40)
+   // Run sauce labs browsers in batches due lack of 
concurrency limit
+   // 
(https://github.com/karma-runner/karma-sauce-launcher/issues/40)
ci1: {
browsers: [ 'slChrome', 'slFirefox', 'slIE11' ]
},
@@ -107,8 +108,8 @@
// Support IE6: 
https://github.com/karma-runner/karma/issues/983
transports: [ 'jsonp-polling' ]
},
-   phantom: {
-   browsers: [ 'PhantomJS' ],
+   quick: {
+   browsers: [ 'Chrome' ],
preprocessors: {
'dist/*.js': [ 'coverage' ]
},
@@ -118,8 +119,8 @@
{ type: 'text-summary', dir: 
'dist/coverage/' }
] }
},
-   jqphantom: {
-   browsers: [ 'PhantomJS' ],
+   jqquick: {
+   browsers: [ 'Chrome' ],
options: {
files: [
'lib/jquery.js',
@@ -130,10 +131,10 @@
}
},
local: {
-   browsers: [ 'Firefox', 'Chrome' ]
+   browsers: [ 'Chrome', 'Firefox' ]
},
bg: {
-   browsers: [ 'PhantomJS', 'Firefox', 'Chrome' ],
+   browsers: [ 'Chrome', 'Firefox' ],
singleRun: false,
background: true
}
@@ -162,7 +163,7 @@
} );
 
grunt.registerTask( 'build', [ 'clean', 'concat' ] );
-   grunt.registerTask( '_test', [ 'git-build', 'build', 'jshint', 'jscs', 
'karma:phantom', 'karma:jqphantom' ] );
+   grunt.registerTask( '_test', [ 'git-build', 'build', 'jshint', 'jscs', 
'karma:quick', 'karma:jqquick' ] );
grunt.registerTask( 'ci', [ '_test', 'karma:ci1', 'karma:ci2' ] );
grunt.registerTask( 'watch', [ 'karma:bg:start', 'runwatch' ] );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a60691cd213ec70aa836090c6e562fc74c521c7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] build: Update to karma-qunit v0.1.4 and qunitjs v1.15 - change (oojs/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: build: Update to karma-qunit v0.1.4 and qunitjs v1.15
..

build: Update to karma-qunit v0.1.4 and qunitjs v1.15

A bug in qunitjs v1.14 caused karma-qunit to report Executed 31 of 0 tests.
karma-qunit, however, hardcoded a dependency on qunitjs v1.15 making it
impossible to upgrade to qunitjs v1.15 (which fixed the bug).

karma-qunit v0.1.4 laxes its peer dependency on qunitjs to ^1.14.0 allowing
its users to use a newer version of QUnit.

Changes
* https://github.com/karma-runner/karma-qunit/commits/v0.1.4
* https://github.com/jquery/qunit/blob/1.15.0/History.md

Change-Id: Ib4f4be5679191bfba57d6dfa2aa8446525c79088
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/20/164920/1

diff --git a/package.json b/package.json
index 7cb1997..231a67f 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,9 @@
 karma-coverage: 0.2.6,
 karma-firefox-launcher: 0.1.3,
 karma-phantomjs-launcher: 0.1.4,
-karma-qunit: 0.1.3,
+karma-qunit: 0.1.4,
 karma-sauce-launcher: 0.2.10,
 qunit: 0.7.2,
-qunitjs: 1.14.0
+qunitjs: 1.15.0
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4f4be5679191bfba57d6dfa2aa8446525c79088
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Move TimestampException to exception directory - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move TimestampException to exception directory
..


Move TimestampException to exception directory

Change-Id: Id3829cbd155636839a272dc7e28e45bee7b87e8b
---
M includes/AutoLoader.php
R includes/exception/TimestampException.php
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 50fcd61..2a45fc3 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -164,7 +164,6 @@
'StubObject' = 'includes/StubObject.php',
'StubUserLang' = 'includes/StubObject.php',
'MWTimestamp' = 'includes/MWTimestamp.php',
-   'TimestampException' = 'includes/TimestampException.php',
'Title' = 'includes/Title.php',
'TitleArray' = 'includes/TitleArray.php',
'TitleArrayFromResult' = 'includes/TitleArrayFromResult.php',
@@ -500,6 +499,7 @@
'UserBlockedError' = 'includes/exception/UserBlockedError.php',
'UserNotLoggedIn' = 'includes/exception/UserNotLoggedIn.php',
'ThrottledError' = 'includes/exception/ThrottledError.php',
+   'TimestampException' = 'includes/exception/TimestampException.php',
'ReadOnlyError' = 'includes/exception/ReadOnlyError.php',
'PermissionsError' = 'includes/exception/PermissionsError.php',
'MWException' = 'includes/exception/MWException.php',
diff --git a/includes/TimestampException.php 
b/includes/exception/TimestampException.php
similarity index 100%
rename from includes/TimestampException.php
rename to includes/exception/TimestampException.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3829cbd155636839a272dc7e28e45bee7b87e8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@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] New deployment build, partial fix for bug 71479 and editing ... - change (mediawiki...Wikidata)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: New deployment build, partial fix for bug 71479 and editing 
properties
..

New deployment build, partial fix for bug 71479 and editing properties

also fix for bug 71469

Change-Id: I2b3b6ba574fd09b9610844ba2aa36ef76b920acd
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M extensions/Wikibase/repo/includes/ClaimHtmlGenerator.php
M extensions/Wikibase/repo/includes/View/FingerprintView.php
M extensions/Wikibase/repo/includes/api/MergeItems.php
M extensions/Wikibase/repo/includes/api/SetClaim.php
M vendor/composer/installed.json
10 files changed, 57 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/25/164925/1

diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 7f45a99..e5209e6 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
 ?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412261754;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589185;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 0b1e9bd..a8f8be9 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
 ?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412261754;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589185;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index cacff2a..9308ad1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,7 +1191,7 @@
 source: {
 type: git,
 url: 
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: 6f2bf7dbd02099b84bb0067d238343a7b65de690
+reference: a69dcbf461a897bcb060a9322dc59c0145f160e9
 },
 require: {
 data-values/common: ~0.2.0,
@@ -1262,7 +1262,7 @@
 issues: https://bugzilla.wikimedia.org/;,
 irc: irc://irc.freenode.net/wikidata
 },
-time: 2014-10-02 14:52:57
+time: 2014-10-06 09:25:56
 },
 {
 name: wikibase/wikimedia-badges,
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f323c34..1272bd6 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -366,15 +366,20 @@
if( this.$fingerprints ) {
this.$fingerprints.data( 'fingerprintgroupview' 
)[state]();
}
-   this.$claims.data( 'claimgrouplistview' )[state]();
-   // TODO: Resolve integration of referenceviews
-   this.$claims.find( '.wb-statement-references' ).each( 
function() {
-   var $listview = $( this ).children( 
':wikibase-listview' );
-   if( $listview.length ) {
-   $listview.data( 'listview' )[state]();
-   }
-   } );
-   if( this.$siteLinks.length  0 ) {
+
+   // horrible, horrible hack until we have proper item and 
property views
+   if( this.$claims ) {
+   this.$claims.data( 'claimgrouplistview' )[state]();
+   // TODO: Resolve integration of referenceviews
+   this.$claims.find( '.wb-statement-references' ).each( 
function() {
+   var $listview = $( this ).children( 
':wikibase-listview' );
+   if( $listview.length ) {
+   $listview.data( 'listview' )[state]();
+   }
+   } );
+   }
+
+   if( this.$siteLinks  this.$siteLinks.length  0 ) {
this.$siteLinks.data( 'sitelinkgrouplistview' 
)[state]();
}
},
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index fce3526..ba1748c 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
 
// 

[MediaWiki-commits] [Gerrit] New Wikidata Build - 06/10/2014 - change (mediawiki...Wikidata)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: New Wikidata Build - 06/10/2014
..

New Wikidata Build - 06/10/2014

Change-Id: Idc8f9bf92b31d16a3d243961f2678cd37a43ca4e
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/i18n/ce.json
M extensions/Wikibase/client/i18n/cs.json
M extensions/Wikibase/client/i18n/hu.json
M extensions/Wikibase/client/i18n/ka.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php
M extensions/Wikibase/client/resources/Resources.php
A extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
M extensions/Wikibase/lib/i18n/ce.json
M extensions/Wikibase/lib/i18n/cs.json
M extensions/Wikibase/lib/i18n/ms.json
M extensions/Wikibase/lib/i18n/roa-tara.json
M extensions/Wikibase/lib/i18n/tr.json
M extensions/Wikibase/lib/includes/parsers/EntityIdValueParser.php
M extensions/Wikibase/lib/includes/serializers/ClaimSerializer.php
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M extensions/Wikibase/lib/resources/wikibase.store/store.CombiningEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M extensions/Wikibase/lib/tests/phpunit/ChangesTableTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M extensions/Wikibase/lib/tests/phpunit/parsers/EntityIdParserTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ClaimSerializerTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ClaimsSerializerTest.php
M 
extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ItemSerializerTest.php
M extensions/Wikibase/repo/Wikibase.i18n.alias.php
M extensions/Wikibase/repo/config/Wikibase.example.php
A extensions/Wikibase/repo/config/Wikibase.searchindex.php
M extensions/Wikibase/repo/i18n/ce.json
M extensions/Wikibase/repo/i18n/el.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/fa.json
M extensions/Wikibase/repo/i18n/fi.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/id.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/ms.json
M extensions/Wikibase/repo/i18n/nl.json
M extensions/Wikibase/repo/i18n/pa.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/pt-br.json
M extensions/Wikibase/repo/i18n/ro.json
M extensions/Wikibase/repo/i18n/ru.json
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/i18n/vi.json
M extensions/Wikibase/repo/i18n/zh-hans.json
M extensions/Wikibase/repo/i18n/zh-hant.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M 

[MediaWiki-commits] [Gerrit] MT health check for the language pairs - change (mediawiki...cxserver)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: MT health check for the language pairs
..

MT health check for the language pairs

Simple test to see if the MT backend can respond to
each language pair for which cxserver is configured.
This might also prepare the processing pipelines.
This dos not test whether the machine translation is correct or not.

Change-Id: I0bb7251af8b509aae9a76946a50901337b3fea6e
---
D public/js/mt.js
A public/mt/css/main.css
M public/mt/index.html
3 files changed, 82 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/28/164928/1

diff --git a/public/js/mt.js b/public/js/mt.js
deleted file mode 100644
index 9eca076..000
--- a/public/js/mt.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*jshint browser:true, jquery:true */
-( function ( $ ) {
-   'use strict';
-
-   $( document ).ready( function () {
-   $( 'progress' ).hide();
-   $( 'button' ).click( function () {
-   $( '.targetHtmlRaw' ).text( '' );
-   $( '.targetHtmlRendered' ).html( '' );
-   $( 'progress' ).show();
-   $( '.status' ).text( 'Connecting to server...' );
-   var sourceHtml = $( 'textarea[name=sourceHtml]' ).val(),
-   sourceLanguage = $( 
'input[name=sourceLanguage]' ).val(),
-   targetLanguage = $( 
'input[name=targetLanguage]' ).val(),
-url = '/mt/' + sourceLanguage + '/' + targetLanguage;
-   $.post( url, sourceHtml, function ( response ) {
-   $( '.targetHtmlRaw' ).text( response );
-   $( '.targetHtmlRendered' ).html( response );
-   } ).fail( function () {
-   $( '.targetHtmlRendered' ).html( 
'h1Error/h1' );
-   } ).always( function () {
-   $( 'progress' ).hide();
-   } );
-   } );
-   } );
-}( jQuery ) );
diff --git a/public/mt/css/main.css b/public/mt/css/main.css
new file mode 100644
index 000..3608481
--- /dev/null
+++ b/public/mt/css/main.css
@@ -0,0 +1,46 @@
+body {
+   width: 80%;
+   margin-left: 10%;
+   color: #555;
+}
+
+label {
+   width: 20%;
+}
+
+input {
+   width: 40%;
+   padding: 5px;
+}
+
+textarea {
+   width: 100%;
+}
+.lang {
+   width: 5%;
+}
+button {
+   width: 10%;
+   padding: 5px;
+}
+.status {
+   color: grey;
+}
+
+.status.ok {
+   color: green;
+}
+
+.status.fail {
+   color: red;
+}
+
+table {
+   border-collapse: collapse;
+}
+
+table, th, td {
+   border: 1px solid #aaa;
+   width: 20%;
+   padding: 5px;
+}
\ No newline at end of file
diff --git a/public/mt/index.html b/public/mt/index.html
index 523f415..ea09d86 100644
--- a/public/mt/index.html
+++ b/public/mt/index.html
@@ -1,23 +1,38 @@
 html
-   head
-   script src=//code.jquery.com/jquery-1.10.2.min.js/script
-   titleApertium Wrapper/title
-   link rel=stylesheet href=../css/main.css type=text/css /
-   /head
-   body
-   h1Apertium Wrapper/h1
-   div class=form
-   label for=sourceHtmlEnter some HTML/labelbr
-   textarea name=sourceHtml style=width: 100%; height: 
10empsAdemás/s de Valencia. Un dos ba href=3tres/a quatre ia 
href=5cinc/a sis set/i vuit nou/b deu/p/textareabr
-   label for=sourceLanguagefrom/label
-   input class=lang name=sourceLanguage value=es /
-   label for=targetLanguageto/label
-   input class=lang name=targetLanguage value=ca /
-   buttonGo/button
-   progress/progress
-   /div
-   div class=targetHtmlRendered/div
-   div class=targetHtmlRaw/div
-   script src=../js/mt.js/script
-   /body
+
+head
+script src=//code.jquery.com/jquery-1.10.2.min.js/script
+titleCX Machine Translation/title
+link rel=stylesheet href=css/main.css type=text/css /
+script src=js/main.js/script
+/head
+
+body
+h1CX Machine Translation/h1
+div class=form
+label for=sourceHtmlEnter some HTML/label
+br
+textarea name=sourceHtml style=width: 100%; height: 10em
+psAdemás/s de Valencia. Un dos ba href=3tres/a 
quatre ia href=5cinc/a sis set/i vuit nou/b deu/p
+/textarea
+br
+label for=sourceLanguagefrom/label
+input class=lang name=sourceLanguage value=es /
+label for=targetLanguageto/label
+input class=lang name=targetLanguage value=ca /
+button class=translateGo/button
+progress/progress
+/div
+div class=targetHtmlRendered/div
+div 

[MediaWiki-commits] [Gerrit] Fix adding new files for Blockly - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Fix adding new files for Blockly
..

Fix adding new files for Blockly

Change-Id: I264f8077a5ca4ee6cf1ca8a16ec84bb705d39e83
---
M bin/repocommit
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/31/164931/1

diff --git a/bin/repocommit b/bin/repocommit
index 889911e..713f257 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -101,7 +101,7 @@
cd $PROJECT
for i in `find . -name *.json`
do
-   svn add -q $i
+   svn status |grep [?] |  tr -s ' ' | cut -d ' ' -f 2 | xargs svn 
add -q
svn propset -q svn:mime-type text/plain $i
done
svn commit --message $COMMITMSG

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I264f8077a5ca4ee6cf1ca8a16ec84bb705d39e83
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl

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

[MediaWiki-commits] [Gerrit] Fix adding new files for Blockly - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Fix adding new files for Blockly
..


Fix adding new files for Blockly

Change-Id: I264f8077a5ca4ee6cf1ca8a16ec84bb705d39e83
---
M bin/repocommit
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bin/repocommit b/bin/repocommit
index 889911e..713f257 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -101,7 +101,7 @@
cd $PROJECT
for i in `find . -name *.json`
do
-   svn add -q $i
+   svn status |grep [?] |  tr -s ' ' | cut -d ' ' -f 2 | xargs svn 
add -q
svn propset -q svn:mime-type text/plain $i
done
svn commit --message $COMMITMSG

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I264f8077a5ca4ee6cf1ca8a16ec84bb705d39e83
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] A bunch of changes, as per legoktm's code review - change (mediawiki...Challenge)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: A bunch of changes, as per legoktm's code review
..

A bunch of changes, as per legoktm's code review

Change-Id: If8533fc128d0e72010be2555dc1a72c0d78e6bca
---
M Challenge.class.php
M Challenge.php
M ChallengeHistory.php
M ChallengeUser.php
M ChallengeView.php
M resources/js/Challenge.js
M resources/js/DatePicker.js
7 files changed, 20 insertions(+), 18 deletions(-)


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

diff --git a/Challenge.class.php b/Challenge.class.php
index e580f86..bfd0f77 100644
--- a/Challenge.class.php
+++ b/Challenge.class.php
@@ -38,6 +38,7 @@
 * Add a challenge to the database and send a challenge request mail to 
the
 * challenged user.
 *
+* @param User $challenger The user (object) who challenged $user_to
 * @param string $user_to Name of the person who was challenged
 * @param $info
 * @param $event_date
@@ -45,17 +46,15 @@
 * @param string $win_terms User-supplied win terms
 * @param string $lose_terms User-supplied lose terms
 */
-   public function addChallenge( $user_to, $info, $event_date, 
$description, $win_terms, $lose_terms ) {
-   global $wgUser;
-
+   public function addChallenge( $challenger, $user_to, $info, 
$event_date, $description, $win_terms, $lose_terms ) {
$user_id_to = User::idFromName( $user_to );
 
$dbw = wfGetDB( DB_MASTER );
$dbw-insert(
'challenge',
array(
-   'challenge_user_id_1' = $wgUser-getId(),
-   'challenge_username1' = $wgUser-getName(),
+   'challenge_user_id_1' = $challenger-getId(),
+   'challenge_username1' = $challenger-getName(),
'challenge_user_id_2' = $user_id_to,
'challenge_username2' = $user_to,
'challenge_info' = $info,
@@ -70,7 +69,7 @@
);
 
$this-challenge_id = $dbw-insertId();
-   $this-sendChallengeRequestEmail( $user_id_to, 
$wgUser-getName(), $this-challenge_id );
+   $this-sendChallengeRequestEmail( $user_id_to, 
$challenger-getName(), $this-challenge_id );
}
 
public function sendChallengeRequestEmail( $user_id_to, $user_from, $id 
) {
diff --git a/Challenge.php b/Challenge.php
index 212ea95..1406685 100644
--- a/Challenge.php
+++ b/Challenge.php
@@ -53,6 +53,7 @@
'challenge-js-accepted', 'challenge-js-rejected', 
'challenge-js-countered',
'challenge-js-winner-recorded', 'challenge-js-rating-submitted'
),
+   'dependencies' = 'mediawiki.util',
'localBasePath' = __DIR__,
'remoteExtPath' = 'Challenge'
 );
@@ -71,6 +72,7 @@
 
 $wgResourceModules['ext.challenge.js.datepicker'] = array(
'scripts' = 'resources/js/DatePicker.js',
+   'dependencies' = 'jquery.ui.datepicker',
'localBasePath' = __DIR__,
'remoteExtPath' = 'Challenge'
 );
@@ -94,6 +96,10 @@
 $wgAutoloadClasses['ChallengeUser'] = __DIR__ . '/ChallengeUser.php';
 $wgAutoloadClasses['ChallengeView'] = __DIR__ . '/ChallengeView.php';
 
+// Special page UI templates
+$wgAutoloadClasses['ChallengeUserTemplate'] = __DIR__ . 
'/templates/challengeuser.tmpl.php';
+$wgAutoloadClasses['ChallengeViewTemplate'] = __DIR__ . 
'/templates/challengeview.tmpl.php';
+
 // New special pages
 $wgSpecialPages['ChallengeAction'] = 'ChallengeAction';
 $wgSpecialPages['ChallengeHistory'] = 'ChallengeHistory';
diff --git a/ChallengeHistory.php b/ChallengeHistory.php
index e6e97f5..d537a4b 100644
--- a/ChallengeHistory.php
+++ b/ChallengeHistory.php
@@ -66,7 +66,7 @@
 
$this-getOutput()-setPageTitle(
$this-msg( 'challengehistory-users-history',
-   $userTitle-getText() )-parse()
+   $userTitle-getText() )
);
$out .= $this-displayUserHeader( 
$userTitle-getText(), $userId );
} else {
diff --git a/ChallengeUser.php b/ChallengeUser.php
index fe5f9fc..75d35b4 100644
--- a/ChallengeUser.php
+++ b/ChallengeUser.php
@@ -55,6 +55,7 @@
$_SESSION['alreadysubmitted'] = true;
$c = new Challenge();
$c-addChallenge(
+   $this-getUser(),
$this-user_name_to,
$request-getVal( 'info' ),

[MediaWiki-commits] [Gerrit] Enable import on fa.wikivoyage - change (operations/mediawiki-config)

[Reza (Code Review)]

Reza has uploaded a new change for review.

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

Change subject: Enable import on fa.wikivoyage
..

Enable import on fa.wikivoyage

Bug: 71681
Change-Id: Ie747ff7b5561a2338065cbe4cc1b41af107f8d15
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e248e27..5c14dcb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7086,6 +7086,9 @@
'rollbacker' = array( 'rollback' = true ),
'patroller' = array( 'patrol' = true ),
),
+   '+fawikivoyage' = array(
+   'sysop' = array( 'importupload' = true ), // bug 71681
+   ),
'fiwiki' = array(
'patroller' = array( 'patrol' = true ),
'rollbacker' = array( 'rollback' = true ),
@@ -8062,6 +8065,9 @@
'+fawikinews' = array(
'sysop' = array( 'rollbacker', 'patroller' ),
),
+   '+fawikivoyage' = array(
+   'sysop' = array( 'transwiki' ), // bug 71681
+   ),
'+fiwiki' = array(
'bureaucrat' = array( 'arbcom' ),
'sysop' = array( 'rollbacker' ),
@@ -8582,6 +8588,9 @@
'+fawikinews' = array(
'sysop' = array( 'rollbacker', 'patroller', ),
),
+   '+fawikivoyage' = array(
+   'sysop' = array( 'transwiki' ), // bug 71681
+   ),
'+fiwiki' = array(
'bureaucrat' = array( 'sysop', 'bureaucrat', 'arbcom' ),
'sysop' = array( 'rollbacker', ),
@@ -9047,6 +9056,7 @@
'etwikisource' = array( 'w' ),
'etwiktionary' = array( 'w' ),
'extwiki' = array( 'incubator' ),
+   'fawikivoyage' = array( 'w', 'w:en', 'en' ), // Bug 71681
'fdcwiki' = array( 'meta' ),
'fiwikisource' = array( 'OldWikisource', 'w', 'b' ),
'fiwikiversity' = array( 'b', 'q', 'n', 's', 'wikt', 'w', 
'betawikiversity' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie747ff7b5561a2338065cbe4cc1b41af107f8d15
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reza reza.ene...@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 module name - change (mediawiki...Wikibase)

[Adrian Lang (Code Review)]

Adrian Lang has uploaded a new change for review.

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

Change subject: Fix module name
..

Fix module name

Change-Id: Ic5301b8f99a1a6b79b9686438d032c23698fdf73
---
M client/resources/Resources.php
M client/resources/wikibase.client.linkitem.init.js
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index ba5d402..89ac67b 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -8,9 +8,9 @@
);
 
return array(
-   'wikibase.client.getMwRepoForApi' = $moduleTemplate + array(
+   'wikibase.client.getMwApiForRepo' = $moduleTemplate + array(
'scripts' = array(
-   'wikibase.client.getMwRepoForApi.js'
+   'wikibase.client.getMwApiForRepo.js'
),
'dependencies' = array(
'mw.config.values.wbRepo',
diff --git a/client/resources/wikibase.client.linkitem.init.js 
b/client/resources/wikibase.client.linkitem.init.js
index ad7fce9..a99922f 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -21,7 +21,7 @@
'jquery.wikibase.linkitem',
'mediawiki.Title',
'mw.config.values.wbRepo',
-   'wikibase.client.getMwRepoForApi',
+   'wikibase.client.getMwApiForRepo',
],
function() {
$spinner.remove();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5301b8f99a1a6b79b9686438d032c23698fdf73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Use appropriate direction on searchinputbox - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Use appropriate direction on searchinputbox
..


Use appropriate direction on searchinputbox

And override .sitedir-ltr input { direction: ltr; } on it useful
for translatewiki search

Change-Id: I793f2e32c238903f18810d4acbed7c5c11cf5028
---
M specials/SpecialSearchTranslations.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/specials/SpecialSearchTranslations.php 
b/specials/SpecialSearchTranslations.php
index cad64ca..6fb2037 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -307,6 +307,7 @@
$attribs = array(
'placeholder' = $this-msg( 'tux-sst-search-ph' ),
'class' = 'searchinputbox',
+   'dir' = $this-getLanguage()-getDir(),
);
 
$title = Html::hidden( 'title', 
$this-getTitle()-getPrefixedText() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I793f2e32c238903f18810d4acbed7c5c11cf5028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@gnu.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Ebrahim ebra...@gnu.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Prefer anonymous functions - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Prefer anonymous functions
..


Prefer anonymous functions

Change-Id: I7aacd5d0a2a21c35fd2a1ef2d3b7d01e17b5f5e6
---
M TranslatewikiSettings.php
1 file changed, 12 insertions(+), 17 deletions(-)

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



diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index 36f3d10..b873641 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -476,18 +476,15 @@
 # Dynamic code starts here
 
 if ( $wgCanonicalServer !== https://translatewiki.net; ) {
-   $wgHooks['SiteNoticeAfter'] = array( 'nbwWarn' );
+   $wgHooks['SiteNoticeAfter'][] = function ( $siteNotice ) {
+   $siteNotice = 
+   big align=\center\ dir='ltr'strongThis is not a production site!
+   Go to a 
href='https://translatewiki.net'translatewiki.net/a!/strong/big;
+   return true;
+   };
 }
 
-function nbwWarn( $siteNotice ) {
-   $siteNotice = 
-big align=\center\ dir='ltr'strongThis is not a production site!
-Go to a 
href='https://translatewiki.net'translatewiki.net/a!/strong/big;
-   return true;
-}
-
-$wgHooks['GetLocalURL'][] = 'cleanUrlExceptions';
-function cleanUrlExceptions( $title, $url, $query ) {
+$wgHooks['GetLocalURL'][] = function ( $title, $url, $query ) {
if ( !$title-isExternal()  $query == '' ) {
$dbkey = wfUrlencode( $title-getPrefixedDBkey() );
if ( strpos( $dbkey, '%3F' ) !== false || strpos( $dbkey, '%26' 
) !== false || strpos( $dbkey, '//' ) !== false ) {
@@ -496,10 +493,9 @@
}
}
return true;
-}
+};
 
-$wgExtensionFunctions[] = 'banAmp';
-function banAmp() {
+$wgExtensionFunctions[] = function () {
global $wgRequest;
try {
$url = $wgRequest-getRequestURL();
@@ -509,10 +505,9 @@
exit();
}
} catch ( MWException $e ) {}
-}
+};
 
-$wgHooks['LanguageGetNamespaces'][] = 'sortNamespaces';
-function sortNamespaces( $list ) {
+$wgHooks['LanguageGetNamespaces'][] = function ( $list ) {
// help
unset( $list[12] );
unset( $list[13] );
@@ -531,7 +526,7 @@
 
$list = $basic + $extra;
return true;
-}
+};
 
 $wgResourceModules['twn.jserrorlog'] = array(
'localBasePath' = __DIR__ . '/webfiles',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7aacd5d0a2a21c35fd2a1ef2d3b7d01e17b5f5e6
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Clean up extension inclusion - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Clean up extension inclusion
..


Clean up extension inclusion

Also restore SemanticForms extension.

Change-Id: Id00caf28c2e4cc03040d3d5d0af0bd671d163a92
---
M TranslatewikiSettings.php
1 file changed, 49 insertions(+), 51 deletions(-)

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

Objections:
  Nemo bis: There's a problem with this change, please improve



diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index a3f7ec8..fec103e 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -98,16 +98,6 @@
 $wgPageLanguageUseDB = true;
 
 ###
-# Extensions
-###
-
-include( $IP/extensions/cldr/cldr.php );
-include( $IP/extensions/CleanChanges/CleanChanges.php );
-$wgCCUserFilter = true;
-$wgCCTrailerFilter = true;
-include( $IP/extensions/UserDailyContribs/UserDailyContribs.php );
-
-###
 # Namespaces
 ###
 
@@ -148,31 +138,45 @@
 $wgContentNamespaces[] = NS_MEDIAWIKI;
 $wgContentNamespaces[] = NS_TRANSLATING;
 
-// Skins
+###
+# Skins
+###
 require_once $IP/skins/Vector/Vector.php;
 require_once $IP/skins/MonoBook/MonoBook.php;
+
+###
+# Extensions
+###
+$EXT = $IP/extensions;
+
+require_once $EXT/cldr/cldr.php;
+require_once $EXT/CleanChanges/CleanChanges.php;
+$wgCCUserFilter = true;
+$wgCCTrailerFilter = true;
+require_once $EXT/UserDailyContribs/UserDailyContribs.php;
+
 
 ###
 # Search
 ###
 $wgNamespacesToBeSearchedDefault[NS_MAIN] = true;
 $wgNamespacesToBeSearchedDefault[NS_MEDIAWIKI] = true;
-require_once $IP/extensions/Elastica/Elastica.php;
-require_once $IP/extensions/CirrusSearch/CirrusSearch.php;
+require_once $EXT/Elastica/Elastica.php;
+require_once $EXT/CirrusSearch/CirrusSearch.php;
 $wgSearchType = 'CirrusSearch';
 $wgAdvancedSearchHighlighting = true;
 
-include( $IP/extensions/I18nTags/I18nTags.php );
-include( $IP/extensions/Translate/Translate.php );
-require( __DIR__ . /TranslateSettings.php );
+require_once $EXT/I18nTags/I18nTags.php;
+require_once $EXT/Translate/Translate.php;
+require_once __DIR__ . /TranslateSettings.php;
 
-include( __DIR__ . /nikext.php );
-include( $IP/extensions/Renameuser/Renameuser.php );
-include( $IP/extensions/ParserFunctions/ParserFunctions.php );
+require_once __DIR__ . /nikext.php;
+require_once $EXT/Renameuser/Renameuser.php;
+require_once $EXT/ParserFunctions/ParserFunctions.php;
 $wgMaxIfExistCount = 300;
 $wgPFEnableStringFunctions = true;
 
-include( $IP/extensions/NewUserMessage/NewUserMessage.php );
+require_once $EXT/NewUserMessage/NewUserMessage.php;
 $wgNewUserSuppressRC = true;
 $wgNewUserMinorEdit = false;
 
@@ -183,23 +187,18 @@
 $wgCaptchaTriggers['createaccount'] = true; // Special:Userlogintype=signup
 $wgCaptchaTriggers['badlogin'] = true; // Special:Userlogin after failure
 
-include( $IP/extensions/CharInsert/CharInsert.php );
-
-# LiquidThreads - Siebrand / 2009-11-01
-require( $IP/extensions/LiquidThreads/LiquidThreads.php );
-
-# Just for fun
-include( $IP/extensions/ContributionScores/ContributionScores.php );
+require_once $EXT/CharInsert/CharInsert.php;
+require_once $EXT/LiquidThreads/LiquidThreads.php;
+require_once $EXT/ContributionScores/ContributionScores.php;
 $wgContribScoreIgnoreBots = true;
 
-include( $IP/extensions/Gadgets/Gadgets.php );
-include( $IP/extensions/UserMerge/UserMerge.php );
-
-require( $IP/extensions/WebChat/WebChat.php );
+require_once $EXT/Gadgets/Gadgets.php;
+require_once $EXT/UserMerge/UserMerge.php;
+require_once $EXT/WebChat/WebChat.php;
 $wgWebChatChannel = '#mediawiki-i18n';
 $wgWebChatClient = 'freenodeChat';
 
-require( $IP/extensions/Babel/Babel.php );
+require_once $EXT/Babel/Babel.php;
 $wgBabelCategoryNames = array(
'0' = 'User_%code%-0',
'1' = 'User_%code%-1',
@@ -210,11 +209,12 @@
'N' = 'User_%code%-N'
 );
 $wgBabelMainCategory = 'User_%code%';
-include( $IP/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php );
-include( $IP/extensions/Interwiki/Interwiki.php ); # Added by Raymond 
2009-01-07
-include( $IP/extensions/Nuke/Nuke.php ); # Nike 2009-01-12
-include( $IP/extensions/ReplaceText/ReplaceText.php ); # Added: Siebrand 
2009-04-25.
-include( $IP/extensions/ApiSandbox/ApiSandbox.php ); # Added: Siebrand 
2012-11-05.
+
+require_once $EXT/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php;
+require_once $EXT/Interwiki/Interwiki.php;
+require_once $EXT/Nuke/Nuke.php;
+require_once $EXT/ReplaceText/ReplaceText.php;
+require_once $EXT/ApiSandbox/ApiSandbox.php;
 
 # Semantic MediaWiki (installed using composer)
 $smwgNamespaceIndex = 200; # Nike 2010-06-15
@@ -222,24 +222,24 @@
 $smwgNamespacesWithSemanticLinks[NS_LQT_THREAD] = true;
 $smwgNamespacesWithSemanticLinks[NS_LQT_SUMMARY] = true;
 
-# Semantic Forms (installed using composer)
+require_once $EXT/SemanticForms/SemanticForms.php;
 $sfgRedLinksCheckOnlyLocalProps = true;
 
-# Niklas 2011-11-12

[MediaWiki-commits] [Gerrit] Map Simplified Chinese (zh-hans) to zh default - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Map Simplified Chinese (zh-hans) to zh default
..


Map Simplified Chinese (zh-hans) to zh default

In the Android app we have sym links for the two most
common Traditional Chinese variants (zh-rHK to zh-rTW)
but Simplified Chinese is simpler to solve by making it
the default for zh. It's the lesser evil than falling back
to English.

Bug: 69304
Change-Id: I929072a69d39145cb9303e8d12ae6e927c7c2906
---
M groups/Wikimedia/WikimediaMobile-android.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Nikerabbit: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml 
b/groups/Wikimedia/WikimediaMobile-android.yaml
index 93475fb..f2bfec5 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -9,7 +9,7 @@
 class: AndroidXmlFFS
 codeMap:
   pt-br: pt-rBR
-  zh-hans: zh-rCN
+  zh-hans: zh
   zh-hant: zh-rTW
   qqq: qq
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I929072a69d39145cb9303e8d12ae6e927c7c2906
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Ebe123 beauleetien...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update for simplified Chinese - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Update for simplified Chinese
..


Update for simplified Chinese

- move translations from zh to zh-rCN
- add a symbolic link from zh-rCN to zh

This goes together with https://gerrit.wikimedia.org/r/#/c/158324/2

Change-Id: I8e14457bfdd41837864d7995c3210100647270ea
---
A wikipedia/res/values-zh
M wikipedia/res/values-zh-rCN/strings.xml
A wikipedia/res/values-zh-rCN/values-zh
D wikipedia/res/values-zh/strings.xml
4 files changed, 12 insertions(+), 263 deletions(-)

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



diff --git a/wikipedia/res/values-zh b/wikipedia/res/values-zh
new file mode 12
index 000..46af1b0
--- /dev/null
+++ b/wikipedia/res/values-zh
@@ -0,0 +1 @@
+values-zh-rCN
\ No newline at end of file
diff --git a/wikipedia/res/values-zh-rCN/strings.xml 
b/wikipedia/res/values-zh-rCN/strings.xml
index 71322a7..466e2cc 100644
--- a/wikipedia/res/values-zh-rCN/strings.xml
+++ b/wikipedia/res/values-zh-rCN/strings.xml
@@ -53,7 +53,7 @@
   string 
name=nearby_dialog_goto_settings您的设备未启用位置更新。您想要前往您的设备设置启用位置更新么？/string
   string name=last_updated_text最后更新：%s/string
   string name=content_license_html除非另有说明，内容依据lt;a 
href=\//creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;协议发布。/string
-  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Special:MyLanguage/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;许可下提交您的贡献。/string
+  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC 的 SA 
3.0lt;/agt;许可下提交您的贡献。/string
   string name=edit_save_action_license_anon通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并义无反顾地根据lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC-BY-SA 
3.0lt;/agt;协议发布您的贡献。编辑历史将显示您设备的IP地址。如果您lt;a 
href=\https://#login\gt;登陆lt;/agt;，您的隐私会被保护。/string
   string name=preference_title_language维基百科语言/string
   string name=preference_summary_language内容语言/string
@@ -99,7 +99,7 @@
   string name=preference_summary_logout退出您的维基百科账户/string
   string name=preference_summary_notloggedin未登录。/string
   string name=toast_logout_complete已注销/string
-  string name=saved_pages_empty_title此处的页面尚无保存！/string
+  string name=saved_pages_empty_title尚无保存页面！/string
   string 
name=saved_pages_empty_message保存页面非常棒。试想一下在你保存后，即使离线时也可以阅读。/string
   string name=history_empty_title这里没有最新页面。/string
   string name=history_empty_message您可能清空了它们。下次您前往一个页面时，可从此返回。/string
@@ -115,7 +115,7 @@
   string name=edit_section_activity_title编辑章节/string
   string name=dialog_create_account_checking_progress验证/string
   string name=create_account_email_hint电子邮件（可选）/string
-  string name=create_account_password_repeat_hint重新输入密码/string
+  string name=create_account_password_repeat_hint重置密码/string
   string name=create_account_passwords_mismatch_error两次密码不一致/string
   string name=create_account_email_error无效的电子邮件地址/string
   string name=create_account_username_exists_error用户名已被使用/string
@@ -132,14 +132,14 @@
   string name=create_account_next下一步/string
   string name=create_account_button创建账户/string
   string name=preferences_general_heading常规/string
-  string name=zero_charged_verbiageWikipedia Zero已关闭/string
+  string name=zero_charged_verbiage维基百科零已关闭/string
   string name=zero_charged_verbiage_extended载入其他条目可能产生流量费用。/string
-  string name=zero_search_hint搜索Wikipedia Zero/string
-  string name=zero_warn_when_leaving离开Wikipedia Zero时提示/string
+  string name=zero_search_hint搜索维基百科零/string
+  string name=zero_warn_when_leaving离开维基百科零时提示/string
   string name=zero_warn_when_leaving_summary如果您的移动运营商作为Wikipedia 
Zero的合作伙伴，而放弃维基百科应用程序相关的数据接入费用，启用该设置可以帮助您检查何时离开应用程序并开始计费。/string
   string name=zero_webpage_title维基百科零常见问题/string
-  string name=zero_wikipedia_zero_headingWikipedia Zero/string
-  string name=zero_interstitial_title离开Wikipedia Zero/string
+  string name=zero_wikipedia_zero_heading维基百科零/string
+  string name=zero_interstitial_title离开维基百科零/string
   string name=zero_interstitial_leave_app将收取数据费用。继续前往外部网站？/string
   string name=zero_interstitial_continue离开/string
   string name=zero_interstitial_cancel留在这里/string
@@ -148,7 +148,7 @@
   string name=zero_learn_more_dismiss隐藏/string
   string name=zero_settings设置/string
   string name=zero_settings_devmode零开发模式/string
-  string name=zero_settings_devmode_summary在开发期间启用Wikipedia 
Zero的代码执行。/string
+  string name=zero_settings_devmode_summary在开发期间启用维基百科零计划的代码执行。/string
   string name=edit_preview_fetching_dialog_message正在获取预览效果.../string
   string name=edit_preview_activity_title预览编辑/string
   string name=create_account_logging_in正在登录.../string
@@ -245,7 +245,7 @@
 - 

[MediaWiki-commits] [Gerrit] Revert Update for simplified Chinese - change (apps...wikipedia)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Revert Update for simplified Chinese
..

Revert Update for simplified Chinese

I misread the dependent change.

This reverts commit 1cde96a87447246c27496aba22f067309c761eaf.

Change-Id: I74545d090dfacbbb7d7b227732a4b67e5567d03d
---
D wikipedia/res/values-zh
M wikipedia/res/values-zh-rCN/strings.xml
D wikipedia/res/values-zh-rCN/values-zh
A wikipedia/res/values-zh/strings.xml
4 files changed, 263 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/36/164936/1

diff --git a/wikipedia/res/values-zh b/wikipedia/res/values-zh
deleted file mode 12
index 46af1b0..000
--- a/wikipedia/res/values-zh
+++ /dev/null
@@ -1 +0,0 @@
-values-zh-rCN
\ No newline at end of file
diff --git a/wikipedia/res/values-zh-rCN/strings.xml 
b/wikipedia/res/values-zh-rCN/strings.xml
index 466e2cc..71322a7 100644
--- a/wikipedia/res/values-zh-rCN/strings.xml
+++ b/wikipedia/res/values-zh-rCN/strings.xml
@@ -53,7 +53,7 @@
   string 
name=nearby_dialog_goto_settings您的设备未启用位置更新。您想要前往您的设备设置启用位置更新么？/string
   string name=last_updated_text最后更新：%s/string
   string name=content_license_html除非另有说明，内容依据lt;a 
href=\//creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;协议发布。/string
-  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC 的 SA 
3.0lt;/agt;许可下提交您的贡献。/string
+  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Special:MyLanguage/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;许可下提交您的贡献。/string
   string name=edit_save_action_license_anon通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并义无反顾地根据lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC-BY-SA 
3.0lt;/agt;协议发布您的贡献。编辑历史将显示您设备的IP地址。如果您lt;a 
href=\https://#login\gt;登陆lt;/agt;，您的隐私会被保护。/string
   string name=preference_title_language维基百科语言/string
   string name=preference_summary_language内容语言/string
@@ -99,7 +99,7 @@
   string name=preference_summary_logout退出您的维基百科账户/string
   string name=preference_summary_notloggedin未登录。/string
   string name=toast_logout_complete已注销/string
-  string name=saved_pages_empty_title尚无保存页面！/string
+  string name=saved_pages_empty_title此处的页面尚无保存！/string
   string 
name=saved_pages_empty_message保存页面非常棒。试想一下在你保存后，即使离线时也可以阅读。/string
   string name=history_empty_title这里没有最新页面。/string
   string name=history_empty_message您可能清空了它们。下次您前往一个页面时，可从此返回。/string
@@ -115,7 +115,7 @@
   string name=edit_section_activity_title编辑章节/string
   string name=dialog_create_account_checking_progress验证/string
   string name=create_account_email_hint电子邮件（可选）/string
-  string name=create_account_password_repeat_hint重置密码/string
+  string name=create_account_password_repeat_hint重新输入密码/string
   string name=create_account_passwords_mismatch_error两次密码不一致/string
   string name=create_account_email_error无效的电子邮件地址/string
   string name=create_account_username_exists_error用户名已被使用/string
@@ -132,14 +132,14 @@
   string name=create_account_next下一步/string
   string name=create_account_button创建账户/string
   string name=preferences_general_heading常规/string
-  string name=zero_charged_verbiage维基百科零已关闭/string
+  string name=zero_charged_verbiageWikipedia Zero已关闭/string
   string name=zero_charged_verbiage_extended载入其他条目可能产生流量费用。/string
-  string name=zero_search_hint搜索维基百科零/string
-  string name=zero_warn_when_leaving离开维基百科零时提示/string
+  string name=zero_search_hint搜索Wikipedia Zero/string
+  string name=zero_warn_when_leaving离开Wikipedia Zero时提示/string
   string name=zero_warn_when_leaving_summary如果您的移动运营商作为Wikipedia 
Zero的合作伙伴，而放弃维基百科应用程序相关的数据接入费用，启用该设置可以帮助您检查何时离开应用程序并开始计费。/string
   string name=zero_webpage_title维基百科零常见问题/string
-  string name=zero_wikipedia_zero_heading维基百科零/string
-  string name=zero_interstitial_title离开维基百科零/string
+  string name=zero_wikipedia_zero_headingWikipedia Zero/string
+  string name=zero_interstitial_title离开Wikipedia Zero/string
   string name=zero_interstitial_leave_app将收取数据费用。继续前往外部网站？/string
   string name=zero_interstitial_continue离开/string
   string name=zero_interstitial_cancel留在这里/string
@@ -148,7 +148,7 @@
   string name=zero_learn_more_dismiss隐藏/string
   string name=zero_settings设置/string
   string name=zero_settings_devmode零开发模式/string
-  string name=zero_settings_devmode_summary在开发期间启用维基百科零计划的代码执行。/string
+  string name=zero_settings_devmode_summary在开发期间启用Wikipedia 
Zero的代码执行。/string
   string name=edit_preview_fetching_dialog_message正在获取预览效果.../string
   string name=edit_preview_activity_title预览编辑/string
   string name=create_account_logging_in正在登录.../string
@@ -245,7 

[MediaWiki-commits] [Gerrit] Revert Update for simplified Chinese - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Revert Update for simplified Chinese
..


Revert Update for simplified Chinese

I misread the dependent change.

This reverts commit 1cde96a87447246c27496aba22f067309c761eaf.

Change-Id: I74545d090dfacbbb7d7b227732a4b67e5567d03d
---
D wikipedia/res/values-zh
M wikipedia/res/values-zh-rCN/strings.xml
D wikipedia/res/values-zh-rCN/values-zh
A wikipedia/res/values-zh/strings.xml
4 files changed, 263 insertions(+), 12 deletions(-)

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



diff --git a/wikipedia/res/values-zh b/wikipedia/res/values-zh
deleted file mode 12
index 46af1b0..000
--- a/wikipedia/res/values-zh
+++ /dev/null
@@ -1 +0,0 @@
-values-zh-rCN
\ No newline at end of file
diff --git a/wikipedia/res/values-zh-rCN/strings.xml 
b/wikipedia/res/values-zh-rCN/strings.xml
index 466e2cc..71322a7 100644
--- a/wikipedia/res/values-zh-rCN/strings.xml
+++ b/wikipedia/res/values-zh-rCN/strings.xml
@@ -53,7 +53,7 @@
   string 
name=nearby_dialog_goto_settings您的设备未启用位置更新。您想要前往您的设备设置启用位置更新么？/string
   string name=last_updated_text最后更新：%s/string
   string name=content_license_html除非另有说明，内容依据lt;a 
href=\//creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;协议发布。/string
-  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC 的 SA 
3.0lt;/agt;许可下提交您的贡献。/string
+  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Special:MyLanguage/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;许可下提交您的贡献。/string
   string name=edit_save_action_license_anon通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并义无反顾地根据lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC-BY-SA 
3.0lt;/agt;协议发布您的贡献。编辑历史将显示您设备的IP地址。如果您lt;a 
href=\https://#login\gt;登陆lt;/agt;，您的隐私会被保护。/string
   string name=preference_title_language维基百科语言/string
   string name=preference_summary_language内容语言/string
@@ -99,7 +99,7 @@
   string name=preference_summary_logout退出您的维基百科账户/string
   string name=preference_summary_notloggedin未登录。/string
   string name=toast_logout_complete已注销/string
-  string name=saved_pages_empty_title尚无保存页面！/string
+  string name=saved_pages_empty_title此处的页面尚无保存！/string
   string 
name=saved_pages_empty_message保存页面非常棒。试想一下在你保存后，即使离线时也可以阅读。/string
   string name=history_empty_title这里没有最新页面。/string
   string name=history_empty_message您可能清空了它们。下次您前往一个页面时，可从此返回。/string
@@ -115,7 +115,7 @@
   string name=edit_section_activity_title编辑章节/string
   string name=dialog_create_account_checking_progress验证/string
   string name=create_account_email_hint电子邮件（可选）/string
-  string name=create_account_password_repeat_hint重置密码/string
+  string name=create_account_password_repeat_hint重新输入密码/string
   string name=create_account_passwords_mismatch_error两次密码不一致/string
   string name=create_account_email_error无效的电子邮件地址/string
   string name=create_account_username_exists_error用户名已被使用/string
@@ -132,14 +132,14 @@
   string name=create_account_next下一步/string
   string name=create_account_button创建账户/string
   string name=preferences_general_heading常规/string
-  string name=zero_charged_verbiage维基百科零已关闭/string
+  string name=zero_charged_verbiageWikipedia Zero已关闭/string
   string name=zero_charged_verbiage_extended载入其他条目可能产生流量费用。/string
-  string name=zero_search_hint搜索维基百科零/string
-  string name=zero_warn_when_leaving离开维基百科零时提示/string
+  string name=zero_search_hint搜索Wikipedia Zero/string
+  string name=zero_warn_when_leaving离开Wikipedia Zero时提示/string
   string name=zero_warn_when_leaving_summary如果您的移动运营商作为Wikipedia 
Zero的合作伙伴，而放弃维基百科应用程序相关的数据接入费用，启用该设置可以帮助您检查何时离开应用程序并开始计费。/string
   string name=zero_webpage_title维基百科零常见问题/string
-  string name=zero_wikipedia_zero_heading维基百科零/string
-  string name=zero_interstitial_title离开维基百科零/string
+  string name=zero_wikipedia_zero_headingWikipedia Zero/string
+  string name=zero_interstitial_title离开Wikipedia Zero/string
   string name=zero_interstitial_leave_app将收取数据费用。继续前往外部网站？/string
   string name=zero_interstitial_continue离开/string
   string name=zero_interstitial_cancel留在这里/string
@@ -148,7 +148,7 @@
   string name=zero_learn_more_dismiss隐藏/string
   string name=zero_settings设置/string
   string name=zero_settings_devmode零开发模式/string
-  string name=zero_settings_devmode_summary在开发期间启用维基百科零计划的代码执行。/string
+  string name=zero_settings_devmode_summary在开发期间启用Wikipedia 
Zero的代码执行。/string
   string name=edit_preview_fetching_dialog_message正在获取预览效果.../string
   string name=edit_preview_activity_title预览编辑/string
   string name=create_account_logging_in正在登录.../string
@@ -245,7 +245,7 @@
 - 

[MediaWiki-commits] [Gerrit] Update for simplified Chinese - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Update for simplified Chinese
..


Update for simplified Chinese

- move translations from zh-rCN to zh
- add a symbolic link from zh to zh-rCN

This goes together with https://gerrit.wikimedia.org/r/#/c/158324/2

Change-Id: I3ad62dd0e0aeaed864542a3343a45bc7e859e7cf
---
A wikipedia/res/values-zh-rCN
D wikipedia/res/values-zh-rCN/strings.xml
M wikipedia/res/values-zh/strings.xml
A wikipedia/res/values-zh/values-zh-rCN
4 files changed, 12 insertions(+), 263 deletions(-)

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



diff --git a/wikipedia/res/values-zh-rCN b/wikipedia/res/values-zh-rCN
new file mode 12
index 000..d83d3e6
--- /dev/null
+++ b/wikipedia/res/values-zh-rCN
@@ -0,0 +1 @@
+values-zh
\ No newline at end of file
diff --git a/wikipedia/res/values-zh-rCN/strings.xml 
b/wikipedia/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 71322a7..000
--- a/wikipedia/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-resources
-  string name=app_name维基百科/string
-  string name=app_name_beta维基百科测试版/string
-  string name=app_name_alpha维基百科Alpha/string
-  string name=yes是/string
-  string name=no不/string
-  string name=acra_report_dialog_title维基百科崩溃了:(/string
-  string name=acra_report_dialog_text将崩溃报告发送给我们/string
-  string name=acra_report_dialog_comment崩溃发生时您进行了什么操作?/string
-  string name=search_hint在维基百科内搜索/string
-  string name=history_activity_title历史/string
-  string name=nav_item_history历史/string
-  string name=error_network_error不能连接网络:(/string
-  string name=search_network_error网络故障。点击可重试。/string
-  string name=page_error_retry重试/string
-  string name=menu_clear_all_history清除历史记录/string
-  string name=menu_clear_all_bookmarks清空书签/string
-  string name=menu_clear_all_saved_pages清除已保存页面/string
-  string name=page_does_not_exist_error此页面不存在。/string
-  string name=nav_item_today今日首页/string
-  string name=dialog_title_clear_history清除浏览历史？/string
-  string name=saved_pages_activity_title保存的页面/string
-  string name=nav_item_saved_pages保存的页面/string
-  string name=menu_update_all_saved_pages更新保存的页面/string
-  string name=menu_update_selected_saved_pages更新保存的页面/string
-  string name=dialog_prompt_refresh_all_saved_pages更新所有保存的页面？/string
-  string name=toast_saved_page_refreshed已更新保存的页面/string
-  string name=menu_save_page保存页面/string
-  string name=menu_share_page分享/string
-  string name=share_via共享/string
-  string name=dialog_title_clear_saved_pages清空所有保存的页面？/string
-  string name=dialog_message_clear_saved_pages您确定要清除所有保存的页面么？/string
-  string name=toast_saving_page页面保存中…/string
-  string name=toast_saved_page页面保存成功/string
-  string name=toast_saved_page_missing_images不能保存所有图片/string
-  string name=toast_save_page_failed保存页面失败 :(/string
-  string name=toast_refresh_saved_page正在刷新保存的页面…/string
-  string name=delete_selected_saved_pages删除/string
-  string name=toast_saved_page_deleted保存页面已删除/string
-  string name=saved_pages_search_list_hint搜索/string
-  string name=saved_pages_search_empty_message未找到匹配您的查询的页面。/string
-  string name=nearby_activity_title附近/string
-  string name=nav_item_nearby附近/string
-  string name=menu_update_nearby更新附近/string
-  string name=nearby_empty_title附近没有页面/string
-  string name=nearby_empty_message当您移动到一个新的位置时您可以刷新此页面。/string
-  string name=nearby_distance_in_meters%d米/string
-  string name=nearby_distance_in_kilometers%.2f千米/string
-  string name=nearby_no_network无网络连接/string
-  string name=nearby_server_error无法获取附近地点的列表。/string
-  string name=nearby_no_location不能获取位置/string
-  string 
name=nearby_dialog_goto_settings您的设备未启用位置更新。您想要前往您的设备设置启用位置更新么？/string
-  string name=last_updated_text最后更新：%s/string
-  string name=content_license_html除非另有说明，内容依据lt;a 
href=\//creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;协议发布。/string
-  string name=edit_save_action_license_logged_in通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Special:MyLanguage/Terms_of_Use\gt;使用条款lt;/agt;，并不可撤销地在lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/deed.zh\gt;CC BY-SA 
3.0lt;/agt;许可下提交您的贡献。/string
-  string name=edit_save_action_license_anon通过保存，您同意lt;a 
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;使用条款lt;/agt;，并义无反顾地根据lt;a
 href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC-BY-SA 
3.0lt;/agt;协议发布您的贡献。编辑历史将显示您设备的IP地址。如果您lt;a 
href=\https://#login\gt;登陆lt;/agt;，您的隐私会被保护。/string
-  string name=preference_title_language维基百科语言/string
-  string name=preference_summary_language内容语言/string
-  string name=preference_languages_filter_hint搜索/string
-  string name=langlinks_filter_hint搜索/string
-  string name=menu_other_languages阅读其他语言版/string
-  string name=langlinks_error_retry重试/string
-  string name=langlinks_empty此页面在其他语言不可用/string
-  string name=langlinks_no_match未找到匹配您的查询的语言。/string
-  string 

[MediaWiki-commits] [Gerrit] Clean up MediaWiki settings - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Clean up MediaWiki settings
..


Clean up MediaWiki settings

Removed obsolete/default config variables. Resorted stuff.

Change-Id: I0e383f0ffe620ac0888591f516099ca7592a3b87
---
M TranslatewikiSettings.php
1 file changed, 80 insertions(+), 102 deletions(-)

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

Objections:
  Nemo bis: There's a problem with this change, please improve



diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index fec103e..c4d2621 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -1,44 +1,53 @@
 ?php
 
-$wgEnableCanonicalServerLink = true;
-
-$wgEnableEmail = true;
-$wgEnableUserEmail = true;
-
-$wgEnotifUserTalk = true; # UPO
-$wgEnotifWatchlist = true; # UPO
-$wgEnotifMinorEdits = false;
-
+###
+# Performance etc.
+###
 $wgMainCacheType = CACHE_MEMCACHED;
 $wgMemCachedServers = array( 127.0.0.1:11211 );
-$wgMemCachedTimeout = 15; // Value moved from a live hack to this 
settings. Raymond 2010-01-21
+$wgMemCachedTimeout = 15;
 $wgEnableSidebarCache = true;
 $wgSessionsInMemcached = true;
 $wgDisableCounters = true;
-$wgWellFormedXml = false; # Nike 2009-09-18
-$wgExperimentalHtmlIds = true; # Nike 2010-01-30
+$wgShowIPinHeader = false;
+$wgAdaptiveMessageCache = true;
+$wgJobRunRate = 0;
+
+###
+# Experimentalism
+###
+$wgWellFormedXml = false;
+$wgExperimentalHtmlIds = true;
 $wgAllUnicodeFixes = true;
-$wgAdaptiveMessageCache = true; # Nike 2010-08-08
 $wgDevelopmentWarnings = true;
 
-if ( !defined( 'HHVM_VERSION' ) ) {
-   $wgExternalDiffEngine = 'wikidiff2';
-}
+# Temporary till enabled by default in core, bug 9360
+$wgPageLanguageUseDB = true;
 
+$wgResourceLoaderValidateJS = false;
+#$wgIncludeLegacyJavaScript = false;
+$wgLegacyJavaScriptGlobals = false;
+
+$wgDeprecationReleaseLimit = '1.21';
+
+
+###
+# Unsorted
+###
 $wgRightsPage = ; # Set to the title of a wiki page that describes your 
license/copyright
 $wgRightsUrl = ;
 $wgRightsText = ;
 $wgRightsIcon = ;
 
 $wgUseTidy = false;
-$wgSVGConverter = 'rsvg';
-$wgSVGConverters['rsvg'] = '$path/rsvg-convert -w $width -h $height $input -o 
$output';
 $wgMaxShellMemory = 1024 * 200;
 
 ###
 # Names
 ###
 $wgSitename = 'translatewiki.net';
+$wgEnableCanonicalServerLink = true;
+
 $wgLogo = //translatewiki.net/static/logo.png;
 
 $wgGrammarForms['fi']['genitive']['translatewiki.net'] = 'translatewiki.netin';
@@ -46,6 +55,8 @@
 $wgGrammarForms['fi']['illative']['translatewiki.net'] = 
'translatewiki.netiin';
 $wgGrammarForms['fi']['elative']['translatewiki.net'] = 
'translatewiki.netistä';
 $wgGrammarForms['fi']['partitive']['translatewiki.net'] = 
'translatewiki.netiä';
+
+$wgFooterIcons['poweredby']['netcup'] = div class='mw_poweredby'a 
href=\http://www.netcup.de/\; title=\Powered by netcup - netcup.de – 
Webhosting, vServer, Servermanagement\ target=\_blank\Powered by netcup - 
netcup.de – Webhosting, vServer, Servermanagement/a/div;
 
 ###
 # Changes list
@@ -64,14 +75,8 @@
 ###
 # Ajax spicy etc
 ###
-$wgShowIPinHeader = false;
 $wgUseAutomaticEditSummaries = false;
 $wgUseInstantCommons = true;
-
-###
-# Jobs
-###
-$wgJobRunRate = 0;
 
 ###
 # User (account) settings
@@ -84,23 +89,62 @@
 $wgAccountCreationThrottle = 1;
 $wgAutoblockExpiry = 3600 * 24 * 14; // 2 weeks of rest from vandals reusing 
IPs
 
+$wgEnableEmail = true;
+$wgEnableUserEmail = true;
+
+$wgEnotifUserTalk = true;
+$wgEnotifWatchlist = true;
+$wgEnotifMinorEdits = false;
+
+$wgHiddenPrefs[] = 'stubthreshold';
+$wgHiddenPrefs[] = 'userid';
+$wgHiddenPrefs[] = 'math';
+$wgHiddenPrefs[] = 'imagesize';
+$wgHiddenPrefs[] = 'thumbsize';
+$wgHiddenPrefs[] = 'highlightbroken';
+$wgHiddenPrefs[] = 'nocache';
+$wgHiddenPrefs[] = 'showtoc';
+$wgHiddenPrefs[] = 'showjumplinks';
+$wgHiddenPrefs[] = 'justify';
+$wgHiddenPrefs[] = 'numberheadings';
+$wgHiddenPrefs[] = 'livepreview';
+$wgHiddenPrefs[] = 'watchmoves';
+$wgHiddenPrefs[] = 'watchdeletion';
+$wgHiddenPrefs[] = 'disablesuggest';
+$wgHiddenPrefs[] = 'searchlimit';
+$wgHiddenPrefs[] = 'contextlines';
+$wgHiddenPrefs[] = 'contextchars';
+$wgHiddenPrefs[] = 'diffonly';
+$wgHiddenPrefs[] = 'norollbackdiff';
+$wgHiddenPrefs[] = 'cols';
+
+$wgDefaultUserOptions['usenewrc'] = 1;
+# Disabled 2012-08-20 / Nike / Too spammy/buggy.
+#$wgDefaultUserOptions['lqtnotifytalk'] = true;
+$wgDefaultUserOptions['watchcreations'] = true;
+
+$wgCaptchaTriggers['createaccount'] = true; // Special:Userlogintype=signup
+$wgCaptchaRegexes[] = '/viagra|cialis/sDu';
+$wgCaptchaTriggers['edit'] = true; // Would check on every edit
+$wgCaptchaTriggers['create'] = true; // Check on page creation.
+$wgCaptchaTriggers['addurl'] = true; // Check on edits that add URLs
+$wgCaptchaTriggers['badlogin'] = true; // Special:Userlogin after failure
+
 ###
 # Upload
 ###
 $wgEnableUploads = true;
-$wgUseImageResize = true;

[MediaWiki-commits] [Gerrit] swift: clean up - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: swift: clean up
..


swift: clean up

Change-Id: I3a996a5f62e205aa68c0332baec9fadaf970fb3f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A hieradata/hosts/ms-fe2001.yaml
A hieradata/hosts/ms-fe2002.yaml
A hieradata/hosts/ms-fe2003.yaml
A hieradata/hosts/ms-fe2004.yaml
A hieradata/mainrole/swift_proxy_codfw.yaml
M manifests/site.pp
6 files changed, 9 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/ms-fe2001.yaml b/hieradata/hosts/ms-fe2001.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2001.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2002.yaml b/hieradata/hosts/ms-fe2002.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2002.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2003.yaml b/hieradata/hosts/ms-fe2003.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2003.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2004.yaml b/hieradata/hosts/ms-fe2004.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2004.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/mainrole/swift_proxy_codfw.yaml 
b/hieradata/mainrole/swift_proxy_codfw.yaml
new file mode 100644
index 000..1a0ed89
--- /dev/null
+++ b/hieradata/mainrole/swift_proxy_codfw.yaml
@@ -0,0 +1,4 @@
+cluster: swift
+nagios_group: swift
+lvs::realserver::realserver_ips: 
+  - '10.2.1.27'
diff --git a/manifests/site.pp b/manifests/site.pp
index 99e4223..4de1f30 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2009,8 +2009,7 @@
 include role::swift::stats_reporter
 }
 
-class { 'lvs::realserver': realserver_ips = [ '10.2.1.27' ] }
-
+include ::lvs::realserver
 include role::swift::proxy
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a996a5f62e205aa68c0332baec9fadaf970fb3f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove support for mwlib.rl - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Remove support for mwlib.rl
..

Remove support for mwlib.rl

Soon to be obsolete and unsupported.

Change-Id: I706b97da612f4c49ac8fdecd0f5e57bd1472d7f6
---
M REPOCONF
M REPOCONF.siebrand
M SpecialRally.php
M TranslateSettings.php
M bin/EXTERNAL-PROJECTS
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M bin/twn-wikistats
R groups/archive/Mwlib/Checker.php
R groups/archive/Mwlib/Mwlibrl.yaml
R groups/archive/Mwlib/README
13 files changed, 1 insertion(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/38/164938/1

diff --git a/REPOCONF b/REPOCONF
index 846d1c8..e294525 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -25,8 +25,6 @@
 REPO_MANTIS_BRANCH=master
 REPO_MATHJAX=git://github.com/mathjax/MathJax-i18n.git
 REPO_MIFOS=git://github.com/openMF/community-app.git
-REPO_MWLIB=git://github.com/pediapress/mwlib.git
-REPO_MWLIBRL=git://github.com/pediapress/mwlib.rl.git
 REPO_NFCRINGCONTROL=git://github.com/mclear/NFC_Ring_Control.git
 REPO_NOCC=https://svn.code.sf.net/p/nocc/code/trunk
 
REPO_OPENIMAGES=https://scm.mmbase.org/openimages/trunk/src/main/native2ascii/eu/openimages
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index f43ced4..97a4e94 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -25,8 +25,6 @@
 REPO_MANTIS_BRANCH=master
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
 REPO_MIFOS=g...@github.com:openMF/community-app.git
-REPO_MWLIB=g...@github.com:pediapress/mwlib.git
-REPO_MWLIBRL=g...@github.com:pediapress/mwlib.rl.git
 REPO_NFCRINGCONTROL=g...@github.com:mclear/NFC_Ring_Control.git
 REPO_NOCC=svn+ssh://siebr...@svn.code.sf.net/p/nocc/code/trunk
 REPO_OSM=ssh://translatew...@git.openstreetmap.org/var/lib/git/rails.git
diff --git a/SpecialRally.php b/SpecialRally.php
index 182169d..cbffe18 100644
--- a/SpecialRally.php
+++ b/SpecialRally.php
@@ -37,7 +37,6 @@
'ext-0-all', // 8
'out-jquery-uls', // 1206
'out-kiwix', // 1244
-   'out-mwlibrl', // 1212
'out-okawix-0-all', // 1220
'out-pywikipedia-0-all', // 1238
'out-wikiblame', // 1206
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 31ce1b1..a0447ce 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -244,8 +244,8 @@
 wfAddNamespace( 1210, 'Mantis' );
 $wgTranslateGroupFiles[] = $GROUPS/MantisBT/MantisBT.yaml;
 
+# No longer in use.
 wfAddNamespace( 1212, 'Mwlib' );
-$wgTranslateGroupFiles[] = $GROUPS/Mwlib/Mwlibrl.yaml;
 
 # No longer in use.
 wfAddNamespace( 1214, 'Commonist' );
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 24cc105..1a261f9 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -15,7 +15,6 @@
 mantis
 mathjax
 mifos
-mwlib
 nfcring-control
 nocc
 osm
diff --git a/bin/repocommit b/bin/repocommit
index 28cca10..ef9a99b 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -176,10 +176,6 @@
 
mergeL10n-bot
 
-elif [ $PROJECT = mwlib ]
-then
-   gitCommit $PROJECT.rl
-
 elif [ $PROJECT = nocc ]
 then
cd $PROJECT
diff --git a/bin/repocreate b/bin/repocreate
index 0ebcd8b..fc0915d 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -144,17 +144,6 @@
checkVar 'REPO_MIFOS'
git clone $REPO_MIFOS $PROJECT
 
-elif [ $PROJECT = mwlib ]
-then
-   if [ $REPO_RW = yes ]
-   then
-   checkVar 'REPO_MWLIB'
-   git clone $REPO_MWLIB $PROJECT
-   fi
-
-   checkVar 'REPO_MWLIBRL'
-   git clone $REPO_MWLIBRL mwlib.rl
-
 elif [ $PROJECT = nocc ]
 then
checkVar 'REPO_NOCC'
diff --git a/bin/repoexport b/bin/repoexport
index 76feba5..af43c67 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -118,17 +118,6 @@
php $EXPORTER --target . --group='out-mifos' --lang='*' --skip en,qqq 
--threshold 20
php $EXPORTER --target . --group='out-mifos' --lang qqq
 
-elif [ $PROJECT = mwlib ]
-then
-   php $EXPORTER --target . --group=out-mwlibrl --lang='*' --skip en,qqq 
--threshold 10 $HOURS
-   php $EXPORTER --target . --group=out-mwlibrl --lang qqq
-
-   cd mwlib.rl
-   FILEDIR=`pwd`
-   CODES=$(echo mwlib/rl/locale/* | xargs -n1 basename | cat )
-   export PYTHONPATH=/usr/local/lib/python:$DIR/mwlib/
-   echo $CODES | xargs -n1 python make_messages.py
-
 elif [ $PROJECT = nocc ]
 then
php $EXPORTER --target . --group=out-nocc-* --lang='*' --skip en,qqq 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index d87b85c..f794574 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -233,15 +233,6 @@
sudo -u betawiki php 
$WIKI/extensions/Translate/scripts/createMessageIndex.php --quiet || 

[MediaWiki-commits] [Gerrit] Fix module name - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix module name
..


Fix module name

Change-Id: Ic5301b8f99a1a6b79b9686438d032c23698fdf73
---
M client/resources/Resources.php
M client/resources/wikibase.client.linkitem.init.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index ba5d402..89ac67b 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -8,9 +8,9 @@
);
 
return array(
-   'wikibase.client.getMwRepoForApi' = $moduleTemplate + array(
+   'wikibase.client.getMwApiForRepo' = $moduleTemplate + array(
'scripts' = array(
-   'wikibase.client.getMwRepoForApi.js'
+   'wikibase.client.getMwApiForRepo.js'
),
'dependencies' = array(
'mw.config.values.wbRepo',
diff --git a/client/resources/wikibase.client.linkitem.init.js 
b/client/resources/wikibase.client.linkitem.init.js
index ad7fce9..a99922f 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -21,7 +21,7 @@
'jquery.wikibase.linkitem',
'mediawiki.Title',
'mw.config.values.wbRepo',
-   'wikibase.client.getMwRepoForApi',
+   'wikibase.client.getMwApiForRepo',
],
function() {
$spinner.remove();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5301b8f99a1a6b79b9686438d032c23698fdf73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] swift_new: order output of template - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: swift_new: order output of template
..

swift_new: order output of template

Change-Id: I17a4931e3974548b5c759491d434c4bc5271a2f6
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/swift_new/templates/proxy-server.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/164939/1

diff --git a/modules/swift_new/templates/proxy-server.conf.erb 
b/modules/swift_new/templates/proxy-server.conf.erb
index 7127271..aeaf959 100644
--- a/modules/swift_new/templates/proxy-server.conf.erb
+++ b/modules/swift_new/templates/proxy-server.conf.erb
@@ -27,7 +27,7 @@
 [filter:tempauth]
 use = egg:swift#tempauth
 token_life = 604800
-% @accounts.each_pair do |name, info| -%
+% @accounts.sort.map do |name, info| -%
 % key = @credentials[name] -%
 %= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']} 
#{info['auth']}/v1/#{info['account_name']} %
 % end -%

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17a4931e3974548b5c759491d434c4bc5271a2f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Remove support for mwlib.rl - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Remove support for mwlib.rl
..


Remove support for mwlib.rl

Soon to be obsolete and unsupported.

Change-Id: I706b97da612f4c49ac8fdecd0f5e57bd1472d7f6
---
M REPOCONF
M REPOCONF.siebrand
M SpecialRally.php
M TranslateSettings.php
M bin/EXTERNAL-PROJECTS
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M bin/twn-wikistats
R groups/archive/Mwlib/Checker.php
R groups/archive/Mwlib/Mwlibrl.yaml
R groups/archive/Mwlib/README
13 files changed, 1 insertion(+), 43 deletions(-)

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



diff --git a/REPOCONF b/REPOCONF
index 741f67b..50f8c82 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -27,8 +27,6 @@
 REPO_MANTIS_BRANCH=master
 REPO_MATHJAX=git://github.com/mathjax/MathJax-i18n.git
 REPO_MIFOS=git://github.com/openMF/community-app.git
-REPO_MWLIB=git://github.com/pediapress/mwlib.git
-REPO_MWLIBRL=git://github.com/pediapress/mwlib.rl.git
 REPO_NFCRINGCONTROL=git://github.com/mclear/NFC_Ring_Control.git
 REPO_NOCC=https://svn.code.sf.net/p/nocc/code/trunk
 
REPO_OPENIMAGES=https://scm.mmbase.org/openimages/trunk/src/main/native2ascii/eu/openimages
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index 2a22711..b8fa704 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -27,8 +27,6 @@
 REPO_MANTIS_BRANCH=master
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
 REPO_MIFOS=g...@github.com:openMF/community-app.git
-REPO_MWLIB=g...@github.com:pediapress/mwlib.git
-REPO_MWLIBRL=g...@github.com:pediapress/mwlib.rl.git
 REPO_NFCRINGCONTROL=g...@github.com:mclear/NFC_Ring_Control.git
 REPO_NOCC=svn+ssh://siebr...@svn.code.sf.net/p/nocc/code/trunk
 REPO_OSM=ssh://translatew...@git.openstreetmap.org/var/lib/git/rails.git
diff --git a/SpecialRally.php b/SpecialRally.php
index 182169d..cbffe18 100644
--- a/SpecialRally.php
+++ b/SpecialRally.php
@@ -37,7 +37,6 @@
'ext-0-all', // 8
'out-jquery-uls', // 1206
'out-kiwix', // 1244
-   'out-mwlibrl', // 1212
'out-okawix-0-all', // 1220
'out-pywikipedia-0-all', // 1238
'out-wikiblame', // 1206
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 31ce1b1..a0447ce 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -244,8 +244,8 @@
 wfAddNamespace( 1210, 'Mantis' );
 $wgTranslateGroupFiles[] = $GROUPS/MantisBT/MantisBT.yaml;
 
+# No longer in use.
 wfAddNamespace( 1212, 'Mwlib' );
-$wgTranslateGroupFiles[] = $GROUPS/Mwlib/Mwlibrl.yaml;
 
 # No longer in use.
 wfAddNamespace( 1214, 'Commonist' );
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 3934b06..e92531c 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -17,7 +17,6 @@
 mantis
 mathjax
 mifos
-mwlib
 nfcring-control
 nocc
 osm
diff --git a/bin/repocommit b/bin/repocommit
index 713f257..a8dbc45 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -178,10 +178,6 @@
 
mergeL10n-bot
 
-elif [ $PROJECT = mwlib ]
-then
-   gitCommit $PROJECT.rl
-
 elif [ $PROJECT = nocc ]
 then
cd $PROJECT
diff --git a/bin/repocreate b/bin/repocreate
index 23bea9f..6d7c3bb 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -156,17 +156,6 @@
checkVar 'REPO_MIFOS'
git clone $REPO_MIFOS $PROJECT
 
-elif [ $PROJECT = mwlib ]
-then
-   if [ $REPO_RW = yes ]
-   then
-   checkVar 'REPO_MWLIB'
-   git clone $REPO_MWLIB $PROJECT
-   fi
-
-   checkVar 'REPO_MWLIBRL'
-   git clone $REPO_MWLIBRL mwlib.rl
-
 elif [ $PROJECT = nocc ]
 then
checkVar 'REPO_NOCC'
diff --git a/bin/repoexport b/bin/repoexport
index e785c0e..1aa3785 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -128,17 +128,6 @@
php $EXPORTER --target . --group='out-mifos' --lang='*' --skip en,qqq 
--threshold 20
php $EXPORTER --target . --group='out-mifos' --lang qqq
 
-elif [ $PROJECT = mwlib ]
-then
-   php $EXPORTER --target . --group=out-mwlibrl --lang='*' --skip en,qqq 
--threshold 10 $HOURS
-   php $EXPORTER --target . --group=out-mwlibrl --lang qqq
-
-   cd mwlib.rl
-   FILEDIR=`pwd`
-   CODES=$(echo mwlib/rl/locale/* | xargs -n1 basename | cat )
-   export PYTHONPATH=/usr/local/lib/python:$DIR/mwlib/
-   echo $CODES | xargs -n1 python make_messages.py
-
 elif [ $PROJECT = nocc ]
 then
php $EXPORTER --target . --group=out-nocc-* --lang='*' --skip en,qqq 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index 5ab9c2a..492feb6 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -235,15 +235,6 @@
sudo -u betawiki php 
$WIKI/extensions/Translate/scripts/createMessageIndex.php --quiet || 
${DIRSCRIPT}/udpcast Message index 

[MediaWiki-commits] [Gerrit] swift_new: order output of template - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: swift_new: order output of template
..


swift_new: order output of template

Change-Id: I17a4931e3974548b5c759491d434c4bc5271a2f6
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/swift_new/templates/proxy-server.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/swift_new/templates/proxy-server.conf.erb 
b/modules/swift_new/templates/proxy-server.conf.erb
index 7127271..aeaf959 100644
--- a/modules/swift_new/templates/proxy-server.conf.erb
+++ b/modules/swift_new/templates/proxy-server.conf.erb
@@ -27,7 +27,7 @@
 [filter:tempauth]
 use = egg:swift#tempauth
 token_life = 604800
-% @accounts.each_pair do |name, info| -%
+% @accounts.sort.map do |name, info| -%
 % key = @credentials[name] -%
 %= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']} 
#{info['auth']}/v1/#{info['account_name']} %
 % end -%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17a4931e3974548b5c759491d434c4bc5271a2f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove all IMAP configuration and Puppet manifests - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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

Change subject: Remove all IMAP configuration and Puppet manifests
..

Remove all IMAP configuration and Puppet manifests

Change-Id: I7cd3461b12c12ceab739c9ea2ea0d851b29e252a
---
M manifests/mail.pp
M manifests/role/mail.pp
M manifests/site.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
4 files changed, 1 insertion(+), 158 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/164940/1

diff --git a/manifests/mail.pp b/manifests/mail.pp
index 33184b4..5e7683a 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -21,8 +21,6 @@
 #   other mail servers
 #   - $enable_mailman:
 #   Whether Mailman delivery functionality is enabled (true/false)
-#   - $enable_imap_delivery:
-#   Whether IMAP local delivery functional is enabled (true/false)
 #   - $enable_mail_submission:
 #   Enable/disable mail submission by users/client MUAs
 #   - $mediawiki_relay:
@@ -44,7 +42,6 @@
 class roled(
 $enable_clamav=false,
 $enable_external_mail=true,
-$enable_imap_delivery=false,
 $enable_mail_relay=false,
 $enable_mail_submission=false,
 $enable_mailman=false,
@@ -100,15 +97,6 @@
 }
 
 class mail_relay {
-file { '/etc/exim4/imap_accounts':
-ensure  = present,
-owner   = 'root',
-group   = 'root',
-mode= '0444',
-source  = 'puppet:///files/exim/imap_accounts',
-require = Class['exim4'],
-}
-
 exim4::dkim { 'wikimedia.org':
 domain   = 'wikimedia.org',
 selector = 'wikimedia',
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index d24af3f..dc111e8 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -195,11 +195,3 @@
 }
 
 }
-
-class role::mail::imap {
-# confusingly enough, the former is amanda, the latter is bacula
-include backup::host
-backup::set { 'var-vmail': }
-
-# FIXME: the rest is unpuppetized so far
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4de1f30..7971946 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2464,7 +2464,6 @@
 include role::ntp
 include ldap::role::server::corp
 include ldap::role::client::corp
-include role::mail::imap
 class { 'admin': groups = ['oit'] }
 }
 
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb 
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 514c2f0..f3ffea7 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -7,13 +7,6 @@
 CONFDIR=/etc/exim4
 WIKI_INTERFACE=; 208.80.154.91 ; 2620:0:861:3:208:80:154:91
 
-% if enable_imap_delivery == true then -%
-USERDB=/var/vmaildb/user.db
-VMAIL=/var/vmail
-DELIVER=/usr/lib/dovecot/deliver
-NOT_LOCALLY_SUBMITTED=${if !match{$received_protocol}{\Nsmtpsa$\N}}
-
-% end -%
 % if enable_mailman == true then -%
 # Mailman
 MAILMAN_HOME = /usr/lib/mailman
@@ -70,11 +63,7 @@
 
 hostlist wikimedia_nets = ; %= 
scope.lookupvar('network::constants::all_networks').join( ; ) %
 hostlist relay_from_hosts = ; @[] ; 127.0.0.1 ; ::1 ; % if enable_mail_relay 
!= false -%%= scope.lookupvar('network::constants::external_networks').join( 
; ) %; 10.0.0.0/8% end %
-% if enable_imap_delivery == true then -%
-
-# Interfaces
-daemon_smtp_ports = smtp : ssmtp
-% elsif enable_otrs_server == true then -%
+% if enable_otrs_server == true then -%
 
 # Interfaces
 daemon_smtp_ports = smtp
@@ -130,14 +119,6 @@
 
 # Malware scanning
 av_scanner = clamd:/var/run/clamav/clamd.ctl
-% end %
-
-% if enable_imap_delivery == true then -%
-# TLS
-tls_certificate = /etc/ssl/certs/wikimedia.org.pem
-tls_privatekey = /etc/ssl/private/wikimedia.org.key
-tls_advertise_hosts = *
-tls_on_connect_ports = 465
 % end %
 
 # Other
@@ -544,70 +525,6 @@
route_list = *  iodine.wikimedia.org  byname
transport = remote_smtp
 % end %
-% if enable_imap_delivery == true then -%
-# Run a custom user filter, e.g. to sort mail into subfolders
-# By default Exim filter CONFDIR/default_user_filter is run,
-# which sorts mail classified spam into the Junk folder
-user_filter:
-   driver = redirect
-   domains = +local_domains
-   condition = NOT_LOCALLY_SUBMITTED
-   router_home_directory = VMAIL/$domain/$local_part
-   address_data = ${lookup sqlite{USERDB \
-   SELECT id, filter NOTNULL AS hasfilter \
-   FROM account \
-   WHERE localpart='${quote_sqlite:$local_part}' \
-   AND domain='${quote_sqlite:$domain}' \
-   AND active='1'}{$value}fail}
-   data = ${if eq{${extract{hasfilter}{$address_data}}}{1}{ \
-   ${lookup sqlite{USERDB \
-   

[MediaWiki-commits] [Gerrit] Remove support for Commons Android/iOS apps - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Remove support for Commons Android/iOS apps
..


Remove support for Commons Android/iOS apps

They are unsupported since 2013 and were retired today:
http://thread.gmane.org/gmane.org.wikimedia.mobile/2885/focus=2940

Change-Id: I65346334808669e81e2555f337ee0d078820d2df
---
M REPOCONF
M REPOCONF.siebrand
M bin/EXTERNAL-PROJECTS
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M groups/Wikimedia/WikimediaMobile-android.yaml
M groups/Wikimedia/WikimediaMobile-ios.yaml
M groups/Wikimedia/WikimediaMobile.yaml
10 files changed, 12 insertions(+), 113 deletions(-)

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



diff --git a/REPOCONF b/REPOCONF
index 741f67b..846d1c8 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -7,8 +7,6 @@
 REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
 
 REPO_BLOCKLY=http://blockly.googlecode.com/svn/trunk/
-REPO_COMMONSANDROID=https://gerrit.wikimedia.org/r/p/apps/android/commons.git
-REPO_COMMONSIOS=https://gerrit.wikimedia.org/r/p/apps/ios/commons.git
 REPO_EOL=git://github.com/EOL/eol.git
 REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git
 REPO_ETHERPADLITE_BRANCH=develop
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index 2a22711..f43ced4 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -7,8 +7,6 @@
 REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins
 
 REPO_BLOCKLY=https://blockly.googlecode.com/svn/trunk/
-REPO_COMMONSANDROID=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/commons.git
-REPO_COMMONSIOS=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/ios/commons.git
 REPO_EOL=g...@github.com:EOL/eol.git
 REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git
 REPO_ETHERPADLITE_BRANCH=develop
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 3934b06..24cc105 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -2,8 +2,6 @@
 ihris
 pywikibot
 blockly
-commons-android
-commons-ios
 eol
 etherpad-lite
 europeana
diff --git a/bin/repocommit b/bin/repocommit
index 713f257..28cca10 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -81,8 +81,6 @@
 
 # TODO: Move to separate file?
 GERRITPROJECTS=\
-commons-android \
-commons-ios \
 pywikibot \
 wikimania \
 wikipedia-android \
diff --git a/bin/repocreate b/bin/repocreate
index 23bea9f..86cc5e7 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -31,19 +31,7 @@
fi
 }
 
-if [ $PROJECT = commons-android ]
-then
-   checkVar 'REPO_COMMONSANDROID'
-   git clone $REPO_COMMONSANDROID $PROJECT
-   gitCreateGerrit $PROJECT
-
-elif [ $PROJECT = commons-ios ]
-then
-   checkVar 'REPO_COMMONSIOS'
-   git clone $REPO_COMMONSIOS $PROJECT
-   gitCreateGerrit $PROJECT
-
-elif [ $PROJECT = blockly ]
+if [ $PROJECT = blockly ]
 then
checkVar 'REPO_BLOCKLY'
svn checkout $REPO_BLOCKLY $PROJECT
diff --git a/bin/repoexport b/bin/repoexport
index e785c0e..55232f1 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -20,17 +20,7 @@
 THRESHOLD=--threshold 35
 HOURS=--hours 200 # Somewhat over a week
 
-if [ $PROJECT = commons-android ]
-then
-   php $EXPORTER --target . 
--group=out-wikimedia-mobile-commons-android* --lang='*' --skip en,qqq 
$THRESHOLD
-   php $EXPORTER --target . 
--group=out-wikimedia-mobile-commons-android* --lang qqq
-
-elif [ $PROJECT = commons-ios ]
-then
-   php $EXPORTER --target . --group=out-wikimedia-mobile-commons-ios* 
--lang='*' --skip en,qqq $THRESHOLD
-   php $EXPORTER --target . --group=out-wikimedia-mobile-commons-ios* 
--lang qqq
-
-elif [ $PROJECT = blockly ]
+if [ $PROJECT = blockly ]
 then
php $EXPORTER --target . --group=out-blockly* --lang='*' --skip en 
$THRESHOLD
 
diff --git a/bin/repoupdate b/bin/repoupdate
index 5ab9c2a..d87b85c 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -72,8 +72,6 @@
 }
 
 GITUPDATEPROJECTS=\
-commons-android \
-commons-ios \
 eol \
 europeana \
 freecol \
diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml 
b/groups/Wikimedia/WikimediaMobile-android.yaml
index f2bfec5..0c2e65f 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -1,7 +1,7 @@
 TEMPLATE:
   BASIC:
-description: {{int:translate-group-desc-wikimedia-mobile-commons}}
-icon: wiki://Commons-icon.svg
+description: 
{{int:translate-group-desc-wikimedia-mobile-wikipedia-android}}
+icon: wiki://Wikimedia-logo.svg
 namespace: NS_WIKIMEDIA
 class: FileBasedMessageGroup
 
@@ -204,45 +204,6 @@
   - zu
 ---
 BASIC:
-  id: out-wikimedia-mobile-commons-android-0-all
-  label: Commons Mobile App
-  meta: yes
-  class: AggregateMessageGroup
-
-GROUPS:
-  - out-wikimedia-mobile-commons-*
-

-BASIC:
-  id: out-wikimedia-mobile-commons-android-strings
-  label: Commons Android Mobile (main)
-
-MANGLER:
- 

[MediaWiki-commits] [Gerrit] Remove descriptions for unsupported products - change (mediawiki...Translate)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Remove descriptions for unsupported products
..

Remove descriptions for unsupported products

Change-Id: Iebd9d05b9f6c4ee69b029341ea549364f82517c6
---
M i18n/groupdescriptions/en.json
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/i18n/groupdescriptions/en.json b/i18n/groupdescriptions/en.json
index 3cbe893..c965d0b 100644
--- a/i18n/groupdescriptions/en.json
+++ b/i18n/groupdescriptions/en.json
@@ -5,7 +5,6 @@
bw-desc-freecol: [[Translating:FreeCol|FreeCol]] is a turn-based 
strategy game,
bw-desc-fudforum: [[Translating:FUDforum|FUDforum]] is web-based 
discussion forum software,
bw-desc-mantisbt: [[Translating:MantisBT|MantisBT]] is web-based 
issue tracking software,
-   bw-desc-mwlibrl: [[Translating:Mwlib.rl|Mwlib.rl]] is a library for 
creating PDF documents from MediaWiki pages,
bw-desc-openstreetmap: All messages related to 
[[Translating:OpenStreetMap|OpenStreetMap]],
bw-desc-osm-site: [[Translating:OpenStreetMap|OpenStreetMap]] is an 
editable map of the whole world,
bw-desc-wikiblame: [[Translating:WikiBlame|WikiBlame]] is able to 
quickly find the authors of a part of a page in a Wikimedia wiki,
@@ -36,7 +35,6 @@
translate-group-desc-pywikipedia: 
[[Translating:Pywikibot|Pywikibot]] is a collection of tools to edit 
Wikipedia,
translate-group-desc-readerfeedback: Meta message group containing 
all messages for the MediaWiki extension 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:ReaderFeedback 
ReaderFeedback],
translate-group-desc-semantic: Meta message group containing all 
messages for all [https://semantic-mediawiki.org/ Semantic MediaWiki] 
extensions,
-   translate-group-desc-sharelatex: A message group for 
[[Translating:ShareLaTeX|ShareLaTeX]], a web-based collaborative LaTeX editor,
translate-group-desc-translatablepages: All translatable pages,
translate-group-desc-translate: Meta message group containing all 
messages for the MediaWiki extension 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Translate 
Translate]; please familiarize yourself with its 
[https://www.mediawiki.org/wiki/Help:Extension:Translate/Glossary glossary],
translate-group-desc-tsint: A message group for 
[[Translating:Intuition|Intuition]], the i18n system for [//tools.wmflabs.org/ 
Wikimedia Tool Labs] tools (span class=\plainlinks\[[Translating 
talk:Intuition|support]]/span),
@@ -48,7 +46,6 @@
translate-group-desc-wikiaextensions: Meta message group containing 
all messages for supported MediaWiki extensions used by [http://www.wikia.com 
Wikia],
translate-group-desc-wikimania-scholarships-app: Message group for 
the [https://scholarships.wikimedia.org/apply Wikimania Scholarship 
application],
translate-group-desc-wikimedia-mobile: Aggregate message group 
containing mobile applications for Wikimedia projects,
-   translate-group-desc-wikimedia-mobile-commons: 
[[Translating:WikipediaMobile|Commons Mobile]] is an app for Android or iOS 
for uploading and browsing Wikimedia Commons,
translate-group-desc-wikimedia-mobile-wikipedia: 
[[Translating:WikipediaMobile|WikipediaMobile]] is a cross-platform mobile and 
tablet application for reading and contributing to Wikipedia,
translate-group-desc-wikimedia-mobile-wikipedia-android: 
[[Translating:WikipediaMobile|Wikipedia Android]] is the Android-specific 
version of the Wikipedia mobile app,
translate-group-desc-wikimedia-mobile-wikipedia-ios: 
[[Translating:WikipediaMobile|Wikipedia iOS]] is the iOS-specific version of 
the Wikipedia mobile app,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebd9d05b9f6c4ee69b029341ea549364f82517c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl

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

[MediaWiki-commits] [Gerrit] Link: Validate the selected text for title - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Link: Validate the selected text for title
..

Link: Validate the selected text for title

It can potentially save api hits.
Text selections, that cannot be a valid link is currently throwing
js error

Change-Id: I1f084039ef7d475a7d2cf184197a79ba71ccd1bc
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 15 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/42/164942/1

diff --git a/modules/tools/ext.cx.tools.link.js 
b/modules/tools/ext.cx.tools.link.js
index b66b5d1..a2facd4 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -541,6 +541,20 @@
};
 
/**
+* Get a valid normalized title from the given text
+* If the text is not suitable for the title, return null;
+* Validation is done by mw.Title
+* @param {string} text Text for the title.
+* @return {string|null}
+*/
+   function getValidTitle( text ) {
+   var title = text.trim();
+   title = mw.Title.newFromText( title );
+   title = title  title.toString();
+   return title;
+   }
+
+   /**
 * Executed when link cards are shown, for example when a link is 
clicked on
 * the source or translation column (jQuery type for link) or when a 
word is
 * searched or selected in the source or translation column (string).
@@ -559,7 +573,7 @@
 
// link can be link text or jQuery link object
if ( typeof link === 'string' ) {
-   title = link.trim();
+   title = getValidTitle( link );
} else {
title = cleanupLinkHref( link.attr( 'href' ) );
this.$link = link;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f084039ef7d475a7d2cf184197a79ba71ccd1bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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] New Wikidata Build - 06/10/2014 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 06/10/2014
..


New Wikidata Build - 06/10/2014

Change-Id: Idc8f9bf92b31d16a3d243961f2678cd37a43ca4e
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/i18n/ce.json
M extensions/Wikibase/client/i18n/cs.json
M extensions/Wikibase/client/i18n/hu.json
M extensions/Wikibase/client/i18n/ka.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php
M extensions/Wikibase/client/resources/Resources.php
A extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
M extensions/Wikibase/lib/i18n/ce.json
M extensions/Wikibase/lib/i18n/cs.json
M extensions/Wikibase/lib/i18n/ms.json
M extensions/Wikibase/lib/i18n/roa-tara.json
M extensions/Wikibase/lib/i18n/tr.json
M extensions/Wikibase/lib/includes/parsers/EntityIdValueParser.php
M extensions/Wikibase/lib/includes/serializers/ClaimSerializer.php
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M extensions/Wikibase/lib/resources/wikibase.store/store.CombiningEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M extensions/Wikibase/lib/tests/phpunit/ChangesTableTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M extensions/Wikibase/lib/tests/phpunit/parsers/EntityIdParserTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ClaimSerializerTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ClaimsSerializerTest.php
M 
extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ItemSerializerTest.php
M extensions/Wikibase/repo/Wikibase.i18n.alias.php
M extensions/Wikibase/repo/config/Wikibase.example.php
A extensions/Wikibase/repo/config/Wikibase.searchindex.php
M extensions/Wikibase/repo/i18n/ce.json
M extensions/Wikibase/repo/i18n/el.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/fa.json
M extensions/Wikibase/repo/i18n/fi.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/id.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/ms.json
M extensions/Wikibase/repo/i18n/nl.json
M extensions/Wikibase/repo/i18n/pa.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/pt-br.json
M extensions/Wikibase/repo/i18n/ro.json
M extensions/Wikibase/repo/i18n/ru.json
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/i18n/vi.json
M extensions/Wikibase/repo/i18n/zh-hans.json
M extensions/Wikibase/repo/i18n/zh-hant.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M 

[MediaWiki-commits] [Gerrit] Move additional languages to separate file - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Move additional languages to separate file
..


Move additional languages to separate file

This takes a large chunk of language related configuration out
of the TranslatewikiSettings.php file.

Change-Id: If2b33ffc077fe20784eb02e987bb47cd5dc61c41
---
A LanguageSettings.php
M TranslatewikiSettings.php
2 files changed, 97 insertions(+), 98 deletions(-)

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



diff --git a/LanguageSettings.php b/LanguageSettings.php
new file mode 100644
index 000..cf0ed4f
--- /dev/null
+++ b/LanguageSettings.php
@@ -0,0 +1,96 @@
+?php
+
+$wgExtraLanguageNames['sxu'] = 'Säggssch'; # Upper Saxon
+$wgExtraLanguageNames['rtm'] = 'Faeag Rotuma'; # Rotuman
+$wgExtraLanguageNames['wls'] = 'Faka\'uvea'; # Fakauvea
+$wgExtraLanguageNames['twd'] = 'Tweants'; # Twents
+$wgExtraLanguageNames['trp'] = 'Kokborok (Tripuri)'; # Kokborok
+$wgExtraLanguageNames['pko'] = 'Pökoot'; # Pökoot
+$wgExtraLanguageNames['pru'] = 'Prūsiskan'; # Prussian
+$wgExtraLanguageNames['test'] = 'Test (site admin only)'; # Test
+$wgExtraLanguageNames['swb'] = 'Shikomoro'; # Comorian
+$wgExtraLanguageNames['njo'] = 'Ao'; # Ao Naga
+$wgExtraLanguageNames['mni'] = 'মেইতেই লোন্'; # Meitei / Siebrand 2008-02-11
+$wgExtraLanguageNames['ttt'] = 'Tati'; # Tat / Siebrand 2008-04-04
+$wgExtraLanguageNames['yrl'] = 'ñe\'engatú'; # Nheengatu / Siebrand 2008-04-06
+$wgExtraLanguageNames['krl'] = 'Karjala'; # Karelian / Siebrand 2008-04-12
+$wgExtraLanguageNames['mwv'] = 'Behase Mentawei'; # Mentawai / Siebrand 
2008-05-07
+$wgExtraLanguageNames['niu'] = 'ko e vagahau Niuē'; # Niue / Nike 2008-06-29
+$wgExtraLanguageNames['bew'] = 'Bahasa Betawi'; # Betawi / Siebrand 2008-07-13
+$wgExtraLanguageNames['rw'] = 'Kinyarwanda'; # Kinyarwanda / Siebrand 
2008-07-23
+$wgExtraLanguageNames['slr'] = 'Salırça'; # Salar / Siebrand 2008-08-18
+$wgExtraLanguageNames['ryu'] = 'ʔucināguci'; # Central Okinawan / Siebrand 
2008-08-28
+$wgExtraLanguageNames['gom'] = 'कोंकणी/Konknni '; # Konkani (falls back to 
gom-deva) / Siebrand 2008-09-02
+$wgExtraLanguageNames['gom-deva'] = 'कोंकणी'; # Konkani (Devanagari script) / 
Siebrand 2008-09-02
+$wgExtraLanguageNames['akz'] = 'Albaamo innaaɬiilka'; # Alabama / Siebrand 
2008-09-15
+$wgExtraLanguageNames['kgp'] = 'Kaingáng'; # Siebrand 2008-12-05
+$wgExtraLanguageNames['hu-formal'] = 'Magyar (magázó)'; # Siebrand 2009-01-01
+$wgExtraLanguageNames['kea'] = 'Kabuverdianu'; # Kabuverdianu / Siebrand 
2009-01-07
+$wgExtraLanguageNames['ady'] = 'Адыгэбзэ / Adygabze'; # Adyghe / Siebrand 
2009-07-02
+$wgExtraLanguageNames['ady-cyrl'] = 'Адыгэбзэ'; # Adyghe / Siebrand 2009-07-02
+$wgExtraLanguageNames['tsd'] = 'Τσακωνικά'; # Tsakonian / Siebrand 2009-08-20
+$wgExtraLanguageNames['gcf'] = 'Guadeloupean Creole French'; # Guadeloupean 
Creole French / Siebrand 2009-09-21
+$wgExtraLanguageNames['lld'] = 'Ladin'; # Ladin / Siebrand 2009-09-23
+$wgExtraLanguageNames['ruq-grek'] = 'Megleno-Romanian (Greek script)'; # 
Megleno-Romanian (Greek script) / Siebrand 2009-09-23
+$wgExtraLanguageNames['ydd'] = 'Eastern Yiddish'; # Eastern Yiddish / Siebrand 
2009-09-23
+$wgExtraLanguageNames['tzm'] = 'ⵜⴰⵎⴰⵣⵉⵖⵜ'; # Tamazight / Siebrand 2009-09-23
+$wgExtraLanguageNames['bto'] = 'Iriga Bicolano'; # Iriga Bicolano / Siebrand 
2009-09-23
+$wgExtraLanguageNames['rap'] = 'arero rapa nui'; # Rapa Nui / Siebrand 
2009-11-13
+$wgExtraLanguageNames['bfq'] = 'படகா'; # UBadaga / Siebrand 2009-11-19
+$wgExtraLanguageNames['guc'] = 'Wayúu'; # Wayuu / Siebrand 2009-12-12
+$wgExtraLanguageNames['mui'] = 'Musi'; # Musi / Siebrand 2010-02-11
+$wgExtraLanguageNames['kbd-latn'] = 'Qabardjajəbza'; # Kabardian (Latin 
script) / Siebrand 2010-02-21
+$wgExtraLanguageNames['ase'] = 'American sign language'; # Siebrand 2010-03-13
+$wgExtraLanguageNames['mnc'] = 'ᠮᠠᠨᠵᡠ ᡤᡳᠰᡠᠨ'; # Manchu / Siebrand 2010-08-11
+$wgExtraLanguageNames['aro'] = 'Araona'; # Araona / Siebrand 2010-08-25
+$wgExtraLanguageNames['hif-deva'] = 'फ़ीजी हिन्दी'; # Fiji Hindi (Devangari 
script) / Siebrand 2010-08-26
+$wgExtraLanguageNames['gah'] = 'Alekano'; # Alekano / Siebrand 2010-10-08
+$wgExtraLanguageNames['rki'] = 'ရခိုင်'; # Rakhine / Siebrand 2010-10-14
+$wgExtraLanguageNames['es-formal'] = 'español (formal)'; # Spanish (formal 
address) / Siebrand 2010-11-22
+$wgExtraLanguageNames['nqo'] = 'ߒߞߏ'; # N'Ko / Siebrand 2011-01-11
+$wgExtraLanguageNames['gbz'] = 'Dari'; # Zoroastrian Dari / Siebrand 2011-01-20
+$wgExtraLanguageNames['gur'] = 'Gurenɛ'; # Farefare / Siebrand 2011-01-27
+$wgExtraLanguageNames['yrk'] = 'Ненэцяʼ вада'; # Tundra Nenets / Lcawte 
2011-02-07
+$wgExtraLanguageNames['esu'] = 'Yup\'ik'; # Central Alaskan Yupik / Siebrand 
2011-02-14
+$wgExtraLanguageNames['saz'] = 'ꢱꣃꢬꢵꢯ꣄ꢡ꣄ꢬꢵ'; # Saurashtra / Siebrand 2011-03-17
+$wgExtraLanguageNames['hsn'] = '湘语'; # Xiang Chinese / Siebrand 2011-04-06

[MediaWiki-commits] [Gerrit] Optional messages in Android app - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Optional messages in Android app
..


Optional messages in Android app

Change-Id: I9210da6463eb789a61705cc50dad2642f67561f4
---
M groups/Wikimedia/WikimediaMobile-android.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml 
b/groups/Wikimedia/WikimediaMobile-android.yaml
index 0c2e65f..a641dbd 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -218,3 +218,6 @@
 TAGS:
   ignored:
 - wikipedia-android-strings-zero_webpage_url
+  optional:
+- wikipedia-android-strings-privacy_policy_url
+- wikipedia-android-strings-terms_of_use_url

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9210da6463eb789a61705cc50dad2642f67561f4
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
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] Cleanup TranslateSettings - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup TranslateSettings
..


Cleanup TranslateSettings

Change-Id: Ieaa642ce313ec55c08ed9c7de64ff81ba96e46e8
---
M TranslateSettings.php
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/TranslateSettings.php b/TranslateSettings.php
index a0447ce..9288639 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -1,6 +1,6 @@
 ?php
 
-require_once( __DIR__ . '/FallbackSettings.php' );
+require_once __DIR__ . '/FallbackSettings.php';
 
 $GROUPS = __DIR__ . '/groups';
 
@@ -8,12 +8,9 @@
 $wgTranslateNewsletterPreference = true;
 
 $wgTranslateCacheDirectory = /resources/caches/translatewiki.net;
-$wgTranslateEC = array();
-$wgTranslateFuzzyBotName = 'FuzzyBot';
 $wgTranslateDocumentationLanguageCode = 'qqq';
 $wgTranslatePHPlot = '/home/betawiki/software/phplot/phplot.php';
 $wgTranslateGroupRoot = '/resources/projects';
-$wgEnablePageTranslation = true;
 $wgTranslateMessageIndex = array( 'CDBMessageIndex' );
 $wgTranslateDelayedMessageIndexRebuild = true;
 $wgTranslateDisablePreSaveTransform = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaa642ce313ec55c08ed9c7de64ff81ba96e46e8
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] reorder items - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: reorder items
..


reorder items

Change-Id: Icdc5386549e942a8944d3753621ad6a7c9768b27
---
M groups/Pywikibot/Pywikibot.yaml
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml
index 7baaff9..19d7eb2 100644
--- a/groups/Pywikibot/Pywikibot.yaml
+++ b/groups/Pywikibot/Pywikibot.yaml
@@ -284,14 +284,6 @@
   definitionFile: %GROUPROOT%/pywikibot/pagefromfile.py
 ---
 BASIC:
-  id: out-pywikipedia-pywikibot
-  label: Pywikibot Pywikibot
-
-FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/pywikibot.py
-  definitionFile: %GROUPROOT%/pywikibot/pywikibot.py

-BASIC:
   id: out-pywikipedia-protect
   label: Pywikibot Protect
 
@@ -300,12 +292,12 @@
   definitionFile: %GROUPROOT%/pywikibot/protect.py
 ---
 BASIC:
-  id: out-pywikipedia-spamremove
-  label: Pywikibot Spam Remove
+  id: out-pywikipedia-pywikibot
+  label: Pywikibot Pywikibot
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/spamremove.py
-  definitionFile: %GROUPROOT%/pywikibot/spamremove.py
+  sourcePattern: %GROUPROOT%/pywikibot/pywikibot.py
+  definitionFile: %GROUPROOT%/pywikibot/pywikibot.py
 ---
 BASIC:
   id: out-pywikipedia-redirect
@@ -360,6 +352,14 @@
   definitionFile: %GROUPROOT%/pywikibot/solve_disambiguation.py
 ---
 BASIC:
+  id: out-pywikipedia-spamremove
+  label: Pywikibot Spam Remove
+
+FILES:
+  sourcePattern: %GROUPROOT%/pywikibot/spamremove.py
+  definitionFile: %GROUPROOT%/pywikibot/spamremove.py
+---
+BASIC:
   id: out-pywikipedia-spellcheck
   label: Pywikibot Spellcheck
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdc5386549e942a8944d3753621ad6a7c9768b27
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] New deployment build, partial fix for bug 71479 and editing ... - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New deployment build, partial fix for bug 71479 and editing 
properties
..


New deployment build, partial fix for bug 71479 and editing properties

also fix for bug 71469

Change-Id: I2b3b6ba574fd09b9610844ba2aa36ef76b920acd
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M extensions/Wikibase/repo/includes/ClaimHtmlGenerator.php
M extensions/Wikibase/repo/includes/View/FingerprintView.php
M extensions/Wikibase/repo/includes/api/MergeItems.php
M extensions/Wikibase/repo/includes/api/SetClaim.php
M vendor/composer/installed.json
10 files changed, 57 insertions(+), 54 deletions(-)

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



diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 7f45a99..e5209e6 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
 ?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412261754;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589185;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 0b1e9bd..a8f8be9 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
 ?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412261754;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589185;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index cacff2a..9308ad1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,7 +1191,7 @@
 source: {
 type: git,
 url: 
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: 6f2bf7dbd02099b84bb0067d238343a7b65de690
+reference: a69dcbf461a897bcb060a9322dc59c0145f160e9
 },
 require: {
 data-values/common: ~0.2.0,
@@ -1262,7 +1262,7 @@
 issues: https://bugzilla.wikimedia.org/;,
 irc: irc://irc.freenode.net/wikidata
 },
-time: 2014-10-02 14:52:57
+time: 2014-10-06 09:25:56
 },
 {
 name: wikibase/wikimedia-badges,
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f323c34..1272bd6 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -366,15 +366,20 @@
if( this.$fingerprints ) {
this.$fingerprints.data( 'fingerprintgroupview' 
)[state]();
}
-   this.$claims.data( 'claimgrouplistview' )[state]();
-   // TODO: Resolve integration of referenceviews
-   this.$claims.find( '.wb-statement-references' ).each( 
function() {
-   var $listview = $( this ).children( 
':wikibase-listview' );
-   if( $listview.length ) {
-   $listview.data( 'listview' )[state]();
-   }
-   } );
-   if( this.$siteLinks.length  0 ) {
+
+   // horrible, horrible hack until we have proper item and 
property views
+   if( this.$claims ) {
+   this.$claims.data( 'claimgrouplistview' )[state]();
+   // TODO: Resolve integration of referenceviews
+   this.$claims.find( '.wb-statement-references' ).each( 
function() {
+   var $listview = $( this ).children( 
':wikibase-listview' );
+   if( $listview.length ) {
+   $listview.data( 'listview' )[state]();
+   }
+   } );
+   }
+
+   if( this.$siteLinks  this.$siteLinks.length  0 ) {
this.$siteLinks.data( 'sitelinkgrouplistview' 
)[state]();
}
},
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index fce3526..ba1748c 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
 
// Encapsulate sitelinkviews by suppressing their events:

[MediaWiki-commits] [Gerrit] Remove descriptions for unsupported products - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Remove descriptions for unsupported products
..


Remove descriptions for unsupported products

Change-Id: Iebd9d05b9f6c4ee69b029341ea549364f82517c6
---
M i18n/groupdescriptions/en.json
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/i18n/groupdescriptions/en.json b/i18n/groupdescriptions/en.json
index 3cbe893..c965d0b 100644
--- a/i18n/groupdescriptions/en.json
+++ b/i18n/groupdescriptions/en.json
@@ -5,7 +5,6 @@
bw-desc-freecol: [[Translating:FreeCol|FreeCol]] is a turn-based 
strategy game,
bw-desc-fudforum: [[Translating:FUDforum|FUDforum]] is web-based 
discussion forum software,
bw-desc-mantisbt: [[Translating:MantisBT|MantisBT]] is web-based 
issue tracking software,
-   bw-desc-mwlibrl: [[Translating:Mwlib.rl|Mwlib.rl]] is a library for 
creating PDF documents from MediaWiki pages,
bw-desc-openstreetmap: All messages related to 
[[Translating:OpenStreetMap|OpenStreetMap]],
bw-desc-osm-site: [[Translating:OpenStreetMap|OpenStreetMap]] is an 
editable map of the whole world,
bw-desc-wikiblame: [[Translating:WikiBlame|WikiBlame]] is able to 
quickly find the authors of a part of a page in a Wikimedia wiki,
@@ -36,7 +35,6 @@
translate-group-desc-pywikipedia: 
[[Translating:Pywikibot|Pywikibot]] is a collection of tools to edit 
Wikipedia,
translate-group-desc-readerfeedback: Meta message group containing 
all messages for the MediaWiki extension 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:ReaderFeedback 
ReaderFeedback],
translate-group-desc-semantic: Meta message group containing all 
messages for all [https://semantic-mediawiki.org/ Semantic MediaWiki] 
extensions,
-   translate-group-desc-sharelatex: A message group for 
[[Translating:ShareLaTeX|ShareLaTeX]], a web-based collaborative LaTeX editor,
translate-group-desc-translatablepages: All translatable pages,
translate-group-desc-translate: Meta message group containing all 
messages for the MediaWiki extension 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Translate 
Translate]; please familiarize yourself with its 
[https://www.mediawiki.org/wiki/Help:Extension:Translate/Glossary glossary],
translate-group-desc-tsint: A message group for 
[[Translating:Intuition|Intuition]], the i18n system for [//tools.wmflabs.org/ 
Wikimedia Tool Labs] tools (span class=\plainlinks\[[Translating 
talk:Intuition|support]]/span),
@@ -48,7 +46,6 @@
translate-group-desc-wikiaextensions: Meta message group containing 
all messages for supported MediaWiki extensions used by [http://www.wikia.com 
Wikia],
translate-group-desc-wikimania-scholarships-app: Message group for 
the [https://scholarships.wikimedia.org/apply Wikimania Scholarship 
application],
translate-group-desc-wikimedia-mobile: Aggregate message group 
containing mobile applications for Wikimedia projects,
-   translate-group-desc-wikimedia-mobile-commons: 
[[Translating:WikipediaMobile|Commons Mobile]] is an app for Android or iOS 
for uploading and browsing Wikimedia Commons,
translate-group-desc-wikimedia-mobile-wikipedia: 
[[Translating:WikipediaMobile|WikipediaMobile]] is a cross-platform mobile and 
tablet application for reading and contributing to Wikipedia,
translate-group-desc-wikimedia-mobile-wikipedia-android: 
[[Translating:WikipediaMobile|Wikipedia Android]] is the Android-specific 
version of the Wikipedia mobile app,
translate-group-desc-wikimedia-mobile-wikipedia-ios: 
[[Translating:WikipediaMobile|Wikipedia iOS]] is the iOS-specific version of 
the Wikipedia mobile app,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebd9d05b9f6c4ee69b029341ea549364f82517c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update ApiModules to conform to API conventions - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Update ApiModules to conform to API conventions
..


Update ApiModules to conform to API conventions

Bug: 69739
Change-Id: Ic8e0e4b91a190134b2364a48f766e9661a856bfd
---
M repo/includes/api/ModifyEntity.php
M repo/includes/api/ParseValue.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetSiteLink.php
4 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/api/ModifyEntity.php 
b/repo/includes/api/ModifyEntity.php
index 15f3bb8..22b7e2d 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -519,9 +519,6 @@
autocomment together with the summary is 260 
characters. Be aware that everything above that
limit will be cut off.
),
-   'type' = array( 'A specific type of entity.',
-   Will default to 'item' as this will be the 
most common type.
-   ),
'token' = 'A edittoken token previously obtained 
through the token module (prop=info).',
'bot' = array( 'Mark this edit as bot',
'This URL flag will only be respected if the 
user belongs to the group bot.'
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index 1efd1d8..191bf7d 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -209,7 +209,8 @@
 */
protected function getExamples() {
return array(
-   // 'ex' = 'desc' // TODO
+   
'api.php?action=wbparsevalueparser=nullvalues=foo|bar' = 'No change to the 
format of the string.',
+   
'api.php?action=wbparsevalueparser=timevalues=1994-02-08options={precision:9}'
 = 'Parse 1994-02-08 to a date format with a precision of 9 (the year).',
);
}
 
@@ -224,4 +225,4 @@
return __CLASS__ . '-0.2';
}
 
-}
+}
\ No newline at end of file
diff --git a/repo/includes/api/SetReference.php 
b/repo/includes/api/SetReference.php
index e439518..bca0bba 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -246,6 +246,7 @@
array(
'statement' = 'A GUID identifying the 
statement for which a reference is being set',
'snaks' = 'The snaks to set the reference to. 
JSON object with property ids pointing to arrays containing the snaks for that 
property',
+   'snaks-order' = 'The order of the snaks. 
Comma-separated list of property ids',
'reference' = 'A hash of the reference that 
should be updated. Optional. When not provided, a new reference is created',
'index' = 'The index within the statement\'s 
list of references where to move the reference to. Optional. When not provided, 
an existing reference will stay in place while a new reference will be 
appended.',
)
diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index 3f0821b..4974b2b 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -201,8 +201,8 @@
parent::getParamDescriptionForEntity(),
array(
'linksite' = 'The identifier of the site on 
which the article to link resides',
-   'badges' = 'The IDs of items to be set as 
badges. They will replace the current ones. If this parameter is not set, the 
badges will not be changed',
'linktitle' = 'The title of the article to 
link. If this parameter is an empty string or both linktitle and badges are not 
set, the link will be removed.',
+   'badges' = 'The IDs of items to be set as 
badges. They will replace the current ones. If this parameter is not set, the 
badges will not be changed',
)
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8e0e4b91a190134b2364a48f766e9661a856bfd
Gerrit-PatchSet: 19
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee lucie.kaf...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

[MediaWiki-commits] [Gerrit] Refactored and reorganized - change (phabricator...Sprint)

[Christopher Johnson (WMDE) (Code Review)]

Christopher Johnson (WMDE) has uploaded a new change for review.

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

Change subject: Refactored and reorganized
..

Refactored and reorganized

Change-Id: I3cf2ea3e84367661c7e6e36adecddf9243b70a3d
---
M __phutil_library_map__.php
M src/BurndownController.php
M src/BurndownData.php
M src/BurndownDataDate.php
M src/BurndownTestDataGenerator.php
M src/SprintEndDateField.php
M src/SprintProjectCustomField.php
M src/SprintStartDateField.php
M src/SprintTaskStoryPointsField.php
9 files changed, 266 insertions(+), 156 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint 
refs/changes/43/164943/1

diff --git a/__phutil_library_map__.php b/__phutil_library_map__.php
index ec65902..b249693 100644
--- a/__phutil_library_map__.php
+++ b/__phutil_library_map__.php
@@ -17,6 +17,7 @@
 'BurndownException' = 'src/BurndownException.php',
 'BurndownListController' = 'src/BurndownListController.php',
 'BurndownTestDataGenerator' = 'src/BurndownTestDataGenerator.php',
+'NullObject' = 'src/NullObject.php',
 'SprintEndDateField' = 'src/SprintEndDateField.php',
 'SprintProjectCustomField' = 'src/SprintProjectCustomField.php',
 'SprintStartDateField' = 'src/SprintStartDateField.php',
@@ -30,6 +31,7 @@
 'BurndownException' = 'Exception',
 'BurndownListController' = 'PhabricatorController',
 'BurndownTestDataGenerator' = 'PhabricatorTestDataGenerator',
+'NullObject' = 'BurndownData',
 'SprintEndDateField' = 'SprintProjectCustomField',
 'SprintProjectCustomField' = array(
   'PhabricatorProjectCustomField',
diff --git a/src/BurndownController.php b/src/BurndownController.php
index 66e723f..63ee240 100644
--- a/src/BurndownController.php
+++ b/src/BurndownController.php
@@ -8,15 +8,15 @@
 
   // Project data
   private $projectID;
-  private $project;
+  //private $project;
 
   // Start and end date for the sprint
-  private $startdate;
-  private $enddate;
+  //private $startdate;
+  //private $enddate;
 
   // Tasks and transactions
-  private $tasks;
-  private $xactions;
+  //private $tasks;
+  //private $xactions;
 
public function shouldAllowPublic() {
 return true;
@@ -48,10 +48,10 @@
 
 try {
   $data = new BurndownData($project, $viewer);
-
+ // $data = new BurndownDataChart($project, $viewer);
   $burndown_chart = $data-buildBurnDownChart();
-  $burndown_table = $data-buildBurnDownTable();
   $tasks_table= $data-buildTasksTable();
+  $burndown_table = $data-buildBurnDownTable();
   $events_table   = $data-buildEventTable();
 } catch (BurndownException $e) {
   $error_box = id(new AphrontErrorView())
@@ -70,8 +70,8 @@
 $crumbs,
 $error_box,
 $burndown_chart,
-$burndown_table,
 $tasks_table,
+$burndown_table,
 $events_table,
   ),
   array(
diff --git a/src/BurndownData.php b/src/BurndownData.php
index abc7ce2..72ada66 100644
--- a/src/BurndownData.php
+++ b/src/BurndownData.php
@@ -6,86 +6,105 @@
 
 class BurndownData {
 
-  private $startDate;
-  private $endDate;
+   // private $startDate;
+   //private $endDate;
 
-  // Array of BurndownDataDates
-  // There are two special keys, 'before' and 'after'
-  //
-  // Looks like: array(
-  //   'before' = BurndownDataDate
-  //   'Tue Jun 3' = BurndownDataDate
-  //   'Wed Jun 4' = BurndownDataDate
-  //   ...
-  //   'after' = BurndownDataDate
-  // )
+   // Array of BurndownDataDates
+   // There are two special keys, 'before' and 'after'
+   //
+   // Looks like: array(
+   //   'before' = BurndownDataDate
+   //   'Tue Jun 3' = BurndownDataDate
+   //   'Wed Jun 4' = BurndownDataDate
+   //   ...
+   //   'after' = BurndownDataDate
+   // )
   private $dates;
-
-  // These hold an array of each task, and how many points are assigned, and
-  // whether it's open or closed. These values change as we progress through
-  // time, so that changes to points or status reflect on the graph.
+  private $data;
+   // These hold an array of each task, and how many points are assigned, and
+   // whether it's open or closed. These values change as we progress through
+   // time, so that changes to points or status reflect on the graph.
   private $task_points = array();
   private $task_statuses = array();
-
-  // Project associated with this burndown.
+  private $task_in_sprint= array();
+// Project associated with this burndown.
   private $project;
-
+  private $viewer;
   private $tasks;
   private $events;
   private $xactions;
 
-  public function __construct($project, $viewer) {
+
+
+  public function __construct($project, $viewer)
+  {
 
 $this-project = $project;
 $this-viewer = $viewer;
 
 // We need the custom fields so we can pull out the start and end date
-$field_list = PhabricatorCustomField::getObjectFields(
-  $this-project,
-  

[MediaWiki-commits] [Gerrit] Use JSON for Pywikibot - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Use JSON for Pywikibot
..


Use JSON for Pywikibot

Change-Id: I66d94f3fef3ae608af0e0496fd1f96c3ff1cba77
---
M groups/Pywikibot/Pywikibot.yaml
1 file changed, 46 insertions(+), 88 deletions(-)

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



diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml
index 19d7eb2..c69d282 100644
--- a/groups/Pywikibot/Pywikibot.yaml
+++ b/groups/Pywikibot/Pywikibot.yaml
@@ -6,8 +6,8 @@
 class: FileBasedMessageGroup
 
   FILES:
-class: PythonSingleFFS
-# Pywikibot works on language code, so mapping fallbacked to Wikimedia 
code.
+class: JsonFFS
+# Pywikibot works on wiki domain code, so mapping fallbacked to Wikimedia 
code.
 codeMap:
   be-tarask: be-x-old
   gan-hant: gan
@@ -32,6 +32,7 @@
   CHECKER:
 class: MessageChecker
 checks:
+  # This check should be renamed when we use JSON for everything
   - pythonInterpolationCheck
 
   LANGUAGES:
@@ -68,152 +69,133 @@
   label: Pywikibot Add Text
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/add_text.py
-  definitionFile: %GROUPROOT%/pywikibot/add_text.py
+  sourcePattern: %GROUPROOT%/pywikibot/add_text/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-archivebot
   label: Pywikibot Archive Bot
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/archivebot.py
-  definitionFile: %GROUPROOT%/pywikibot/archivebot.py
+  sourcePattern: %GROUPROOT%/pywikibot/archivebot/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-basic
   label: Pywikibot Basic
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/basic.py
-  definitionFile: %GROUPROOT%/pywikibot/basic.py
+  sourcePattern: %GROUPROOT%/pywikibot/basic/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-blockpageschecker
   label: Pywikibot Blockpages Checker
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/blockpageschecker.py
-  definitionFile: %GROUPROOT%/pywikibot/blockpageschecker.py
+  sourcePattern: %GROUPROOT%/pywikibot/blockpageschecker/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-capitalizeredirects
   label: Pywikibot Capitalize Redirects
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/capitalize_redirects.py
-  definitionFile: %GROUPROOT%/pywikibot/capitalize_redirects.py
+  sourcePattern: %GROUPROOT%/pywikibot/capitalize_redirects/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-casechecker
   label: Pywikibot Casechecker
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/casechecker.py
-  definitionFile: %GROUPROOT%/pywikibot/casechecker.py
+  sourcePattern: %GROUPROOT%/pywikibot/casechecker/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-catall
   label: Pywikibot Catall
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/catall.py
-  definitionFile: %GROUPROOT%/pywikibot/catall.py
+  sourcePattern: %GROUPROOT%/pywikibot/catall/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-category
   label: Pywikibot Category
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/category.py
-  definitionFile: %GROUPROOT%/pywikibot/category.py
+  sourcePattern: %GROUPROOT%/pywikibot/category/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-categoryredirect
   label: Pywikibot Category Redirect
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/category_redirect.py
-  definitionFile: %GROUPROOT%/pywikibot/category_redirect.py
+  sourcePattern: %GROUPROOT%/pywikibot/category_redirect/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-cleansandbox
   label: Pywikibot Clean Sandbox
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/clean_sandbox.py
-  definitionFile: %GROUPROOT%/pywikibot/clean_sandbox.py
+  sourcePattern: %GROUPROOT%/pywikibot/clean_sandbox/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-commons
   label: Pywikibot Commons
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/commons.py
-  definitionFile: %GROUPROOT%/pywikibot/commons.py
+  sourcePattern: %GROUPROOT%/pywikibot/commons/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-commonslink
   label: Pywikibot Commons Link
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/commons_link.py
-  definitionFile: %GROUPROOT%/pywikibot/commons_link.py
+  sourcePattern: %GROUPROOT%/pywikibot/commons_link/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-cosmeticchanges
   label: Pywikibot Cosmetic Changes
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/cosmetic_changes.py
-  definitionFile: %GROUPROOT%/pywikibot/cosmetic_changes.py
+  sourcePattern: %GROUPROOT%/pywikibot/cosmetic_changes/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-delete
   label: Pywikibot Delete
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/delete.py
-  definitionFile: %GROUPROOT%/pywikibot/delete.py
+  sourcePattern: %GROUPROOT%/pywikibot/delete/%CODE%.json
 ---
 BASIC:
   id: out-pywikipedia-djvutext
   label: Pywikibot DjVu Text
 
 FILES:
-  sourcePattern: %GROUPROOT%/pywikibot/djvutext.py
-  definitionFile: 

[MediaWiki-commits] [Gerrit] Remove unused, slow and error prone PythonSingleFFS - change (mediawiki...Translate)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Remove unused, slow and error prone PythonSingleFFS
..

Remove unused, slow and error prone PythonSingleFFS

Bug: 71702
Change-Id: I4abdcae706bc0ffd1494ad002ea174d3261ec705
---
M Autoload.php
D ffs/PythonSingleFFS.php
D tests/phpunit/ffs/PythonSingleFFSTest.php
3 files changed, 0 insertions(+), 293 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/44/164944/1

diff --git a/Autoload.php b/Autoload.php
index ea9cd26..d58f480 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -181,7 +181,6 @@
 $al['JavaScriptFFS'] = $dir/ffs/JavaScriptFFS.php;
 $al['JsonFFS'] = $dir/ffs/JsonFFS.php;
 $al['MediaWikiExtensionFFS'] = $dir/ffs/MediaWikiExtensionFFS.php;
-$al['PythonSingleFFS'] = $dir/ffs/PythonSingleFFS.php;
 $al['RubyYamlFFS'] = $dir/ffs/RubyYamlFFS.php;
 $al['ShapadoJsFFS'] = $dir/ffs/JavaScriptFFS.php;
 $al['SimpleFFS'] = $dir/ffs/SimpleFFS.php;
diff --git a/ffs/PythonSingleFFS.php b/ffs/PythonSingleFFS.php
deleted file mode 100644
index f5933ca..000
--- a/ffs/PythonSingleFFS.php
+++ /dev/null
@@ -1,229 +0,0 @@
-?php
-
-/**
- * Generic file format support for Python single dictionary formatted files.
- * @ingroup FFS
- */
-class PythonSingleFFS extends SimpleFFS {
-   public function getFileExtensions() {
-   return array( '.py' );
-   }
-
-   /**
-* To avoid parsing full files again and again when reading or exporting
-* multiple languages, keep cache of the sections of the latest active 
file.
-* @var array
-*/
-   protected static $cache = array();
-
-   /**
-* @param string $data Full file contents
-* @param string $filename Full path to file for debugging
-* @return string[] Sections indexed by language code, or 0 for header 
section
-* @throws MWException
-*/
-   protected function splitSections( $data, $filename = 'unknown' ) {
-   $data = SimpleFFS::fixNewLines( $data );
-
-   $splitter = 'msg = {';
-
-   $pos = strpos( $data, $splitter );
-   if ( $pos === false ) {
-   throw new MWException( MWEFFS1: File $filename: 
splitter not found );
-   }
-
-   $offset = $pos + strlen( $splitter );
-   $header = substr( $data, 0, $offset );
-   // Avoid buildup of whitespace
-   $header = trim( $header );
-
-   $pattern = '.*?},\s';
-   $regexp = ~$pattern~xsu;
-   $matches = array();
-   preg_match_all( $regexp, $data, $matches, PREG_SET_ORDER, 
$offset );
-
-   $sections = array();
-   $sections[] = $header;
-
-   foreach ( $matches as $data ) {
-   $pattern = '([a-z-]+)'\s*:\s*{;
-   $regexp = ~$pattern~su;
-   $matches = array();
-   if ( !preg_match( $regexp, $data[0], $matches ) ) {
-   throw new MWException( MWEFFS2: File 
$filename: malformed section: {$data[0]} );
-   }
-   $code = $matches[1];
-   // Normalize number of newlines
-   $sections[$code] = trim( $data[0], \n );
-   }
-
-   return $sections;
-   }
-
-   /**
-* @param string $code Language code.
-* @return array|bool
-*/
-   public function read( $code ) {
-   $code = $this-group-mapCode( $code );
-   $filename = $this-group-getSourceFilePath( $code );
-   if ( !file_exists( $filename ) ) {
-   return false;
-   }
-
-   if ( isset( self::$cache[$filename]['parsed'][$code] ) ) {
-   return self::$cache[$filename]['parsed'][$code];
-   }
-
-   if ( !isset( self::$cache[$filename] ) ) {
-   // Clear the cache if the filename changes to reduce 
memory use
-   self::$cache = array();
-
-   $contents = file_get_contents( $filename );
-   self::$cache[$filename]['sections'] =
-   $this-splitSections( $contents, $filename );
-
-   self::$cache[$filename]['parsed'] = $this-parseFile();
-   }
-
-   if ( !isset( self::$cache[$filename]['parsed'][$code] ) ) {
-   return null;
-   }
-
-   return self::$cache[$filename]['parsed'][$code];
-   }
-
-   protected function parseFile() {
-   /* N levels of escaping
-* - for PHP string
-* - for Python string
-* - for shell command
-* 

[MediaWiki-commits] [Gerrit] Remove exception for iHRIS from bexportall - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Remove exception for iHRIS from bexportall
..


Remove exception for iHRIS from bexportall

Change-Id: I9a3320ee523521a7e77efd63d633bc9aebae0a11
---
M bin/bexportall
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/bin/bexportall b/bin/bexportall
index 91c69dd..0dfc71c 100755
--- a/bin/bexportall
+++ b/bin/bexportall
@@ -10,14 +10,6 @@
exit;
 fi
 
-# Export all iHRIS groups
-if [ $1 = 'ihris' ]; then
-   echo Exporting all iHRIS groups in languages over 35%...
-   php $SCRIPTPATH/export.php --target=$EXPORTPATH/ --lang='*' 
--skip=en,qqq --threshold=35 --ppgettext=/resources/projects --group=out-ihris*
-   echo Done.
-   exit;
-fi
-
 if [ -z $2 ]; then
php export.php --target=$EXPORTPATH --skip=en --group=$1 --lang='*'
 else

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a3320ee523521a7e77efd63d633bc9aebae0a11
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Move window overlay up to be a sibling of the frame - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Move window overlay up to be a sibling of the frame
..


Move window overlay up to be a sibling of the frame

Bug: 71178
Change-Id: I7e0294bb1dfc3c0fe32ad1070926f1e24e55d6e5
---
M src/Window.js
M src/themes/apex/windows.less
M src/themes/mediawiki/windows.less
M src/widgets/LookupInputWidget.js
4 files changed, 13 insertions(+), 8 deletions(-)

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



diff --git a/src/Window.js b/src/Window.js
index 3efec83..177f0fa 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -60,12 +60,14 @@
this.loading = null;
this.size = config.size || this.constructor.static.size;
this.$frame = this.$( 'div' );
+   this.$overlay = this.$( 'div' );
 
// Initialization
this.$element
.addClass( 'oo-ui-window' )
-   .append( this.$frame );
+   .append( this.$frame, this.$overlay );
this.$frame.addClass( 'oo-ui-window-frame' );
+   this.$overlay.addClass( 'oo-ui-window-overlay' );
 
// NOTE: Additional intitialization will occur when #setManager is 
called
 };
@@ -541,7 +543,6 @@
this.$head = this.$( 'div' );
this.$body = this.$( 'div' );
this.$foot = this.$( 'div' );
-   this.$overlay = this.$( 'div' );
this.$focusTrap = this.$( 'div' ).prop( 'tabIndex', 0 );
 
// Events
@@ -551,9 +552,8 @@
this.$head.addClass( 'oo-ui-window-head' );
this.$body.addClass( 'oo-ui-window-body' );
this.$foot.addClass( 'oo-ui-window-foot' );
-   this.$overlay.addClass( 'oo-ui-window-overlay' );
this.$focusTrap.addClass( 'oo-ui-window-focustrap' );
-   this.$content.append( this.$head, this.$body, this.$foot, 
this.$overlay, this.$focusTrap );
+   this.$content.append( this.$head, this.$body, this.$foot, 
this.$focusTrap );
 
return this;
 };
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 206fa03..0b11e3f 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -1,7 +1,8 @@
 @import 'common';
 
 .theme-oo-ui-window () {
-   -isolated {
+   -isolated,
+   -overlay {
background-color: transparent;
background-image: none;
font-family: sans-serif;
diff --git a/src/themes/mediawiki/windows.less 
b/src/themes/mediawiki/windows.less
index 5f2916f..d7c5ed2 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -1,7 +1,8 @@
 @import 'common';
 
 .theme-oo-ui-window () {
-   -isolated {
+   -isolated,
+   -overlay {
background: transparent;
font-family: sans-serif;
font-size: 0.8em;
diff --git a/src/widgets/LookupInputWidget.js b/src/widgets/LookupInputWidget.js
index 33f01ad..2f679f4 100644
--- a/src/widgets/LookupInputWidget.js
+++ b/src/widgets/LookupInputWidget.js
@@ -9,7 +9,7 @@
  * @constructor
  * @param {OO.ui.TextInputWidget} input Input widget
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$overlay=this.$( 'body, .oo-ui-window-overlay' ).last()] 
Overlay layer
+ * @cfg {jQuery} [$overlay] Overlay layer; defaults to the current window's 
overlay.
  */
 OO.ui.LookupInputWidget = function OoUiLookupInputWidget( input, config ) {
// Config intialization
@@ -17,7 +17,10 @@
 
// Properties
this.lookupInput = input;
-   this.$overlay = config.$overlay || this.$( 'body, 
.oo-ui-window-overlay' ).last();
+   this.$overlay = config.$overlay || ( this.$.$iframe || this.$element 
).closest( '.oo-ui-window' ).children( '.oo-ui-window-overlay' );
+   if ( this.$overlay.length === 0 ) {
+   this.$overlay = this.$( 'body' );
+   }
this.lookupMenu = new OO.ui.TextInputMenuWidget( this, {
$: OO.ui.Element.getJQuery( this.$overlay ),
input: this.lookupInput,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e0294bb1dfc3c0fe32ad1070926f1e24e55d6e5
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@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] ComboBoxWidget: Append menu to $overlay option - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: ComboBoxWidget: Append menu to $overlay option
..


ComboBoxWidget: Append menu to $overlay option

Bug: 71178
Change-Id: I0a39ae702e3fccf5bfb6d27299bd640ac2fa5c94
---
M src/widgets/ComboBoxWidget.js
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 3ea9a2e..65e3793 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -8,6 +8,7 @@
  * @param {Object} [config] Configuration options
  * @cfg {Object} [menu] Configuration options to pass to menu widget
  * @cfg {Object} [input] Configuration options to pass to input widget
+ * @cfg {jQuery} [$overlay] Overlay layer; defaults to the current window's 
overlay.
  */
 OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) {
// Configuration initialization
@@ -17,11 +18,15 @@
OO.ui.ComboBoxWidget.super.call( this, config );
 
// Properties
+   this.$overlay = config.$overlay || ( this.$.$iframe || this.$element 
).closest( '.oo-ui-window' ).children( '.oo-ui-window-overlay' );
+   if ( this.$overlay.length === 0 ) {
+   this.$overlay = this.$( 'body' );
+   }
this.input = new OO.ui.TextInputWidget( $.extend(
{ $: this.$, indicator: 'down', disabled: this.isDisabled() },
config.input
) );
-   this.menu = new OO.ui.MenuWidget( $.extend(
+   this.menu = new OO.ui.TextInputMenuWidget( this.input, $.extend(
{ $: this.$, widget: this, input: this.input, disabled: 
this.isDisabled() },
config.menu
) );
@@ -39,10 +44,8 @@
} );
 
// Initialization
-   this.$element.addClass( 'oo-ui-comboBoxWidget' ).append(
-   this.input.$element,
-   this.menu.$element
-   );
+   this.$element.addClass( 'oo-ui-comboBoxWidget' ).append( 
this.input.$element );
+   this.$overlay.append( this.menu.$element );
this.onMenuItemsChange();
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a39ae702e3fccf5bfb6d27299bd640ac2fa5c94
Gerrit-PatchSet: 9
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
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] Remove exception for iHRIS from bexportall - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Remove exception for iHRIS from bexportall
..

Remove exception for iHRIS from bexportall

Change-Id: I9a3320ee523521a7e77efd63d633bc9aebae0a11
---
M bin/bexportall
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/45/164945/1

diff --git a/bin/bexportall b/bin/bexportall
index 91c69dd..0dfc71c 100755
--- a/bin/bexportall
+++ b/bin/bexportall
@@ -10,14 +10,6 @@
exit;
 fi
 
-# Export all iHRIS groups
-if [ $1 = 'ihris' ]; then
-   echo Exporting all iHRIS groups in languages over 35%...
-   php $SCRIPTPATH/export.php --target=$EXPORTPATH/ --lang='*' 
--skip=en,qqq --threshold=35 --ppgettext=/resources/projects --group=out-ihris*
-   echo Done.
-   exit;
-fi
-
 if [ -z $2 ]; then
php export.php --target=$EXPORTPATH --skip=en --group=$1 --lang='*'
 else

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a3320ee523521a7e77efd63d633bc9aebae0a11
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 70fe9aa..dcdc5ab - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 70fe9aa..dcdc5ab
..


Syncronize VisualEditor: 70fe9aa..dcdc5ab

Change-Id: I8008fb2bc7bc0079e09f66c43169a72292a7d77a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 70fe9aa..dcdc5ab 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 70fe9aac4d5695bd4824666888c5b86700cf6473
+Subproject commit dcdc5ab0c022eac157cf81891abf2ece0f978ab2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8008fb2bc7bc0079e09f66c43169a72292a7d77a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.Platform: Use 'mediawiki.language' for language fallback ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: mw.Platform: Use 'mediawiki.language' for language fallback 
chain
..


mw.Platform: Use 'mediawiki.language' for language fallback chain

Bonus:
* Remove doubled dependency on mediawiki.Uri
* Add missing dependency on mediawiki.language

Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
---
M VisualEditor.php
M modules/ve-mw/init/ve.init.mw.Platform.js
2 files changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index f15c32c..182a617 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -280,8 +280,8 @@
'jquery.visibleText',
'jquery.byteLength',
'jquery.client',
-   'mediawiki.Uri',
'mediawiki.api',
+   'mediawiki.language',
'mediawiki.Title',
'mediawiki.Uri',
'mediawiki.user',
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js 
b/modules/ve-mw/init/ve.init.mw.Platform.js
index f5cdfb0..0f5be8f 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -105,15 +105,7 @@
 
 /** @inheritdoc */
 ve.init.mw.Platform.prototype.getUserLanguages = function () {
-   var lang = mw.config.get( 'wgUserLanguage' ),
-   langParts = lang.split( '-' ),
-   langs = [ lang ];
-
-   if ( langParts.length  1 ) {
-   langs.push( langParts[0] );
-   }
-
-   return langs;
+   return mw.language.getFallbackLanguageChain();
 };
 
 /* Initialization */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@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] Syncronize VisualEditor: 70fe9aa..dcdc5ab - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 70fe9aa..dcdc5ab
..

Syncronize VisualEditor: 70fe9aa..dcdc5ab

Change-Id: I8008fb2bc7bc0079e09f66c43169a72292a7d77a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/48/164948/1

diff --git a/VisualEditor b/VisualEditor
index 70fe9aa..dcdc5ab 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 70fe9aac4d5695bd4824666888c5b86700cf6473
+Subproject commit dcdc5ab0c022eac157cf81891abf2ece0f978ab2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8008fb2bc7bc0079e09f66c43169a72292a7d77a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Don't lose specified language on search - change (mediawiki...Translate)

[Ebrahim (Code Review)]

Ebrahim has uploaded a new change for review.

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

Change subject: Don't lose specified language on search
..

Don't lose specified language on search

Change-Id: I1a5bd2460b094da1a33a0b0004270847cfa67164
---
M specials/SpecialSearchTranslations.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/49/164949/1

diff --git a/specials/SpecialSearchTranslations.php 
b/specials/SpecialSearchTranslations.php
index 6fb2037..09eebb2 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -313,9 +313,12 @@
$title = Html::hidden( 'title', 
$this-getTitle()-getPrefixedText() );
$input = Xml::input( 'query', false, $query, $attribs );
$submit = Xml::submitButton( $this-msg( 'tux-sst-search' ), 
array( 'class' = 'button' ) );
+   $language = isset( $_REQUEST['language'] ) ?
+   Html::hidden( 'language', $_REQUEST['language'] ) :
+   '';
 
$form = Html::rawElement( 'form', array( 'action' = wfScript() 
),
-   $title . $input . $submit
+   $title . $input . $submit . $language
);
 
return $form;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a5bd2460b094da1a33a0b0004270847cfa67164
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@gnu.org

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

[MediaWiki-commits] [Gerrit] Remove VisualEditor-qunit - change (integration/zuul-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove VisualEditor-qunit
..


Remove VisualEditor-qunit

On review of JJB change https://gerrit.wikimedia.org/r/#/c/163837/ the
job should only be triggered for mediawiki/extensions/VisualEditor which
is where the integration work is being done.

It is also very confusing to have it named 'VisualEditor-qunit' which
would suggest it is meant to be triggered on upstream repository
VisualEditor/VisualEditor when it really tests the MediaWiki extension.

Change-Id: I6218a0bd3d06d13b794b5c03dbf4b4e064cc0193
---
M layout.yaml
1 file changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/layout.yaml b/layout.yaml
index b4b8d66..96ccfbe 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1532,12 +1532,6 @@
   - name: 'mwext-VisualEditor-sync-gerrit'
 branch: ^master$
 
-  # Experimental https://gerrit.wikimedia.org/r/163837
-  # Once made voting remove it from experimental pipeline and uncomment it from
-  # the test and gate-and-submit pipelines.
-  - name: 'VisualEditor-qunit'
-voting: false
-
   # FIXME: work in progress
   - name: sartoris-sphinx-doc
 voting: false
@@ -5486,16 +5480,12 @@
   - mwext-VisualEditor-npm
   - mwext-VisualEditor-lint
   - mwext-VisualEditor-doc-test
-  #- VisualEditor-qunit
 gate-and-submit:
   - mediawiki-gate
   - mwext-VisualEditor-npm
   - mwext-VisualEditor-lint
   - mwext-VisualEditor-doc-test
   - experiment-gating-dependencies
-  #- VisualEditor-qunit
-experimental:
-  - VisualEditor-qunit
 postmerge:
   - mwext-VisualEditor-doc-publish
   - mwext-VisualEditor-sync-gerrit
@@ -5817,14 +5807,10 @@
   - VisualEditor-npm
   - VisualEditor-ruby1.9.3lint
   - VisualEditor-jsduck
-  #- VisualEditor-qunit
 gate-and-submit:
   - VisualEditor-npm
   - VisualEditor-ruby1.9.3lint
   - VisualEditor-jsduck
-  #- VisualEditor-qunit
-experimental:
-  - VisualEditor-qunit
 
   - name: wikimedia/bots/jouncebot
 check-voter:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6218a0bd3d06d13b794b5c03dbf4b4e064cc0193
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update Wikidata, partial fix for bug 71479 and editing prope... - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Update Wikidata, partial fix for bug 71479 and editing 
properties
..

Update Wikidata, partial fix for bug 71479 and editing properties

also fix for bug 71469.

see I2b3b6ba for actual extension changes.

Change-Id: I511095eed603b1df7f6dea0aae64d90f4fe2b6d9
---
M extensions/Wikidata
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/164950/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index 2276fb2..fb07761 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit 2276fb2e2dab992f707442aab4ecdfffc9956056
+Subproject commit fb07761c53992b045e5cd9e4de0d1be04857ce01

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I511095eed603b1df7f6dea0aae64d90f4fe2b6d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] codfw: add missing machines - change (operations...swift-ring)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: codfw: add missing machines
..

codfw: add missing machines

each row is a zone, thus four machines per row at the moment

Change-Id: Ic6f3b044a37773c3c1a1cfd05c9bff78a5415376
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 192 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring 
refs/changes/51/164951/1

diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index f62af7b..aae8d24 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index a2f7a68..dfa504c 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,10 +1,28 @@
-codfw-prod/account.builder, build version 6
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 6 devices, 100.00 
balance
-The minimum number of hours before a partition can be reassigned is 3
+codfw-prod/account.builder, build version 26
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 24 devices, 0.00 
balance
+The minimum number of hours before a partition can be reassigned is 0
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00  0 -100.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00  0 -100.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00  0 -100.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00  0 -100.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00  0 -100.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00  0 -100.00 
+ 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   81920.00 
+ 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   81920.00 
+ 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   81920.00 
+ 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   81920.00 
+ 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   81920.00 
+ 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   81920.00 
+ 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   81920.00 
+ 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   81920.00 
+ 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   81920.00 
+ 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   81920.00 
+10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   81920.00 
+11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   81920.00 
+12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   81920.00 
+13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   81920.00 
+14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   81920.00 
+15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   81920.00 
+16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   81920.00 
+17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   81920.00 
+18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   81920.00 
+19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   81920.00 
+20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   8192  

[MediaWiki-commits] [Gerrit] codfw: add missing machines to the ring - change (operations...swift-ring)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: codfw: add missing machines to the ring
..


codfw: add missing machines to the ring

each row is a zone, thus four machines per row at the moment

Change-Id: Ic6f3b044a37773c3c1a1cfd05c9bff78a5415376
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 192 insertions(+), 57 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index f62af7b..aae8d24 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index a2f7a68..dfa504c 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,10 +1,28 @@
-codfw-prod/account.builder, build version 6
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 6 devices, 100.00 
balance
-The minimum number of hours before a partition can be reassigned is 3
+codfw-prod/account.builder, build version 26
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 24 devices, 0.00 
balance
+The minimum number of hours before a partition can be reassigned is 0
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00  0 -100.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00  0 -100.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00  0 -100.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00  0 -100.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00  0 -100.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00  0 -100.00 
+ 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   81920.00 
+ 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   81920.00 
+ 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   81920.00 
+ 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   81920.00 
+ 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   81920.00 
+ 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   81920.00 
+ 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   81920.00 
+ 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   81920.00 
+ 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   81920.00 
+ 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   81920.00 
+10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   81920.00 
+11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   81920.00 
+12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   81920.00 
+13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   81920.00 
+14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   81920.00 
+15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   81920.00 
+16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   81920.00 
+17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   81920.00 
+18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   81920.00 
+19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   81920.00 
+20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   81920.00 
+21   1 3   

[MediaWiki-commits] [Gerrit] Update Wikidata, partial fix for bug 71479 and editing prope... - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Update Wikidata, partial fix for bug 71479 and editing 
properties
..

Update Wikidata, partial fix for bug 71479 and editing properties

also fix for bug 71469.

see I2b3b6ba for actual extension changes.

Change-Id: I882e219f6ea0e0b4494843ad222d064ac17bfcd8
---
M extensions/Wikidata
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/164952/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index 2276fb2..fb07761 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit 2276fb2e2dab992f707442aab4ecdfffc9956056
+Subproject commit fb07761c53992b045e5cd9e4de0d1be04857ce01

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I882e219f6ea0e0b4494843ad222d064ac17bfcd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] mw-run-phpunit*: let us override PHPUNIT_DIR - change (integration/jenkins)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: mw-run-phpunit*: let us override PHPUNIT_DIR
..

mw-run-phpunit*: let us override PHPUNIT_DIR

I would like to run MediaWiki PHPUnit job whenever a change is proposed
to our PHPUnit fork in integration/phpunit.git.  To do so change the
assignement of PHPUNIT_DIR so it does not override the variable if it is
already set.

Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit-hhvm.sh
M bin/mw-run-phpunit.sh
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/53/164953/1

diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index 55f3b05..8c2d45e 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -13,7 +13,7 @@
 JUNIT_DEST=$LOG_DIR/junit-phpunit-allexts.xml
 
 # See documentation in mw-run-phpunit.sh
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Make sure to compress MediaWiki log dir after phpunit has ran
 function compress_log_dir() {
diff --git a/bin/mw-run-phpunit-hhvm.sh b/bin/mw-run-phpunit-hhvm.sh
index 4f2cfb6..f608e10 100755
--- a/bin/mw-run-phpunit-hhvm.sh
+++ b/bin/mw-run-phpunit-hhvm.sh
@@ -23,7 +23,7 @@
 #
 # WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
 #
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Setup Junit destination
 LOG_DIR=$WORKSPACE/log
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index 60bef01..f6e33fc 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -32,7 +32,7 @@
 #
 # WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
 #
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Setup Junit destination
 LOG_DIR=$WORKSPACE/log

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] Use $.when for promise handling - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Use $.when for promise handling
..


Use $.when for promise handling

Change-Id: If56e331167a3e51582c10e08083355a9f76f16ad
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
1 file changed, 15 insertions(+), 29 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 84b7eb7..6034b41 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -328,38 +328,24 @@
 */
_fetchItems: function( itemIds ) {
var self = this,
-   deferred = $.Deferred(),
-   i = 0;
+   deferred = $.Deferred();
 
-   /**
-* @param {string} itemId
-* @param {wikibase.store.EntityStore} entityStore
-* @param {jQuery.Deferred} deferred
-*/
-   function fetchItem( itemId, entityStore, deferred ) {
-   entityStore.get( itemId )
-   .done( function( fetchedContent ) {
-   if( fetchedContent ) {
-   badges[itemId] = 
fetchedContent.getContent();
+   $.when.apply( $, $.map( itemIds, function( itemId ) {
+   return self.options.entityStore.get( itemId );
+   } ) ).done( function( /*…*/ ) {
+   var item;
+   for( var i = 0; i  arguments.length; ++i ) {
+   if( arguments[i] ) {
+   item = arguments[i].getContent();
+   badges[item.getId()] = item;
}
-   if( --i === 0 ) {
-   deferred.resolve();
-   }
-   } )
-   .fail( function() {
-   // TODO: Have entityStore return a proper 
RepoApiError object.
-   deferred.reject();
-   } );
-   }
-
-   $.each( itemIds, function() {
-   i++;
-   fetchItem( this, self.options.entityStore, deferred );
-   } );
-
-   if( $.isEmptyObject( itemIds ) ) {
+   }
deferred.resolve();
-   }
+   } )
+   .fail( function() {
+   // TODO: Have entityStore return a proper RepoApiError 
object.
+   deferred.reject();
+   } );
 
return deferred.promise();
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If56e331167a3e51582c10e08083355a9f76f16ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] Replace widgetBaseClass with widgetFullName - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Replace widgetBaseClass with widgetFullName
..


Replace widgetBaseClass with widgetFullName

See http://bugs.jqueryui.com/ticket/8154 and
http://bugs.jqueryui.com/ticket/8155.

Change-Id: I8247d2bb6c0f4554b2c9feaf643fef860e1bf72a
---
M lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
M lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/toolbar/addtoolbar.js
M lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M lib/resources/jquery.wikibase/toolbar/movetoolbar.js
M lib/resources/jquery.wikibase/toolbar/removetoolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbarbase.js
M lib/resources/jquery.wikibase/toolbar/toolbarbutton.js
M lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
M lib/resources/jquery.wikibase/toolbar/toolbarlabel.js
23 files changed, 57 insertions(+), 57 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js 
b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
index 0bf704a..c440fc1 100644
--- a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
+++ b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
@@ -93,7 +93,7 @@
 
// the element node will be preserved, no matter 
whether it is of the same kind as the
// template's root node (it is assumed that the 
template has a root node)
-   this.element.addClass( this.widgetBaseClass );
+   this.element.addClass( this.widgetFullName );
this.element.applyTemplate( this.option( 'template' ), 
templateParams );
},
 
@@ -125,7 +125,7 @@
destroy: function() {
PARENT.prototype.destroy.call( this );
 
-   this.element.removeClass( this.widgetBaseClass );
+   this.element.removeClass( this.widgetFullName );
 
// nullify references to short-cut DOM nodes
for( var shortCut in this.options.templateShortCuts ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 84b7eb7..5dc009b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -92,7 +92,7 @@
 * @see jQuery.Widget.destroy
 */
destroy: function() {
-   if( $( '.' + this.widgetBaseClass ).length === 0 ) {
+   if( $( '.' + this.widgetFullName ).length === 0 ) {
this._detachMenuEventListeners();
 
$menu.data( 'menu' ).destroy();
@@ -221,7 +221,7 @@
 
$menu = $( 'ul/' )
.text( '...' )
-   .addClass( this.widgetBaseClass + '-menu' )
+   .addClass( this.widgetFullName + '-menu' )
.appendTo( 'body' );
 
return $menu.menu();
@@ -296,7 +296,7 @@
}
 
$( 'li/' )
-   .addClass( self.widgetBaseClass + '-menuitem-' 
+ itemId )
+   .addClass( self.widgetFullName + '-menuitem-' + 
itemId )
.data( self.widgetName + '-menuitem-badge', 
itemId )
.append( $item
.prepend( mw.template( 'wb-badge',
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index 9f7672c..524e92b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -532,6 +532,6 @@
 
 // We have to override this here because $.widget sets it no matter 

[MediaWiki-commits] [Gerrit] mw-run-phpunit*: let us override PHPUNIT_DIR - change (integration/jenkins)

[jenkins-bot (Code Review)]

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

Change subject: mw-run-phpunit*: let us override PHPUNIT_DIR
..


mw-run-phpunit*: let us override PHPUNIT_DIR

I would like to run MediaWiki PHPUnit job whenever a change is proposed
to our PHPUnit fork in integration/phpunit.git.  To do so change the
assignement of PHPUNIT_DIR so it does not override the variable if it is
already set.

Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit-hhvm.sh
M bin/mw-run-phpunit.sh
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index 55f3b05..8c2d45e 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -13,7 +13,7 @@
 JUNIT_DEST=$LOG_DIR/junit-phpunit-allexts.xml
 
 # See documentation in mw-run-phpunit.sh
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Make sure to compress MediaWiki log dir after phpunit has ran
 function compress_log_dir() {
diff --git a/bin/mw-run-phpunit-hhvm.sh b/bin/mw-run-phpunit-hhvm.sh
index 4f2cfb6..f608e10 100755
--- a/bin/mw-run-phpunit-hhvm.sh
+++ b/bin/mw-run-phpunit-hhvm.sh
@@ -23,7 +23,7 @@
 #
 # WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
 #
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Setup Junit destination
 LOG_DIR=$WORKSPACE/log
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index 60bef01..f6e33fc 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -32,7 +32,7 @@
 #
 # WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
 #
-PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
 
 # Setup Junit destination
 LOG_DIR=$WORKSPACE/log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
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] Change badgeselector test to use the new EntityStore - change (mediawiki...Wikibase)

[Adrian Lang (Code Review)]

Adrian Lang has uploaded a new change for review.

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

Change subject: Change badgeselector test to use the new EntityStore
..

Change badgeselector test to use the new EntityStore

Change-Id: I2aabbec0e8480589b9057feff1ee81e87f304120
---
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
1 file changed, 9 insertions(+), 4 deletions(-)


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

diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
index f462b53..36ef524 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
@@ -18,9 +18,7 @@
}
 } ) );
 
-var entityStore = new wb.store.EntityStore( 'i am an abstracted repo api' );
-
-entityStore.compile( {
+var entities =  {
Q1: new wb.store.FetchedContent( {
title: new mw.Title( 'Item:Q1' ),
content: new wb.datamodel.Item( {
@@ -45,7 +43,14 @@
labels: { en: { language: 'en', value: 'Q3-label' } }
} )
} )
-} );
+};
+
+var entityStore = {
+   get: function( entityId ) {
+   return $.Deferred().resolve( entities[entityId] );
+   }
+};
+
 
 /**
  * @param {Object} [options]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aabbec0e8480589b9057feff1ee81e87f304120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Remove unused code from snakview - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Remove unused code from snakview
..

Remove unused code from snakview

Change-Id: Ia7fb2ae2497961d83a94324d0fc4ca3f6f683d70
---
M lib/resources/jquery.wikibase/snakview/snakview.js
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js 
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 555fddd..862f710 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -638,7 +638,7 @@
 *
 * @since 0.4
 *
-* @param {String|null} snakType
+* @param {String|null} [snakType]
 * @return String|null
 */
snakType: function( snakType ) {
@@ -671,7 +671,6 @@
 */
_updateVariation: function() {
var variationsFactory = $.wikibase.snakview.variations,
-   variationType,
snakType = this._snakType,
VariationConstructor = variationsFactory.getVariation( 
snakType );
 
@@ -694,7 +693,6 @@
this._entityStore,
this._valueViewBuilder
);
-   variationType = 
this._variation.variationSnakConstructor.TYPE;
}
},
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7fb2ae2497961d83a94324d0fc4ca3f6f683d70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Fix sitelinklistview and sitelinkgroupview tests - change (mediawiki...Wikibase)

[Adrian Lang (Code Review)]

Adrian Lang has uploaded a new change for review.

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

Change subject: Fix sitelinklistview and sitelinkgroupview tests
..

Fix sitelinklistview and sitelinkgroupview tests

Change-Id: I0bb490da25b4fbdbabab2aff9eccb1ebc00ee6cb
---
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
2 files changed, 61 insertions(+), 25 deletions(-)


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

diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
index 9791133..703bf62 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
@@ -131,22 +131,38 @@
);
} );
 
-   sitelinkgroupview.startEditing();
-   sitelinkgroupview.startEditing(); // should not trigger event
-   sitelinkgroupview.stopEditing( true );
-   sitelinkgroupview.stopEditing( true ); // should not trigger event
-   sitelinkgroupview.stopEditing(); // should not trigger event
+   function p1() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstartediting', 
p2 );
+   sitelinkgroupview.startEditing();
+   sitelinkgroupview.startEditing(); // should not trigger event
+   }
 
-   sitelinkgroupview.startEditing();
+   function p2() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstopediting', p3 
);
+   sitelinkgroupview.stopEditing( true );
+   sitelinkgroupview.stopEditing( true ); // should not trigger 
event
+   sitelinkgroupview.stopEditing(); // should not trigger event
+   }
 
-   // Mock adding a new item:
-   var sitelinklistview = sitelinkgroupview.$sitelinklistview.data( 
'sitelinklistview' ),
-   listview = sitelinklistview.$listview.data( 'listview' ),
-   lia = listview.listItemAdapter(),
-   $sitelinkview = listview.addItem( new wb.datamodel.SiteLink( 
'aawiki', 'aawiki-page' ) );
-   lia.liInstance( $sitelinkview ).startEditing();
+   function p3() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstartediting', 
p4 );
+   sitelinkgroupview.startEditing();
 
-   sitelinkgroupview.stopEditing();
+   // Mock adding a new item:
+   var sitelinklistview = 
sitelinkgroupview.$sitelinklistview.data( 'sitelinklistview' ),
+   listview = sitelinklistview.$listview.data( 'listview' 
),
+   lia = listview.listItemAdapter(),
+   $sitelinkview = listview.addItem( new 
wb.datamodel.SiteLink( 'aawiki', 'aawiki-page' ) );
+   lia.liInstance( $sitelinkview ).startEditing();
+   }
+
+   function p4() {
+   QUnit.start();
+   sitelinkgroupview.stopEditing();
+   }
+
+   p1();
+   QUnit.stop();
 } );
 
 QUnit.test( 'setError()', 1, function( assert ) {
diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
index 537a844..a6495ea 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
@@ -213,21 +213,41 @@
);
} );
 
-   sitelinklistview.startEditing();
-   sitelinklistview.startEditing(); // should not trigger event
-   sitelinklistview.stopEditing( true );
-   sitelinklistview.stopEditing( true ); // should not trigger event
-   sitelinklistview.stopEditing(); // should not trigger event
+   function p1() {
+   $sitelinklistview.one( 'sitelinklistviewafterstartediting', p2 
);
+   sitelinklistview.startEditing();
+   sitelinklistview.startEditing(); // should not trigger event
+   }
 
-   sitelinklistview.startEditing();
+   function p2() {
+   $sitelinklistview.one( 'sitelinklistviewafterstopediting', p3 );
+   sitelinklistview.stopEditing( true );
+   sitelinklistview.stopEditing( true ); // should not trigger 
event
+   sitelinklistview.stopEditing(); // should not trigger event
+   }
 
-   // Mock adding a new item:
-   var listview = sitelinklistview.$listview.data( 'listview' ),
-   lia = listview.listItemAdapter(),
-   $sitelinkview = listview.addItem( new wb.datamodel.SiteLink( 
'aawiki', 'aawiki-page' ) );
-   lia.liInstance( $sitelinkview ).startEditing();
+   function p3() {
+   

[MediaWiki-commits] [Gerrit] swift: add codfw monitoring and dashboards - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: add codfw monitoring and dashboards
..

swift: add codfw monitoring and dashboards

Change-Id: I7ea244d2b49b7f53112808ff450dc9047abb
---
A files/gdash/dashboards/swift.codfw-prod/10_proxy_change_state.graph
A files/gdash/dashboards/swift.codfw-prod/20_proxy_unchange_state.graph
A files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
A files/gdash/dashboards/swift.codfw-prod/30_proxy_server_errors.graph
A files/gdash/dashboards/swift.codfw-prod/40_proxy_client_errors.graph
A files/gdash/dashboards/swift.codfw-prod/45_load_average.graph
A files/gdash/dashboards/swift.codfw-prod/50_proxy_misc.graph
A files/gdash/dashboards/swift.codfw-prod/60_network_io.graph
A files/gdash/dashboards/swift.codfw-prod/70_network_err.graph
A files/gdash/dashboards/swift.codfw-prod/dash.yaml
M manifests/ganglia.pp
M manifests/role/graphite.pp
A modules/swift_new/manifests/monitoring/graphite.pp
13 files changed, 175 insertions(+), 1 deletion(-)


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

diff --git 
a/files/gdash/dashboards/swift.codfw-prod/10_proxy_change_state.graph 
b/files/gdash/dashboards/swift.codfw-prod/10_proxy_change_state.graph
new file mode 100644
index 000..8e439a2
--- /dev/null
+++ b/files/gdash/dashboards/swift.codfw-prod/10_proxy_change_state.graph
@@ -0,0 +1,13 @@
+title   proxy ops/s (state-changing)
+
+field :put,
+:alias = object PUT 2xx,
+:data  = 
movingAverage(sumSeries(swift.codfw-prod.*.proxy-server.object.PUT.2*.timing.rate),5)
+
+field :delete,
+:alias = object DELETE 2xx,
+:data  = 
secondYAxis(movingAverage(sumSeries(swift.codfw-prod.*.proxy-server.object.DELETE.2*.timing.rate),5))
+
+field :post,
+:alias = object POST 2xx,
+:data  = 
secondYAxis(movingAverage(sumSeries(swift.codfw-prod.*.proxy-server.object.POST.2*.timing.rate),5))
diff --git 
a/files/gdash/dashboards/swift.codfw-prod/20_proxy_unchange_state.graph 
b/files/gdash/dashboards/swift.codfw-prod/20_proxy_unchange_state.graph
new file mode 100644
index 000..0b84011
--- /dev/null
+++ b/files/gdash/dashboards/swift.codfw-prod/20_proxy_unchange_state.graph
@@ -0,0 +1,9 @@
+title   proxy ops/s (not state-changing)
+
+field :get,
+:alias = proxy GET 2xx,
+:data  = 
movingAverage(sumSeries(swift.codfw-prod.*.proxy-server.object.GET.2*.timing.rate),5)
+
+field :head,
+:alias = proxy HEAD 2xx,
+:data  = 
secondYAxis(movingAverage(sumSeries(swift.codfw-prod.*.proxy-server.object.HEAD.2*.timing.rate),5))
diff --git a/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph 
b/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
new file mode 100644
index 000..0fa2aca
--- /dev/null
+++ b/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
@@ -0,0 +1,9 @@
+title   object and container availability (swift-dispersion)
+
+field :container_avail,
+:alias = container avail %,
+:data  = swift.codfw-prod.dispersion.container.pct_found.value
+
+field :object_avail,
+:alias = object avail %,
+:data  = swift.codfw-prod.dispersion.object.pct_found.value
diff --git 
a/files/gdash/dashboards/swift.codfw-prod/30_proxy_server_errors.graph 
b/files/gdash/dashboards/swift.codfw-prod/30_proxy_server_errors.graph
new file mode 100644
index 000..6992bdc
--- /dev/null
+++ b/files/gdash/dashboards/swift.codfw-prod/30_proxy_server_errors.graph
@@ -0,0 +1,25 @@
+title   proxy server errors/s
+
+field :proxy_object_errors_get,
+:alias = object GET 5xx errors,
+:data  = 
sumSeries(swift.codfw-prod.*.proxy-server.object.GET.5*.timing.rate)
+
+field :proxy_object_errors_delete,
+:alias = object DELETE 5xx errors,
+:data  = 
sumSeries(swift.codfw-prod.*.proxy-server.object.DELETE.5*.timing.rate)
+
+field :proxy_object_errors_head,
+:alias = object HEAD 5xx errors,
+:data  = 
sumSeries(swift.codfw-prod.*.proxy-server.object.HEAD.5*.timing.rate)
+
+field :proxy_object_errors_post,
+:alias = object POST 5xx errors,
+:data  = 
sumSeries(swift.codfw-prod.*.proxy-server.object.POST.5*.timing.rate)
+
+field :proxy_object_errors_put,
+:alias = object PUT 5xx errors,
+:data  = 
sumSeries(swift.codfw-prod.*.proxy-server.object.PUT.5*.timing.rate)
+
+field :proxy_errors,
+:alias = proxy errors count,
+:data  = sumSeries(swift.codfw-prod.*.proxy-server.errors.count)
diff --git 
a/files/gdash/dashboards/swift.codfw-prod/40_proxy_client_errors.graph 
b/files/gdash/dashboards/swift.codfw-prod/40_proxy_client_errors.graph
new file mode 100644
index 000..51b9efd
--- /dev/null
+++ b/files/gdash/dashboards/swift.codfw-prod/40_proxy_client_errors.graph
@@ -0,0 +1,25 @@
+title   proxy client errors/s
+
+field :proxy_object_errors_get,
+:alias = object GET 4xx errors,
+:data  = 

[MediaWiki-commits] [Gerrit] Remove unnecessary calls to variation.draw() - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Remove unnecessary calls to variation.draw()
..


Remove unnecessary calls to variation.draw()

snakview._setValue is the only method calling variation.value. It drawed the
variation three times per call. First, in snakview._updateVariation, then by
calling variation.value directly, and finally through snakview.draw.

The variation.value call in snakview._updateVariation is also unnecessary,
since snakview._setValue (only caller) immediately calls variation.value
afterwards.

Change-Id: I66c0f13d09cccec7096a4c08db3ebd860c4931c0
---
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
2 files changed, 1 insertion(+), 21 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js 
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 3ebd418..555fddd 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -112,13 +112,6 @@
_variation: null,
 
/**
-* Keeps track of values from previously used variations. This allows 
to display the same value
-* when using a previously used variation again during one edit-mode 
session.
-* @type Object
-*/
-   _recentVariationValues: null,
-
-   /**
 * The property of the Snak currently represented by the view.
 * @type {String}
 */
@@ -169,8 +162,6 @@
_create: function() {
// apply template to this.element:
PARENT.prototype._create.call( this );
-
-   this._recentVariationValues = {};
 
this._entityStore = this.option( 'entityStore' );
this._valueViewBuilder = this.option( 'valueViewBuilder' );
@@ -388,9 +379,6 @@
// TODO: should throw an error somewhere when trying to 
leave edit mode while
//  this.snak() still returns null. For now setting {} 
is a simple solution for non-
//  existent error handling in the snak UI
-
-   // forget about values set in different variations
-   this._recentVariationValues = {};
 
this.element.off( 'keydown.' + this.widgetName );
 
@@ -690,9 +678,6 @@
if( this._variation
 ( !this._propertyId || this._variation.constructor 
!== VariationConstructor )
) {
-   // remember variation's value for next time variation 
is used during same edit mode:
-   variationType = 
this._variation.variationSnakConstructor.TYPE;
-   this._recentVariationValues[ variationType ] = 
this._variation.value();
 
this.$snakValue.empty();
 
@@ -710,9 +695,6 @@
this._valueViewBuilder
);
variationType = 
this._variation.variationSnakConstructor.TYPE;
-
-   // display value used last for this variation within 
same edit-mode session:
-   this._variation.value( this._recentVariationValues[ 
variationType ] || {} );
}
},
 
diff --git 
a/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js 
b/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
index 965d75b..8932990 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
@@ -123,8 +123,7 @@
},
 
/**
-* Will set or return the value of the variation's part of the 
Snak. This will trigger
-* draw() as well.
+* Will set or return the value of the variation's part of the 
Snak.
 *
 * @since 0.4
 *
@@ -139,7 +138,6 @@
return this._getValue();
}
this._setValue( value );
-   this.draw();
},
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66c0f13d09cccec7096a4c08db3ebd860c4931c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Zuul cloner now defaults --branch to $ZUUL_BRANCH - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Zuul cloner now defaults --branch to $ZUUL_BRANCH
..

Zuul cloner now defaults --branch to $ZUUL_BRANCH

Upstream changed zuul-cloner --branch argument to default to
$ZUUL_BRANCH.  So we no more need to hardcoded it.

Reference:
https://review.openstack.org/#/c/116098/

Change-Id: If67bb9cc2b3f17322831417db5e4cf4828a032fc
---
M macro-scm.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/58/164958/1

diff --git a/macro-scm.yaml b/macro-scm.yaml
index 3f80ca3..8d0b4d5 100644
--- a/macro-scm.yaml
+++ b/macro-scm.yaml
@@ -101,7 +101,6 @@
 /usr/local/bin/zuul-cloner \
 --color \
 --verbose \
---branch $ZUUL_BRANCH \
 --map 
/srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml \
 --workspace src \
 https://gerrit.wikimedia.org/r/p \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If67bb9cc2b3f17322831417db5e4cf4828a032fc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] Test integration/phpunit against mw core branches - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Test integration/phpunit against mw core branches
..

Test integration/phpunit against mw core branches

Generate a job per maintained branch of MediaWiki core so we can assert
that changes proposed to integration/phpunit let us still run tests.

Change-Id: I151285fb04aa148d847f6c0b4c6cc6c7ab8411fa
---
M integration.yaml
M mediawiki.yaml
2 files changed, 35 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/59/164959/1

diff --git a/integration.yaml b/integration.yaml
index 6ee8d0b..6b3c154 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -135,3 +135,13 @@
  - '{name}-phpunit'
  - '{name}-yamllint'
  - python-jobs
+
+- project:
+name: 'integration-phpunit'
+mwbranch:
+ - master
+ - REL1_22
+ - REL1_23
+ - REL1_24
+jobs:
+  - 'integration-phpunit-mediawiki-{mwbranch}'
diff --git a/mediawiki.yaml b/mediawiki.yaml
index ca41aa1..97bb2ba 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -169,6 +169,31 @@
  - phpunit-junit-2
  - archive-log-dir
 
+# Test out our PHPUnit against various MediaWiki branches
+#
+# Essentially a copy paste of mediawiki-vendor-integration
+- job-template:
+name: 'integration-phpunit-mediawiki-{mwbranch}'
+node: productionSlaves  # not on labs for now
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - zuul-cloner:
+ projects: 
+ --branch {mwbranch}
+ mediawiki/core
+ mediawiki/vendor
+ integration/phpunit
+ - mw-install-sqlite
+ - mw-apply-settings
+ - shell: |
+ export 
PHPUNIT_DIR=$WORKSPACE/src/integration/phpunit/vendor/phpunit/phpunit
+ /srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh
+publishers:
+ - phpunit-junit-2
+ - archive-log-dir
+
 - job-template:
 name: mediawiki-core-regression-hhvm-{branch}
 node: contintLabsSlave  UbuntuTrusty

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I151285fb04aa148d847f6c0b4c6cc6c7ab8411fa
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] Change badgeselector test to use the new EntityStore - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Change badgeselector test to use the new EntityStore
..


Change badgeselector test to use the new EntityStore

Change-Id: I2aabbec0e8480589b9057feff1ee81e87f304120
---
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
1 file changed, 9 insertions(+), 4 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
index f462b53..36ef524 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
@@ -18,9 +18,7 @@
}
 } ) );
 
-var entityStore = new wb.store.EntityStore( 'i am an abstracted repo api' );
-
-entityStore.compile( {
+var entities =  {
Q1: new wb.store.FetchedContent( {
title: new mw.Title( 'Item:Q1' ),
content: new wb.datamodel.Item( {
@@ -45,7 +43,14 @@
labels: { en: { language: 'en', value: 'Q3-label' } }
} )
} )
-} );
+};
+
+var entityStore = {
+   get: function( entityId ) {
+   return $.Deferred().resolve( entities[entityId] );
+   }
+};
+
 
 /**
  * @param {Object} [options]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2aabbec0e8480589b9057feff1ee81e87f304120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] Remove unused code from snakview - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Remove unused code from snakview
..


Remove unused code from snakview

Change-Id: Ia7fb2ae2497961d83a94324d0fc4ca3f6f683d70
---
M lib/resources/jquery.wikibase/snakview/snakview.js
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js 
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 555fddd..862f710 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -638,7 +638,7 @@
 *
 * @since 0.4
 *
-* @param {String|null} snakType
+* @param {String|null} [snakType]
 * @return String|null
 */
snakType: function( snakType ) {
@@ -671,7 +671,6 @@
 */
_updateVariation: function() {
var variationsFactory = $.wikibase.snakview.variations,
-   variationType,
snakType = this._snakType,
VariationConstructor = variationsFactory.getVariation( 
snakType );
 
@@ -694,7 +693,6 @@
this._entityStore,
this._valueViewBuilder
);
-   variationType = 
this._variation.variationSnakConstructor.TYPE;
}
},
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7fb2ae2497961d83a94324d0fc4ca3f6f683d70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@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] Fix sitelinklistview and sitelinkgroupview tests - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix sitelinklistview and sitelinkgroupview tests
..


Fix sitelinklistview and sitelinkgroupview tests

Change-Id: I0bb490da25b4fbdbabab2aff9eccb1ebc00ee6cb
---
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
2 files changed, 61 insertions(+), 25 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
index 9791133..703bf62 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
@@ -131,22 +131,38 @@
);
} );
 
-   sitelinkgroupview.startEditing();
-   sitelinkgroupview.startEditing(); // should not trigger event
-   sitelinkgroupview.stopEditing( true );
-   sitelinkgroupview.stopEditing( true ); // should not trigger event
-   sitelinkgroupview.stopEditing(); // should not trigger event
+   function p1() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstartediting', 
p2 );
+   sitelinkgroupview.startEditing();
+   sitelinkgroupview.startEditing(); // should not trigger event
+   }
 
-   sitelinkgroupview.startEditing();
+   function p2() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstopediting', p3 
);
+   sitelinkgroupview.stopEditing( true );
+   sitelinkgroupview.stopEditing( true ); // should not trigger 
event
+   sitelinkgroupview.stopEditing(); // should not trigger event
+   }
 
-   // Mock adding a new item:
-   var sitelinklistview = sitelinkgroupview.$sitelinklistview.data( 
'sitelinklistview' ),
-   listview = sitelinklistview.$listview.data( 'listview' ),
-   lia = listview.listItemAdapter(),
-   $sitelinkview = listview.addItem( new wb.datamodel.SiteLink( 
'aawiki', 'aawiki-page' ) );
-   lia.liInstance( $sitelinkview ).startEditing();
+   function p3() {
+   $sitelinkgroupview.one( 'sitelinkgroupviewafterstartediting', 
p4 );
+   sitelinkgroupview.startEditing();
 
-   sitelinkgroupview.stopEditing();
+   // Mock adding a new item:
+   var sitelinklistview = 
sitelinkgroupview.$sitelinklistview.data( 'sitelinklistview' ),
+   listview = sitelinklistview.$listview.data( 'listview' 
),
+   lia = listview.listItemAdapter(),
+   $sitelinkview = listview.addItem( new 
wb.datamodel.SiteLink( 'aawiki', 'aawiki-page' ) );
+   lia.liInstance( $sitelinkview ).startEditing();
+   }
+
+   function p4() {
+   QUnit.start();
+   sitelinkgroupview.stopEditing();
+   }
+
+   p1();
+   QUnit.stop();
 } );
 
 QUnit.test( 'setError()', 1, function( assert ) {
diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
index 537a844..a6495ea 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
@@ -213,21 +213,41 @@
);
} );
 
-   sitelinklistview.startEditing();
-   sitelinklistview.startEditing(); // should not trigger event
-   sitelinklistview.stopEditing( true );
-   sitelinklistview.stopEditing( true ); // should not trigger event
-   sitelinklistview.stopEditing(); // should not trigger event
+   function p1() {
+   $sitelinklistview.one( 'sitelinklistviewafterstartediting', p2 
);
+   sitelinklistview.startEditing();
+   sitelinklistview.startEditing(); // should not trigger event
+   }
 
-   sitelinklistview.startEditing();
+   function p2() {
+   $sitelinklistview.one( 'sitelinklistviewafterstopediting', p3 );
+   sitelinklistview.stopEditing( true );
+   sitelinklistview.stopEditing( true ); // should not trigger 
event
+   sitelinklistview.stopEditing(); // should not trigger event
+   }
 
-   // Mock adding a new item:
-   var listview = sitelinklistview.$listview.data( 'listview' ),
-   lia = listview.listItemAdapter(),
-   $sitelinkview = listview.addItem( new wb.datamodel.SiteLink( 
'aawiki', 'aawiki-page' ) );
-   lia.liInstance( $sitelinkview ).startEditing();
+   function p3() {
+   $sitelinklistview.one( 'sitelinklistviewafterstartediting', p4 

[MediaWiki-commits] [Gerrit] Test integration/phpunit against mw core branches - change (integration/zuul-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Test integration/phpunit against mw core branches
..

Test integration/phpunit against mw core branches

Change-Id: I151285fb04aa148d847f6c0b4c6cc6c7ab8411fa
---
M layout.yaml
1 file changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/layout.yaml b/layout.yaml
index 96ccfbe..d529c61 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1788,6 +1788,18 @@
   - integration-jjb-config-yamllint
   - integration-jjb-config-diff
 
+  - name: integration/phpunit
+test:
+  - integration-phpunit-mediawiki-REL1_22
+  - integration-phpunit-mediawiki-REL1_23
+  - integration-phpunit-mediawiki-REL1_24
+  - integration-phpunit-mediawiki-master
+gate-and-submit:
+  - integration-phpunit-mediawiki-REL1_22
+  - integration-phpunit-mediawiki-REL1_23
+  - integration-phpunit-mediawiki-REL1_24
+  - integration-phpunit-mediawiki-master
+
   - name: integration/zuul-config
 check:
   - integration-zuul-config-yamllint

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I151285fb04aa148d847f6c0b4c6cc6c7ab8411fa
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] Parse EntityIds via API - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Parse EntityIds via API
..


Parse EntityIds via API

Change-Id: I6fe341c6e7aa4a06e19a8648be00c943ae35e09e
---
M lib/resources/experts/EntityIdInput.js
D lib/resources/parsers/EntityIdParser.js
M lib/resources/parsers/getStore.js
M lib/resources/parsers/resources.php
4 files changed, 3 insertions(+), 87 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/experts/EntityIdInput.js 
b/lib/resources/experts/EntityIdInput.js
index ffe2acb..81a1000 100644
--- a/lib/resources/experts/EntityIdInput.js
+++ b/lib/resources/experts/EntityIdInput.js
@@ -85,16 +85,8 @@
selectedEntity = 
entitySelector.selectedEntity();
 
return selectedEntity ? selectedEntity.id : '';
-   },
-
-   /**
-* @see jQuery.valueview.Expert.valueCharacteristics
-*
-* TODO: remove this once the parsing is done via API
-*/
-   valueCharacteristics: function() {
-   return { prefixmap: WB_ENTITIES_PREFIXMAP };
}
+
} );
 
 }( mediaWiki, wikibase, jQuery, jQuery.valueview ) );
diff --git a/lib/resources/parsers/EntityIdParser.js 
b/lib/resources/parsers/EntityIdParser.js
deleted file mode 100644
index 0cf3059..000
--- a/lib/resources/parsers/EntityIdParser.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @licence GNU GPL v2+
- * @author H. Snater  mediaw...@snater.com 
- */
-( function( wb, vp, $, util ) {
-   'use strict';
-
-   var PARENT = vp.ValueParser,
-   constructor = function( options ) {
-   if ( !options.prefixmap ) {
-   throw new Error( 'EntityIdParser: Prefix map 
required for initialization.' );
-   }
-   PARENT.call( this, options );
-   };
-
-   /**
-* Constructor for an entity id parser.
-*
-* @constructor
-* @extends vp.ValueParser
-* @since 0.4
-*/
-   wb.EntityIdParser = util.inherit( 'WbEntityIdParser', PARENT, 
constructor, {
-
-   /**
-* @see vp.ValueParser.parse
-* @since 0.4
-*
-* @param {string} rawValue
-* @return {$.Promise}
-*/
-   parse: function( rawValue ) {
-   var deferred = $.Deferred(),
-   entityType = null,
-   numericId = null;
-
-   $.each( this._options.prefixmap, function( prefix, type 
) {
-   if ( rawValue.substr( 0, prefix.length 
).toLowerCase() === prefix.toLowerCase() ) {
-   numericId = rawValue.substr( 
prefix.length );
-   if ( ( /^\d+$/ ).test( numericId ) ) {
-   numericId = parseInt( 
numericId, 10 );
-   entityType = type;
-   return false;
-   }
-   }
-   } );
-
-   if ( entityType ) {
-   deferred.resolve( new wb.datamodel.EntityId( 
entityType, numericId ) );
-   } else {
-   // TODO: Use a proper Error object to transport 
detailed information about the failure.
-   deferred.reject( 'parsererror' );
-   }
-
-   return deferred.promise();
-   }
-   } );
-
-}( wikibase, valueParsers, jQuery, util ) );
diff --git a/lib/resources/parsers/getStore.js 
b/lib/resources/parsers/getStore.js
index 8d34d0f..fa78791 100644
--- a/lib/resources/parsers/getStore.js
+++ b/lib/resources/parsers/getStore.js
@@ -21,11 +21,6 @@
var parserStore = new vp.ValueParserStore( vp.NullParser );
 
parserStore.registerDataValueParser(
-   wb.EntityIdParser,
-   wb.datamodel.EntityId.TYPE
-   );
-
-   parserStore.registerDataValueParser(
vp.StringParser,
dv.StringValue.TYPE
);
@@ -36,7 +31,8 @@
'globecoordinate': dv.GlobeCoordinateValue.TYPE,
'monolingualtext': dv.MonolingualTextValue.TYPE,
'quantity': dv.QuantityValue.TYPE,
-   'time': dv.TimeValue.TYPE
+   'time': dv.TimeValue.TYPE,
+   'wikibase-entityid': wb.datamodel.EntityId.TYPE
};
 
$.each( parserIdToDataValueType, function( parserId, dvType ) {
diff --git a/lib/resources/parsers/resources.php 

[MediaWiki-commits] [Gerrit] Stop insource:// from adding extra spaces to query - change (mediawiki...CirrusSearch)

[Manybubbles (Code Review)]

Manybubbles has uploaded a new change for review.

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

Change subject: Stop insource:// from adding extra spaces to query
..

Stop insource:// from adding extra spaces to query

This was breaking queries like insource:/foo/ insource:/bar/.

Change-Id: I9b729eb75ff24903fc9bd1f457bd641829e39bdd
---
M includes/Searcher.php
M tests/browser/features/insource.feature
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/61/164961/1

diff --git a/includes/Searcher.php b/includes/Searcher.php
index cbe6718..daae9ae 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -422,7 +422,7 @@
$boostTemplates = self::getDefaultBoostTemplates();
$highlightSource = array();
$this-extractSpecialSyntaxFromTerm(
-   
'/(?not-)?insource:\/(?pattern(?:[^\/]|.)+)\/(?insensitivei)?/',
+   
'/(?not-)?insource:\/(?pattern(?:[^\/]|.)+)\/(?insensitivei)? ?/',
function ( $matches ) use ( $searcher, $filters, 
$notFilters, $searchContainedSyntax, $searchType, $highlightSource ) {
global $wgLanguageCode,
$wgCirrusSearchWikimediaExtraPlugin;
diff --git a/tests/browser/features/insource.feature 
b/tests/browser/features/insource.feature
index cadbd14..1d70528 100644
--- a/tests/browser/features/insource.feature
+++ b/tests/browser/features/insource.feature
@@ -79,3 +79,8 @@
   Scenario: insource:// reports errors sanely
 When I search for all:insource:/[ /
 Then this error is reported: An error has occurred while searching: 
Regular expression syntax error at 2: expected ']'
+
+  @regex
+  Scenario: insource:// doesn't break other clauses
+When I search for insource:/b c/ insource:/a b c/
+Then RegexSpaces is the first search result
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b729eb75ff24903fc9bd1f457bd641829e39bdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org

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