date:20130326

[MediaWiki-commits] [Gerrit] Provide a base ULS RL module and seperate UI language selection - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Provide a base ULS RL module and seperate UI language selection
..

Provide a base ULS RL module and seperate UI language selection

ULS is disabled for anonymous users on WMF projects. But to provide
rest of the features - apis, language database, language selection for
many use cases, we need to provide a minimal ULS. RL module
ext.uls.init does that job now.

For using ULS as interface language selection tool, new RL module
ext.uls.interface is introduced. That will add UI language selection,
webfonts, ime features, if enabled.

Change-Id: I796a7c9cce0de42bf8aa06b26e383e0075dbe1dd
---
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.php
M resources/js/ext.uls.init.js
A resources/js/ext.uls.interface.js
4 files changed, 226 insertions(+), 184 deletions(-)


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

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 868f4a2..04600b0 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -39,12 +39,13 @@
 * @return bool
 */
public static function addModules( $out, $skin ) {
-   if ( !self::isToolbarEnabled( $out-getUser() ) ) {
-   return true;
-   }
-
+   // If extension is enabled, basic features(API, language data) 
available.
$out-addModules( 'ext.uls.init' );
$out-addModules( 'ext.uls.geoclient' );
+   if ( self::isToolbarEnabled( $out-getUser() ) ) {
+   // Enable UI language selection for the user.
+   $out-addModules( 'ext.uls.interface' );
+   }
 
return true;
}
@@ -58,7 +59,7 @@
public static function addTestModules( array $testModules, 
ResourceLoader $resourceLoader ) {
$testModules['qunit']['ext.uls.tests'] = array(
'scripts' = array( 'tests/qunit/ext.uls.tests.js' ),
-   'dependencies' = array( 'ext.uls.init' ),
+   'dependencies' = array( 'ext.uls.init', 
'ext.uls.interface' ),
'localBasePath' = __DIR__,
'remoteExtPath' = 'UniversalLanguageSelector',
);
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 2564d48..216bd3e 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -104,6 +104,7 @@
 $wgDefaultUserOptions['uls-preferences'] = '';
 $wgHooks['GetPreferences'][] = 
'UniversalLanguageSelectorHooks::onGetPreferences';
 
+/* Base ULS module */
 $wgResourceModules['ext.uls.init'] = array(
'scripts' = 'resources/js/ext.uls.init.js',
'styles' = 'resources/css/ext.uls.css',
@@ -111,12 +112,24 @@
'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'mediawiki.Uri',
-   'jquery.tipsy',
+   'mediawiki.util',
+   'jquery.json',
'jquery.uls',
'jquery.i18n',
+   ),
+   'position' = 'top',
+);
+
+/* Interface language selection module */
+$wgResourceModules['ext.uls.interface'] = array(
+   'scripts' = 'resources/js/ext.uls.interface.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'ext.uls.init',
+   'jquery.tipsy',
'ext.uls.displaysettings',
'ext.uls.inputsettings',
-   'ext.uls.geoclient'
),
'position' = 'top',
 );
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 994c7c1..b449c7a 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -1,7 +1,7 @@
 /**
- * ULS startup script.
+ * ULS startup script - MediaWiki specific customization for jquery.uls
  *
- * Copyright (C) 2012 Alolita Sharma, Amir Aharoni, Arun Ganesh, Brandon 
Harris,
+ * Copyright (C) 2012-2013 Alolita Sharma, Amir Aharoni, Arun Ganesh, Brandon 
Harris,
  * Niklas Laxström, Pau Giner, Santhosh Thottingal, Siebrand Mazeland and other
  * contributors. See CREDITS for a list.
  *
@@ -137,8 +137,6 @@
}
 
$( document ).ready( function () {
-   var $ulsTrigger, previousLanguages, previousLang;
-
/*
 * The 'als' is used in a non-standard way in MediaWiki -
 * it may be used to represent the Allemanic language,
@@ -152,178 +150,5 @@
// JavaScript side i18n initialization
i18nInit();
 
-   $ulsTrigger = $( '.uls-trigger' );
-   previousLanguages = mw.uls.getPreviousLanguages()

[MediaWiki-commits] [Gerrit] Quieter installation of dependencies; defaultrebase=0 - change (mediawiki...EventLogging)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Quieter installation of dependencies; defaultrebase=0
..


Quieter installation of dependencies; defaultrebase=0

* In .gitreview, specify defaultrebase=0 (was: 1)
* In .travis.yml, run pip in quiet mode, and tell pyzmq's setup.py to use
  bundled zmq lib.

Change-Id: I3ab55b0088eb385b59d57a7e8233ed4702276556
---
M .gitreview
M .travis.yml
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitreview b/.gitreview
index ac17fe2..4129a3b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
 port=29418
 project=mediawiki/extensions/EventLogging.git
 defaultbranch=master
-defaultrebase=1
+defaultrebase=0
diff --git a/.travis.yml b/.travis.yml
index 3dcee37..ddf4ca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@
 - 2.7
 - 3.3
 install:
-- pip install server/ --use-mirrors
+- pip install -q pyzmq --install-option=--zmq=bundled --use-mirrors
+- pip install -q server/ --use-mirrors
 script:
 - cd server
 - python setup.py test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ab55b0088eb385b59d57a7e8233ed4702276556
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Small cleanup in CE - change (mediawiki...VisualEditor)

2013-03-26 Thread Inez (Code Review)

Inez has uploaded a new change for review.

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


Change subject: Small cleanup in CE
..

Small cleanup in CE

Better comments for:
* ve.ce.Document.getRelativeOffset,
* ve.ce.Document.getSiblingWordBoundary.
Convert ve.ce.Surface.getSelectionRect to a static method.
Moved getNodeAndOffset from ve.ce.Surface to ve.ce.Document.

Change-Id: Ic00221fa463205d04c9b52150c0dd15904493b1e
---
M modules/ve/ce/ve.ce.Document.js
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ui/ve.ui.Context.js
3 files changed, 92 insertions(+), 88 deletions(-)


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

diff --git a/modules/ve/ce/ve.ce.Document.js b/modules/ve/ce/ve.ce.Document.js
index 27e2767..394a6c4 100644
--- a/modules/ve/ce/ve.ce.Document.js
+++ b/modules/ve/ce/ve.ce.Document.js
@@ -81,6 +81,8 @@
 
 /**
  * Get the nearest word boundary.
+ * This method is in CE instead of DM because its behaviour depends on the 
browser (IE/non-IE) and
+ * that information is closer to view layer. (CE)
  *
  * @method
  * @param {number} offset Offset to start from
@@ -128,6 +130,8 @@
 
 /**
  * Get the relative word or character boundary.
+ * This method is in CE instead of DM because it uses information about slugs 
about which model
+ * does not know at all.
  *
  * @method
  * @param {number} offset Offset to start from
@@ -158,4 +162,73 @@
return relativeContentOffset;
}
}
+};
+
+/**
+ * Get a DOM node and DOM element offset for a document offset.
+ *
+ * The results of this function are meant to be used with rangy.
+ *
+ * @method
+ * @param {number} offset Linear model offset
+ * @returns {Object} Object containing a node and offset property where node 
is an HTML element and
+ * offset is the position within the element
+ * @throws {Error} Offset could not be translated to a DOM element and offset
+ */
+ve.ce.Document.prototype.getNodeAndOffset = function ( offset ) {
+   var node, startOffset, current, stack, item, $item, length,
+   $slug = this.getSlugAtOffset( offset );
+   if ( $slug ) {
+   return { node: $slug[0].childNodes[0], offset: 0 };
+   }
+   node = this.getNodeFromOffset( offset );
+   startOffset = this.getDocumentNode().getOffsetFromNode( node ) + ( ( 
node.isWrapped() ) ? 1 : 0 );
+   current = [node.$.contents(), 0];
+   stack = [current];
+   while ( stack.length  0 ) {
+   if ( current[1] = current[0].length ) {
+   stack.pop();
+   current = stack[ stack.length - 1 ];
+   continue;
+   }
+   item = current[0][current[1]];
+   if ( item.nodeType === Node.TEXT_NODE ) {
+   length = item.textContent.length;
+   if ( offset = startOffset  offset = startOffset + 
length ) {
+   return {
+   node: item,
+   offset: offset - startOffset
+   };
+   } else {
+   startOffset += length;
+   }
+   } else if ( item.nodeType === Node.ELEMENT_NODE ) {
+   $item = current[0].eq( current[1] );
+   if ( $item.hasClass('ve-ce-slug') ) {
+   if ( offset === startOffset ) {
+   return {
+   node: $item[0],
+   offset: 1
+   };
+   }
+   } else if ( $item.is( '.ve-ce-branchNode, 
.ve-ce-leafNode' ) ) {
+   length = $item.data( 'node' 
).model.getOuterLength();
+   if ( offset = startOffset  offset  
startOffset + length ) {
+   stack.push( [$item.contents(), 0] );
+   current[1]++;
+   current = stack[stack.length-1];
+   continue;
+   } else {
+   startOffset += length;
+   }
+   } else {
+   stack.push( [$item.contents(), 0] );
+   current[1]++;
+   current = stack[stack.length-1];
+   continue;
+   }
+   }
+   current[1]++;
+   }
+   throw new Error( 'Offset could not be translated to a DOM element and 
offset: ' + offset );
 };
\ No newline at end of file
diff --git

[MediaWiki-commits] [Gerrit] Remove duplicate grid system inside Translate and use jquery... - change (mediawiki...Translate)

2013-03-26 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Remove duplicate grid system inside Translate and use 
jquery.uls.grid
..

Remove duplicate grid system inside Translate and use jquery.uls.grid

Change-Id: I82a1fff167d3be0b7f240066a1ca52b5ee473135
---
M Resources.php
D resources/css/ext.translate.grid.css
2 files changed, 2 insertions(+), 317 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 1380aa3..2a34b2e 100644
--- a/Resources.php
+++ b/Resources.php
@@ -92,9 +92,9 @@
'position' = 'top',
 ) + $resourcePaths;
 
-// TODO: jquery.uls uses the same grid system. So don't duplicate
+
 $wgResourceModules['ext.translate.grid'] = array(
-   'styles' = 'resources/css/ext.translate.grid.css',
+   'dependencies' = 'jquery.uls.grid',
'position' = 'top',
 ) + $resourcePaths;
 
diff --git a/resources/css/ext.translate.grid.css 
b/resources/css/ext.translate.grid.css
deleted file mode 100644
index 6b0a5ef..000
--- a/resources/css/ext.translate.grid.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Generated using Foundation http://foundation.zurb.com/docs/grid.php */
-/* Global Reset  Standards -- */
-.grid * {
-   -webkit-box-sizing: border-box;
-   -moz-box-sizing: border-box;
-   box-sizing: border-box;
-}
-
-/* Misc -- */
-.grid .left {
-   float: left;
-}
-
-.grid .right {
-   float: right;
-}
-
-.grid .text-left {
-   text-align: left;
-}
-
-.grid .text-right {
-   text-align: right;
-}
-
-.grid .text-center {
-   text-align: center;
-}
-
-.grid .hide {
-   display: none;
-}
-
-.grid .highlight {
-   background: #99;
-}
-
-/* The Grid -- */
-.grid .row {
-   width: 100%;
-   max-width: none;
-   min-width: 600px;
-   margin: 0 auto;
-}
-
-.grid .row .row {
-   width: auto;
-   max-width: none;
-   min-width: 0;
-   margin: 0 -5px;
-}
-
-.grid .row.collapse .column,
-.grid .row.collapse .columns {
-   padding: 0;
-}
-
-.grid .row .row {
-   width: auto;
-   max-width: none;
-   min-width: 0;
-   margin: 0 -5px;
-}
-
-.grid .row .row.collapse {
-   margin: 0;
-}
-
-.grid .column, .grid  .columns {
-   float: left;
-   min-height: 1px;
-   padding: 0 5px;
-   position: relative;
-}
-
-.grid .column.centered, .grid .columns.centered {
-   float: none;
-   margin: 0 auto;
-}
-
-.grid .row .one {
-   width: 8.333%;
-}
-
-.grid .row .two {
-   width: 16.667%;
-}
-
-.grid .row .three {
-   width: 25%;
-}
-
-.grid .row .four {
-   width: 33.333%;
-}
-
-.grid .row .five {
-   width: 41.667%;
-}
-
-.grid .row .six {
-   width: 50%;
-}
-
-.grid .row .seven {
-   width: 58.333%;
-}
-
-.grid .row .eight {
-   width: 66.667%;
-}
-
-.grid .row .nine {
-   width: 75%;
-}
-
-.grid .row .ten {
-   width: 83.333%;
-}
-
-.grid .row .eleven {
-   width: 91.667%;
-}
-
-.grid .row .twelve {
-   width: 100%;
-}
-
-.grid .row .offset-by-one {
-   margin-left: 8.333%;
-}
-
-.grid .row .offset-by-two {
-   margin-left: 16.667%;
-}
-
-.grid .row .offset-by-three {
-   margin-left: 25%;
-}
-
-.grid .row .offset-by-four {
-   margin-left: 33.333%;
-}
-
-.grid .row .offset-by-five {
-   margin-left: 41.667%;
-}
-
-.grid .row .offset-by-six {
-   margin-left: 50%;
-}
-
-.grid .row .offset-by-seven {
-   margin-left: 58.333%;
-}
-
-.grid .row .offset-by-eight {
-   margin-left: 66.667%;
-}
-
-.grid .row .offset-by-nine {
-   margin-left: 75%;
-}
-
-.grid .row .offset-by-ten {
-   margin-left: 83.333%;
-}
-
-.grid .push-two {
-   left: 16.667%;
-}
-
-.grid .pull-two {
-   right: 16.667%;
-}
-
-.grid .push-three {
-   left: 25%;
-}
-
-.grid .pull-three {
-   right: 25%;
-}
-
-.grid .push-four {
-   left: 33.333%;
-}
-
-.grid .pull-four {
-   right: 33.333%;
-}
-
-.grid .push-five {
-   left: 41.667%;
-}
-
-.grid .pull-five {
-   right: 41.667%;
-}
-
-.grid .push-six {
-   left: 50%;
-}
-
-.grid .pull-six {
-   right: 50%;
-}
-
-.grid .push-seven {
-   left: 58.333%;
-}
-
-.grid .pull-seven {
-   right: 58.333%;
-}
-
-.grid .push-eight {
-   left: 66.667%;
-}
-
-.grid .pull-eight {
-   right: 66.667%;
-}
-
-.grid .push-nine {
-   left: 75%;
-}
-
-.grid .pull-nine {
-   right: 75%;
-}
-
-.grid .push-ten {
-   left: 83.333%;
-}
-
-.grid .pull-ten {
-   right: 83.333%;
-}
-
-/* Nicolas Gallagher's micro clearfix */
-.grid .row {
-   *zoom: 1;
-}
-
-.grid .row:before, .grid .row:after {
-   content: ;
-   display: table;
-}
-
-.grid .row:after {
-   clear: both;
-}
-
-/* Block Grids -- */
-/* These are 2-up, 3-up, 4-up and

[MediaWiki-commits] [Gerrit] Base commit for meta dialog category suggestion widget - change (mediawiki...VisualEditor)

2013-03-26 Thread Robmoen (Code Review)

Robmoen has uploaded a new change for review.

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


Change subject: Base commit for meta dialog category suggestion widget
..

Base commit for meta dialog category suggestion widget

VisualEditor.i18n.php
Added placeholder text for category input
Updated Link inspector i18n messages

ve.ui.MetaDialog.js
Add ve.ui.CategoryWidget with dummy data to editorPanel

ve.ui.Dialog.css
Added padding to editorPanel

ve.ui.Widget.css
Added CategoryWidget styles

ve.ui.PendingInputWidget.js,
Moved pushPending and popPending methods into pending class

ve.ui.CategoryInputMenuWidget.js,
New class Category Input Menu

ve.ui.CategoryInputWidget.js,
Category input class
Adds css class for input styles
Sets placeholder text

ve.ui.MWCategoryInputWidget.js
Class managing the menu and mw api requests

ve.ui.CategoryGroupItemWidget.js,
Category group item base class

ve.ui.CategoryWidget.js
New class for creating the main category widget to manage group items and input

ve.ui.GroupWidget.
Added addItem method and change addItems to use it

ve.ui.MWLinkTargetInputWidget.js
Mixin ve.ui.PendingInputWidget and remove pending methods
Prevent querying on spaces
Update menu text to use i18n messages

ve.ui.MenuWidget.js
Remove some cruft where it uses both config.input and config.$input

Change-Id: I5eafaa484a1924a566d3a1ee1d869293089d0ecf
---
M VisualEditor.i18n.php
M VisualEditor.php
M demos/ve/index.php
M modules/ve/ui/dialogs/ve.ui.MetaDialog.js
M modules/ve/ui/styles/ve.ui.Dialog.css
M modules/ve/ui/styles/ve.ui.Icons-raster.css
M modules/ve/ui/styles/ve.ui.Icons-vector.css
M modules/ve/ui/styles/ve.ui.Widget.css
A modules/ve/ui/widgets/ve.ui.CategoryGroupItemWidget.js
A modules/ve/ui/widgets/ve.ui.CategoryInputMenuWidget.js
A modules/ve/ui/widgets/ve.ui.CategoryInputWidget.js
A modules/ve/ui/widgets/ve.ui.CategoryWidget.js
M modules/ve/ui/widgets/ve.ui.GroupWidget.js
A modules/ve/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve/ui/widgets/ve.ui.MenuWidget.js
A modules/ve/ui/widgets/ve.ui.PendingInputWidget.js
17 files changed, 843 insertions(+), 50 deletions(-)


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

diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 9fe6511..9733389 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -17,6 +17,7 @@
'visualeditor-ca-editsource' = 'Edit source',
'visualeditor-ca-ve-edit' = 'VisualEditor',
'visualeditor-ca-ve-create' = 'VisualEditor',
+   'visualeditor-category-input-placeholder' = 'Category name',
'visualeditor-dialog-meta-title' = 'Page settings',
'visualeditor-dialog-content-title' = 'Content settings',
'visualeditor-dialog-action-apply' = 'Apply changes',
@@ -38,9 +39,9 @@
'visualeditor-window-title' = 'Inspect',
'visualeditor-linkinspector-title' = 'Hyperlink',
'visualeditor-linkinspector-label-pagetitle' = 'Page title',
-   'visualeditor-linkinspector-suggest-existing-page' = 'Existing page',
+   'visualeditor-linkinspector-suggest-matching-page' = 'Matching page',
'visualeditor-linkinspector-suggest-new-page' = 'New page',
-   'visualeditor-linkinspector-suggest-external-link' = 'Web link',
+   'visualeditor-linkinspector-suggest-external-link' = 'External link',
'visualeditor-formatdropdown-title' = 'Change format',
'visualeditor-formatdropdown-format-paragraph' = 'Paragraph',
'visualeditor-formatdropdown-format-heading1' = 'Heading 1',
diff --git a/VisualEditor.php b/VisualEditor.php
index cfb634f..854a5e1 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -337,9 +337,15 @@
've/ui/widgets/ve.ui.MenuItemWidget.js',
've/ui/widgets/ve.ui.MenuSectionItemWidget.js',
've/ui/widgets/ve.ui.MenuWidget.js',
+   've/ui/widgets/ve.ui.PendingInputWidget.js',
've/ui/widgets/ve.ui.TextInputMenuWidget.js',
've/ui/widgets/ve.ui.LinkTargetInputWidget.js',
've/ui/widgets/ve.ui.MWLinkTargetInputWidget.js',
+   've/ui/widgets/ve.ui.CategoryInputMenuWidget.js',
+   've/ui/widgets/ve.ui.CategoryInputWidget.js',
+   've/ui/widgets/ve.ui.MWCategoryInputWidget.js',
+   've/ui/widgets/ve.ui.CategoryGroupItemWidget.js',
+   've/ui/widgets/ve.ui.CategoryWidget.js',
 
've/ui/dialogs/ve.ui.ContentDialog.js',
've/ui/dialogs/ve.ui.MetaDialog.js',
@@ -399,7 +405,7 @@
'visualeditor-inspector-title',
'visualeditor-linkinspector-title',

[MediaWiki-commits] [Gerrit] Provide a base ULS RL module and seperate UI language selection - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Provide a base ULS RL module and seperate UI language selection
..


Provide a base ULS RL module and seperate UI language selection

ULS is disabled for anonymous users on WMF projects. But to provide
rest of the features - apis, language database, language selection for
many use cases, we need to provide a minimal ULS. RL module
ext.uls.init does that job now.

For using ULS as interface language selection tool, new RL module
ext.uls.interface is introduced. That will add UI language selection,
webfonts, ime features, if enabled.

Change-Id: I796a7c9cce0de42bf8aa06b26e383e0075dbe1dd
---
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.php
M resources/js/ext.uls.init.js
A resources/js/ext.uls.interface.js
4 files changed, 226 insertions(+), 184 deletions(-)

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



diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 868f4a2..04600b0 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -39,12 +39,13 @@
 * @return bool
 */
public static function addModules( $out, $skin ) {
-   if ( !self::isToolbarEnabled( $out-getUser() ) ) {
-   return true;
-   }
-
+   // If extension is enabled, basic features(API, language data) 
available.
$out-addModules( 'ext.uls.init' );
$out-addModules( 'ext.uls.geoclient' );
+   if ( self::isToolbarEnabled( $out-getUser() ) ) {
+   // Enable UI language selection for the user.
+   $out-addModules( 'ext.uls.interface' );
+   }
 
return true;
}
@@ -58,7 +59,7 @@
public static function addTestModules( array $testModules, 
ResourceLoader $resourceLoader ) {
$testModules['qunit']['ext.uls.tests'] = array(
'scripts' = array( 'tests/qunit/ext.uls.tests.js' ),
-   'dependencies' = array( 'ext.uls.init' ),
+   'dependencies' = array( 'ext.uls.init', 
'ext.uls.interface' ),
'localBasePath' = __DIR__,
'remoteExtPath' = 'UniversalLanguageSelector',
);
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 2564d48..216bd3e 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -104,6 +104,7 @@
 $wgDefaultUserOptions['uls-preferences'] = '';
 $wgHooks['GetPreferences'][] = 
'UniversalLanguageSelectorHooks::onGetPreferences';
 
+/* Base ULS module */
 $wgResourceModules['ext.uls.init'] = array(
'scripts' = 'resources/js/ext.uls.init.js',
'styles' = 'resources/css/ext.uls.css',
@@ -111,12 +112,24 @@
'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'mediawiki.Uri',
-   'jquery.tipsy',
+   'mediawiki.util',
+   'jquery.json',
'jquery.uls',
'jquery.i18n',
+   ),
+   'position' = 'top',
+);
+
+/* Interface language selection module */
+$wgResourceModules['ext.uls.interface'] = array(
+   'scripts' = 'resources/js/ext.uls.interface.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'ext.uls.init',
+   'jquery.tipsy',
'ext.uls.displaysettings',
'ext.uls.inputsettings',
-   'ext.uls.geoclient'
),
'position' = 'top',
 );
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 994c7c1..b449c7a 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -1,7 +1,7 @@
 /**
- * ULS startup script.
+ * ULS startup script - MediaWiki specific customization for jquery.uls
  *
- * Copyright (C) 2012 Alolita Sharma, Amir Aharoni, Arun Ganesh, Brandon 
Harris,
+ * Copyright (C) 2012-2013 Alolita Sharma, Amir Aharoni, Arun Ganesh, Brandon 
Harris,
  * Niklas Laxström, Pau Giner, Santhosh Thottingal, Siebrand Mazeland and other
  * contributors. See CREDITS for a list.
  *
@@ -137,8 +137,6 @@
}
 
$( document ).ready( function () {
-   var $ulsTrigger, previousLanguages, previousLang;
-
/*
 * The 'als' is used in a non-standard way in MediaWiki -
 * it may be used to represent the Allemanic language,
@@ -152,178 +150,5 @@
// JavaScript side i18n initialization
i18nInit();
 
-   $ulsTrigger = $( '.uls-trigger' );
-   previousLanguages = mw.uls.getPreviousLanguages() || [];
-   previousLang = previousLanguages.slice( -1

[MediaWiki-commits] [Gerrit] allowing negative timestamps, BC - change (mediawiki/core)

2013-03-26 Thread Toniher (Code Review)

Toniher has uploaded a new change for review.

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


Change subject: allowing negative timestamps, BC
..

allowing negative timestamps, BC

Change-Id: I6859f1a903792b83cba80e065e4a0bdcb5d1cd32
---
M includes/Timestamp.php
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/55854/1

diff --git a/includes/Timestamp.php b/includes/Timestamp.php
index 7dbfabf..a884c74 100644
--- a/includes/Timestamp.php
+++ b/includes/Timestamp.php
@@ -100,7 +100,7 @@
# TS_DB
} elseif ( preg_match( '/^(\d{4}):(\d\d):(\d\d) 
(\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
# TS_EXIF
-   } elseif ( preg_match( 
'/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
+   } elseif ( preg_match( 
'/^(-?\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
# TS_MW
} elseif ( preg_match( '/^-?\d{1,13}$/D', $ts ) ) {
# TS_UNIX
@@ -135,8 +135,19 @@
 
if( !$strtime ) {
$da = array_map( 'intval', $da );
+   
+   $sign = false; //we assume no sign (positive)
+   if ( $da[1]  0 ) { // If negative
+   $sign = true;
+   $da[1] = $da[1]*-1; //Turn year into positive
+   }
+
$da[0] = %04d-%02d-%02dT%02d:%02d:%02d.00+00:00;
$strtime = call_user_func_array( sprintf, $da );
+   if ( $sign ) {
+   // We add negative sign back if necessary
+   $strtime = -.$strtime;
+   }
}
 
try {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6859f1a903792b83cba80e065e4a0bdcb5d1cd32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Toniher toni...@cau.cat

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

[MediaWiki-commits] [Gerrit] Customize shell; remove stale LocalSettings.php - change (mediawiki/vagrant)

2013-03-26 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Customize shell; remove stale LocalSettings.php
..

Customize shell; remove stale LocalSettings.php

- If auto-generated LocalSettings.php is present, but the database it specifies
  is not, assume it is left over from a previous VM instance and re-run
  install.php.
- Correct 'mediawiki' in .gitignore to '/mediawiki/', so it doesn't ignore
  files in puppet/modules/mediawiki.
- Add color.sh and phpsh.sh to /etc/profile.d: the former specifies a colorful
  prompt should be used, and the latter makes phpsh always execute with
  /vagrant/mediawiki as its cwd.
- Consume '--debug' flag from the command line; if it is present, pass it on to
  Puppet.
- Specify 'Ubuntu_64' os_type to VirtualBox.

Change-Id: Ic989d6b9ff56419ec77b4c6d5d2c8dcf5341a499
---
M .gitignore
M Vagrantfile
A puppet/modules/mediawiki/files/color.sh
A puppet/modules/mediawiki/files/phpsh.sh
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/phpsh.pp
6 files changed, 31 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/55/55855/1

diff --git a/.gitignore b/.gitignore
index 5fe9635..aca2ce6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .vagrant
 LocalSettings.php
 tags
-mediawiki
+/mediawiki/
diff --git a/Vagrantfile b/Vagrantfile
index 55bc87a..4c55edd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,6 @@
 system( '( nfsstat || nfsiostat ) /dev/null' ) and not $?.exitstatus
 end
 
-
 Vagrant.configure('2') do |config|
 
 config.vm.hostname = 'mediawiki-vagrant'
@@ -38,7 +37,8 @@
 nfs: host_supports_nfs?
 
 config.vm.provider :virtualbox do |vb|
-vb.customize ['modifyvm', :id, '--memory', '512']
+# See http://www.virtualbox.org/manual/ch08.html for additional 
options.
+vb.customize ['modifyvm', :id, '--memory', '512', '--ostype', 
'Ubuntu_64']
 end
 
 config.vm.provision :shell do |s|
@@ -50,7 +50,7 @@
 puppet.module_path = 'puppet/modules'
 puppet.manifests_path = 'puppet/manifests'
 puppet.manifest_file = 'site.pp'
-puppet.options = '--verbose'  # Add '--debug' for more output
+puppet.options = ['--verbose', ARGV.delete('--debug')].compact
 end
 
 end
diff --git a/puppet/modules/mediawiki/files/color.sh 
b/puppet/modules/mediawiki/files/color.sh
new file mode 100755
index 000..d6520b3
--- /dev/null
+++ b/puppet/modules/mediawiki/files/color.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export force_color_prompt=yes
diff --git a/puppet/modules/mediawiki/files/phpsh.sh 
b/puppet/modules/mediawiki/files/phpsh.sh
new file mode 100644
index 000..cb15d1b
--- /dev/null
+++ b/puppet/modules/mediawiki/files/phpsh.sh
@@ -0,0 +1,8 @@
+# Ensure that we're in an interactive bash session.
+[ -z $BASH_VERSION -o -z $PS1 ]  return
+phpsh () {
+  (
+cd /vagrant/mediawiki
+command phpsh $@
+  )
+}
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 277e486..4bb7451 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -22,6 +22,16 @@
ensure = absent,
}
 
+   # If an auto-generated LocalSettings.php file exists but the database it
+   # refers to is missing, assume it is residual of a discarded instance 
and
+   # delete it.
+   exec { 'check-settings':
+   command = 'rm /vagrant/mediawiki/LocalSettings.php 2/dev/null 
|| true',
+   require = [ Package['php5'], Exec['fetch-mediawiki'], 
Service['mysql'] ],
+   unless  = 'php /vagrant/mediawiki/maintenance/eval.php 
wfGetDB(-1) /dev/null',
+   before  = Exec['mediawiki-setup'],
+   }
+
apache::site { 'wiki':
ensure  = present,
content = template('mediawiki/mediawiki-apache-site.erb'),
diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp 
b/puppet/modules/mediawiki/manifests/phpsh.pp
index d1b775f..df44808 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -8,10 +8,16 @@
exec { 'pip-install-phpsh':
creates = '/usr/local/bin/phpsh',
command = 'pip install 
https://github.com/facebook/phpsh/tarball/master',
-   onlyif  = 'ping -c1 -W0.5 -q github.com',  # only if GitHub is 
reachable
+   onlyif  = 'ping -c1 -w0.5 -q github.com',  # only if GitHub is 
reachable
require = Package['php5', 'python-pip'],
}
 
+   file { '/etc/profile.d/phpsh.sh':
+   ensure = file,
+   mode   = '0755',
+   source = 'puppet:///modules/mediawiki/phpsh.sh',
+   }
+
file { '/etc/phpsh':
ensure = directory,

[MediaWiki-commits] [Gerrit] (bug 46547) use content language for rotation comment - change (mediawiki/core)

2013-03-26 Thread J (Code Review)

J has uploaded a new change for review.

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


Change subject: (bug 46547) use content language for rotation comment
..

(bug 46547) use content language for rotation comment

Change-Id: I93519557e15857176f50ea34cb59832c9575f20e
---
M includes/api/ApiImageRotate.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/55856/1

diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index e261f38..d966c1b 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -119,7 +119,7 @@
rotation = $rotation
) );
if ( !$err ) {
-   $comment = wfMessage( 'rotate-comment' 
)-numParams( $rotation )-text();
+   $comment = wfMessage( 'rotate-comment' 
)-numParams( $rotation )-inContentLanguage()-text();
$status = $file-upload( $dstPath,
$comment, $comment, 0, false, false, 
$this-getUser() );
if ( $status-isGood() ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93519557e15857176f50ea34cb59832c9575f20e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: J jger...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix workflow selector in TUX - change (mediawiki...Translate)

2013-03-26 Thread Santhosh (Code Review)

Santhosh has submitted this change and it was merged.

Change subject: Fix workflow selector in TUX
..


Fix workflow selector in TUX

Refactored it into separate resource loader module and jQuery
plugin. Fixed the api to not return empty arrays but false or
object. Simplified and cleaned up the logic.

Bug: 45558
Change-Id: Ib0f874af7356b8affced73139dff9510c6c970f1
---
M Resources.php
M api/ApiQueryMessageGroups.php
M resources/css/ext.translate.special.translate.css
A resources/css/ext.translate.workflowselector.css
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.special.translate.js
A resources/js/ext.translate.workflowselector.js
M specials/SpecialTranslate.php
8 files changed, 231 insertions(+), 161 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index 1380aa3..43d8fa4 100644
--- a/Resources.php
+++ b/Resources.php
@@ -298,13 +298,13 @@
'ext.translate.base',
'ext.translate.groupselector',
'ext.translate.messagetable',
+   'ext.translate.workflowselector',
'ext.uls.init',
),
'messages' = array(
'translate-workflow-set-do',
'translate-workflow-set-doing',
'translate-workflow-set-done',
-   'translate-workflowstatus',
'translate-workflow-set-error-alreadyset',
'translate-documentation-language',
'translate-workflow-state-',
@@ -333,6 +333,14 @@
'position' = 'top',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.workflowselector'] = array(
+   'styles' = 'resources/css/ext.translate.workflowselector.css',
+   'scripts' = 'resources/js/ext.translate.workflowselector.js',
+   'messages' = array(
+   'translate-workflowstatus',
+   ),
+) + $resourcePaths;
+
 $wgResourceModules['jquery.autoresize'] = array(
'scripts' = 'resources/js/jquery.autoresize.js',
 ) + $resourcePaths;
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 6562ca2..a2c5532 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -216,8 +216,8 @@
 
$stateConfig = $group-getMessageGroupStates()-getStates();
 
-   if ( !is_array( $stateConfig ) ) {
-   return $stateConfig;
+   if ( !is_array( $stateConfig ) || $stateConfig === array() ) {
+   return false;
}
 
$user = $this-getUser();
diff --git a/resources/css/ext.translate.special.translate.css 
b/resources/css/ext.translate.special.translate.css
index 9be382c..43f7e6a 100644
--- a/resources/css/ext.translate.special.translate.css
+++ b/resources/css/ext.translate.special.translate.css
@@ -128,66 +128,6 @@
display: none;
 }
 
-.tux-workflow-status {
-   background: #eee;
-   border: 1px solid #ddd;
-   color: #252525;
-   cursor: pointer;
-   display: inline-block;
-   padding: 2px 4px;
-   margin: 5px 0;
-}
-
-.tux-workflow-status:hover {
-   border: 1px solid #c9c9c9;
-}
-
-.tux-workflow-status:after {
-   margin-left: 3px;
-   border-left: 3px solid transparent;
-   border-right: 3px solid transparent;
-   border-top: 3px solid #555;
-   content: ;
-   display: inline-block;
-   vertical-align: middle;
-}
-
-ul.tux-workflow-status-selector {
-   padding-top: 2em;
-   border: 1px solid #c9c9c9;
-   /* @noflip */
-   -webkit-box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.5);
-   /* @noflip */
-   box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.5);
-   font-size: 14px;
-   margin: 0 5px;
-   list-style: none;
-   cursor: pointer;
-   padding: 4px;
-   width: 200px;
-   z-index: 10;
-   background: #fff;
-   display: block;
-   position: absolute;
-}
-
-ul.tux-workflow-status-selector li {
-   color: #55;
-   font-size: 14px;
-   padding: 0 2px;
-}
-
-ul.tux-workflow-status-selector li:hover {
-   background-color: #f0f0f0;
-   color: #252525;
-}
-
-ul.tux-workflow-status-selector li.selected {
-   /* @embed */
-   background: url(../images/label-tick.png) right no-repeat;
-   color: #252525;
-}
-
 .tux-messagetable-header {
padding-top: 5px;
border-bottom: 1px solid #777;
diff --git a/resources/css/ext.translate.workflowselector.css 
b/resources/css/ext.translate.workflowselector.css
new file mode 100644
index 000..7c25995
--- /dev/null
+++ b/resources/css/ext.translate.workflowselector.css
@@ -0,0 +1,59 @@
+.tux-workflow-status {
+   background: #eee;
+   border: 1px solid #ddd;
+   color: #252525;
+   cursor: pointer;
+   display: inline-block;
+   padding: 2px 4px;
+   margin: 5px 0;
+}
+

[MediaWiki-commits] [Gerrit] Filter out some more git chattiness - change (translatewiki)

2013-03-26 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Filter out some more git chattiness
..

Filter out some more git chattiness

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/57/55857/1

diff --git a/bin/wikiupdate b/bin/wikiupdate
index da0106d..bf05fdf 100755
--- a/bin/wikiupdate
+++ b/bin/wikiupdate
@@ -16,7 +16,7 @@
cd $dir
if [ -d .git ]; then
echo -n $dir.. ;
-   git pull --rebase |grep -v Already 
+   git pull --rebase |egrep -v (Already|rewinding|up to 
date) 
let count+=1; [[ $((count%10)) -eq 0 ]]  wait
fi
cd ..

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

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

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

[MediaWiki-commits] [Gerrit] Workflow selector: Show a progress text while changing the s... - change (mediawiki...Translate)

2013-03-26 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Workflow selector: Show a progress text while changing the state
..

Workflow selector: Show a progress text while changing the state

Change-Id: I18f6e1ca6a70cfa16a4ffbcd4ca0001f15f3613b
---
M resources/js/ext.translate.workflowselector.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/js/ext.translate.workflowselector.js 
b/resources/js/ext.translate.workflowselector.js
index 0ad9448..ee55869 100644
--- a/resources/js/ext.translate.workflowselector.js
+++ b/resources/js/ext.translate.workflowselector.js
@@ -125,6 +125,7 @@
 
state = $this.data( 'state' ).id;
 
+   $display.text( mw.msg( 
'translate-workflow-set-doing' ) );
instance.changeState( state )
.done( function () {
instance.receiveState( 
instance.groupId, instance.language, state );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18f6e1ca6a70cfa16a4ffbcd4ca0001f15f3613b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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] Translate and ULS to master - change (mediawiki/core)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Translate and ULS to master
..

Translate and ULS to master

This fixes TUX for anonymous users since TUX depends on parts
of ULS. Also other fixes for TUX to allow us test it more
before enabling it by default.

Change-Id: Ie16cae0d4cf7bf84a61c6547faa0e1db2382073a
---
M extensions/Translate
M extensions/UniversalLanguageSelector
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/55859/1

diff --git a/extensions/Translate b/extensions/Translate
index 214df82..7c530a8 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 214df82e86dd28fcce76222a751a4d08c0f59ba5
+Subproject commit 7c530a872515f00395d0385f1854776f62370310
diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index f76ce1a..453912f 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit f76ce1a4b40e8b39aee9de787b1c3d5ad38473bb
+Subproject commit 453912fdf2d449b7cd8c56f4815e4fccf9359763

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie16cae0d4cf7bf84a61c6547faa0e1db2382073a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fixes to Special:FileDuplicateSearch form - change (mediawiki/core)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Fixes to Special:FileDuplicateSearch form
..


Fixes to Special:FileDuplicateSearch form

- Use Html class instead of Xml where possible
- Add line breaks to the output for better readability

Change-Id: Ia58e0d017a2a54c2458da625bd27a775204908d9
---
M includes/specials/SpecialFileDuplicateSearch.php
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/includes/specials/SpecialFileDuplicateSearch.php 
b/includes/specials/SpecialFileDuplicateSearch.php
index 3fe64e6..cc5cd5b 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -113,14 +113,14 @@
 
# Create the input form
$out-addHTML(
-   Xml::openElement( 'form', array( 'id' = 
'fileduplicatesearch', 'method' = 'get', 'action' = $wgScript ) ) .
-   Html::hidden( 'title', 
$this-getTitle()-getPrefixedDBkey() ) .
-   Xml::openElement( 'fieldset' ) .
-   Xml::element( 'legend', null, $this-msg( 
'fileduplicatesearch-legend' )-text() ) .
-   Xml::inputLabel( $this-msg( 
'fileduplicatesearch-filename' )-text(), 'filename', 'filename', 50, 
$this-filename ) . ' ' .
-   Xml::submitButton( $this-msg( 
'fileduplicatesearch-submit' )-text() ) .
-   Xml::closeElement( 'fieldset' ) .
-   Xml::closeElement( 'form' )
+   Html::openElement( 'form', array( 'id' = 
'fileduplicatesearch', 'method' = 'get', 'action' = $wgScript ) ) . \n .
+   Html::hidden( 'title', 
$this-getTitle()-getPrefixedDBkey() ) . \n .
+   Html::openElement( 'fieldset' ) . \n .
+   Html::element( 'legend', null, $this-msg( 
'fileduplicatesearch-legend' )-text() ) . \n .
+   Xml::inputLabel( $this-msg( 
'fileduplicatesearch-filename' )-text(), 'filename', 'filename', 50, 
$this-filename ) . \n .
+   Xml::submitButton( $this-msg( 
'fileduplicatesearch-submit' )-text() ) . \n .
+   Html::closeElement( 'fieldset' ) . \n .
+   Html::closeElement( 'form' )
);
 
if( $this-file ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia58e0d017a2a54c2458da625bd27a775204908d9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update method documentation - change (mediawiki...Renameuser)

2013-03-26 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Update method documentation
..

Update method documentation

Change-Id: I7b453e7b97bd886b02288fcd2d8c77a8c6c06e97
---
M RenameUserJob.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Renameuser 
refs/changes/60/55860/1

diff --git a/RenameUserJob.php b/RenameUserJob.php
index a55cca2..d2dc14c 100644
--- a/RenameUserJob.php
+++ b/RenameUserJob.php
@@ -3,12 +3,12 @@
  * Custom job to perform updates on tables in busier environments
  */
 class RenameUserJob extends Job {
-
/**
 * Constructor
 *
 * @param Title $title Associated title
 * @param array $params Job parameters
+* @param int $id
 */
public function __construct( $title, $params = array(), $id = 0 ) {
parent::__construct( 'renameUser', $title, $params, $id );

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

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

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

[MediaWiki-commits] [Gerrit] Replace dirname( FILE ) with DIR - change (mediawiki...Renameuser)

2013-03-26 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Replace dirname( __FILE__ ) with __DIR__
..

Replace dirname( __FILE__ ) with __DIR__

Change-Id: I2a8b7300cef47d5dde473947946f4028bdab36bc
---
M cleanupArchiveUserText.php
M renameUserCleanup.php
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/cleanupArchiveUserText.php b/cleanupArchiveUserText.php
index ff16bf6..8599f3c 100644
--- a/cleanupArchiveUserText.php
+++ b/cleanupArchiveUserText.php
@@ -2,7 +2,7 @@
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
-   $IP = dirname( __FILE__ ) . '/../..';
+   $IP = __DIR__ . '/../..';
 }
 
 require_once( $IP/maintenance/Maintenance.php );
@@ -56,4 +56,4 @@
 }
 
 $maintClass = CleanupArchiveUserText;
-require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/renameUserCleanup.php b/renameUserCleanup.php
index 374cb89..25c4a1f 100644
--- a/renameUserCleanup.php
+++ b/renameUserCleanup.php
@@ -25,7 +25,7 @@
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
-   $IP = dirname( __FILE__ ) . '/../..';
+   $IP = __DIR__ . '/../..';
 }
 require_once( $IP/maintenance/Maintenance.php );
 

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

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

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

[MediaWiki-commits] [Gerrit] Fixes to Special:WithoutInterwiki form - change (mediawiki/core)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Fixes to Special:WithoutInterwiki form
..


Fixes to Special:WithoutInterwiki form

- Use Html class instead of Xml where possible
- Add line breaks to the output for better readability

Change-Id: I794da047f0664913cfd7ceb00247145f9b7d3a1b
---
M includes/specials/SpecialWithoutinterwiki.php
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/includes/specials/SpecialWithoutinterwiki.php 
b/includes/specials/SpecialWithoutinterwiki.php
index 3723740..329b1ad 100644
--- a/includes/specials/SpecialWithoutinterwiki.php
+++ b/includes/specials/SpecialWithoutinterwiki.php
@@ -51,14 +51,14 @@
$prefix = $this-prefix;
$t = $this-getTitle();
 
-   return Xml::openElement( 'form', array( 'method' = 'get', 
'action' = $wgScript ) ) .
-   Xml::openElement( 'fieldset' ) .
-   Xml::element( 'legend', null, $this-msg( 
'withoutinterwiki-legend' )-text() ) .
-   Html::hidden( 'title', $t-getPrefixedText() ) .
-   Xml::inputLabel( $this-msg( 'allpagesprefix' 
)-text(), 'prefix', 'wiprefix', 20, $prefix ) . ' ' .
-   Xml::submitButton( $this-msg( 
'withoutinterwiki-submit' )-text() ) .
-   Xml::closeElement( 'fieldset' ) .
-   Xml::closeElement( 'form' );
+   return Html::openElement( 'form', array( 'method' = 'get', 
'action' = $wgScript ) ) . \n .
+   Html::openElement( 'fieldset' ) . \n .
+   Html::element( 'legend', null, $this-msg( 
'withoutinterwiki-legend' )-text() ) . \n .
+   Html::hidden( 'title', $t-getPrefixedText() ) . \n .
+   Xml::inputLabel( $this-msg( 'allpagesprefix' 
)-text(), 'prefix', 'wiprefix', 20, $prefix ) . \n .
+   Xml::submitButton( $this-msg( 
'withoutinterwiki-submit' )-text() ) . \n .
+   Html::closeElement( 'fieldset' ) . \n .
+   Html::closeElement( 'form' );
}
 
function sortDescending() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I794da047f0664913cfd7ceb00247145f9b7d3a1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Translate and ULS to master - change (mediawiki/core)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has submitted this change and it was merged.

Change subject: Translate and ULS to master
..


Translate and ULS to master

This fixes TUX for anonymous users since TUX depends on parts
of ULS. Also other fixes for TUX to allow us test it more
before enabling it by default.

Change-Id: Ie16cae0d4cf7bf84a61c6547faa0e1db2382073a
---
M extensions/Translate
M extensions/UniversalLanguageSelector
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Translate b/extensions/Translate
index 214df82..7c530a8 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 214df82e86dd28fcce76222a751a4d08c0f59ba5
+Subproject commit 7c530a872515f00395d0385f1854776f62370310
diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index f76ce1a..453912f 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit f76ce1a4b40e8b39aee9de787b1c3d5ad38473bb
+Subproject commit 453912fdf2d449b7cd8c56f4815e4fccf9359763

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie16cae0d4cf7bf84a61c6547faa0e1db2382073a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Move subclasses of LogFormatter to their own file - change (mediawiki/core)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Move subclasses of LogFormatter to their own file
..


Move subclasses of LogFormatter to their own file

Except LegacyLogFormatter.

includes/logging/LogFormatter.php is getting bigger and bigger with
the addition of new formatters when logs are changed to use them
instead of the old method, so better doing this now before we get
new formatters for remaining log types.

Change-Id: I6aab19c8d68bf47beddad42632b0360a7b12f251
---
M includes/AutoLoader.php
A includes/logging/DeleteLogFormatter.php
M includes/logging/LogFormatter.php
A includes/logging/MoveLogFormatter.php
A includes/logging/NewUsersLogFormatter.php
A includes/logging/PatrolLogFormatter.php
A includes/logging/RightsLogFormatter.php
7 files changed, 523 insertions(+), 397 deletions(-)

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



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 7136232..5fe1e3f 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -700,7 +700,7 @@
 
# includes/logging
'DatabaseLogEntry' = 'includes/logging/LogEntry.php',
-   'DeleteLogFormatter' = 'includes/logging/LogFormatter.php',
+   'DeleteLogFormatter' = 'includes/logging/DeleteLogFormatter.php',
'LegacyLogFormatter' = 'includes/logging/LogFormatter.php',
'LogEntry' = 'includes/logging/LogEntry.php',
'LogEventsList' = 'includes/logging/LogEventsList.php',
@@ -709,12 +709,12 @@
'LogPage' = 'includes/logging/LogPage.php',
'LogPager' = 'includes/logging/LogPager.php',
'ManualLogEntry' = 'includes/logging/LogEntry.php',
-   'MoveLogFormatter' = 'includes/logging/LogFormatter.php',
-   'NewUsersLogFormatter' = 'includes/logging/LogFormatter.php',
+   'MoveLogFormatter' = 'includes/logging/MoveLogFormatter.php',
+   'NewUsersLogFormatter' = 'includes/logging/NewUsersLogFormatter.php',
'PatrolLog' = 'includes/logging/PatrolLog.php',
-   'PatrolLogFormatter' = 'includes/logging/LogFormatter.php',
+   'PatrolLogFormatter' = 'includes/logging/PatrolLogFormatter.php',
'RCDatabaseLogEntry' = 'includes/logging/LogEntry.php',
-   'RightsLogFormatter' = 'includes/logging/LogFormatter.php',
+   'RightsLogFormatter' = 'includes/logging/RightsLogFormatter.php',
 
# includes/media
'BitmapHandler' = 'includes/media/Bitmap.php',
diff --git a/includes/logging/DeleteLogFormatter.php 
b/includes/logging/DeleteLogFormatter.php
new file mode 100644
index 000..8a9e6db
--- /dev/null
+++ b/includes/logging/DeleteLogFormatter.php
@@ -0,0 +1,196 @@
+?php
+/**
+ * Formatter for delete log entries.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Niklas Laxström
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ * @since 1.21
+ */
+
+/**
+ * This class formats delete log entries.
+ *
+ * @since 1.19
+ */
+class DeleteLogFormatter extends LogFormatter {
+   protected function getMessageKey() {
+   $key = parent::getMessageKey();
+   if ( in_array( $this-entry-getSubtype(), array( 'event', 
'revision' ) ) ) {
+   if ( count( $this-getMessageParameters() )  5 ) {
+   return $key-legacy;
+   }
+   }
+   return $key;
+   }
+
+   protected function getMessageParameters() {
+   if ( isset( $this-parsedParametersDeleteLog ) ) {
+   return $this-parsedParametersDeleteLog;
+   }
+
+   $params = parent::getMessageParameters();
+   $subtype = $this-entry-getSubtype();
+   if ( in_array( $subtype, array( 'event', 'revision' ) ) ) {
+   // $params[3] here is 'revision' for page revisions, 
'oldimage' for file versions, or a comma-separated list of log_ids for log 
entries.
+   // $subtype here is 'revision' for page revisions and 
file versions, or 'event' for log entries.
+

[MediaWiki-commits] [Gerrit] Add full stops to error messages - change (mediawiki...UserMerge)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Add full stops to error messages
..


Add full stops to error messages

Change-Id: I4b742cc94dc6bb21f4a81755c19668cf3b30ee3b
---
M UserMerge.i18n.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php
index 758767c..6e0f440 100644
--- a/UserMerge.i18n.php
+++ b/UserMerge.i18n.php
@@ -11,17 +11,17 @@
 $messages['en'] = array(
'usermerge' = 'Merge and delete users',
'usermerge-desc'= [[Special:UserMerge|Merges 
references from one user to another user]] in the wiki database - will also 
delete old users following merge. Requires ''usermerge'' privileges,
-   'usermerge-badolduser'  = 'Invalid old username',
-   'usermerge-badnewuser'  = 'Invalid new username',
+   'usermerge-badolduser'  = 'Invalid old username.',
+   'usermerge-badnewuser'  = 'Invalid new username.',
'usermerge-nonewuser'   = 'Empty new username. Assuming merge 
to {{GENDER:$1|$1}}.br /
 Click {{int:usermerge-submit}} to accept.',
-   'usermerge-noolduser'   = 'Empty old username',
+   'usermerge-noolduser'   = 'Empty old username.',
'usermerge-fieldset'= 'Usernames to merge',
'usermerge-olduser' = 'Old user (merge from):',
'usermerge-newuser' = 'New user (merge to):',
'usermerge-deleteolduser'   = 'Delete old user',
'usermerge-submit'  = 'Merge user',
-   'usermerge-badtoken'= 'Invalid edit token',
+   'usermerge-badtoken'= 'Invalid edit token.',
'usermerge-userdeleted' = '$1 ($2) has been deleted.',
'usermerge-userdeleted-log' = 'Deleted user: $2 ($3)',
'usermerge-updating'= 'Updating $1 table ($2 to $3)',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b742cc94dc6bb21f4a81755c19668cf3b30ee3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] CentralNotice supports SQLite now - change (integration/zuul-config)

2013-03-26 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: CentralNotice supports SQLite now
..


CentralNotice supports SQLite now

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

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



diff --git a/layout.yaml b/layout.yaml
index c7db48a..50c8114 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -289,10 +289,6 @@
 # (times out or doesn't start in the first place).
 branch: (?!REL1_19)
 
-  # CentralNotice does not support SQLite backend :-/
-  - name: ^mwext-CentralNotice-testextensions-.*
-voting: false
-
   # not working yet, might need some dependency
   - name: ^mwext-ContributionTracking-testextensions-.*
 voting: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If91e4370f1372a70b5347a51e072f2eecc1645a8
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Avoid invitation to unmark as proofread since it is not al... - change (mediawiki...Translate)

2013-03-26 Thread Pginer (Code Review)

Pginer has uploaded a new change for review.

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


Change subject: Avoid invitation to unmark as proofread since it is not 
allowed
..

Avoid invitation to unmark as proofread since it is not allowed

CSS has been adjusted to avoid to convey the idea that proofread marks
can be removed. Once the user marks a message as proofread, the
mark will not be highlighted on hover and the cursor will not turn into
a hand.

Change-Id: Ifec127376fb4d8f69b575265c11fd7b1e06e83d8
---
M resources/css/ext.translate.proofread.css
1 file changed, 2 insertions(+), 8 deletions(-)


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

diff --git a/resources/css/ext.translate.proofread.css 
b/resources/css/ext.translate.proofread.css
index 5e1c77e..6bbf3b7 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -111,11 +111,8 @@
 }
 
 .tux-proofread-action.accepted {
+   cursor: default;
background-position: right -62px;
-}
-
-.tux-proofread-action.accepted:hover {
-   background-position: right -93px;
 }
 
 .proofread-by-others .tux-proofread-action {
@@ -127,11 +124,8 @@
 }
 
 .proofread-by-others .tux-proofread-action.accepted {
+   cursor: default;
background-position: right -186px;
-}
-
-.proofread-by-others .tux-proofread-action.accepted:hover {
-   background-position: right -217px;
 }
 
 .tux-proofread-edit {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifec127376fb4d8f69b575265c11fd7b1e06e83d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] (bug 46418) Claim Diff View for Qualifiers - change (mediawiki...Wikibase)

2013-03-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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


Change subject: (bug 46418) Claim Diff View for Qualifiers
..

(bug 46418) Claim Diff View for Qualifiers

Change-Id: I55cee5597d65ede5d9e3d73a85e55afa75f479a3
---
M lib/includes/ClaimDifferenceVisualizer.php
1 file changed, 85 insertions(+), 49 deletions(-)


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

diff --git a/lib/includes/ClaimDifferenceVisualizer.php 
b/lib/includes/ClaimDifferenceVisualizer.php
index 1efbf93..3c30d22 100644
--- a/lib/includes/ClaimDifferenceVisualizer.php
+++ b/lib/includes/ClaimDifferenceVisualizer.php
@@ -75,12 +75,18 @@
$html .= $this-visualizeRankChange( 
$claimDifference-getRankChange() );
}
 
-   // TODO: html for qualifier changes
+   if ( $claimDifference-getQualifierChanges() !== null ) {
+   $html .= $this-visualizeQualifierChanges(
+   $claimDifference-getQualifierChanges(),
+   $baseClaim
+   );
+   }
 
if ( $claimDifference-getReferenceChanges() !== null ) {
-   $html .= $this-visualizeReferenceChanges(
+   $html .= $this-visualizeSnakListChanges(
$claimDifference-getReferenceChanges(),
-   $baseClaim
+   $baseClaim,
+   wfMessage( 'wikibase-diffview-reference' )
);
}
 
@@ -143,9 +149,9 @@
protected function visualizeMainSnakChange( $mainSnakChange ) {
$valueFormatter = new DiffOpValueFormatter(
// todo: should show specific headers for both columns
-   $this-getMainSnakHeader( 
$mainSnakChange-getNewValue() ),
-   $this-getMainSnakValue( $mainSnakChange-getOldValue() 
),
-   $this-getMainSnakValue( $mainSnakChange-getNewValue() 
)
+   $this-getSnakHeader( $mainSnakChange-getNewValue() ),
+   $this-getSnakValue( $mainSnakChange-getOldValue() ),
+   $this-getSnakValue( $mainSnakChange-getNewValue() )
);
 
return $valueFormatter-generateHtml();
@@ -189,7 +195,7 @@
 
if ( $newSnak instanceof Snak || $oldSnak instanceof Snak ) {
$headerSnak = $newSnak instanceof Snak ? $newSnak : 
$oldSnak;
-   $snakHeader .= $this-getMainSnakHeader( $headerSnak );
+   $snakHeader .= $this-getSnakHeader( $headerSnak );
} else {
// something went wrong
throw new \MWException( 'Snak parameters not provided.' 
);
@@ -199,11 +205,11 @@
$newValue = null;
 
if ( $oldSnak instanceof Snak ) {
-   $oldValue = $this-getMainSnakValue( $oldSnak );
+   $oldValue = $this-getSnakValue( $oldSnak );
}
 
if ( $newSnak instanceof Snak ) {
-   $newValue = $this-getMainSnakValue( $newSnak );
+   $newValue = $this-getSnakValue( $newSnak );
}
 
$valueFormatter = new DiffOpValueFormatter( $snakHeader, 
$oldValue, $newValue );
@@ -229,7 +235,7 @@
$values[] =
$this-getEntityLabel( $snak-getPropertyId() ) 
.
': '.
-   $this-getMainSnakValue( $snak );
+   $this-getSnakValue( $snak );
}
 
return $values;
@@ -240,12 +246,12 @@
 *
 * @since 0.4
 *
-* @param Snak $mainSnak
+* @param Snak $snak
 *
 * @return string
 */
-   protected function getMainSnakHeader( Snak $mainSnak ) {
-   $propertyId = $mainSnak-getPropertyId();
+   protected function getSnakHeader( Snak $snak ) {
+   $propertyId = $snak-getPropertyId();
$propertyLabel = $this-getEntityLabel( $propertyId );
$headerText = wfMessage( 'wikibase-entity-property' ) . ' / ' . 
$propertyLabel;
 
@@ -253,7 +259,7 @@
}
 
/**
-* Get main snak value in string form
+* Get snak value in string form
 *
 * @since 0.4
 *
@@ -261,7 +267,7 @@
 *
 * @return string
 */
-   protected function getMainSnakValue( Snak $snak ) {
+   protected function getSnakValue( Snak $snak ) {
$snakType = $snak-getType();
 
if ( $snakType === 'value' ) {
@@ -306,73 +312,103

[MediaWiki-commits] [Gerrit] Workflow selector: Show a progress text while changing the s... - change (mediawiki...Translate)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Workflow selector: Show a progress text while changing the state
..


Workflow selector: Show a progress text while changing the state

Change-Id: I18f6e1ca6a70cfa16a4ffbcd4ca0001f15f3613b
---
M Resources.php
M resources/js/ext.translate.workflowselector.js
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index 43d8fa4..1954b58 100644
--- a/Resources.php
+++ b/Resources.php
@@ -337,6 +337,7 @@
'styles' = 'resources/css/ext.translate.workflowselector.css',
'scripts' = 'resources/js/ext.translate.workflowselector.js',
'messages' = array(
+   'translate-workflow-set-doing',
'translate-workflowstatus',
),
 ) + $resourcePaths;
diff --git a/resources/js/ext.translate.workflowselector.js 
b/resources/js/ext.translate.workflowselector.js
index 0ad9448..ee55869 100644
--- a/resources/js/ext.translate.workflowselector.js
+++ b/resources/js/ext.translate.workflowselector.js
@@ -125,6 +125,7 @@
 
state = $this.data( 'state' ).id;
 
+   $display.text( mw.msg( 
'translate-workflow-set-doing' ) );
instance.changeState( state )
.done( function () {
instance.receiveState( 
instance.groupId, instance.language, state );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18f6e1ca6a70cfa16a4ffbcd4ca0001f15f3613b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@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] Add separate Resources.php - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Add separate Resources.php
..

Add separate Resources.php

Change-Id: Ie02fbdd1bb8a1c83f66eacff8de0ca0bd6c67ab4
---
A Resources.php
M UniversalLanguageSelector.php
2 files changed, 191 insertions(+), 182 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/64/55864/1

diff --git a/Resources.php b/Resources.php
new file mode 100644
index 000..6b7c725
--- /dev/null
+++ b/Resources.php
@@ -0,0 +1,190 @@
+?php
+/**
+ * JavaScript and CSS resource definitions.
+ *
+ * @file
+ * @license GPL2+
+ */
+
+// Base ULS module
+$wgResourceModules['ext.uls.init'] = array(
+   'scripts' = 'resources/js/ext.uls.init.js',
+   'styles' = 'resources/css/ext.uls.css',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'mediawiki.Uri',
+   'mediawiki.util',
+   'jquery.json',
+   'jquery.uls',
+   'jquery.i18n',
+   ),
+   'position' = 'top',
+);
+
+// Interface language selection module
+$wgResourceModules['ext.uls.interface'] = array(
+   'scripts' = 'resources/js/ext.uls.interface.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'ext.uls.init',
+   'jquery.tipsy',
+   'ext.uls.displaysettings',
+   'ext.uls.inputsettings',
+   ),
+   'position' = 'top',
+);
+
+$wgResourceModules['ext.uls.geoclient'] = array(
+   'scripts' = 'resources/js/ext.uls.geoclient.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['ext.uls.preferences'] = array(
+   'scripts' = 'resources/js/ext.uls.preferences.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'mediawiki.user',
+   'mediawiki.api',
+   'jquery.jStorage',
+   ),
+);
+
+$wgResourceModules['ext.uls.languagesettings'] = array(
+   'scripts' = 'resources/js/ext.uls.languagesettings.js',
+   'styles' = 'resources/css/ext.uls.languagesettings.css',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'ext.uls.preferences',
+   ),
+);
+
+$wgResourceModules['ext.uls.webfonts'] = array(
+   'scripts' = 'resources/js/ext.uls.webfonts.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'jquery.webfonts',
+   'ext.uls.webfonts.repository',
+   'ext.uls.preferences',
+   ),
+);
+$wgResourceModules['ext.uls.ime'] = array(
+   'scripts' = 'resources/js/ext.uls.ime.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'jquery.ime',
+   'ext.uls.preferences',
+   ),
+);
+
+
+$wgResourceModules['ext.uls.displaysettings'] = array(
+   'scripts' = 'resources/js/ext.uls.displaysettings.js',
+   'styles' = 'resources/css/ext.uls.displaysettings.css',
+   'localBasePath' = $dir,
+   'dependencies' = array(
+   'ext.uls.languagesettings',
+   'ext.uls.webfonts',
+   'jquery.i18n',
+   ),
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['ext.uls.inputsettings'] = array(
+   'scripts' = 'resources/js/ext.uls.inputsettings.js',
+   'styles' = 'resources/css/ext.uls.inputsettings.css',
+   'localBasePath' = $dir,
+   'dependencies' = array(
+   'ext.uls.languagesettings',
+   'ext.uls.ime',
+   'jquery.i18n',
+   ),
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['jquery.uls'] = array(
+   'scripts' = array(
+   'lib/jquery.uls/src/jquery.uls.core.js',
+   'lib/jquery.uls/src/jquery.uls.lcd.js',
+   'lib/jquery.uls/src/jquery.uls.languagefilter.js',
+   'lib/jquery.uls/src/jquery.uls.regionfilter.js',
+   ),
+   'styles' = array(
+   'lib/jquery.uls/css/jquery.uls.css',
+   'lib/jquery.uls/css/jquery.uls.lcd.css',
+   ),
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'jquery.i18n',
+   'jquery.uls.grid',
+   'jquery.uls.data',
+   ),
+   'position' = 'top',
+);
+
+
+$wgResourceModules['jquery.uls.grid'] = array(
+   'styles' = array(
+   'lib/jquery.uls/css/jquery.uls.grid.css',
+   ),

[MediaWiki-commits] [Gerrit] Sort modules alphabetically - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Sort modules alphabetically
..

Sort modules alphabetically

Change-Id: Id8a0daabe6204e2a4c52d702e29d891fd80b89ae
---
M Resources.php
1 file changed, 67 insertions(+), 69 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/65/55865/1

diff --git a/Resources.php b/Resources.php
index 6b7c725..8bde270 100644
--- a/Resources.php
+++ b/Resources.php
@@ -6,6 +6,34 @@
  * @license GPL2+
  */
 
+$wgResourceModules['ext.uls.displaysettings'] = array(
+   'scripts' = 'resources/js/ext.uls.displaysettings.js',
+   'styles' = 'resources/css/ext.uls.displaysettings.css',
+   'localBasePath' = $dir,
+   'dependencies' = array(
+   'ext.uls.languagesettings',
+   'ext.uls.webfonts',
+   'jquery.i18n',
+   ),
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['ext.uls.geoclient'] = array(
+   'scripts' = 'resources/js/ext.uls.geoclient.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['ext.uls.ime'] = array(
+   'scripts' = 'resources/js/ext.uls.ime.js',
+   'localBasePath' = $dir,
+   'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'jquery.ime',
+   'ext.uls.preferences',
+   ),
+);
+
 // Base ULS module
 $wgResourceModules['ext.uls.init'] = array(
'scripts' = 'resources/js/ext.uls.init.js',
@@ -22,6 +50,18 @@
'position' = 'top',
 );
 
+$wgResourceModules['ext.uls.inputsettings'] = array(
+   'scripts' = 'resources/js/ext.uls.inputsettings.js',
+   'styles' = 'resources/css/ext.uls.inputsettings.css',
+   'localBasePath' = $dir,
+   'dependencies' = array(
+   'ext.uls.languagesettings',
+   'ext.uls.ime',
+   'jquery.i18n',
+   ),
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
 // Interface language selection module
 $wgResourceModules['ext.uls.interface'] = array(
'scripts' = 'resources/js/ext.uls.interface.js',
@@ -36,10 +76,14 @@
'position' = 'top',
 );
 
-$wgResourceModules['ext.uls.geoclient'] = array(
-   'scripts' = 'resources/js/ext.uls.geoclient.js',
+$wgResourceModules['ext.uls.languagesettings'] = array(
+   'scripts' = 'resources/js/ext.uls.languagesettings.js',
+   'styles' = 'resources/css/ext.uls.languagesettings.css',
'localBasePath' = $dir,
'remoteExtPath' = 'UniversalLanguageSelector',
+   'dependencies' = array(
+   'ext.uls.preferences',
+   ),
 );
 
 $wgResourceModules['ext.uls.preferences'] = array(
@@ -53,16 +97,6 @@
),
 );
 
-$wgResourceModules['ext.uls.languagesettings'] = array(
-   'scripts' = 'resources/js/ext.uls.languagesettings.js',
-   'styles' = 'resources/css/ext.uls.languagesettings.css',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-   'dependencies' = array(
-   'ext.uls.preferences',
-   ),
-);
-
 $wgResourceModules['ext.uls.webfonts'] = array(
'scripts' = 'resources/js/ext.uls.webfonts.js',
'localBasePath' = $dir,
@@ -73,38 +107,25 @@
'ext.uls.preferences',
),
 );
-$wgResourceModules['ext.uls.ime'] = array(
-   'scripts' = 'resources/js/ext.uls.ime.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-   'dependencies' = array(
-   'jquery.ime',
-   'ext.uls.preferences',
-   ),
-);
 
-
-$wgResourceModules['ext.uls.displaysettings'] = array(
-   'scripts' = 'resources/js/ext.uls.displaysettings.js',
-   'styles' = 'resources/css/ext.uls.displaysettings.css',
+$wgResourceModules['ext.uls.webfonts.repository'] = array(
+   'scripts' = 'resources/js/ext.uls.webfonts.repository.js',
'localBasePath' = $dir,
-   'dependencies' = array(
-   'ext.uls.languagesettings',
-   'ext.uls.webfonts',
-   'jquery.i18n',
-   ),
'remoteExtPath' = 'UniversalLanguageSelector',
 );
 
-$wgResourceModules['ext.uls.inputsettings'] = array(
-   'scripts' = 'resources/js/ext.uls.inputsettings.js',
-   'styles' = 'resources/css/ext.uls.inputsettings.css',
+$wgResourceModules['jquery.i18n'] = array(
+   'scripts' = 'lib/jquery.i18n.js',
'localBasePath' = $dir,
-   'dependencies' = array(
-   'ext.uls.languagesettings',
-   'ext.uls.ime',
-   'jquery.i18n',
+   'remoteExtPath' = 'UniversalLanguageSelector',
+);
+
+$wgResourceModules['jquery.ime'] = array(
+   'scripts' = 'lib/jquery.ime/jquery.ime.js',
+   'styles' = array(
+

[MediaWiki-commits] [Gerrit] Add $resourcePaths - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Add $resourcePaths
..

Add $resourcePaths

Change-Id: I2b3ef5f57566fe5bcc6549157e09c47fdc61e95f
---
M Resources.php
1 file changed, 22 insertions(+), 51 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/66/55866/1

diff --git a/Resources.php b/Resources.php
index 8bde270..2dd3b74 100644
--- a/Resources.php
+++ b/Resources.php
@@ -6,40 +6,37 @@
  * @license GPL2+
  */
 
+$resourcePaths = array(
+   'localBasePath' = __DIR__,
+   'remoteExtPath' = 'UniversalLanguageSelector'
+) + $resourcePaths;
+
 $wgResourceModules['ext.uls.displaysettings'] = array(
'scripts' = 'resources/js/ext.uls.displaysettings.js',
'styles' = 'resources/css/ext.uls.displaysettings.css',
-   'localBasePath' = $dir,
'dependencies' = array(
'ext.uls.languagesettings',
'ext.uls.webfonts',
'jquery.i18n',
),
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.geoclient'] = array(
'scripts' = 'resources/js/ext.uls.geoclient.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.ime'] = array(
'scripts' = 'resources/js/ext.uls.ime.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'jquery.ime',
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
 
 // Base ULS module
 $wgResourceModules['ext.uls.init'] = array(
'scripts' = 'resources/js/ext.uls.init.js',
'styles' = 'resources/css/ext.uls.css',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'mediawiki.Uri',
'mediawiki.util',
@@ -48,25 +45,21 @@
'jquery.i18n',
),
'position' = 'top',
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.inputsettings'] = array(
'scripts' = 'resources/js/ext.uls.inputsettings.js',
'styles' = 'resources/css/ext.uls.inputsettings.css',
-   'localBasePath' = $dir,
'dependencies' = array(
'ext.uls.languagesettings',
'ext.uls.ime',
'jquery.i18n',
),
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
 
 // Interface language selection module
 $wgResourceModules['ext.uls.interface'] = array(
'scripts' = 'resources/js/ext.uls.interface.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'ext.uls.init',
'jquery.tipsy',
@@ -74,60 +67,48 @@
'ext.uls.inputsettings',
),
'position' = 'top',
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.languagesettings'] = array(
'scripts' = 'resources/js/ext.uls.languagesettings.js',
'styles' = 'resources/css/ext.uls.languagesettings.css',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.preferences'] = array(
'scripts' = 'resources/js/ext.uls.preferences.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'mediawiki.user',
'mediawiki.api',
'jquery.jStorage',
),
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.webfonts'] = array(
'scripts' = 'resources/js/ext.uls.webfonts.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
'dependencies' = array(
'jquery.webfonts',
'ext.uls.webfonts.repository',
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
 
 $wgResourceModules['ext.uls.webfonts.repository'] = array(
'scripts' = 'resources/js/ext.uls.webfonts.repository.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
 
 $wgResourceModules['jquery.i18n'] = array(
'scripts' = 'lib/jquery.i18n.js',
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
 
 $wgResourceModules['jquery.ime'] = array(
'scripts' = 'lib/jquery.ime/jquery.ime.js',
'styles' = array(
'lib/jquery.ime/css/jquery.ime.css',
),
-   'localBasePath' = $dir,
-   'remoteExtPath' = 'UniversalLanguageSelector',
-);
+) + $resourcePaths;

[MediaWiki-commits] [Gerrit] Consistency changes - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Consistency changes
..

Consistency changes

As a side note I think not all of these need to have
position = top

Change-Id: Id5c62940ef7084b97573cfd62974f3bc27dd418a
---
M Resources.php
1 file changed, 4 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/67/55867/1

diff --git a/Resources.php b/Resources.php
index 2dd3b74..5ebbe12 100644
--- a/Resources.php
+++ b/Resources.php
@@ -105,9 +105,7 @@
 
 $wgResourceModules['jquery.ime'] = array(
'scripts' = 'lib/jquery.ime/jquery.ime.js',
-   'styles' = array(
-   'lib/jquery.ime/css/jquery.ime.css',
-   ),
+   'styles' = 'lib/jquery.ime/css/jquery.ime.css',
 ) + $resourcePaths;
 
 $wgResourceModules['jquery.uls'] = array(
@@ -130,12 +128,8 @@
 ) + $resourcePaths;
 
 $wgResourceModules['jquery.uls.compact'] = array(
-   'styles' = array(
-   'lib/jquery.uls/css/jquery.uls.compact.css',
-   ),
-   'dependencies' = array(
-   'jquery.uls',
-   ),
+   'styles' = 'lib/jquery.uls/css/jquery.uls.compact.css',
+   'dependencies' = 'jquery.uls',
'position' = 'top',
 ) + $resourcePaths;
 
@@ -148,9 +142,7 @@
 ) + $resourcePaths;
 
 $wgResourceModules['jquery.uls.grid'] = array(
-   'styles' = array(
-   'lib/jquery.uls/css/jquery.uls.grid.css',
-   ),
+   'styles' = 'lib/jquery.uls/css/jquery.uls.grid.css',
'position' = 'top',
 ) + $resourcePaths;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5c62940ef7084b97573cfd62974f3bc27dd418a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Avoid invitation to unmark as proofread since it is not al... - change (mediawiki...Translate)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Avoid invitation to unmark as proofread since it is not 
allowed
..


Avoid invitation to unmark as proofread since it is not allowed

CSS has been adjusted to avoid to convey the idea that proofread marks
can be removed. Once the user marks a message as proofread, the
mark will not be highlighted on hover and the cursor will not turn into
a hand.

Change-Id: Ifec127376fb4d8f69b575265c11fd7b1e06e83d8
---
M resources/css/ext.translate.proofread.css
1 file changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/resources/css/ext.translate.proofread.css 
b/resources/css/ext.translate.proofread.css
index 5e1c77e..6bbf3b7 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -111,11 +111,8 @@
 }
 
 .tux-proofread-action.accepted {
+   cursor: default;
background-position: right -62px;
-}
-
-.tux-proofread-action.accepted:hover {
-   background-position: right -93px;
 }
 
 .proofread-by-others .tux-proofread-action {
@@ -127,11 +124,8 @@
 }
 
 .proofread-by-others .tux-proofread-action.accepted {
+   cursor: default;
background-position: right -186px;
-}
-
-.proofread-by-others .tux-proofread-action.accepted:hover {
-   background-position: right -217px;
 }
 
 .tux-proofread-edit {

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

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

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)

2013-03-26 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: Iff5643cc479cb7764b1895edc8a5634efcb076ef
---
M Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/68/55868/1

diff --git a/Gemfile.lock b/Gemfile.lock
index e552a34..56c5aa8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,7 +16,7 @@
 diff-lcs (1.2.1)
 faker (1.1.2)
   i18n (~ 0.5)
-ffi (1.5.0)
+ffi (1.6.0)
 gherkin (2.11.6)
   json (= 1.7.6)
 i18n (0.6.4)
@@ -30,9 +30,9 @@
 page_navigation (0.7)
   data_magic (= 0.14)
 parallel (0.6.3)
-parallel_tests (0.10.3)
+parallel_tests (0.10.4)
   parallel
-rake (10.0.3)
+rake (10.0.4)
 rspec-expectations (2.13.0)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (0.9.9)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff5643cc479cb7764b1895edc8a5634efcb076ef
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...MobileFrontend)

2013-03-26 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: I67847fb8c8d2a186e65fcbc3dcb0b2c7c75cc732
---
M tests/acceptance/Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/69/55869/1

diff --git a/tests/acceptance/Gemfile.lock b/tests/acceptance/Gemfile.lock
index e552a34..56c5aa8 100644
--- a/tests/acceptance/Gemfile.lock
+++ b/tests/acceptance/Gemfile.lock
@@ -16,7 +16,7 @@
 diff-lcs (1.2.1)
 faker (1.1.2)
   i18n (~ 0.5)
-ffi (1.5.0)
+ffi (1.6.0)
 gherkin (2.11.6)
   json (= 1.7.6)
 i18n (0.6.4)
@@ -30,9 +30,9 @@
 page_navigation (0.7)
   data_magic (= 0.14)
 parallel (0.6.3)
-parallel_tests (0.10.3)
+parallel_tests (0.10.4)
   parallel
-rake (10.0.3)
+rake (10.0.4)
 rspec-expectations (2.13.0)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (0.9.9)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67847fb8c8d2a186e65fcbc3dcb0b2c7c75cc732
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add ext.uls.geoclient back to deps - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Add ext.uls.geoclient back to deps
..

Add ext.uls.geoclient back to deps

Change-Id: I4e1aa22edd89ff666b29c7b26c1928885e8bc896
---
M UniversalLanguageSelector.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/70/55870/1

diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 216bd3e..956d828 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -130,6 +130,7 @@
'jquery.tipsy',
'ext.uls.displaysettings',
'ext.uls.inputsettings',
+   'ext.uls.geoclient',
),
'position' = 'top',
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e1aa22edd89ff666b29c7b26c1928885e8bc896
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add full stops to error messages - change (mediawiki...PoolCounter)

2013-03-26 Thread Shirayuki (Code Review)

Shirayuki has uploaded a new change for review.

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


Change subject: Add full stops to error messages
..

Add full stops to error messages

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter 
refs/changes/71/55871/1

diff --git a/PoolCounterClient.i18n.php b/PoolCounterClient.i18n.php
index 3ec9463..f8e3060 100644
--- a/PoolCounterClient.i18n.php
+++ b/PoolCounterClient.i18n.php
@@ -14,8 +14,8 @@
 $messages['en'] = array(
'poolcounter-desc' = 'MediaWiki client for the pool counter daemon',
'poolcounter-connection-error' = 'Error connecting to pool counter 
server: $1',
-   'poolcounter-read-error' = 'Error reading from pool counter server',
-   'poolcounter-write-error' = 'Error writing to pool counter server',
+   'poolcounter-read-error' = 'Error reading from pool counter server.',
+   'poolcounter-write-error' = 'Error writing to pool counter server.',
'poolcounter-remote-error' = 'Pool counter server error: $1',
 );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5bec0bcf9e230462dad1555bd1a3d90f0d44181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add ext.uls.geoclient back to deps - change (mediawiki...UniversalLanguageSelector)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Add ext.uls.geoclient back to deps
..


Add ext.uls.geoclient back to deps

Change-Id: I4e1aa22edd89ff666b29c7b26c1928885e8bc896
---
M UniversalLanguageSelector.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 216bd3e..956d828 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -130,6 +130,7 @@
'jquery.tipsy',
'ext.uls.displaysettings',
'ext.uls.inputsettings',
+   'ext.uls.geoclient',
),
'position' = 'top',
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e1aa22edd89ff666b29c7b26c1928885e8bc896
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated documentation - change (operations/puppet)

2013-03-26 Thread Silke Meyer (Code Review)

Silke Meyer has uploaded a new change for review.

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


Change subject: Updated documentation
..

Updated documentation

Change-Id: I548367c234e4e53d9950ffdfdc29ea897423603d
---
M modules/wikidata_singlenode/templates/wikidata-client-requires.php
M modules/wikidata_singlenode/templates/wikidata-repo-requires.php
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/55872/1

diff --git a/modules/wikidata_singlenode/templates/wikidata-client-requires.php 
b/modules/wikidata_singlenode/templates/wikidata-client-requires.php
index c1262a1..ece0b0a 100644
--- a/modules/wikidata_singlenode/templates/wikidata-client-requires.php
+++ b/modules/wikidata_singlenode/templates/wikidata-client-requires.php
@@ -41,7 +41,7 @@
 
 // The global site ID by which this wiki is known on the repo.
 $wgWBSettings['siteGlobalID'] = %=siteGlobalID%;
-// Database name of the repository, for use by the pollForChanges script.
+// Database name of the repository, for the propagation of changes.
 // This requires the given database name to be known to LBFactory, see
 // $wgLBFactoryConf below.
 $wgWBSettings['changesDatabase'] = repo;
diff --git a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php 
b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
index baa60a6..d12c964 100644
--- a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
+++ b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
@@ -118,8 +118,7 @@
 
 // Load Balancer
 $wgLBFactoryConf = array(
-   // In order to seamlessly access a remote wiki, as the pollForChanges 
script needs to do,
-   // LBFactory_Multi must be used.
+   // In order to seamlessly access a remote wiki, LBFactory_Multi must be 
used.
'class' = 'LBFactory_Multi',
 
// Connect to all databases using the same credentials.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I548367c234e4e53d9950ffdfdc29ea897423603d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Silke Meyer silke.me...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Add full stops to error messages - change (mediawiki...PoolCounter)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Add full stops to error messages
..


Add full stops to error messages

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

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



diff --git a/PoolCounterClient.i18n.php b/PoolCounterClient.i18n.php
index 3ec9463..f8e3060 100644
--- a/PoolCounterClient.i18n.php
+++ b/PoolCounterClient.i18n.php
@@ -14,8 +14,8 @@
 $messages['en'] = array(
'poolcounter-desc' = 'MediaWiki client for the pool counter daemon',
'poolcounter-connection-error' = 'Error connecting to pool counter 
server: $1',
-   'poolcounter-read-error' = 'Error reading from pool counter server',
-   'poolcounter-write-error' = 'Error writing to pool counter server',
+   'poolcounter-read-error' = 'Error reading from pool counter server.',
+   'poolcounter-write-error' = 'Error writing to pool counter server.',
'poolcounter-remote-error' = 'Pool counter server error: $1',
 );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5bec0bcf9e230462dad1555bd1a3d90f0d44181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] ULS to master again, pick up a fix for Wikidata - change (mediawiki/core)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: ULS to master again, pick up a fix for Wikidata
..

ULS to master again, pick up a fix for Wikidata

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/55873/1

diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 453912f..00189af 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 453912fdf2d449b7cd8c56f4815e4fccf9359763
+Subproject commit 00189afa66e791fdce33824f61d4c6bf629ac536

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc2e6360e9981a7ecfb4001cf8f6dc2719926d6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] ULS to master again, pick up a fix for Wikidata - change (mediawiki/core)

2013-03-26 Thread Nikerabbit (Code Review)

Nikerabbit has submitted this change and it was merged.

Change subject: ULS to master again, pick up a fix for Wikidata
..


ULS to master again, pick up a fix for Wikidata

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

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



diff --git a/extensions/UniversalLanguageSelector 
b/extensions/UniversalLanguageSelector
index 453912f..00189af 16
--- a/extensions/UniversalLanguageSelector
+++ b/extensions/UniversalLanguageSelector
-Subproject commit 453912fdf2d449b7cd8c56f4815e4fccf9359763
+Subproject commit 00189afa66e791fdce33824f61d4c6bf629ac536

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2e6360e9981a7ecfb4001cf8f6dc2719926d6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] (bug 46383) correct constructor fields for prototypes not us... - change (mediawiki...DataValues)

2013-03-26 Thread Henning Snater (Code Review)

Henning Snater has submitted this change and it was merged.

Change subject: (bug 46383) correct constructor fields for prototypes not using 
dv.util.inherit
..


(bug 46383) correct constructor fields for prototypes not using dv.util.inherit

Same as Ied01e553d16dd0b161fa97ea25d33d9f4efd0447 for Wikibase but for 
DataValues extensions.

Change-Id: Ib52694b932b5f9bdc0949b357960917c06593ef2
---
M DataTypes/resources/dataTypes.js
M DataTypes/resources/jquery/jquery.inputAutoExpand.js
M DataValues/resources/DataValue.js
M DataValues/resources/dataValues.util.js
M DataValues/tests/qunit/DataValue.tests.js
M ValueParsers/resources/ValueParser.js
M ValueParsers/resources/ValueParserFactory.js
7 files changed, 40 insertions(+), 47 deletions(-)

Approvals:
  Henning Snater: Verified; Looks good to me, approved



diff --git a/DataTypes/resources/dataTypes.js b/DataTypes/resources/dataTypes.js
index 865a3d3..5ab6bcb 100644
--- a/DataTypes/resources/dataTypes.js
+++ b/DataTypes/resources/dataTypes.js
@@ -37,7 +37,7 @@
 * @param {Object} formatter
 * @param {Object} validators
 */
-   dt.DataType = function DtDataType( typeId, dataValueType, parser, 
formatter, validators ) {
+   var SELF = dt.DataType = function DtDataType( typeId, dataValueType, 
parser, formatter, validators ) {
// TODO: enforce the requirement or remove it after we 
implemented and use all of the parts
if( dataValueType === undefined ) {
throw new Error( 'All arguments must be provided for 
creating a new DataType object' );
@@ -52,7 +52,8 @@
this._formatter = formatter;
this._validators = validators;
};
-   dt.DataType.prototype = {
+
+   $.extend( SELF.prototype, {
/**
 * Returns the data type's identifier.
 * @since 0.1
@@ -94,7 +95,7 @@
getLabel: function() {
return mw.message( 'datatypes-type-' + this.getId() );
}
-   };
+   } );
 
/**
 * Creates a new DataType object from a given JSON structure.
@@ -104,9 +105,9 @@
 * @param {Object} json JSON structure containing data type info
 * @return {dt.DataType} DataType object
 */
-   dt.DataType.newFromJSON = function( typeId, json ) {
+   SELF.newFromJSON = function( typeId, json ) {
// TODO: inmplement parser, formatter and validators parameters
-   return new dt.DataType( typeId, json.dataValueType );
+   return new SELF( typeId, json.dataValueType );
};
 
 
@@ -116,7 +117,7 @@
var dts = {};
 
$.each( mw.config.get( 'wbDataTypes' ) || {}, function( dtTypeId, 
dtDefinition ) {
-   dts[ dtTypeId ] = dt.DataType.newFromJSON( dtTypeId, 
dtDefinition );
+   dts[ dtTypeId ] = SELF.newFromJSON( dtTypeId, dtDefinition );
} );
 
/**
diff --git a/DataTypes/resources/jquery/jquery.inputAutoExpand.js 
b/DataTypes/resources/jquery/jquery.inputAutoExpand.js
index 7c06df2..2976ecb 100644
--- a/DataTypes/resources/jquery/jquery.inputAutoExpand.js
+++ b/DataTypes/resources/jquery/jquery.inputAutoExpand.js
@@ -287,7 +287,7 @@
return instances;
};
 
-   AutoExpandInput.prototype = {
+   $.extend( AutoExpandInput.prototype, {
/**
 * sets the input boxes width to fit the boxes content.
 *
@@ -549,6 +549,6 @@
this.expand();
}
 
-   };
+   } );
 
 }( jQuery ) );
diff --git a/DataValues/resources/DataValue.js 
b/DataValues/resources/DataValue.js
index 164d3a7..80c101a 100644
--- a/DataValues/resources/DataValue.js
+++ b/DataValues/resources/DataValue.js
@@ -15,9 +15,16 @@
  * @abstract
  * @since 0.1
  */
-dv.DataValue = function DvDataValue() {};
-dv.DataValue.prototype = {
+var SELF = dv.DataValue = function DvDataValue() {};
 
+/**
+ * Type of the DataValue. A static definition of the type like this has to be 
defined for all
+ * DataValue implementations.
+ * @type String
+ */
+SELF.TYPE = null;
+
+$.extend( SELF.prototype, {
/**
 * Returns the most basic representation of this Object's value.
 *
@@ -70,13 +77,6 @@
getType: function() {
return this.constructor.TYPE;
}
-};
-
-/**
- * Type of the DataValue. A static definition of the type like this has to be 
defined for all
- * DataValue implementations.
- * @type String
- */
-dv.DataValue.TYPE = null;
+} );
 
 }( dataValues, jQuery ) );
diff --git a/DataValues/resources/dataValues.util.js 
b/DataValues/resources/dataValues.util.js
index d64c70d..10fabe7 100644
--- a/DataValues/resources/dataValues.util.js
+++ b/DataValues/resources/dataValues.util.js
@@ -66,8 +66,8 @@
 
NewConstructor.prototype = $.extend(

[MediaWiki-commits] [Gerrit] (bug 46383) correct constructor fields for prototypes not us... - change (mediawiki...Wikibase)

2013-03-26 Thread Henning Snater (Code Review)

Henning Snater has submitted this change and it was merged.

Change subject: (bug 46383) correct constructor fields for prototypes not using 
wb.utilities.inherit
..


(bug 46383) correct constructor fields for prototypes not using 
wb.utilities.inherit

Since the object literal was used for those constructors prototypes, the 
original prototype's
constructor field has not been there. Now we extend the original prototype 
(which is also
just a plain object with the constructor field set) instead of overwriting it.
Also did some renaming and general cleanup around the constructors.

Change-Id: Ied01e553d16dd0b161fa97ea25d33d9f4efd0447
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
M 
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
M lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
M lib/resources/wikibase.datamodel/wikibase.Claim.js
M lib/resources/wikibase.datamodel/wikibase.PropertyNoValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.PropertySomeValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.PropertyValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.Reference.js
M lib/resources/wikibase.datamodel/wikibase.Snak.js
M lib/resources/wikibase.datamodel/wikibase.SnakList.js
M lib/resources/wikibase.datamodel/wikibase.Statement.js
M lib/resources/wikibase.serialization/serialization.Serializer.js
M lib/resources/wikibase.serialization/serialization.Unserializer.js
13 files changed, 63 insertions(+), 64 deletions(-)

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



diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
index 8b98cb4..ab85ff5 100644
--- 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
@@ -25,7 +25,7 @@
}
this._view = snakView;
};
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * The widget object whose status is represented.
 * @type jQuery.wikibase.snakview
@@ -69,6 +69,6 @@
isDisabled: function() {
return this._view.isDisabled();
}
-   };
+   } );
 
 }( mediaWiki, wikibase, jQuery ) );
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
index a3863bd..97f8cf0 100644
--- 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
@@ -45,7 +45,7 @@
 
this._init();
};
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * A unique class for this variation. Will be set by the 
variations factory when creating a
 * new variation definition.
@@ -173,6 +173,6 @@
 * @since 0.4
 */
blur: function() {}
-   };
+   } );
 
 }( mediaWiki, wikibase, jQuery ) );
diff --git 
a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js 
b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
index 58fb00f..5b264af 100644
--- a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
+++ b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
@@ -159,7 +159,7 @@
return fields1length === fields2length;
}
 
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * Internal representation of the object.
 * @type Object
@@ -367,7 +367,7 @@
map.type = this.getType();
return map;
}
-   };
+   } );
 
/**
 * Creates a new Entity Object from a given Object with certain keys 
and values, what an actual
diff --git a/lib/resources/wikibase.datamodel/wikibase.Claim.js 
b/lib/resources/wikibase.datamodel/wikibase.Claim.js
index 6c542ac..d599a5b 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Claim.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Claim.js
@@ -2,7 +2,7 @@
  * @file
  * @ingroup WikibaseLib
  * @licence GNU GPL v2+
- * @author Daniel Werner
+ * @author Daniel Werner  daniel.wer...@wikimedia.de 
  */
 ( function( wb, $ ) {
 'use strict';
@@ -18,13 +18,20 @@
  * @param {String|null} [guid] The Global Unique Identifier of this Claim. Can 
be omitted or null
  *if this is a new Claim, not yet stored in the database and 
associated with some entity.

[MediaWiki-commits] [Gerrit] Correct flickr url generation. - change (mediawiki...UploadWizard)

2013-03-26 Thread Nischayn22 (Code Review)

Nischayn22 has uploaded a new change for review.

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


Change subject: Correct flickr url generation.
..

Correct flickr url generation.

The urls for images in flickr was getting wrong setting it to the right
thing as per http://www.flickr.com/services/api/misc.urls.html

Note: Couldn't test this locally because of the curl error, so please test
before merging

Bug 46559

Change-Id: I57900feba9eafc5c4790b17459c857bccdf9e236
---
M resources/mw.FlickrChecker.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/74/55874/1

diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 4f6b99d..012a04f 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -84,7 +84,7 @@
api_key: _this.apiKey,
photoset_id: albumIdMatches[1],
format: 'json',
-   extras: 'license, url_sq, owner_name, original_format, 
date_taken, geo, path_alias' },
+   extras: 'license, url_sq, owner_name, original_format, 
date_taken, geo' },
function( data ) {
if ( typeof data.photoset !== 'undefined' ) {
$.each( data.photoset.photo, function( 
i, item ){
@@ -100,7 +100,7 @@

fileName = item.title + '.jpg';
}
sourceURL = 
'http://www.flickr.com/photos/'
-   + 
item.pathalias + '/' + item.id + '/';
+   + 
data.photoset.owner + '/' + item.id + '/';
var 
flickrUpload = {
name: 
fileName,
url: '',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57900feba9eafc5c4790b17459c857bccdf9e236
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix case of some Title methods - change (mediawiki/core)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix case of some Title methods
..


Fix case of some Title methods

Change-Id: I1a37ffb0e8cde4deac027721b0e463585b58d634
---
M docs/title.txt
M includes/GlobalFunctions.php
M includes/ImagePage.php
M includes/Linker.php
M includes/Title.php
M includes/api/ApiQuery.php
M includes/api/ApiQueryBase.php
M includes/filerepo/file/ForeignAPIFile.php
M includes/parser/CoreParserFunctions.php
M includes/parser/Parser.php
M languages/classes/LanguageIu.php
M languages/classes/LanguageKk.php
M languages/classes/LanguageKu.php
M languages/classes/LanguageShi.php
M languages/classes/LanguageSr.php
M maintenance/dumpLinks.php
M tests/phpunit/includes/TitleTest.php
17 files changed, 26 insertions(+), 26 deletions(-)

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



diff --git a/docs/title.txt b/docs/title.txt
index d2d91c9..454711d 100644
--- a/docs/title.txt
+++ b/docs/title.txt
@@ -8,7 +8,7 @@
 is intended to be an immutable value class, so there are no mutator 
functions.
 
 To get a new instance, call Title::newFromText(). Once instantiated, the
-non-static accessor methods can be used, such as getText(), getDBKey(),
+non-static accessor methods can be used, such as getText(), getDBkey(),
 getNamespace(), etc. Note that Title::newFromText() may return false if the 
text
 is illegal according to the rules below.
 
@@ -36,11 +36,11 @@
 handling for interlanguage links, image links, and category links. It is also
 used to indicate the main namespace in template inclusions.
 
-Once prefixes have been stripped, the rest of the title processed this way: 
+Once prefixes have been stripped, the rest of the title processed this way:
 
 * Spaces and underscores are treated as equivalent and each  is converted to 
the
   other in the appropriate context (underscore in URL and database keys, spaces
-  in plain text). 
+  in plain text).
 * Multiple consecutive spaces are converted to a single space.
 * Leading or trailing space is removed.
 * If $wgCapitalLinks is enabled (the default), the first letter is  
capitalised,
@@ -58,7 +58,7 @@
 be up to 512 bytes.
 
 Note that Unicode Normal Form C (NFC) is enforced by MediaWiki's user interface
-input functions, and so titles will typically be in this form. 
+input functions, and so titles will typically be in this form.
 
 getArticleID() needs some explanation: for internal articles, it should 
return
 the page_id field if the article exists, else it returns 0. For all external
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0b291ec..9042926 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3940,7 +3940,7 @@
# Handle redirects
$redirectTitle = RepoGroup::singleton()-checkRedirect( 
Title::makeTitle( NS_FILE, $name ) );
if( $redirectTitle ) {
-   $name = $redirectTitle-getDbKey();
+   $name = $redirectTitle-getDBkey();
}
 
# Run the extension hook
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index aba9ab5..b5b69df 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -719,7 +719,7 @@
$limit = 100;
 
$out = $this-getContext()-getOutput();
-   $res = $this-queryImageLinks( $this-getTitle()-getDbKey(), 
$limit + 1 );
+   $res = $this-queryImageLinks( $this-getTitle()-getDBkey(), 
$limit + 1 );
$rows = array();
$redirects = array();
foreach ( $res as $row ) {
diff --git a/includes/Linker.php b/includes/Linker.php
index 972adfc..4f1d10e 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -961,7 +961,7 @@
 */
protected static function getUploadUrl( $destFile, $query = '' ) {
global $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
-   $q = 'wpDestFile=' . $destFile-getPartialUrl();
+   $q = 'wpDestFile=' . $destFile-getPartialURL();
if ( $query != '' )
$q .= '' . $query;
 
@@ -1527,7 +1527,7 @@
$nodotdot = substr( $nodotdot, 3 );
}
if ( $dotdotcount  0 ) {
-   $exploded = explode( '/', 
$contextTitle-GetPrefixedText() );
+   $exploded = explode( '/', 
$contextTitle-getPrefixedText() );
if ( count( $exploded )  $dotdotcount 
) { # not allowed to go below top level page
$ret = implode( '/', 
array_slice( $exploded, 0, -$dotdotcount ) );
# / at the end means don't show 
full path
diff --git a/includes/Title.php b/includes/Title.php
index 80be529..5ce742c 100644

[MediaWiki-commits] [Gerrit] test: ignore code coverage for CleanUpTest - change (mediawiki/core)

2013-03-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: test: ignore code coverage for CleanUpTest
..

test: ignore code coverage for CleanUpTest

The tests under tests/phpunit/includes/normal/CleanUpTest.php do not use
data provider. When being run for code coverage (bug 31518) they take so
long that they ends up timing out.

The whole class need to be refactored to use data providers (bug 46561).

Change-Id: I78c270e71d23ffbab00d8812ee91d380aef342c6
---
M tests/phpunit/includes/normal/CleanUpTest.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/55875/1

diff --git a/tests/phpunit/includes/normal/CleanUpTest.php 
b/tests/phpunit/includes/normal/CleanUpTest.php
index 99ec05d..68efd86 100644
--- a/tests/phpunit/includes/normal/CleanUpTest.php
+++ b/tests/phpunit/includes/normal/CleanUpTest.php
@@ -30,6 +30,10 @@
  *
  * @ingroup UtfNormal
  * @group Large
+ *
+ * We ignore code coverage for this test suite until they are rewritten
+ * to use data providers (bug 46561).
+ * @codeCoverageIgnore
  */
 class CleanUpTest extends MediaWikiTestCase {
/** @todo document */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78c270e71d23ffbab00d8812ee91d380aef342c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] move mw core code coverage - change (integration/jenkins-job-builder-config)

2013-03-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: move mw core code coverage
..

move mw core code coverage

As a hack I have had the PHP Unit code coverage for MediaWiki core
generated at https://integration.wikimedia.org/coverage/  it is now
properly namespaces and uses a layout similiar to the doc.wm.o domain.

The new URL is now:

 https://integration.wikimedia.org/cover/mediawiki-core/master/php

bug: 31518
Change-Id: I7ab7f6188ac20a89d5dd858b1893bc993b742949
---
M mediawiki.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/mediawiki.yaml b/mediawiki.yaml
index 9d3f040..f02062c 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -159,7 +159,9 @@
  - shell: |
 php tests/phpunit/phpunit.php \
 --exclude-group Dump,Broken,ParserFuzz,Stub \
---coverage-html /srv/org/mediawiki/integration/coverage/
+--coverage-html 
/srv/org/wikimedia/integration/cover/mediawiki-core/master/php
+echo Code coverage report is available at:
+echo 
https://integration.wikimedia.org/cover/mediawiki-core/master/php;
 triggers:
  - timed: '0 3 * * *'
 wrappers:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ab7f6188ac20a89d5dd858b1893bc993b742949
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: ignore code coverage for CleanUpTest - change (mediawiki/core)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: test: ignore code coverage for CleanUpTest
..


test: ignore code coverage for CleanUpTest

The tests under tests/phpunit/includes/normal/CleanUpTest.php do not use
data provider. When being run for code coverage (bug 31518) they take so
long that they ends up timing out.

The whole class need to be refactored to use data providers (bug 46561).

Change-Id: I78c270e71d23ffbab00d8812ee91d380aef342c6
---
M tests/phpunit/includes/normal/CleanUpTest.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/normal/CleanUpTest.php 
b/tests/phpunit/includes/normal/CleanUpTest.php
index 99ec05d..68efd86 100644
--- a/tests/phpunit/includes/normal/CleanUpTest.php
+++ b/tests/phpunit/includes/normal/CleanUpTest.php
@@ -30,6 +30,10 @@
  *
  * @ingroup UtfNormal
  * @group Large
+ *
+ * We ignore code coverage for this test suite until they are rewritten
+ * to use data providers (bug 46561).
+ * @codeCoverageIgnore
  */
 class CleanUpTest extends MediaWikiTestCase {
/** @todo document */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78c270e71d23ffbab00d8812ee91d380aef342c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] sql script no more need /etc/cluster - change (operations/puppet)

2013-03-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: sql script no more need /etc/cluster
..

sql script no more need /etc/cluster

The sql wrapper script no more needs to knows the cluster since
MediaWiki multiversion takes care of figuring out the database to
connect to.

Moreover /etc/cluster has been replaced by /etc/wikimedia-site

Change-Id: Idd4b4722c6b264002d024d0deaddde714fc3dd63
---
M files/misc/scripts/sql
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/55877/1

diff --git a/files/misc/scripts/sql b/files/misc/scripts/sql
index 29b5aa1..37275a4 100755
--- a/files/misc/scripts/sql
+++ b/files/misc/scripts/sql
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 db=$1
-cluster=`/etc/cluster`
 . /usr/local/lib/mw-deployment-vars.sh
 
 MWMULTIDIR=$MW_COMMON/multiversion

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd4b4722c6b264002d024d0deaddde714fc3dd63
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Switch to new RVM setup files - change (qa/browsertests)

2013-03-26 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Switch to new RVM setup files
..

Switch to new RVM setup files

Auto generated with: rvm rvmrc to .ruby-version

More information: https://rvm.io/workflow/projects/#ruby-versions

Warning message from terminal:

You are using '.rvmrc', it requires trusting, it is slower and it is
not compatible with other ruby managers,
you can switch to '.ruby-version' using 'rvm rvmrc to [.]ruby-version'
or ignore this warnings with 'rvm rvmrc warning ignore
/Users/z/project/wmf/browsertests/.rvmrc',
'.rvmrc' will continue to be the default project file in RVM 1 and RVM
2,
to ignore the warning for all files run 'rvm rvmrc warning ignore
all.rvmrcs'.

Change-Id: I25b243dd1d1b857756ad206aed453b7008b80ded
---
A .ruby-gemset
A .ruby-version
D .rvmrc
3 files changed, 2 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/78/55878/1

diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 000..f0d4574
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+browsertests
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 000..9a5700d
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.0.0-p0
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 0d8fbeb..000
--- a/.rvmrc
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired ruby[@gemset], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-# echo rvm use 1.9.3  .rvmrc
-environment_id=ruby-2.0.0-p0@browsertests
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version=1.16.11 (stable) # 1.10.1 seams as a safe start
-# eval $(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print [[ 
$1*65536+$2*256+$3 -ge $4*65536+$5*256+$6 ]]}' ) || {
-#   echo This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, 
aborting loading.
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the 
environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d ${rvm_path:-$HOME/.rvm}/environments
-   -s ${rvm_path:-$HOME/.rvm}/environments/$environment_id ]]
-then
-  \. ${rvm_path:-$HOME/.rvm}/environments/$environment_id
-  [[ -s ${rvm_path:-$HOME/.rvm}/hooks/after_use ]] 
-\. ${rvm_path:-$HOME/.rvm}/hooks/after_use || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to 
select.
-  rvm --create  $environment_id || {
-echo Failed to create RVM environment '${environment_id}'.
-return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]]  {
-#   ! builtin command -v bundle /dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle 
/dev/null
-# }
-# then
-#   printf %b The rubygem 'bundler' is not installed. Installing it now.\n
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]]  builtin command -v bundle /dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25b243dd1d1b857756ad206aed453b7008b80ded
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] (bug 43204) Activity log: time ignores user-timezone settings - change (mediawiki...ArticleFeedbackv5)

2013-03-26 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 43204) Activity log: time ignores user-timezone settings
..

(bug 43204) Activity log: time ignores user-timezone settings

Change-Id: I87724bc2271c70ccfb7bfedf4a050b5ce1314bb3
---
M ArticleFeedbackv5.activity.php
M ArticleFeedbackv5.render.php
M api/ApiViewActivityArticleFeedbackv5.php
3 files changed, 9 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/79/55879/1

diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php
index 7102aa4..1fe8218 100644
--- a/ArticleFeedbackv5.activity.php
+++ b/ArticleFeedbackv5.activity.php
@@ -1,4 +1,5 @@
 ?php
+
 /**
  * This class provides some functionality to easily get feedback's activity.
  * Because this data is less often requested  because we're dealing with
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 313ddae..956a515 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -887,8 +887,8 @@
-params(
$userText,

SpecialPage::getTitleFor( 'ArticleFeedbackv5', $title/$record-aft_id ),
-   $wgLang-date( 
$record-aft_timestamp ),
-   $wgLang-time( 
$record-aft_timestamp ),
+   $wgLang-userDate( 
$record-aft_timestamp, $wgUser ),
+   $wgLang-userTime( 
$record-aft_timestamp, $wgUser ),

SpecialPage::getTitleFor( 'ArticleFeedbackv5', $title ),
Message::rawParam( 
Html::element( 'blockquote', array(), $record-aft_comment ) ),

$record-getArticle()-getTitle()
@@ -1086,7 +1086,7 @@
 * @return string  the rendered info section
 */
private function renderPermalinkInfo( $record ) {
-   global $wgLang;
+   global $wgLang, $wgUser;
 
if ( !$this-isAllowed( 'aft-editor' ) ) {
return '';
@@ -1110,7 +1110,7 @@
'p',
array(),
wfMessage( 
'articlefeedbackv5-permalink-info-posted' )
-   -params( $wgLang-date( 
$record-aft_timestamp ), $wgLang-time( $record-aft_timestamp ) )
+   -params( $wgLang-userDate( 
$record-aft_timestamp, $wgUser ), $wgLang-userTime( $record-aft_timestamp, 
$wgUser ) )
-escaped()
) .
Html::rawElement(
diff --git a/api/ApiViewActivityArticleFeedbackv5.php 
b/api/ApiViewActivityArticleFeedbackv5.php
index 3452bd4..bcffc37 100644
--- a/api/ApiViewActivityArticleFeedbackv5.php
+++ b/api/ApiViewActivityArticleFeedbackv5.php
@@ -89,7 +89,7 @@
Html::element(
'div',
array(),
-   wfMessage( 
'articlefeedbackv5-activity-feedback-date', array( $wgLang-timeanddate( 
$feedback-aft_timestamp ) ) )-text()
+   wfMessage( 
'articlefeedbackv5-activity-feedback-date', array( $wgLang-userTimeAndDate( 
$feedback-aft_timestamp, $wgUser ) ) )-text()
) .
Html::rawElement(
'div',
@@ -156,9 +156,9 @@
-rawParams(

ArticleFeedbackv5Utils::getUserLink( $item-log_user, $item-log_user_text ),

Linker::commentBlock( $item-log_comment ),
-   Html::element( 
'span', array(), $wgLang-timeanddate( $item-log_timestamp ) ),
-   Html::element( 
'span', array(), $wgLang-date( $item-log_timestamp ) ),
-   Html::element( 
'span', array(), $wgLang-time( $item-log_timestamp ) )
+   Html::element( 
'span', array(),

[MediaWiki-commits] [Gerrit] Switch to new RVM setup files - change (mediawiki...MobileFrontend)

2013-03-26 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Switch to new RVM setup files
..

Switch to new RVM setup files

Auto generated with: rvm rvmrc to .ruby-version
More information: https://rvm.io/workflow/projects/#ruby-versions
Warning message from terminal:
You are using '.rvmrc', it requires trusting, it is slower and it is
not compatible with other ruby managers,
you can switch to '.ruby-version' using 'rvm rvmrc to [.]ruby-version'
or ignore this warnings with 'rvm rvmrc warning ignore
/Users/z/project/wmf/browsertests/.rvmrc',
'.rvmrc' will continue to be the default project file in RVM 1 and RVM
2,
to ignore the warning for all files run 'rvm rvmrc warning ignore
all.rvmrcs'.

Change-Id: I2f4282c9d508fd6f5118ad4b1fb41c67efa5ead9
---
A tests/acceptance/.ruby-gemset
A tests/acceptance/.ruby-version
D tests/acceptance/.rvmrc
3 files changed, 2 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/80/55880/1

diff --git a/tests/acceptance/.ruby-gemset b/tests/acceptance/.ruby-gemset
new file mode 100644
index 000..3994958
--- /dev/null
+++ b/tests/acceptance/.ruby-gemset
@@ -0,0 +1 @@
+MobileFrontend
diff --git a/tests/acceptance/.ruby-version b/tests/acceptance/.ruby-version
new file mode 100644
index 000..9a5700d
--- /dev/null
+++ b/tests/acceptance/.ruby-version
@@ -0,0 +1 @@
+ruby-2.0.0-p0
diff --git a/tests/acceptance/.rvmrc b/tests/acceptance/.rvmrc
deleted file mode 100644
index c634303..000
--- a/tests/acceptance/.rvmrc
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-RUBY_VER=ruby-2.0.0-p0
-
-if ! rvm list | grep $RUBY_VER  /dev/null; then
-  rvm install $RUBY_VER
-fi
-
-rvm use $RUBY_VER@MobileFrontend --create
-
-bundle install

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4282c9d508fd6f5118ad4b1fb41c67efa5ead9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] some minor cleanup in snakview related files - change (mediawiki...Wikibase)

2013-03-26 Thread Daniel Werner (Code Review)

Daniel Werner has uploaded a new change for review.

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


Change subject: some minor cleanup in snakview related files
..

some minor cleanup in snakview related files

Also fixes a problem with function signature in 
snakview.variations.newFromSnakType

Change-Id: I6967f3668611705062fa373ddf2fe99a3b298dff
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js
2 files changed, 10 insertions(+), 7 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index d270b5a..90f2887 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -15,9 +15,9 @@
  * View for displaying and editing Wikibase Snaks.
  * @since 0.3
  *
- * @option value {Object|wb.Snak|null} The snak this view should represent. If 
omitted, an empty
- * view will be served, ready to take some input by the user. The 
value can be overwritten
- * later, by using the value() or snak() functions.
+ * @option value {Object|wb.Snak|null} The snak this view should represent 
initially. If omitted,
+ * an empty view will be served, ready to take some input by the user. 
The value can also be
+ * overwritten later, by using the value() or snak() functions.
  * Default: { property: null, snaktype: wb.PropertyValueSnak.TYPE }
  *
  * @option locked {Object|boolean} Key-value pairs determining which snakview 
elements to lock. May
@@ -96,7 +96,9 @@
 
/**
 * Variation object responsible for presenting the essential parts of a 
certain kind of Snak.
-* @type jQuery.wikibase.snakview.variations.Variation
+* Can be null if a unsupported Snak Type is represented by the 
snakview. In this case the
+* snakview won't be able to display the Snak but display an 
appropriate message instead.
+* @type jQuery.wikibase.snakview.variations.Variation|null
 */
_variation: null,
 
@@ -846,7 +848,7 @@
},
 
/**
-* Marks the Snak view disabled and triggers re-drawing the Snak view.
+* Marks the Snak view disabled and triggers re-drawing it.
 * Since the visual state should be managed completely by the draw 
method, toggling the css
 * classes is done in draw() by issuing a call to $.Widget.option().
 * @see jQuery.Widget.disable
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js
index 3464ead..953fc6d 100644
--- 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js
@@ -115,17 +115,18 @@
 * @since 0.4
 *
 * @param {String} snakType
+* @param {jQuery.wikibase.snakview.ViewState} viewState
 * @param {jQuery} $variationViewPort
 * @return jQuery.wikibase.snakview.variations.Variation|null
 */
-   newFromSnakType: function( snakType, $variationViewPort ) {
+   newFromSnakType: function( snakType, viewState, 
$variationViewPort ) {
if( typeof snakType !== 'string' ) {
throw new Error( 'Snak type required for 
choosing a suitable variation' );
}
if( !SELF.hasVariation( snakType ) ) {
return null;
}
-   return new ( SELF.getVariation( snakType ) )( 
$variationViewPort );
+   return new ( SELF.getVariation( snakType ) )( 
viewState, $variationViewPort );
}
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6967f3668611705062fa373ddf2fe99a3b298dff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] (testing) enhanced Selenium reference tests: edit reference ... - change (mediawiki...Wikibase)

2013-03-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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


Change subject: (testing) enhanced Selenium reference tests: edit reference 
twice
..

(testing) enhanced Selenium reference tests: edit reference twice

Change-Id: I3af2579f83260819ac331dbd1e24b9987ec22a85
---
M repo/tests/selenium/statements/references_spec.rb
1 file changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/repo/tests/selenium/statements/references_spec.rb 
b/repo/tests/selenium/statements/references_spec.rb
index 630ddd6..78883fa 100644
--- a/repo/tests/selenium/statements/references_spec.rb
+++ b/repo/tests/selenium/statements/references_spec.rb
@@ -226,6 +226,25 @@
 page.wait_for_statement_request_finished
 page.reference1Property.should == properties_cm[1][label]
 page.reference1Value.should == cm_reference_value_changed
+
+# try to edit the reference twice in a row
+page.editReference1
+page.referenceValueInput_element.clear
+page.referenceValueInput = cm_reference_value
+page.saveReference
+ajax_wait
+page.wait_for_statement_request_finished
+page.reference1Property.should == properties_cm[1][label]
+page.reference1Value.should == cm_reference_value
+page.editReference1
+page.referenceValueInput_element.clear
+page.referenceValueInput = cm_reference_value_changed
+page.saveReference
+ajax_wait
+page.wait_for_statement_request_finished
+page.reference1Property.should == properties_cm[1][label]
+page.reference1Value.should == cm_reference_value_changed
+
 page.reference1ValueLink
 page.articleTitle.include?(File: + 
cm_reference_value_changed).should be_true
 page.navigate_to items[0][url]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3af2579f83260819ac331dbd1e24b9987ec22a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] (testing) enhanced Selenium reference tests: edit reference ... - change (mediawiki...Wikibase)

2013-03-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: (testing) enhanced Selenium reference tests: edit reference 
twice
..


(testing) enhanced Selenium reference tests: edit reference twice

Change-Id: I3af2579f83260819ac331dbd1e24b9987ec22a85
---
M repo/tests/selenium/statements/references_spec.rb
1 file changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/repo/tests/selenium/statements/references_spec.rb 
b/repo/tests/selenium/statements/references_spec.rb
index 630ddd6..78883fa 100644
--- a/repo/tests/selenium/statements/references_spec.rb
+++ b/repo/tests/selenium/statements/references_spec.rb
@@ -226,6 +226,25 @@
 page.wait_for_statement_request_finished
 page.reference1Property.should == properties_cm[1][label]
 page.reference1Value.should == cm_reference_value_changed
+
+# try to edit the reference twice in a row
+page.editReference1
+page.referenceValueInput_element.clear
+page.referenceValueInput = cm_reference_value
+page.saveReference
+ajax_wait
+page.wait_for_statement_request_finished
+page.reference1Property.should == properties_cm[1][label]
+page.reference1Value.should == cm_reference_value
+page.editReference1
+page.referenceValueInput_element.clear
+page.referenceValueInput = cm_reference_value_changed
+page.saveReference
+ajax_wait
+page.wait_for_statement_request_finished
+page.reference1Property.should == properties_cm[1][label]
+page.reference1Value.should == cm_reference_value_changed
+
 page.reference1ValueLink
 page.articleTitle.include?(File: + 
cm_reference_value_changed).should be_true
 page.navigate_to items[0][url]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3af2579f83260819ac331dbd1e24b9987ec22a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Handle a few more link cases - change (mediawiki...LightweightRDFa)

2013-03-26 Thread Kontokostas (Code Review)

Kontokostas has submitted this change and it was merged.

Change subject: Handle a few more link cases
..


Handle a few more link cases

Change-Id: Ia911fb424c45f99c325188ade9f27ab73a69
---
M LightweightRDFa.php
1 file changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/LightweightRDFa.php b/LightweightRDFa.php
index c2d7954..1589389 100644
--- a/LightweightRDFa.php
+++ b/LightweightRDFa.php
@@ -127,6 +127,10 @@
$newTitle = '';
// will hold the new link attributes
$newAttribs = array();
+   // will hold the text of the raw annotation, blank otherwise
+   $annotation = '';
+   // will hold the text of the raw annotation, blank otherwise
+   $escaped = false;
 
// escape link when it starts with $rdfaEscape (we already checked the 
strlen)
if ( substr( $link_ref, 0, $rdfaEscapeLn ) === $rdfaEscape ) {
@@ -134,6 +138,7 @@
$newtitle = Title::newFromText( substr( $link_ref, 
$rdfaEscapeLn ), $target-getNamespace() );
// because $skin-Link will call this recursively, set 'ignore' 
for next call
$newAttribs['ignore'] = 'true';
+   $escaped = true;
} else {
$parts = explode( $rdfaCreate, $link_ref );
$count = count( $parts );
@@ -149,7 +154,8 @@
return true;
 
// From now on we create RDFa...
-   $newtitle = Title::newFromText( $parts[1], 
$target-getNamespace() );
+   $annotation = $parts[0];
+   $newtitle = Title::newFromText( $parts[1]);
 
// remove whitespace, non-alpanumeric(but allow unicode 
letters), to lowercase, to camel case, remove spaces
$relAttr = str_replace( ' ', '', ucwords( strtolower( 
preg_replace( '/\s\s+/', ' ', $parts[0] ) ) ) );
@@ -164,6 +170,15 @@
if ($wgContLang-lcfirst($link_ref) === $wgContLang-lcfirst($text))
$text = $newtitle-getText();
 
+   if (!empty($annotation)) {
+
+   $possibleErrorTitle = substr($text, 0, 
strlen($annotation)+$rdfaCreateLn);
+   if ($wgContLang-lcfirst($possibleErrorTitle) === 
$wgContLang-lcfirst($annotation . $rdfaCreate))
+   $text = substr($text, strlen($annotation) + 
$rdfaCreateLn);
+   }
+   if ($escaped === true  substr($text,0,$rdfaEscapeLn) === $rdfaEscape)
+   $text = substr($text, $rdfaEscapeLn);
+
// It could be avoided if $target was by reference (), then we could 
change $target and retun true;
$ret = Linker::Link( $newtitle, $text, $newAttribs );
return false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia911fb424c45f99c325188ade9f27ab73a69
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LightweightRDFa
Gerrit-Branch: master
Gerrit-Owner: Kontokostas jimk...@gmail.com
Gerrit-Reviewer: Kontokostas jimk...@gmail.com

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

[MediaWiki-commits] [Gerrit] showSiteStats now shows ss_active_users statistic - change (mediawiki/core)

2013-03-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: showSiteStats now shows ss_active_users statistic
..

showSiteStats now shows ss_active_users statistic

When we implemented tracking the number of active users, we forgot to
update the stat dumper.  Simply show up the value of ss_active_users.

Change-Id: I7324d1aadfaabcd023abb93360f1f7e6d809ff3d
---
M maintenance/showSiteStats.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/55883/1

diff --git a/maintenance/showSiteStats.php b/maintenance/showSiteStats.php
index e7359b2..dbbdab9 100644
--- a/maintenance/showSiteStats.php
+++ b/maintenance/showSiteStats.php
@@ -48,6 +48,7 @@
'ss_good_articles' = 'Number of articles',
'ss_total_pages' = 'Total pages',
'ss_users' = 'Number of users',
+   'ss_active_users' = 'Active users',
'ss_images' = 'Number of images',
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7324d1aadfaabcd023abb93360f1f7e6d809ff3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] (bug 43433) Feedback of IPv6 users didn't show up in their c... - change (mediawiki...ArticleFeedbackv5)

2013-03-26 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 43433) Feedback of IPv6 users didn't show up in their 
contributions
..

(bug 43433) Feedback of IPv6 users didn't show up in their contributions

Change-Id: Ia2e5cb6f8ed0e36510b54eb5d1fff5ab76a05db6
---
M ArticleFeedbackv5.i18n.php
M api/ApiArticleFeedbackv5.php
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/84/55884/1

diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index 8d6b2e8..d3b9238 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -53,6 +53,7 @@
/* Error Messages */
'articlefeedbackv5-error' = 'An error has occurred. Please try again 
later.',
'articlefeedbackv5-error-blocked' = 'Blocked users may not submit 
feedback.',
+   'articlefeedbackv5-error-user' = 'Invalid user.',
'articlefeedbackv5-error-validation' = 'Validation error.',
'articlefeedbackv5-error-abuse' = 'Your post has been rejected by a 
software filter that suggests it may not meet {{SITENAME}}\'s [$1 feedback 
guidelines]. Please revise your post and try again. 
({{PLURAL:$2|Filter|Filters}}: $3)',
'articlefeedbackv5-error-abuse-link' = 
'//en.wikipedia.org/wiki/Wikipedia:Feedback_guidelines',
@@ -776,6 +777,7 @@
 {{Identical|Close}}',
'articlefeedbackv5-error' = 'This error message will be displayed in a 
grey box replacing the form if there was an unrecoverable error.',
'articlefeedbackv5-error-blocked' = 'This error message will be 
displayed on the form if the user is blocked from submitting feedback.',
+   'articlefeedbackv5-error-user' = 'This error message will be displayed 
on the form if the user is invalid.',
'articlefeedbackv5-error-validation' = 'Generic error message to be 
displayed when the submitted feedback does not pass validation (usually because 
the API request parameters are tampered with, but could be a genuine coding 
error).',
'articlefeedbackv5-error-abuse' = 'This error message will be 
displayed above the form if the comment matched the spam or abuse filters. 
Parameters:
 * $1 is the url to the abuse policy
diff --git a/api/ApiArticleFeedbackv5.php b/api/ApiArticleFeedbackv5.php
index 6350904..abfefd9 100644
--- a/api/ApiArticleFeedbackv5.php
+++ b/api/ApiArticleFeedbackv5.php
@@ -55,12 +55,22 @@
);
}
 
+   // Make sure user name is consistently saved to db; e.g. this 
will
+   // run IP::sanitizeIP on IP's
+   $userTitle = Title::makeTitleSafe( NS_USER, $user-getName() );
+   if ( !$userTitle ) {
+   $this-dieUsage(
+   $this-msg( 'articlefeedbackv5-error-user' 
)-escaped(),
+   'invaliduser'
+   );
+   }
+
// Build feedback entry
$feedback = new ArticleFeedbackv5Model();
$feedback-aft_page = $params['pageid'];
$feedback-aft_page_revision = $params['revid'];
$feedback-aft_user = $user-getId();
-   $feedback-aft_user_text = $user-getName();
+   $feedback-aft_user_text = $userTitle-getText();
$feedback-aft_user_token = $params['anontoken'];
$feedback-aft_form = $params['bucket'];
$feedback-aft_cta = $params['cta'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2e5cb6f8ed0e36510b54eb5d1fff5ab76a05db6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Enable AFTv5 tests since bug 46382 is fixed - change (qa/browsertests)

2013-03-26 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Enable AFTv5 tests since bug 46382 is fixed
..

Enable AFTv5 tests since bug 46382 is fixed

Bug: 46382
Change-Id: If9afaad958943790b2c85e6bfe9b7702ed1e1797
---
M features/aftv5.feature
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/85/55885/1

diff --git a/features/aftv5.feature b/features/aftv5.feature
index a44778c..f167cb4 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -1,6 +1,5 @@
-# https://bugzilla.wikimedia.org/show_bug.cgi?id=46382 @bug
 # 
http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms
 @ie6-bug @phantomjs-bug
-@bug @ie6-bug @phantomjs-bug
+@ie6-bug @phantomjs-bug
 Feature: AFTv5
 
   Scenario: Check if AFTv5 is on the page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9afaad958943790b2c85e6bfe9b7702ed1e1797
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Deal with all our tests failing since I214b3d4 got merged in... - change (mediawiki...DataValues)

2013-03-26 Thread Daniel Werner (Code Review)

Daniel Werner has uploaded a new change for review.

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


Change subject: Deal with all our tests failing since I214b3d4 got merged into 
core
..

Deal with all our tests failing since I214b3d4 got merged into core

For now this seems like the fastest fix. Until it is clear what I214b3d4 is 
actuallz required for
and we might adjust or find an alternative way, this global hack will do its 
service without caring
too much about other extensions.

Change-Id: I43ac49687c72284acc0907d9367b77d84816ca64
---
M DataValues/tests/qunit/DataValues.tests.js
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/86/55886/1

diff --git a/DataValues/tests/qunit/DataValues.tests.js 
b/DataValues/tests/qunit/DataValues.tests.js
index d177739..819b1f2 100644
--- a/DataValues/tests/qunit/DataValues.tests.js
+++ b/DataValues/tests/qunit/DataValues.tests.js
@@ -4,9 +4,14 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */
-( function( dv, $, QUnit, undefined ) {
+( function( dv, $, QUnit ) {
'use strict';
 
+   // Fix for msot of our tests no having the number of required 
assertions.
+   // This is required since I214b3d4 got merged into core.
+   // TODO: figure out some non-global alternative to deal with this.
+   QUnit.config.requireExpects = false;
+
QUnit.module( 'DataValues.js', QUnit.newMwEnvironment() );
 
QUnit.test(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43ac49687c72284acc0907d9367b77d84816ca64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Fix misleading output of Special:DispatchStats. - change (mediawiki...Wikibase)

2013-03-26 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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


Change subject: Fix misleading output of Special:DispatchStats.
..

Fix misleading output of Special:DispatchStats.

Previously, the notions of touched time (time since last dispatch)
was confused with the lag time (time between last dispatched change
and most recent change).

Change-Id: I914bbf5aa7965a6d98d2033e5b1ef83da340cb15
---
M repo/Wikibase.i18n.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/store/sql/DispatchStats.php
M repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php
4 files changed, 142 insertions(+), 79 deletions(-)


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

diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 176aaa0..096a4ed 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -179,8 +179,11 @@
'wikibase-dispatchstats-oldest-change' = 'Oldest',
'wikibase-dispatchstats-newest-change' = 'Newest',
'wikibase-dispatchstats-site-id' = 'Site',
+   'wikibase-dispatchstats-pos' = 'Position',
'wikibase-dispatchstats-lag-num' = 'Pending',
'wikibase-dispatchstats-lag-time' = 'Lag',
+   'wikibase-dispatchstats-touched' = 'Touched',
+   'wikibase-dispatchstats-large-lag' = '(very large)',
'wikibase-dispatchstats-freshest' = 'Freshest',
'wikibase-dispatchstats-stalest' = 'Stalest',
'wikibase-dispatchstats-median'  = 'Median',
@@ -717,9 +720,12 @@
 {{Identical|Newest}}',
'wikibase-dispatchstats-site-id' = 'Column header for site IDs.
 {{Identical|Site}}',
+   'wikibase-dispatchstats-pos' = 'Column header for dispatch position 
(given as change ID).',
'wikibase-dispatchstats-lag-num' = 'Column header for the number of 
changes not yet dispatched to this client wiki.
 {{Identical|Pending}}',
-   'wikibase-dispatchstats-lag-time' = 'Column header for the time since 
a dispatcher visited this client wiki',
+   'wikibase-dispatchstats-lag-time' = 'Column header for the time since 
between the change last dispatched to the client and the latest known change on 
the repo.',
+   'wikibase-dispatchstats-touched' = 'Column header for the time a 
dispatcher last visited this client wiki',
+   'wikibase-dispatchstats-large-lag' = 'Shown instead of the actual lag 
if the lag is so large that the relevant change records were already pruned',
'wikibase-dispatchstats-freshest' = 'Row header for the freshest (most 
recently updated) client wiki.
 
 See also:
@@ -2613,11 +2619,13 @@
'wikibase-dispatchstats-oldest-change' = 'Älteste',
'wikibase-dispatchstats-newest-change' = 'Neueste',
'wikibase-dispatchstats-site-id' = 'Website',
+   'wikibase-dispatchstats-pos' = 'Stand',
'wikibase-dispatchstats-lag-num' = 'Ausstehend',
-   'wikibase-dispatchstats-lag-time' = 'Verzögerung',
+   'wikibase-dispatchstats-lag-time' = 'Rückstand',
+   'wikibase-dispatchstats-touched' = 'Letzte Verarbeitung',
'wikibase-dispatchstats-freshest' = 'Neueste',
'wikibase-dispatchstats-stalest' = 'Älteste',
-   'wikibase-dispatchstats-median' = 'Mittel',
+   'wikibase-dispatchstats-median' = 'Zentralwert',
'wikibase-dispatchstats-average' = 'Durchschnitt',
'special-listdatatypes' = 'Liste aller verfügbaren Datentypen',
'wikibase-listdatatypes-intro' = 'Dies ist eine Liste aller 
Datentypen, die derzeit in dieser Installation verwendet werden:',
diff --git a/repo/includes/specials/SpecialDispatchStats.php 
b/repo/includes/specials/SpecialDispatchStats.php
index 2acfc3a..3273d3c 100644
--- a/repo/includes/specials/SpecialDispatchStats.php
+++ b/repo/includes/specials/SpecialDispatchStats.php
@@ -61,9 +61,15 @@
 
$this-outputRow( array(
$label,
-   isset( $state-chd_site ) ? $state-chd_site : '',
-   $lang-formatNum( $state-chd_dist ),
-   $lang-formatDuration( $state-chd_lag ),
+   isset( $state-chd_site ) ? $state-chd_site : '-',
+   isset( $state-chd_seen ) ? $state-chd_seen : '-',
+   $lang-formatNum( $state-chd_pending ),
+   $state-chd_lag === null
+   ? wfMessage( 'wikibase-dispatchstats-large-lag' 
)-text()
+   : $lang-formatDuration( $state-chd_lag, 
array( 'days', 'hours', 'minutes' ) ),
+   isset( $state-chd_touched )
+   ? $lang-timeanddate( $state-chd_touched )
+   : '-',
) );
}
 
@@ -118,8 +124,10 @@
$this-outputRow( array(
'',
$this-msg(

[MediaWiki-commits] [Gerrit] Deal with all our tests failing since I214b3d4 got merged in... - change (mediawiki...DataValues)

2013-03-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Deal with all our tests failing since I214b3d4 got merged into 
core
..


Deal with all our tests failing since I214b3d4 got merged into core

For now this seems like the fastest fix. Until it is clear what I214b3d4 is 
actuallz required for
and we might adjust or find an alternative way, this global hack will do its 
service without caring
too much about other extensions.

Change-Id: I43ac49687c72284acc0907d9367b77d84816ca64
---
M DataValues/tests/qunit/DataValues.tests.js
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved



diff --git a/DataValues/tests/qunit/DataValues.tests.js 
b/DataValues/tests/qunit/DataValues.tests.js
index d177739..819b1f2 100644
--- a/DataValues/tests/qunit/DataValues.tests.js
+++ b/DataValues/tests/qunit/DataValues.tests.js
@@ -4,9 +4,14 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */
-( function( dv, $, QUnit, undefined ) {
+( function( dv, $, QUnit ) {
'use strict';
 
+   // Fix for msot of our tests no having the number of required 
assertions.
+   // This is required since I214b3d4 got merged into core.
+   // TODO: figure out some non-global alternative to deal with this.
+   QUnit.config.requireExpects = false;
+
QUnit.module( 'DataValues.js', QUnit.newMwEnvironment() );
 
QUnit.test(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ac49687c72284acc0907d9367b77d84816ca64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] fix unix line ending - change (mediawiki...Translate)

2013-03-26 Thread Neverendingo (Code Review)

Neverendingo has uploaded a new change for review.

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


Change subject: fix unix line ending
..

fix unix line ending

Change-Id: I64278e93d9165e6c4d5864df5d0bfefff9f2f9cc
---
M resources/images/paste.svg
1 file changed, 17 insertions(+), 17 deletions(-)


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

diff --git a/resources/images/paste.svg b/resources/images/paste.svg
index f7976de..38373db 100644
--- a/resources/images/paste.svg
+++ b/resources/images/paste.svg
@@ -1,17 +1,17 @@
-?xml version=1.0 encoding=utf-8?
-!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
-!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
-svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
-width=32px height=32px viewBox=0 0 32 32 enable-background=new 
0 0 32 32 xml:space=preserve
-g
-   path fill=#6D6E71 
d=M29.077,29.012c0,1.061-0.859,1.92-1.92,1.92H4.844c-1.061,0-1.921-0.859-1.921-1.92V4.043
-   
c0-1.061,0.86-1.92,1.921-1.92h22.313c1.061,0,1.92,0.859,1.92,1.92V29.012z/
-   
-   rect x=5.368 y=4.054 fill=#F1F2F2 stroke=#58595B 
stroke-width=0.5 stroke-miterlimit=10 width=21 height=24.349/
-   rect x=7.743 y=8.896 fill=#A7A9AC width=15.625 height=2.872/
-   rect x=7.743 y=15.09 fill=#A7A9AC width=15.625 height=2.875/
-   rect x=7.743 y=21.287 fill=#A7A9AC width=6.125 height=2.873/
-   polygon fill=#414042 points=18.646,2.814 18.646,1.068 13.354,1.068 
13.354,2.814 10.459,2.814 10.459,5.152 21.542,5.152 
-   21.542,2.814/
-/g
-/svg
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=32px height=32px viewBox=0 0 32 32 enable-background=new 
0 0 32 32 xml:space=preserve
+g
+   path fill=#6D6E71 
d=M29.077,29.012c0,1.061-0.859,1.92-1.92,1.92H4.844c-1.061,0-1.921-0.859-1.921-1.92V4.043
+   
c0-1.061,0.86-1.92,1.921-1.92h22.313c1.061,0,1.92,0.859,1.92,1.92V29.012z/
+   
+   rect x=5.368 y=4.054 fill=#F1F2F2 stroke=#58595B 
stroke-width=0.5 stroke-miterlimit=10 width=21 height=24.349/
+   rect x=7.743 y=8.896 fill=#A7A9AC width=15.625 height=2.872/
+   rect x=7.743 y=15.09 fill=#A7A9AC width=15.625 height=2.875/
+   rect x=7.743 y=21.287 fill=#A7A9AC width=6.125 height=2.873/
+   polygon fill=#414042 points=18.646,2.814 18.646,1.068 13.354,1.068 
13.354,2.814 10.459,2.814 10.459,5.152 21.542,5.152 
+   21.542,2.814/
+/g
+/svg

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64278e93d9165e6c4d5864df5d0bfefff9f2f9cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Neverendingo imalc...@kde.org

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

[MediaWiki-commits] [Gerrit] (bug 46104) reduce number of wikis on beta - change (operations/mediawiki-config)

2013-03-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: (bug 46104) reduce number of wikis on beta
..

(bug 46104) reduce number of wikis on beta

We have a lot of wikis on beta which is hard to manage. Almost all of
them are not receiving any traffic.  This patch removes most of the
Wikis from the MediaWiki configuration, the short list is:

aawiki  # needed by scripts
dewiki  # we have german developers
dewikivoyage  # Has lot of content
ee_prototypewiki  # historical?

// We Keep one english version of each project:
enwiki
enwikibooks
enwikinews
enwikiquote
enwikisource
enwikiversity
enwikivoyage
enwiktionary

eowiki  # For esperanto automatic conversion
hewiki  # We have hebrew speaking developers
labswiki
metawiki
simplewiki
sqwiki  # Has at least one active user
testwiki

Change-Id: I1e785f869f6eede2293833b2ed1f595bfbf5cdf5
---
M all-labs.dblist
M wikiversions-labs.dat
2 files changed, 18 insertions(+), 903 deletions(-)


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

diff --git a/all-labs.dblist b/all-labs.dblist
index 78c74ae..4ce325d 100644
--- a/all-labs.dblist
+++ b/all-labs.dblist
@@ -1,460 +1,19 @@
 aawiki
-abwiki
-acewiki
-afwiki
-afwikibooks
-afwikiquote
-afwiktionary
-akwiki
-alswiki
-alswikibooks
-alswiktionary
-amwiki
-amwikiquote
-angwiki
-angwikibooks
-angwiktionary
-anwiki
-anwiktionary
-arcwiki
-arwiki
-arwikibooks
-arwikiquote
-arwikiversity
-arzwiki
-astwiki
-aswiki
-avwiki
-aywiki
-azwiki
-azwikibooks
-azwikiquote
-barwiki
-bawiki
-bclwiki
-bewiki
-bewikibooks
-bewikiquote
-bgwiki
-bgwikibooks
-bgwikiquote
-bhwiki
-biwiki
-bjnwiki
-bmwiki
-bnwiki
-bnwikibooks
-bowiki
-bowiktionary
-bpywiki
-brwiki
-brwikiquote
-brwiktionary
-bswiki
-bswikibooks
-bswikiquote
-bswiktionary
-bugwiki
-bxrwiki
-cawiki
-cawikibooks
-cawikiquote
-cdowiki
-cebwiki
-cewiki
-chrwiki
-chwiki
-chywiki
-ckbwiki
-commonswiki
-cowiki
-cowiktionary
-crhwiki
-crwiki
-csbwiki
-cswiki
-cswikibooks
-cswikinews
-cswikiquote
-cswikisource
-cswiktionary
-cuwiki
-cvwiki
-cvwikibooks
-cywiki
-cywikibooks
-cywikiquote
-cywiktionary
-dawiki
-dawikibooks
-dawikiquote
-dawiktionary
 dewiki
-dewikibooks
-dewikinews
-dewikiquote
-dewikiversity
-dewiktionary
-diqwiki
-dsbwiki
-dvwiki
-dzwiki
+dewikivoyage
 ee_prototypewiki
-eewiki
-eewiki
-elwiki
-elwikibooks
-elwikiquote
-elwikiversity
-emlwiki
 enwiki
 enwikibooks
 enwikinews
 enwikiquote
 enwikisource
 enwikiversity
+enwikivoyage
 enwiktionary
 eowiki
-eowikibooks
-eowikiquote
-eowiktionary
-eswiki
-eswikibooks
-eswikiquote
-eswikiversity
-eswiktionary
-etwiki
-etwikibooks
-etwikiquote
-etwiktionary
-euwiki
-euwikibooks
-euwikiquote
-euwiktionary
-extwiki
-fawiki
-fawikibooks
-fawikiquote
-ffwiki
-fiwiki
-fiwikibooks
-fiwikiquote
-fiwikiversity
-fjwiki
-fowiki
-fowiktionary
-frpwiki
-frrwiki
-frwiki
-frwikibooks
-frwikiquote
-frwikisource
-frwikiversity
-frwiktionary
-furwiki
-fywiki
-fywiktionary
-gagwiki
-ganwiki
-gawiki
-gdwiki
-glkwiki
-glwiki
-glwikiquote
-gnwiki
-gotwiki
-guwiki
-guwikiquote
-gvwiki
-hakwiki
-hawiki
-hawwiki
 hewiki
-hewikibooks
-hewikiquote
-hifwiki
-hiwiki
-hiwikibooks
-hiwikiquote
-hrwiki
-hrwikibooks
-hrwikiquote
-hsbwiki
-htwiki
-huwiki
-huwikibooks
-huwikiquote
-hywiki
-hywikibooks
-hywikiquote
-iawiki
-iawikibooks
-idwikibooks
-idwikiquote
-idwiktionary
-iewiki
-iewikibooks
-igwiki
-ikwiki
-ilowiki
-incubatorwiki
-iowiki
-iswiki
-iswikibooks
-iswikiquote
-itwiki
-itwikibooks
-itwikiquote
-itwikiversity
-iuwiki
-jawiki
-jawikibooks
-jawikiquote
-jawikiversity
-jbowiki
-jvwiki
-jvwiktionary
-kaawiki
-kabwiki
-kawiki
-kawikibooks
-kawikiquote
-kbdwiki
-kgwiki
-kiwiki
-kkwiki
-kkwikibooks
-klwiki
-kmwiki
-kmwikibooks
-knwiki
-knwikiquote
-koiwiki
-kowiki
-kowikibooks
-kowikiquote
-krcwiki
-kshwiki
-kswiki
-kuwiki
-kuwikibooks
-kuwikiquote
-kvwiki
-kwwiki
-kywiki
-kywikibooks
-kywikiquote
 labswiki
-ladwiki
-lawiki
-lawikibooks
-lawikiquote
-lbewiki
-lbwiki
-lgwiki
-lijwiki
-liwiki
-liwikibooks
-liwikiquote
-lmowiki
-lnwiki
-lowiki
-ltgwiki
-ltwiki
-ltwikibooks
-ltwikiquote
-lvwiki
-mdfwiki
 metawiki
-mgwiki
-mgwikibooks
-mgwiktionary
-mhrwiki
-miwiki
-mkwiki
-mkwikibooks
-mlwiki
-mlwikibooks
-mlwikiquote
-mnwiki
-mrjwiki
-mrwiki
-mrwikiquote
-mswiki
-mswikibooks
-mswiktionary
-mtwiki
-mtwiktionary
-mwlwiki
-myvwiki
-mywiki
-mznwiki
-nahwiki
-napwiki
-nawiki
-nawiktionary
-ndswiki
-newiki
-newikibooks
-newwiki
-nlwiki
-nlwikibooks
-nlwikiquote
-nnwiki
-nnwikibooks
-nnwikiquote
-novwiki
-nowiki
-nowikibooks
-nowikiquote
-nrmwiki
-nsowiki
-nvwiki
-nywiki
-ocwiki
-ocwikibooks
-omwiki
-orwiki
-oswiki
-pagwiki
-pamwiki
-papwiki
-pawiki
-pawikibooks
-pcdwiki
-pdcwiki
-pflwiki
-pihwiki
-piwiki
-plwiki
-plwikibooks
-plwikiquote
-pmswiki
-pnbwiki
-pntwiki
-pswiki
-ptwiki
-ptwikibooks
-ptwikiquote
-ptwikiversity
-quwiki
-rmwiki
-rmywiki
-rnwiki
-rowiki
-rowikibooks
-rowikiquote
-ruewiki
-ruwiki

[MediaWiki-commits] [Gerrit] wikiversions.cdb for labs - change (operations/mediawiki-config)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: wikiversions.cdb for labs
..


wikiversions.cdb for labs

This patch adapts multiversion to detect an eventual
wikiversions-labs.cdb file whenever it exists.  With git-deploy we will
have to add the .cdb files to git in order to deploy them, so we want
wikiversions-labs.dat to generate a different cdb file.

Bug: 44424
Change-Id: I812a591225bb7cd9c957cfaa2d3a27f10fd423ee
---
M .gitignore
M README
M multiversion/MWMultiVersion.php
M multiversion/getMWVersion
M multiversion/refreshWikiversionsCDB
5 files changed, 33 insertions(+), 15 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index e0e117b..b92e0da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 wmf-config/ExtensionMessages-*.php
 php-*
 wikiversions.cdb
+wikiversions-labs.cdb
 wmf-config/*-setup.php
 wmf-config/checkers.php
 lib
@@ -35,4 +36,4 @@
 # Operating system stuff
 ## Mac OS X
 .DS_Store
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/
diff --git a/README b/README
index e4a9c9e..e407cd6 100644
--- a/README
+++ b/README
@@ -10,6 +10,7 @@
all-labs.dblist.
 
 wikiversions.dat, wikiversions.cdb
+wikiversions-labs.dat, wikiversions-labs.cdb
  Let us associate a database with a specific copy of MediaWiki (generally a
 branch). The .cdb file is updated by editing wikiversions.dat first and then
 running multiversion/refreshWikiversionsCDB. To vary by realm, add a suffix
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 158054a..13db7cb 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -257,23 +257,27 @@
}
$this-versionLoaded = true;
 
-   $db = dba_open( MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb', 
'r', 'cdb' );
+   $cdbFilename = getRealmSpecificFilename(
+   MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
+   );
+
+   $db = dba_open( $cdbFilename, 'r', 'cdb' );
if ( $db ) {
$version = dba_fetch( ver:{$this-db}, $db );
if ( $version === false ) {
$extraVersion = false;
} else {
if ( strpos( $version, 'php-' ) !== 0 ) {
-   self::error( wikiversions.cdb version 
entry does not start with `php-` (got `$version`).\n );
+   self::error( $cdbFilename version 
entry does not start with `php-` (got `$version`).\n );
}
$extraVersion = dba_fetch( ext:{$this-db}, 
$db );
if ( $extraVersion === false ) {
-   self::error( wikiversions.cdb has no 
extra version entry for `$db`.\n );
+   self::error( $cdbFilename has no extra 
version entry for `$db`.\n );
}
}
dba_close( $db );
} else {
-   self::error( Unable to open wikiversions.cdb.\n );
+   self::error( Unable to open $cdbFilename.\n );
}
 
$this-version = $version;
@@ -285,8 +289,11 @@
 * @return bool
 */
private function assertNotMissing() {
+   $cdbFilename = getRealmSpecificFilename(
+   MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
+   );
if ( $this-isMissing() ) {
-   self::error( wikiversions.cdb has no version entry for 
`{$this-db}`.\n );
+   self::error( $cdbFilename has no version entry for 
`{$this-db}`.\n );
}
}
 
diff --git a/multiversion/getMWVersion b/multiversion/getMWVersion
index b64aec9..ae1024d 100755
--- a/multiversion/getMWVersion
+++ b/multiversion/getMWVersion
@@ -3,6 +3,7 @@
 error_reporting( 0 );
 
 require_once( dirname( __FILE__ ) . '/defines.php' );
+require_once( dirname( __FILE__ ) . '/MWRealm.php' );
 
 /**
  * This script prints the MW version associated with a specified wikidb.
@@ -17,16 +18,19 @@
  * @return string MW code version (e.g. php-x.xx or php-trunk)
  */
 function getWikiVersion( $dbName ) {
-   $db = dba_open( MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb', 'r', 
'cdb' );
+   $cdbFilename = getRealmSpecificFilename(
+   MULTIVER_CDB_DIR_APACHE . '/wikiversions.cdb'
+   );
+   $db = dba_open( $cdbFilename, 'r', 'cdb' );
if ( $db ) {
$version = dba_fetch( ver:$dbName, $db );
dba_close( $db );
if ( $version !== false ) {
return $version; //

[MediaWiki-commits] [Gerrit] Moving university filters to gadolinium. Moving 5xx filter t... - change (operations/puppet)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Moving university filters to gadolinium. Moving 5xx filter to 
gadolinium, attempting to use udp-filter instead of 5xx filter
..

Moving university filters to gadolinium.
Moving 5xx filter to gadolinium, attempting to use udp-filter instead of 5xx 
filter

Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
---
M templates/udp2log/filters.gadolinium.erb
M templates/udp2log/filters.locke.erb
2 files changed, 29 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/55890/1

diff --git a/templates/udp2log/filters.gadolinium.erb 
b/templates/udp2log/filters.gadolinium.erb
index 811ac0b..30a2289 100644
--- a/templates/udp2log/filters.gadolinium.erb
+++ b/templates/udp2log/filters.gadolinium.erb
@@ -26,27 +26,36 @@
 
 
 
+### All 5xx error responses -- domas (now using udp-filter instead of 
5xx-filter).
+# pipe 1 %= webrequest_filter_directory %/5xx-filter | awk -W interactive 
'$9 !~ upload.wikimedia.org|query.php'  %= webrequest_log_directory 
%/5xx.tsv.log
+pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  %= webrequest_log_directory %/5xx.tsv.log
 
 
- These are still on locke:
 
 ### Vrije Universiteit
 # Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
-# pipe 10 awk -f %= webrequest_log_directory %/bin/vu.awk | log2udp -h 
130.37.198.252 -p 
+pipe 10 awk -f %= webrequest_filter_directory %/bin/vu.awk | log2udp -h 
130.37.198.252 -p 
 
 ### University of Minnesota
 # Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
 # Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
 # Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
-# pipe 10 awk -f %= webrequest_log_directory %/bin/minnesota.awk | log2udp 
-h bento.cs.umn.edu -p 
+pipe 10 awk -f %= webrequest_filter_directory %/bin/minnesota.awk | log2udp 
-h bento.cs.umn.edu -p 
 
+
+
+
+
+
+
+
+
+
+ These are still on locke:
 
 ### domas' stuff.
 # (This looks like a bunch of C to filter for mobile pages
 # and output things by language.)
 # pipe 1 /a/webstats/bin/filter | log2udp -h 127.0.0.1 -p 3815
 
-### All 5xx error responses -- domas
-# TODO: /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  %= webrequest_log_directory %/5xx.tsv.log
-# pipe 1 %= webrequest_log_directory %/5xx-filter | awk -W interactive '$9 
!~ upload.wikimedia.org|query.php'  %= webrequest_log_directory 
%/5xx.tsv.log
 
diff --git a/templates/udp2log/filters.locke.erb 
b/templates/udp2log/filters.locke.erb
index 5317e56..45bd3b1 100644
--- a/templates/udp2log/filters.locke.erb
+++ b/templates/udp2log/filters.locke.erb
@@ -31,18 +31,6 @@
 pipe 100 /usr/bin/udp-filter -F '\t' -p 
Special:RecordImpression\?banner=,Special:RecordImpression\?result=  
/a/squid/fundraising/logs/bannerImpressions-sampled100.tab.log
 
 
-# Vrije Universiteit
-# Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
-pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 
-
-
-# University of Minnesota
-# Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
-# Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
-# Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
-pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 
-
-
 
 # All 5xx error responses -- domas
 # TODO:  /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  /a/squid/5xx.log
@@ -53,6 +41,20 @@
 
 
 
+ MOVED TO LOCKE:
+
+# Vrije Universiteit
+# Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
+# pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 
+
+
+# University of Minnesota
+# Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
+# Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
+# Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
+# pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 
+
+
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Moving university filters to gadolinium. Moving 5xx filter t... - change (operations/puppet)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Moving university filters to gadolinium. Moving 5xx filter to 
gadolinium, attempting to use udp-filter instead of 5xx filter
..


Moving university filters to gadolinium.
Moving 5xx filter to gadolinium, attempting to use udp-filter instead of 5xx 
filter

Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
---
M templates/udp2log/filters.gadolinium.erb
M templates/udp2log/filters.locke.erb
2 files changed, 29 insertions(+), 18 deletions(-)

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



diff --git a/templates/udp2log/filters.gadolinium.erb 
b/templates/udp2log/filters.gadolinium.erb
index 811ac0b..30a2289 100644
--- a/templates/udp2log/filters.gadolinium.erb
+++ b/templates/udp2log/filters.gadolinium.erb
@@ -26,27 +26,36 @@
 
 
 
+### All 5xx error responses -- domas (now using udp-filter instead of 
5xx-filter).
+# pipe 1 %= webrequest_filter_directory %/5xx-filter | awk -W interactive 
'$9 !~ upload.wikimedia.org|query.php'  %= webrequest_log_directory 
%/5xx.tsv.log
+pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  %= webrequest_log_directory %/5xx.tsv.log
 
 
- These are still on locke:
 
 ### Vrije Universiteit
 # Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
-# pipe 10 awk -f %= webrequest_log_directory %/bin/vu.awk | log2udp -h 
130.37.198.252 -p 
+pipe 10 awk -f %= webrequest_filter_directory %/bin/vu.awk | log2udp -h 
130.37.198.252 -p 
 
 ### University of Minnesota
 # Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
 # Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
 # Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
-# pipe 10 awk -f %= webrequest_log_directory %/bin/minnesota.awk | log2udp 
-h bento.cs.umn.edu -p 
+pipe 10 awk -f %= webrequest_filter_directory %/bin/minnesota.awk | log2udp 
-h bento.cs.umn.edu -p 
 
+
+
+
+
+
+
+
+
+
+ These are still on locke:
 
 ### domas' stuff.
 # (This looks like a bunch of C to filter for mobile pages
 # and output things by language.)
 # pipe 1 /a/webstats/bin/filter | log2udp -h 127.0.0.1 -p 3815
 
-### All 5xx error responses -- domas
-# TODO: /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  %= webrequest_log_directory %/5xx.tsv.log
-# pipe 1 %= webrequest_log_directory %/5xx-filter | awk -W interactive '$9 
!~ upload.wikimedia.org|query.php'  %= webrequest_log_directory 
%/5xx.tsv.log
 
diff --git a/templates/udp2log/filters.locke.erb 
b/templates/udp2log/filters.locke.erb
index 5317e56..45bd3b1 100644
--- a/templates/udp2log/filters.locke.erb
+++ b/templates/udp2log/filters.locke.erb
@@ -31,18 +31,6 @@
 pipe 100 /usr/bin/udp-filter -F '\t' -p 
Special:RecordImpression\?banner=,Special:RecordImpression\?result=  
/a/squid/fundraising/logs/bannerImpressions-sampled100.tab.log
 
 
-# Vrije Universiteit
-# Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
-pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 
-
-
-# University of Minnesota
-# Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
-# Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
-# Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
-pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 
-
-
 
 # All 5xx error responses -- domas
 # TODO:  /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org|query.php'  /a/squid/5xx.log
@@ -53,6 +41,20 @@
 
 
 
+ MOVED TO LOCKE:
+
+# Vrije Universiteit
+# Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %
+# pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 
+
+
+# University of Minnesota
+# Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %
+# Former Contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %
+# Former contact: %= 
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %
+# pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 
+
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] (bug 46104) reduce number of wikis on beta - change (operations/mediawiki-config)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: (bug 46104) reduce number of wikis on beta
..


(bug 46104) reduce number of wikis on beta

We have a lot of wikis on beta which is hard to manage. Almost all of
them are not receiving any traffic.  This patch removes most of the
Wikis from the MediaWiki configuration, the short list is:

aawiki  # needed by scripts
dewiki  # we have german developers
dewikivoyage  # Has lot of content
ee_prototypewiki  # historical?

// We Keep one english version of each project:
enwiki
enwikibooks
enwikinews
enwikiquote
enwikisource
enwikiversity
enwikivoyage
enwiktionary

eowiki  # For esperanto automatic conversion
hewiki  # We have hebrew speaking developers
labswiki
metawiki
simplewiki
sqwiki  # Has at least one active user
testwiki

Change-Id: I1e785f869f6eede2293833b2ed1f595bfbf5cdf5
---
M all-labs.dblist
M wikiversions-labs.dat
2 files changed, 18 insertions(+), 903 deletions(-)

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



diff --git a/all-labs.dblist b/all-labs.dblist
index 78c74ae..4ce325d 100644
--- a/all-labs.dblist
+++ b/all-labs.dblist
@@ -1,460 +1,19 @@
 aawiki
-abwiki
-acewiki
-afwiki
-afwikibooks
-afwikiquote
-afwiktionary
-akwiki
-alswiki
-alswikibooks
-alswiktionary
-amwiki
-amwikiquote
-angwiki
-angwikibooks
-angwiktionary
-anwiki
-anwiktionary
-arcwiki
-arwiki
-arwikibooks
-arwikiquote
-arwikiversity
-arzwiki
-astwiki
-aswiki
-avwiki
-aywiki
-azwiki
-azwikibooks
-azwikiquote
-barwiki
-bawiki
-bclwiki
-bewiki
-bewikibooks
-bewikiquote
-bgwiki
-bgwikibooks
-bgwikiquote
-bhwiki
-biwiki
-bjnwiki
-bmwiki
-bnwiki
-bnwikibooks
-bowiki
-bowiktionary
-bpywiki
-brwiki
-brwikiquote
-brwiktionary
-bswiki
-bswikibooks
-bswikiquote
-bswiktionary
-bugwiki
-bxrwiki
-cawiki
-cawikibooks
-cawikiquote
-cdowiki
-cebwiki
-cewiki
-chrwiki
-chwiki
-chywiki
-ckbwiki
-commonswiki
-cowiki
-cowiktionary
-crhwiki
-crwiki
-csbwiki
-cswiki
-cswikibooks
-cswikinews
-cswikiquote
-cswikisource
-cswiktionary
-cuwiki
-cvwiki
-cvwikibooks
-cywiki
-cywikibooks
-cywikiquote
-cywiktionary
-dawiki
-dawikibooks
-dawikiquote
-dawiktionary
 dewiki
-dewikibooks
-dewikinews
-dewikiquote
-dewikiversity
-dewiktionary
-diqwiki
-dsbwiki
-dvwiki
-dzwiki
+dewikivoyage
 ee_prototypewiki
-eewiki
-eewiki
-elwiki
-elwikibooks
-elwikiquote
-elwikiversity
-emlwiki
 enwiki
 enwikibooks
 enwikinews
 enwikiquote
 enwikisource
 enwikiversity
+enwikivoyage
 enwiktionary
 eowiki
-eowikibooks
-eowikiquote
-eowiktionary
-eswiki
-eswikibooks
-eswikiquote
-eswikiversity
-eswiktionary
-etwiki
-etwikibooks
-etwikiquote
-etwiktionary
-euwiki
-euwikibooks
-euwikiquote
-euwiktionary
-extwiki
-fawiki
-fawikibooks
-fawikiquote
-ffwiki
-fiwiki
-fiwikibooks
-fiwikiquote
-fiwikiversity
-fjwiki
-fowiki
-fowiktionary
-frpwiki
-frrwiki
-frwiki
-frwikibooks
-frwikiquote
-frwikisource
-frwikiversity
-frwiktionary
-furwiki
-fywiki
-fywiktionary
-gagwiki
-ganwiki
-gawiki
-gdwiki
-glkwiki
-glwiki
-glwikiquote
-gnwiki
-gotwiki
-guwiki
-guwikiquote
-gvwiki
-hakwiki
-hawiki
-hawwiki
 hewiki
-hewikibooks
-hewikiquote
-hifwiki
-hiwiki
-hiwikibooks
-hiwikiquote
-hrwiki
-hrwikibooks
-hrwikiquote
-hsbwiki
-htwiki
-huwiki
-huwikibooks
-huwikiquote
-hywiki
-hywikibooks
-hywikiquote
-iawiki
-iawikibooks
-idwikibooks
-idwikiquote
-idwiktionary
-iewiki
-iewikibooks
-igwiki
-ikwiki
-ilowiki
-incubatorwiki
-iowiki
-iswiki
-iswikibooks
-iswikiquote
-itwiki
-itwikibooks
-itwikiquote
-itwikiversity
-iuwiki
-jawiki
-jawikibooks
-jawikiquote
-jawikiversity
-jbowiki
-jvwiki
-jvwiktionary
-kaawiki
-kabwiki
-kawiki
-kawikibooks
-kawikiquote
-kbdwiki
-kgwiki
-kiwiki
-kkwiki
-kkwikibooks
-klwiki
-kmwiki
-kmwikibooks
-knwiki
-knwikiquote
-koiwiki
-kowiki
-kowikibooks
-kowikiquote
-krcwiki
-kshwiki
-kswiki
-kuwiki
-kuwikibooks
-kuwikiquote
-kvwiki
-kwwiki
-kywiki
-kywikibooks
-kywikiquote
 labswiki
-ladwiki
-lawiki
-lawikibooks
-lawikiquote
-lbewiki
-lbwiki
-lgwiki
-lijwiki
-liwiki
-liwikibooks
-liwikiquote
-lmowiki
-lnwiki
-lowiki
-ltgwiki
-ltwiki
-ltwikibooks
-ltwikiquote
-lvwiki
-mdfwiki
 metawiki
-mgwiki
-mgwikibooks
-mgwiktionary
-mhrwiki
-miwiki
-mkwiki
-mkwikibooks
-mlwiki
-mlwikibooks
-mlwikiquote
-mnwiki
-mrjwiki
-mrwiki
-mrwikiquote
-mswiki
-mswikibooks
-mswiktionary
-mtwiki
-mtwiktionary
-mwlwiki
-myvwiki
-mywiki
-mznwiki
-nahwiki
-napwiki
-nawiki
-nawiktionary
-ndswiki
-newiki
-newikibooks
-newwiki
-nlwiki
-nlwikibooks
-nlwikiquote
-nnwiki
-nnwikibooks
-nnwikiquote
-novwiki
-nowiki
-nowikibooks
-nowikiquote
-nrmwiki
-nsowiki
-nvwiki
-nywiki
-ocwiki
-ocwikibooks
-omwiki
-orwiki
-oswiki
-pagwiki
-pamwiki
-papwiki
-pawiki
-pawikibooks
-pcdwiki
-pdcwiki
-pflwiki
-pihwiki
-piwiki
-plwiki
-plwikibooks
-plwikiquote
-pmswiki
-pnbwiki
-pntwiki
-pswiki
-ptwiki
-ptwikibooks
-ptwikiquote
-ptwikiversity
-quwiki
-rmwiki
-rmywiki
-rnwiki
-rowiki
-rowikibooks
-rowikiquote
-ruewiki
-ruwiki
-ruwikibooks
-ruwikiquote
-ruwikiversity
-rwwiki

[MediaWiki-commits] [Gerrit] Avoid uses of magic constants in closure. - change (mediawiki...MWSearch)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Avoid uses of magic constants in closure.
..


Avoid uses of magic constants in closure.

Change-Id: I4449862cc295d0da8fb732bb0378873d53232d7d
---
M MWSearch_body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/MWSearch_body.php b/MWSearch_body.php
index 9165fbf..7a2642e 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -479,7 +479,7 @@
global $wgLuceneSearchTimeout;
 
wfSuppressWarnings();
-   $httpProfile = __CLASS__ . ::newFromQuery . 
'-contact-' . $host;
+   $httpProfile =LuceneSearchSet::newFromQuery . 
'-contact-' . $host;
wfProfileIn( $httpProfile );
$data = Http::get( $searchUrl, 
$wgLuceneSearchTimeout, $httpOpts );
wfProfileOut( $httpProfile );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4449862cc295d0da8fb732bb0378873d53232d7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Demon ch...@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] Fixing comment - change (operations/puppet)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Fixing comment
..

Fixing comment

Change-Id: I9478f90b93ef8e428d9fc86c09c54eba24deda02
---
M templates/udp2log/filters.locke.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/55891/1

diff --git a/templates/udp2log/filters.locke.erb 
b/templates/udp2log/filters.locke.erb
index 45bd3b1..2fc51f6 100644
--- a/templates/udp2log/filters.locke.erb
+++ b/templates/udp2log/filters.locke.erb
@@ -41,7 +41,7 @@
 
 
 
- MOVED TO LOCKE:
+ MOVED TO GADOLINIUM:
 
 # Vrije Universiteit
 # Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9478f90b93ef8e428d9fc86c09c54eba24deda02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fixing comment - change (operations/puppet)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fixing comment
..


Fixing comment

Change-Id: I9478f90b93ef8e428d9fc86c09c54eba24deda02
---
M templates/udp2log/filters.locke.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/udp2log/filters.locke.erb 
b/templates/udp2log/filters.locke.erb
index 45bd3b1..2fc51f6 100644
--- a/templates/udp2log/filters.locke.erb
+++ b/templates/udp2log/filters.locke.erb
@@ -41,7 +41,7 @@
 
 
 
- MOVED TO LOCKE:
+ MOVED TO GADOLINIUM:
 
 # Vrije Universiteit
 # Contact: %= 
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9478f90b93ef8e428d9fc86c09c54eba24deda02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add mutators in MetaList - change (mediawiki...VisualEditor)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Add mutators in MetaList
..


Add mutators in MetaList

Add .insertMeta() and .removeMeta() methods to insert and remove
metadata through the meta list. For convenience, there is also a
.remove() method in MetaItem that wraps around removeMeta().

Also rename insertItem() and removeItem() to addInsertedItem() and
deleteRemovedItem() to avoid confusion, and make the MetaList
constructor take a dm.Surface rather than a document so we can call
change().

Change-Id: I4b62a3109404cfd56f5de68938e1db908b03e678
---
M modules/ve/dm/ve.dm.MetaItem.js
M modules/ve/dm/ve.dm.MetaList.js
M modules/ve/test/dm/ve.dm.MetaList.test.js
3 files changed, 122 insertions(+), 18 deletions(-)

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



diff --git a/modules/ve/dm/ve.dm.MetaItem.js b/modules/ve/dm/ve.dm.MetaItem.js
index b5a686e..71a78f8 100644
--- a/modules/ve/dm/ve.dm.MetaItem.js
+++ b/modules/ve/dm/ve.dm.MetaItem.js
@@ -163,6 +163,17 @@
 /* Methods */
 
 /**
+ * Remove this item from the document. Only works if the item is attached to a 
MetaList.
+ * @throws {Error} Cannot remove detached item
+ */
+ve.dm.MetaItem.prototype.remove = function () {
+   if ( !this.list ) {
+   throw new Error( 'Cannot remove detached item' );
+   }
+   this.list.removeMeta( this );
+};
+
+/**
  * Get the group this meta item belongs to.
  * @see ve.dm.MetaItem#static.group
  * @returns {string} Group
diff --git a/modules/ve/dm/ve.dm.MetaList.js b/modules/ve/dm/ve.dm.MetaList.js
index 1092835..97ca92c 100644
--- a/modules/ve/dm/ve.dm.MetaList.js
+++ b/modules/ve/dm/ve.dm.MetaList.js
@@ -11,15 +11,16 @@
  * @class
  * @extends ve.EventEmitter
  * @constructor
- * @param {ve.dm.Document} doc Document
+ * @param {ve.dm.Surface} surface Surface model
  */
-ve.dm.MetaList = function VeDmMetaList( doc ) {
+ve.dm.MetaList = function VeDmMetaList( surface ) {
var i, j, jlen, metadata, item, group;
// Parent constructor
ve.EventEmitter.call( this );
 
// Properties
-   this.document = doc;
+   this.surface = surface;
+   this.document = surface.getDocument();
this.groups = {};
this.items = [];
 
@@ -84,12 +85,12 @@
ins = reversed ? ops[i].remove : ops[i].insert;
rm = reversed ? ops[i].insert : ops[i].remove;
for ( j = 0, jlen = rm.length; j  jlen; j++ ) {
-   this.removeItem( offset, index + j );
+   this.deleteRemovedItem( offset, index + 
j );
}
for ( j = 0, jlen = ins.length; j  jlen; j++ ) 
{
item = 
ve.dm.metaItemFactory.createFromElement( ins[j] );
// offset and index are 
pre-transaction, but we'll fix them later
-   this.insertItem( offset, index + j, 
item );
+   this.addInsertedItem( offset, index + 
j, item );
}
index += rm.length;
break;
@@ -185,17 +186,50 @@
 };
 
 /**
+ * Insert new metadata into the document. This builds and processes a 
transaction that inserts
+ * metadata into the document.
+ * @param {Object|ve.dm.MetaItem} meta Metadata element (or MetaItem) to insert
+ * @param {Number} offset Offset at which to insert the new metadata
+ * @param {Number} [index] Index at which to insert the new metadata, or 
undefined to add to the end
+ */
+ve.dm.MetaList.prototype.insertMeta = function ( meta, offset, index ) {
+   var tx;
+   if ( meta instanceof ve.dm.MetaItem ) {
+   meta = meta.getElement();
+   }
+   if ( index === undefined ) {
+   index = ( this.document.metadata[offset] || [] ).length;
+   }
+   tx = ve.dm.Transaction.newFromMetadataInsertion( this.document, offset, 
index, [ meta ] );
+   this.surface.change( tx );
+};
+
+/**
+ * Remove a meta item from the document. This builds and processes a 
transaction that removes the
+ * associated metadata from the document.
+ * @param {ve.dm.MetaItem} item Item to remove
+ */
+ve.dm.MetaList.prototype.removeMeta = function ( item ) {
+   var tx;
+   tx = ve.dm.Transaction.newFromMetadataRemoval(
+   this.document,
+   item.getOffset(),
+   new ve.Range( item.getIndex(), item.getIndex() + 1 )
+   );
+   this.surface.change( tx );
+};
+
+/**
  * Insert an item at a given offset and index in response to a transaction.
  *
- * This function is for internal usage by onTransact(). To actually insert an 
item, you need to
- * process a transaction against the

[MediaWiki-commits] [Gerrit] Move .commit()/.rollback() from TransactionProcessor to Docu... - change (mediawiki...VisualEditor)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Move .commit()/.rollback() from TransactionProcessor to Document
..


Move .commit()/.rollback() from TransactionProcessor to Document

Previously these were static functions in TransactionProcessor
which instantiated a TP called .process() on it. These are now
methods of ve.dm.Document.

Also moved the emission of the 'transact' event on the document from
TransactionProcessor to Document itself, and moved the tests asserting
double application is protected against from TP to Document (because
the corresponding code moved as well).

Change-Id: I7c9f22a14accaf0ba1f70d5aa4f0573bb7e677d0
---
M modules/ve/dm/ve.dm.Document.js
M modules/ve/dm/ve.dm.Surface.js
M modules/ve/dm/ve.dm.TransactionProcessor.js
M modules/ve/test/dm/ve.dm.Document.test.js
M modules/ve/test/dm/ve.dm.MetaList.test.js
M modules/ve/test/dm/ve.dm.TransactionProcessor.test.js
6 files changed, 53 insertions(+), 79 deletions(-)

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



diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index 8bce6a3..03625da 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -475,20 +475,32 @@
  * Reverse a transaction's effects on the content data.
  *
  * @method
- * @param {ve.dm.Transaction}
+ * @param {ve.dm.Transaction} transaction Transaction to roll back
+ * @emits transact
+ * @throws {Error} Cannot roll back a transaction that has not been committed
  */
 ve.dm.Document.prototype.rollback = function ( transaction ) {
-   ve.dm.TransactionProcessor.rollback( this, transaction );
+   if ( !transaction.hasBeenApplied() ) {
+   throw new Error( 'Cannot roll back a transaction that has not 
been committed' );
+   }
+   new ve.dm.TransactionProcessor( this, transaction, true ).process();
+   this.emit( 'transact', transaction, true );
 };
 
 /**
  * Apply a transaction's effects on the content data.
  *
  * @method
- * @param {ve.dm.Transaction}
+ * @param {ve.dm.Transaction} transaction Transaction to apply
+ * @emits transact
+ * @throws {Error} Cannot commit a transaction that has already been committed
  */
 ve.dm.Document.prototype.commit = function ( transaction ) {
-   ve.dm.TransactionProcessor.commit( this, transaction );
+   if ( transaction.hasBeenApplied() ) {
+   throw new Error( 'Cannot commit a transaction that has already 
been committed' );
+   }
+   new ve.dm.TransactionProcessor( this, transaction, false ).process();
+   this.emit( 'transact', transaction, false );
 };
 
 /**
diff --git a/modules/ve/dm/ve.dm.Surface.js b/modules/ve/dm/ve.dm.Surface.js
index b81dc90..e812503 100644
--- a/modules/ve/dm/ve.dm.Surface.js
+++ b/modules/ve/dm/ve.dm.Surface.js
@@ -285,7 +285,7 @@
this.bigStack = this.bigStack.slice( 0, 
this.bigStack.length - this.undoIndex );
this.undoIndex = 0;
this.smallStack.push( transactions[i] );
-   ve.dm.TransactionProcessor.commit( 
this.documentModel, transactions[i] );
+   this.documentModel.commit( transactions[i] );
}
}
}
diff --git a/modules/ve/dm/ve.dm.TransactionProcessor.js 
b/modules/ve/dm/ve.dm.TransactionProcessor.js
index e242fc8..19e3572 100644
--- a/modules/ve/dm/ve.dm.TransactionProcessor.js
+++ b/modules/ve/dm/ve.dm.TransactionProcessor.js
@@ -9,8 +9,7 @@
  * DataModel transaction processor.
  *
  * This class reads operations from a transaction and applies them one by one. 
It's not intended
- * to be used directly; use the static functions 
ve.dm.TransactionProcessor.commit() and .rollback()
- * instead.
+ * to be used directly; use the .commit() and .rollback() methods of 
ve.dm.Document.
  *
  * NOTE: Instances of this class are not recyclable: you can only call 
.process() on them once.
  *
@@ -41,40 +40,6 @@
 
 /* See ve.dm.TransactionProcessor.processors */
 ve.dm.TransactionProcessor.processors = {};
-
-/* Static methods */
-
-/**
- * Commit a transaction to a document.
- *
- * @static
- * @method
- * @param {ve.dm.Document} doc Document object to apply the transaction to
- * @param {ve.dm.Transaction} transaction Transaction to apply
- */
-ve.dm.TransactionProcessor.commit = function ( doc, transaction ) {
-   if ( transaction.hasBeenApplied() ) {
-   throw new Error( 'Cannot commit a transaction that has already 
been committed' );
-   }
-   new ve.dm.TransactionProcessor( doc, transaction, false ).process();
-};
-
-/**
- * Roll back a transaction.
- *
- * This applies the transaction to the document in reverse.
- *
- * @static
- * @method
- * @param {ve.dm.Document} doc Document object to apply the transaction to
- * @param

[MediaWiki-commits] [Gerrit] Make the integration/zuul git latest - present - change (operations/puppet)

2013-03-26 Thread Faidon (Code Review)

Faidon has uploaded a new change for review.

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


Change subject: Make the integration/zuul git latest - present
..

Make the integration/zuul git latest - present

This may have unwanted repercussions. The whole git::clone needs to go,
but until then this should suffice.

Change-Id: I1250d254aa7c84f8e6f5f7ce3397fa549d3288f2
---
M modules/zuul/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/55892/1

diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 3f8ee7f..cd9caa0 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -57,10 +57,10 @@
$zuul_source_dir = '/usr/local/src/zuul'
 
git::clone { 'integration/zuul':
+   ensure = present,
directory = $zuul_source_dir,
origin = $git_source_repo,
branch = 'master',
-   ensure = 'latest',
}
 
exec { 'install_zuul':

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

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

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

[MediaWiki-commits] [Gerrit] Fix dos line endings to unix - change (mediawiki...Translate)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix dos line endings to unix
..


Fix dos line endings to unix

Change-Id: I64278e93d9165e6c4d5864df5d0bfefff9f2f9cc
---
M resources/images/paste.svg
1 file changed, 17 insertions(+), 17 deletions(-)

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



diff --git a/resources/images/paste.svg b/resources/images/paste.svg
index f7976de..38373db 100644
--- a/resources/images/paste.svg
+++ b/resources/images/paste.svg
@@ -1,17 +1,17 @@
-?xml version=1.0 encoding=utf-8?
-!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
-!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
-svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
-width=32px height=32px viewBox=0 0 32 32 enable-background=new 
0 0 32 32 xml:space=preserve
-g
-   path fill=#6D6E71 
d=M29.077,29.012c0,1.061-0.859,1.92-1.92,1.92H4.844c-1.061,0-1.921-0.859-1.921-1.92V4.043
-   
c0-1.061,0.86-1.92,1.921-1.92h22.313c1.061,0,1.92,0.859,1.92,1.92V29.012z/
-   
-   rect x=5.368 y=4.054 fill=#F1F2F2 stroke=#58595B 
stroke-width=0.5 stroke-miterlimit=10 width=21 height=24.349/
-   rect x=7.743 y=8.896 fill=#A7A9AC width=15.625 height=2.872/
-   rect x=7.743 y=15.09 fill=#A7A9AC width=15.625 height=2.875/
-   rect x=7.743 y=21.287 fill=#A7A9AC width=6.125 height=2.873/
-   polygon fill=#414042 points=18.646,2.814 18.646,1.068 13.354,1.068 
13.354,2.814 10.459,2.814 10.459,5.152 21.542,5.152 
-   21.542,2.814/
-/g
-/svg
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=32px height=32px viewBox=0 0 32 32 enable-background=new 
0 0 32 32 xml:space=preserve
+g
+   path fill=#6D6E71 
d=M29.077,29.012c0,1.061-0.859,1.92-1.92,1.92H4.844c-1.061,0-1.921-0.859-1.921-1.92V4.043
+   
c0-1.061,0.86-1.92,1.921-1.92h22.313c1.061,0,1.92,0.859,1.92,1.92V29.012z/
+   
+   rect x=5.368 y=4.054 fill=#F1F2F2 stroke=#58595B 
stroke-width=0.5 stroke-miterlimit=10 width=21 height=24.349/
+   rect x=7.743 y=8.896 fill=#A7A9AC width=15.625 height=2.872/
+   rect x=7.743 y=15.09 fill=#A7A9AC width=15.625 height=2.875/
+   rect x=7.743 y=21.287 fill=#A7A9AC width=6.125 height=2.873/
+   polygon fill=#414042 points=18.646,2.814 18.646,1.068 13.354,1.068 
13.354,2.814 10.459,2.814 10.459,5.152 21.542,5.152 
+   21.542,2.814/
+/g
+/svg

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64278e93d9165e6c4d5864df5d0bfefff9f2f9cc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Neverendingo imalc...@kde.org
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] Make the integration/zuul git latest - present - change (operations/puppet)

2013-03-26 Thread Faidon (Code Review)

Faidon has submitted this change and it was merged.

Change subject: Make the integration/zuul git latest - present
..


Make the integration/zuul git latest - present

This may have unwanted repercussions. The whole git::clone needs to go,
but until then this should suffice.

Change-Id: I1250d254aa7c84f8e6f5f7ce3397fa549d3288f2
---
M modules/zuul/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 3f8ee7f..cd9caa0 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -57,10 +57,10 @@
$zuul_source_dir = '/usr/local/src/zuul'
 
git::clone { 'integration/zuul':
+   ensure = present,
directory = $zuul_source_dir,
origin = $git_source_repo,
branch = 'master',
-   ensure = 'latest',
}
 
exec { 'install_zuul':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1250d254aa7c84f8e6f5f7ce3397fa549d3288f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon fai...@wikimedia.org
Gerrit-Reviewer: Faidon fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update method documentation - change (mediawiki...Renameuser)

2013-03-26 Thread Hoo man (Code Review)

Hoo man has submitted this change and it was merged.

Change subject: Update method documentation
..


Update method documentation

Change-Id: I7b453e7b97bd886b02288fcd2d8c77a8c6c06e97
---
M RenameUserJob.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RenameUserJob.php b/RenameUserJob.php
index a55cca2..d2dc14c 100644
--- a/RenameUserJob.php
+++ b/RenameUserJob.php
@@ -3,12 +3,12 @@
  * Custom job to perform updates on tables in busier environments
  */
 class RenameUserJob extends Job {
-
/**
 * Constructor
 *
 * @param Title $title Associated title
 * @param array $params Job parameters
+* @param int $id
 */
public function __construct( $title, $params = array(), $id = 0 ) {
parent::__construct( 'renameUser', $title, $params, $id );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b453e7b97bd886b02288fcd2d8c77a8c6c06e97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Replace dirname( FILE ) with DIR - change (mediawiki...Renameuser)

2013-03-26 Thread Hoo man (Code Review)

Hoo man has submitted this change and it was merged.

Change subject: Replace dirname( __FILE__ ) with __DIR__
..


Replace dirname( __FILE__ ) with __DIR__

Change-Id: I2a8b7300cef47d5dde473947946f4028bdab36bc
---
M cleanupArchiveUserText.php
M renameUserCleanup.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/cleanupArchiveUserText.php b/cleanupArchiveUserText.php
index ff16bf6..8599f3c 100644
--- a/cleanupArchiveUserText.php
+++ b/cleanupArchiveUserText.php
@@ -2,7 +2,7 @@
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
-   $IP = dirname( __FILE__ ) . '/../..';
+   $IP = __DIR__ . '/../..';
 }
 
 require_once( $IP/maintenance/Maintenance.php );
@@ -56,4 +56,4 @@
 }
 
 $maintClass = CleanupArchiveUserText;
-require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/renameUserCleanup.php b/renameUserCleanup.php
index 374cb89..25c4a1f 100644
--- a/renameUserCleanup.php
+++ b/renameUserCleanup.php
@@ -25,7 +25,7 @@
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
-   $IP = dirname( __FILE__ ) . '/../..';
+   $IP = __DIR__ . '/../..';
 }
 require_once( $IP/maintenance/Maintenance.php );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8b7300cef47d5dde473947946f4028bdab36bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fixed DataValues JS tests broken in Ib52694b932b5f9bdc0949b3... - change (mediawiki...DataValues)

2013-03-26 Thread Daniel Werner (Code Review)

Daniel Werner has uploaded a new change for review.

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


Change subject: Fixed DataValues JS tests broken in 
Ib52694b932b5f9bdc0949b357960917c06593ef2
..

Fixed DataValues JS tests broken in Ib52694b932b5f9bdc0949b357960917c06593ef2

Also renamed getObject into getConstructor in the tests for correctness.

Change-Id: I9c1e18ee55a905b5d9d29f32be22cc883653d3cc
---
M DataValues/tests/qunit/DataValue.tests.js
M DataValues/tests/qunit/DataValues.tests.js
M DataValues/tests/qunit/values/BoolValue.tests.js
M DataValues/tests/qunit/values/MonolingualTextValue.tests.js
M DataValues/tests/qunit/values/MultilingualTextValue.tests.js
M DataValues/tests/qunit/values/NumberValue.tests.js
M DataValues/tests/qunit/values/StringValue.tests.js
M DataValues/tests/qunit/values/UnknownValue.tests.js
8 files changed, 27 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/93/55893/1

diff --git a/DataValues/tests/qunit/DataValue.tests.js 
b/DataValues/tests/qunit/DataValue.tests.js
index 685997f..1ea5477 100644
--- a/DataValues/tests/qunit/DataValue.tests.js
+++ b/DataValues/tests/qunit/DataValue.tests.js
@@ -29,13 +29,13 @@
getConstructorArguments: dv.util.abstractMember,
 
/**
-* Returns the dataValue object to be tested (ie 
dv.StringValue).
+* Returns the dataValue constructor to be tested (ie 
dv.StringValue).
 *
 * @since 0.1
 *
-* @return dv.DataValue
+* @return Function
 */
-   getObject: dv.util.abstractMember,
+   getConstructor: dv.util.abstractMember,
 
/**
 * Returns the dataValue object to be tested (ie 
dv.StringValue).
@@ -48,13 +48,14 @@
 */
getInstance: function( constructorArguments ) {
var self = this,
-   DataValueInstance = function( 
constructorArguments ) {
-   self.getObject().apply( this, 
constructorArguments );
+   OriginalConstructor = self.getConstructor(),
+   DataValueConstructor = function( 
constructorArguments ) {
+   OriginalConstructor.apply( this, 
constructorArguments );
};
 
-   $.extend( DataValueInstance.prototype, 
this.getObject().prototype );
+   DataValueConstructor.prototype = 
OriginalConstructor.prototype;
 
-   return new DataValueInstance( constructorArguments );
+   return new DataValueConstructor( constructorArguments );
},
 
/**
diff --git a/DataValues/tests/qunit/DataValues.tests.js 
b/DataValues/tests/qunit/DataValues.tests.js
index 819b1f2..633f91b 100644
--- a/DataValues/tests/qunit/DataValues.tests.js
+++ b/DataValues/tests/qunit/DataValues.tests.js
@@ -7,7 +7,7 @@
 ( function( dv, $, QUnit ) {
'use strict';
 
-   // Fix for msot of our tests no having the number of required 
assertions.
+   // Fix for most of our tests no having the number of required 
assertions.
// This is required since I214b3d4 got merged into core.
// TODO: figure out some non-global alternative to deal with this.
QUnit.config.requireExpects = false;
diff --git a/DataValues/tests/qunit/values/BoolValue.tests.js 
b/DataValues/tests/qunit/values/BoolValue.tests.js
index 2364dc4..7e06325 100644
--- a/DataValues/tests/qunit/values/BoolValue.tests.js
+++ b/DataValues/tests/qunit/values/BoolValue.tests.js
@@ -6,7 +6,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */
-( function( dv, $, QUnit, undefined ) {
+( function( dv, $, QUnit ) {
'use strict';
 
var PARENT = dv.tests.DataValueTest;
@@ -21,9 +21,9 @@
dv.tests.BoolValueTest = dv.util.inherit( PARENT, {
 
/**
-* @see dv.tests.DataValueTest.getObject
+* @see dv.tests.DataValueTest.getConstructor
 */
-   getObject: function() {
+   getConstructor: function() {
return dv.BoolValue;
},
 
diff --git a/DataValues/tests/qunit/values/MonolingualTextValue.tests.js 
b/DataValues/tests/qunit/values/MonolingualTextValue.tests.js
index 7700bc4..7487e79 100644
--- a/DataValues/tests/qunit/values/MonolingualTextValue.tests.js
+++ b/DataValues/tests/qunit/values/MonolingualTextValue.tests.js
@@ -6,7 +6,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  */
-( function( dv, $, QUnit, undefined ) {
+( function( dv, $, QUnit ) {
'use strict';
 
var PARENT =

[MediaWiki-commits] [Gerrit] Fix non-terminating regexp in roundtrip-test.js - change (mediawiki...Parsoid)

2013-03-26 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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


Change subject: Fix non-terminating regexp in roundtrip-test.js
..

Fix non-terminating regexp in roundtrip-test.js

* The same comment regexp that caused trouble in the WTS existed
  in normalizeNewlines function in mediawiki.Util.js for a while.
  Looks like it got exercised recently and sent roundtrip-test.js
  into a coma.

  Wikipedia:Articles for deletion/Wynnton is one of the many pages
  in the Wikipedia namespace that ran into trouble.

* The regexp in question is: !--(?:[^-]+|-(?!-))*--
  Looks like the + match inside combined with the * outside sent
  the regexp into an infinite loop. Converting it into the (a|b)*
  form where a and b match exactly one char fixes it.  This is the
  same fix in all the other instances. Just documenting here for
  posterity with a little more detail.

Change-Id: I30acde6cc4e882061137a87d0ea523ce76066ac5
---
M js/lib/mediawiki.Util.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/94/55894/1

diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 7a8a435..4f287e5 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -918,7 +918,7 @@
 var normalizeNewlines = function ( source ) {
return source
// strip comments first
-   .replace(/!--(?:[^-]+|-(?!-))*--/gm, '')
+   .replace(/!--(?:[^\-]|-(?!-))*--/gm, '')
 
// preserve a space for non-inter-tag-whitespace
// non-tag content followed by non-tag content

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30acde6cc4e882061137a87d0ea523ce76066ac5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix non-terminating regexp in roundtrip-test.js - change (mediawiki...Parsoid)

2013-03-26 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Fix non-terminating regexp in roundtrip-test.js
..


Fix non-terminating regexp in roundtrip-test.js

* The same comment regexp that caused trouble in the WTS existed
  in normalizeNewlines function in mediawiki.Util.js for a while.
  Looks like it got exercised recently and sent roundtrip-test.js
  into a coma.

  Wikipedia:Articles for deletion/Wynnton is one of the many pages
  in the Wikipedia namespace that ran into trouble.

* The regexp in question is: !--(?:[^-]+|-(?!-))*--
  Looks like the + match inside combined with the * outside sent
  the regexp into an infinite loop. Converting it into the (a|b)*
  form where a and b match exactly one char fixes it.  This is the
  same fix in all the other instances. Just documenting here for
  posterity with a little more detail.

Change-Id: I30acde6cc4e882061137a87d0ea523ce76066ac5
---
M js/lib/mediawiki.Util.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 7a8a435..4f287e5 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -918,7 +918,7 @@
 var normalizeNewlines = function ( source ) {
return source
// strip comments first
-   .replace(/!--(?:[^-]+|-(?!-))*--/gm, '')
+   .replace(/!--(?:[^\-]|-(?!-))*--/gm, '')
 
// preserve a space for non-inter-tag-whitespace
// non-tag content followed by non-tag content

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30acde6cc4e882061137a87d0ea523ce76066ac5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Use MessageCache::getMsgFromNamespace() to fetch conversion ... - change (mediawiki/core)

2013-03-26 Thread Liangent (Code Review)

Liangent has uploaded a new change for review.

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


Change subject: Use MessageCache::getMsgFromNamespace() to fetch conversion 
tables.
..

Use MessageCache::getMsgFromNamespace() to fetch conversion tables.

After Iaaf6cceb, MessageCache::get() goes through the fallback chain,
which is unwanted for conversion tables (for example, we don't want
zh-hans table for zh, where zh means no conversion). Since the only
needed feature is to fetch text from MediaWiki namespace (conversion
tables in code are stored somewhere else), it is now changed to use
MessageCache::getMsgFromNamespace() instead to avoid fallbacks.

Change-Id: I46e0be31c9c0fe0a6e4923fc1aff0fbbadbf1d67
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/55895/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 43afe65..e36c085 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -941,7 +941,7 @@
$parsed[$key] = true;
 
if ( $subpage === '' ) {
-   $txt = MessageCache::singleton()-get( 
'conversiontable', true, $code );
+   $txt = MessageCache::singleton()-getMsgFromNamespace( 
$key, $code );
} else {
$txt = false;
$title = Title::makeTitleSafe( NS_MEDIAWIKI, $key );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e0be31c9c0fe0a6e4923fc1aff0fbbadbf1d67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

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

[MediaWiki-commits] [Gerrit] (bug 46565) Don't prune undispatched changes. - change (mediawiki...Wikibase)

2013-03-26 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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


Change subject: (bug 46565) Don't prune undispatched changes.
..

(bug 46565) Don't prune undispatched changes.

This makes the pruneChanges script consider which changes have been dispatched 
yet.

Change-Id: Ic7663a6153a75548c3984a9d61664ff85c934f3d
---
M repo/maintenance/pruneChanges.php
1 file changed, 92 insertions(+), 14 deletions(-)


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

diff --git a/repo/maintenance/pruneChanges.php 
b/repo/maintenance/pruneChanges.php
index 9ee56b6..0cbe081 100644
--- a/repo/maintenance/pruneChanges.php
+++ b/repo/maintenance/pruneChanges.php
@@ -33,14 +33,37 @@
  * @ingroup Maintenance
  */
 class PruneChanges extends Maintenance {
+
+   /**
+* @var int the minimum number of seconds to keep changes for.
+*/
+   protected $keepSeconds = 0;
+
+   /**
+* @var int the minimum number of seconds after dispatching to keep 
changes for.
+*/
+   protected $graceSeconds = 0;
+
+   /**
+* @var bool whether the dispatch time should be ignored
+*/
+   protected $ignoreDispatch = false;
+
public function __construct() {
parent::__construct();
$this-mDescription = Prune the Wikibase changes table to a 
maximum number of entries;
 
-   $this-addOption( 'number-of-days', 'Number of days to keep 
entries in the table after the '
-   . 'maintenance script has been 
run (default: 7)', false, true, 'n' );
+   $this-addOption( 'number-of-days', 'Keep changes at least N 
days (deprecated).', false, true, 'n' );
+   $this-addOption( 'keep-days',  'Keep changes at least N 
days.', false, true, 'd' );
+   $this-addOption( 'keep-hours', 'Keep changes at least N 
hours.', false, true, 'h' );
+   $this-addOption( 'keep-minutes', 'Keep changes at least N 
minutes.', false, true, 'm' );
+   $this-addOption( 'grace-minutes', 'Keep changes at least N 
more minutes after they have been dispatched.', false, true, 'g' );
+
$this-addOption( 'force', 'Run regardless of whether the PID 
file says it is running already.',
 false, false, 'f' );
+
+   $this-addOption( 'ignore-dispatch', 'Ignore whether changes 
have been dispatched or not.',
+   false, false, 'D' );
}
 
public function execute() {
@@ -49,7 +72,6 @@
exit;
}
 
-   $numDays = intval( $this-getOption( 'number-of-days', 7 ) );
$force = $this-getOption( 'force', false );
$pidfile = Utils::makePidFilename( 'WBpruneChanges', wfWikiID() 
);
 
@@ -58,28 +80,84 @@
exit( 5 );
}
 
-   $this-pruneChanges( $numDays );
+   $this-ignoreDispatch = $this-getOption( 'ignore-dispatch', 
false );
 
-   $this-output( date( 'H:i:s' ) .  done, exiting\n );
+   $this-keepSeconds = 0;
+   $this-keepSeconds += intval( $this-getOption( 
'number-of-days', 0 ) ) * 24 * 60 * 60;
+   $this-keepSeconds += intval( $this-getOption( 'keep-days', 0 
) ) * 24 * 60 * 60;
+   $this-keepSeconds += intval( $this-getOption( 'keep-hours', 0 
) ) * 60 * 60;
+   $this-keepSeconds += intval( $this-getOption( 'keep-minutes', 
0 ) ) * 60;
+
+   if ( $this-keepSeconds === 0 ) {
+   // one day
+   $this-keepSeconds = 1 * 24 * 60 * 60;
+   }
+
+   $this-graceSeconds = 0;
+   $this-graceSeconds += intval( $this-getOption( 
'grace-minutes', 0 ) ) * 60;
+
+   if ( $this-graceSeconds === 0 ) {
+   // one hour
+   $this-graceSeconds = 1 * 60 * 60;
+   }
+
+   $until = $this-getCutoffTimestamp();
+   $this-output( date( 'H:i:s' ) .  pruning entries older than 
+   . wfTimestamp( TS_ISO_8601, $until ) . \n );
+
+   $deleted = $this-pruneChanges( $until );
+   $this-output( date( 'H:i:s' ) .  $deleted rows pruned.\n );
+
unlink( $pidfile ); // delete lockfile on normal exit
}
 
-   public function pruneChanges( $numDays ) {
+   /**
+* Calculates the timestamp up to which changes can be pruned.
+*
+* @return int timstamp up to which changes can be pruned (as unix 
period)
+*/
+   protected function getCutoffTimestamp() {
+   $until = time() - $this-keepSeconds;
+
+   if ( !$this-ignoreDispatch ) {
+

[MediaWiki-commits] [Gerrit] Move TermIndex to lib. - change (mediawiki...Wikibase)

2013-03-26 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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


Change subject: Move TermIndex to lib.
..

Move TermIndex to lib.

This is in preparation for direct access to the term index from the client,
for use with finding properties by label.

Change-Id: Ia212cd0d57cc97310f49f6c5d56f9dcf90860789
---
M lib/WikibaseLib.php
R lib/includes/store/TermCombinationMatchFinder.php
R lib/includes/store/TermIndex.php
R lib/includes/store/TermMatchScoreCalculator.php
R lib/includes/store/sql/TermSqlIndex.php
M repo/Wikibase.php
M repo/includes/store/Store.php
7 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 5bfbd9e..54e456b 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -184,6 +184,10 @@
 $wgAutoloadClasses['Wikibase\PropertyLookup']   = $dir . 
'includes/store/PropertyLookup.php';
 $wgAutoloadClasses['Wikibase\SiteLinkCache']   = $dir . 
'includes/store/SiteLinkCache.php';
 $wgAutoloadClasses['Wikibase\SiteLinkLookup']  = $dir . 
'includes/store/SiteLinkLookup.php';
+$wgAutoloadClasses['Wikibase\TermIndex']   = $dir 
. 'includes/store/TermIndex.php';
+$wgAutoloadClasses['Wikibase\TermCombinationMatchFinder'] = $dir . 
'includes/store/TermCombinationMatchFinder.php';
+$wgAutoloadClasses['Wikibase\TermMatchScoreCalculator'] = $dir . 
'includes/store/TermMatchScoreCalculator.php';
+$wgAutoloadClasses['Wikibase\TermSqlIndex']= $dir . 
'includes/store/sql/TermSqlIndex.php';
 
 // includes/store/sql
 $wgAutoloadClasses['Wikibase\CachingEntityLoader']  = $dir . 
'includes/store/sql/CachingEntityLoader.php';
diff --git a/repo/includes/store/TermCombinationMatchFinder.php 
b/lib/includes/store/TermCombinationMatchFinder.php
similarity index 100%
rename from repo/includes/store/TermCombinationMatchFinder.php
rename to lib/includes/store/TermCombinationMatchFinder.php
diff --git a/repo/includes/store/TermIndex.php 
b/lib/includes/store/TermIndex.php
similarity index 100%
rename from repo/includes/store/TermIndex.php
rename to lib/includes/store/TermIndex.php
diff --git a/repo/includes/store/TermMatchScoreCalculator.php 
b/lib/includes/store/TermMatchScoreCalculator.php
similarity index 100%
rename from repo/includes/store/TermMatchScoreCalculator.php
rename to lib/includes/store/TermMatchScoreCalculator.php
diff --git a/repo/includes/store/sql/TermSqlIndex.php 
b/lib/includes/store/sql/TermSqlIndex.php
similarity index 100%
rename from repo/includes/store/sql/TermSqlIndex.php
rename to lib/includes/store/sql/TermSqlIndex.php
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index ad42325..793b41c 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -185,17 +185,13 @@
 $wgAutoloadClasses['Wikibase\IdGenerator'] = $dir 
. 'includes/store/IdGenerator.php';
 $wgAutoloadClasses['Wikibase\Store']   = $dir 
. 'includes/store/Store.php';
 $wgAutoloadClasses['Wikibase\StoreFactory']= $dir . 
'includes/store/StoreFactory.php';
-$wgAutoloadClasses['Wikibase\TermIndex']   = $dir 
. 'includes/store/TermIndex.php';
-$wgAutoloadClasses['Wikibase\TermCombinationMatchFinder'] = $dir . 
'includes/store/TermCombinationMatchFinder.php';
-$wgAutoloadClasses['Wikibase\TermMatchScoreCalculator'] = $dir . 
'includes/store/TermMatchScoreCalculator.php';
-$wgAutoloadClasses['Wikibase\TermSearchKeyBuilder'] = $dir . 
'includes/store/sql/TermSearchKeyBuilder.php';
 
 // includes/store/sql
 $wgAutoloadClasses['Wikibase\SqlIdGenerator']  = $dir . 
'includes/store/sql/SqlIdGenerator.php';
 $wgAutoloadClasses['Wikibase\SqlStore']= $dir 
. 'includes/store/sql/SqlStore.php';
-$wgAutoloadClasses['Wikibase\TermSqlIndex']= $dir . 
'includes/store/sql/TermSqlIndex.php';
 $wgAutoloadClasses['Wikibase\EntityPerPageTable']  = $dir . 
'includes/store/sql/EntityPerPageTable.php';
 $wgAutoloadClasses['Wikibase\DispatchStats']   = $dir . 
'includes/store/sql/DispatchStats.php';
+$wgAutoloadClasses['Wikibase\TermSearchKeyBuilder']= $dir . 
'includes/store/sql/TermSearchKeyBuilder.php';
 
 // includes/updates
 $wgAutoloadClasses['Wikibase\EntityDeletionUpdate']= $dir . 
'includes/updates/EntityDeletionUpdate.php';
diff --git a/repo/includes/store/Store.php b/repo/includes/store/Store.php
index 0692913..b61037a 100644
--- a/repo/includes/store/Store.php
+++ b/repo/includes/store/Store.php
@@ -62,7 +62,7 @@
/**
 * Returns a TermIndex for this store.
 *
-* @since 0.1
+* @since 0.4
 *
 * @return TermIndex
 */

-- 
To view, visit

[MediaWiki-commits] [Gerrit] TTMServer solr schema.xml improvements - change (mediawiki...Translate)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: TTMServer solr schema.xml improvements
..


TTMServer solr schema.xml improvements

* Case insensitive
* Better tokenization

Bug: 46117
Bug: 46118
Change-Id: Iaa7298417f9d924e17267578f58ceeff24a52476
---
M ttmserver/schema.xml
1 file changed, 7 insertions(+), 15 deletions(-)

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



diff --git a/ttmserver/schema.xml b/ttmserver/schema.xml
index d18dd1f..0ed2f04 100644
--- a/ttmserver/schema.xml
+++ b/ttmserver/schema.xml
@@ -5,23 +5,15 @@
fieldType name=long class=solr.TrieLongField 
precisionStep=0 positionIncrementGap=0/
fieldType name=string class=solr.StrField 
sortMissingLast=true /
fieldType name=tint class=solr.TrieIntField 
precisionStep=50 positionIncrementGap=0/
-   fieldType name=text_en class=solr.TextField 
positionIncrementGap=100
-   analyzer type=index
-   tokenizer 
class=solr.StandardTokenizerFactory/
-   filter class=solr.LowerCaseFilterFactory/
-   filter 
class=solr.EnglishPossessiveFilterFactory/
-   filter class=solr.PorterStemFilterFactory/
-   /analyzer
-   analyzer type=query
-   tokenizer 
class=solr.StandardTokenizerFactory/
-   filter class=solr.LowerCaseFilterFactory/
-   filter 
class=solr.KeywordMarkerFilterFactory/
-   filter class=solr.PorterStemFilterFactory/
-   /analyzer
-   /fieldType
+   !-- Our input can basically be in any language, so we use 
either
+language agnostic processing or something that can adapt to
+the language in question. --
fieldType name=text_ws class=solr.TextField 
positionIncrementGap=100
analyzer
-   tokenizer 
class=solr.WhitespaceTokenizerFactory/
+   !-- Consider using solr.ICUTokenizerFactory --
+   tokenizer 
class=solr.StandardTokenizerFactory/
+   !-- Consider using 
solr.ICUNormalizer2FilterFactory --
+   filter class=solr.LowerCaseFilterFactory/
/analyzer
/fieldType
/types

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa7298417f9d924e17267578f58ceeff24a52476
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Oren orenboch...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add insert and remove events to MetaList - change (mediawiki...VisualEditor)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Add insert and remove events to MetaList
..


Add insert and remove events to MetaList

These events occur when an item is inserted or removed by onTransact(),
so both for insertions/removals done through the MetaList mutators and
insertions/removals done by any other means.

We have to gather these events and batch them up because we have to allow
offset translation and index recomputation to occur first (otherwise
calling .getOffset() and .getIndex() on inserted items doesn't work).

Change-Id: I74a9a21398eca4e9afd7148171af20d439cf7ebd
---
M modules/ve/dm/ve.dm.MetaList.js
1 file changed, 31 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve/dm/ve.dm.MetaList.js b/modules/ve/dm/ve.dm.MetaList.js
index 97ca92c..981ea83 100644
--- a/modules/ve/dm/ve.dm.MetaList.js
+++ b/modules/ve/dm/ve.dm.MetaList.js
@@ -49,6 +49,20 @@
 
 ve.inheritClass( ve.dm.MetaList, ve.EventEmitter );
 
+/* Events */
+
+/**
+ * @event insert
+ * @param {ve.dm.MetaItem} item Item that was inserted
+ */
+
+/**
+ * @event remove
+ * @param {ve.dm.MetaItem} item Item that was removed
+ * @param {Number} offset Linear model offset that the item was at
+ * @param {Number} index Index within that offset the item was at
+ */
+
 /* Methods */
 
 /**
@@ -60,9 +74,12 @@
  * - translate offsets and recompute indices for metadata that has shifted
  * @param {ve.dm.Transaction} tx Transaction that was applied to the document
  * @param {boolean} reversed Whether the transaction was applied in reverse
+ * @emits insert
+ * @emits remove
  */
 ve.dm.MetaList.prototype.onTransact = function ( tx, reversed ) {
-   var i, j, ilen, jlen, ins, rm, item, offset = 0, index = 0, ops = 
tx.getOperations();
+   var i, j, ilen, jlen, ins, rm, item, offset = 0, index = 0, ops = 
tx.getOperations(),
+   insertedItems = [], removedItems = [];
// Look for replaceMetadata operations in the transaction and 
insert/remove items as appropriate
// This requires we also inspect retain, replace and replaceMetadata 
operations in order to
// track the offset and index. We track the pre-transaction offset, we 
need to do that in
@@ -86,11 +103,13 @@
rm = reversed ? ops[i].insert : ops[i].remove;
for ( j = 0, jlen = rm.length; j  jlen; j++ ) {
this.deleteRemovedItem( offset, index + 
j );
+   removedItems.push( { 'item': item, 
'offset': offset, 'index': index } );
}
for ( j = 0, jlen = ins.length; j  jlen; j++ ) 
{
item = 
ve.dm.metaItemFactory.createFromElement( ins[j] );
// offset and index are 
pre-transaction, but we'll fix them later
this.addInsertedItem( offset, index + 
j, item );
+   insertedItems.push( {'item': item } );
}
index += rm.length;
break;
@@ -110,6 +129,13 @@
}
this.items[i].setIndex( index );
offset = this.items[i].getOffset();
+   }
+
+   for ( i = 0, ilen = insertedItems.length; i  ilen; i++ ) {
+   this.emit( 'insert', insertedItems[i].item );
+   }
+   for ( i = 0, ilen = removedItems.length; i  ilen; i++ ) {
+   this.emit( 'remove', removedItems[i].item, 
removedItems[i].offset, removedItems[i].index );
}
 };
 
@@ -228,6 +254,7 @@
  * @param {number} offset Offset in the linear model of the new item
  * @param {number} index  Index of the new item in the metadata array at offset
  * @param {ve.dm.MetaItem} item Item object
+ * @emits insert
  */
 ve.dm.MetaList.prototype.addInsertedItem = function ( offset, index, item ) {
var group = item.getGroup(), at = this.findItem( offset, index, null, 
true );
@@ -239,6 +266,7 @@
this.groups[group] = [ item ];
}
item.attach( this, offset, index );
+   this.emit( 'insert', item );
 };
 
 /**
@@ -249,6 +277,7 @@
  *
  * @param {number} offset Offset in the linear model of the item
  * @param {number} index Index of the item in the metadata array at offset
+ * @emits remove
  */
 ve.dm.MetaList.prototype.deleteRemovedItem = function ( offset, index ) {
var item, group, at = this.findItem( offset, index );
@@ -262,6 +291,7 @@
if ( at !== null ) {
this.groups[group].splice( at, 1 );
}
+   this.emit( 'remove', item );
item.detach( this );
 };
 

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

[MediaWiki-commits] [Gerrit] (Bug 43994) New Special:UnconnectedPages - change (mediawiki...Wikibase)

2013-03-26 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has submitted this change and it was merged.

Change subject: (Bug 43994) New Special:UnconnectedPages
..


(Bug 43994) New Special:UnconnectedPages

This special page Special:UnconnectedPages uses a page prop wikibase_item
that holds the id for the item at the repository.

Later it could be other tables that are better suited, and updated faster,
than the page_props table.

The actual page prop in use is defined in
https://gerrit.wikimedia.org/r/#/c/51179/

Patchset 3: Rebased to use the last additions for page props
Patchset 4: Tryed out Daniels proposal
Patchset 5: Rebase to fix an error due to old changes
Patchset 6: Fix of bug introduced by JOIN should be LEFT JOIN
Also fix of whitespace (carriage return).
Patchset 7: More cleanup
Patchset 8: More cleanup - where do those carriage return comes from??

Change-Id: I5cfab43ee8c7feff79c8b4bda0183142dc3e2c98
---
M client/WikibaseClient.hooks.php
A client/WikibaseClient.i18n.alias.php
M client/WikibaseClient.i18n.php
M client/WikibaseClient.php
A client/includes/specials/SpecialUnconnectedPages.php
A client/tests/phpunit/includes/specials/SpecialUnconnectedPagesTest.php
M lib/WikibaseLib.php
R lib/tests/phpunit/specials/SpecialPageTestBase.php
M repo/Wikibase.php
9 files changed, 450 insertions(+), 4 deletions(-)

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



diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index ceb4899..e22fcf6 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -86,6 +86,8 @@
'includes/api/ApiClientInfo',
 
'includes/store/EntityCacheTable',
+
+   'includes/specials/SpecialUnconnectedPages',
);
 
foreach ( $testFiles as $file ) {
diff --git a/client/WikibaseClient.i18n.alias.php 
b/client/WikibaseClient.i18n.alias.php
new file mode 100644
index 000..61ad70d
--- /dev/null
+++ b/client/WikibaseClient.i18n.alias.php
@@ -0,0 +1,20 @@
+?php
+
+/**
+ * Aliases for the special pages of the Wikibase extension.
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup WikibaseRepo
+ *
+ * @licence GNU GPL v2+
+ * @author John Erling Blad  jeb...@gmail.com 
+ */
+
+$specialPageAliases = array();
+
+/** English (English) */
+$specialPageAliases['en'] = array(
+   'UnconnectedPages' = array( 'UnconnectedPages', 'WithoutConnection', 
'WithoutSitelinks' ),
+);
\ No newline at end of file
diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php
index 44b31da..dd358b2 100644
--- a/client/WikibaseClient.i18n.php
+++ b/client/WikibaseClient.i18n.php
@@ -18,9 +18,11 @@
  * @author Jeroen De Dauw
  * @author Nikola Smolenski
  * @author Marius Hoch
+ * @author Jeblad
  */
 $messages['en'] = array(
'wikibase-client-desc' = 'Client for the Wikibase extension',
+   'specialpages-group-wikibaseclient' = 'Wikidata client',
'wikibase-after-page-move' = 'You may also [$1 update] the associated 
Wikidata item to maintain language links on moved page.',
'wikibase-comment-remove' = 'Associated Wikidata item deleted. 
Language links removed.',
'wikibase-comment-linked' = 'A Wikidata item has been linked to this 
page.',
@@ -55,6 +57,14 @@
'wikibase-rc-show-wikidata-pref' = 'Show Wikidata edits in recent 
changes',
'wikibase-watchlist-show-changes-pref' = 'Show Wikidata edits in your 
watchlist',
'wikibase-error-invalid-entity-id' = 'The ID entered is unknown to the 
system. Please use a valid entity ID.',
+   'special-unconnectedpages' = 'Pages not connected to items',
+   'wikibase-unconnectedpages-legend' = 'Unconnected pages options',
+   'wikibase-unconnectedpages-page' = 'Start page:',
+   'wikibase-unconnectedpages-submit' = 'Go',
+   'wikibase-unconnectedpages-invalid-language' = '$1 is not a valid 
language code.',
+   'wikibase-unconnectedpages-page-warning' = 'The page title could not 
be used for the query and is ignored.',
+   'wikibase-unconnectedpages-iwdata-label' = 'Only pages with 
interlanguagelinks',
+   'wikibase-unconnectedpages-format-row' = '($1 interlanguagelinks on 
the page)',
 );
 
 /** Message documentation (Message documentation)
@@ -69,6 +79,7 @@
 $messages['qqq'] = array(
'wikibase-client-desc' = '{{desc|name=Wikibase 
Client|url=http://www.mediawiki.org/wiki/Extension:Wikibase_Client}}
 See also [[d:Wikidata:Glossary#Wikidata|Wikidata]].',
+   'specialpages-group-wikibaseclient' = 'Title of group of special pages 
related to Wikidata clients',
'wikibase-after-page-move' = 'Message on [[Special:MovePage]] on 
submit and successfully move, inviting user to update associated Wikibase 
repository item to maintain language links on the moved page on the client.
 
 Parameters:
@@ -138,6 +149,14 @@

[MediaWiki-commits] [Gerrit] WIP/don't merge: Hack around mw:Placeholder newlines - change (mediawiki...Parsoid)

2013-03-26 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: WIP/don't merge: Hack around mw:Placeholder newlines
..

WIP/don't merge: Hack around mw:Placeholder newlines

This hack shifts many semantic issues in
[[en:1993 NCAA Women's Division I Basketball Tournament]]
to syntactic ones by using the placeholder as last source node.

It is not a proper solution however. We should really get rid of
mw:Placeholder for optional newlines.

Change-Id: I4eba101b1b9a41529cbc87375b727fb9d2649e93
---
M js/lib/mediawiki.WikitextSerializer.js
M js/lib/pegTokenizer.pegjs.txt
2 files changed, 28 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/99/55899/1

diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index eac066b..703fd38 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2595,9 +2595,35 @@
}
}
if (prevNode  prevNode.nodeType === prevNode.TEXT_NODE) {
+   var nextSibling = prevNode.nextSibling;
+   // First check if the text node is followed by one of 
our
+   // mw:Placeholder metas that encapsulate optional 
newlines (so
+   // that the paragraph wrapper has an easier time). If 
such a meta
+   // is there and has a dsr, use it instead of the text 
node.
+   if ( nextSibling  DU.isMarkerMeta(nextSibling, 
mw:Placeholder) 
+   !nextSibling.nextSibling 
+   nextSibling.data  
nextSibling.data.parsoid.dsr 
+   nextSibling.data.parsoid.dsr[1] !== 
null 
+   nextSibling.data.parsoid.dsr[1] - 
nextSibling.data.parsoid.dsr[0] === 1)
+   {
+   prevNode = nextSibling;
+   //prevNode = {
+   //  nodeName: '#fakeelement',
+   //  nodeType: prevNode.ELEMENT_NODE,
+   //  data: {
+   //  parsoid: {
+   //  dsr:
+   //  [
+   //  
nextSibling.data.parsoid.dsr[0],
+   //  
nextSibling.data.parsoid.dsr[1],
+   //  0, 0
+   //  ]
+   //  }
+   //  }
+   //};
+   } else if (!prevNode.nextSibling 
// Check if this is the last child of a zero-width 
element, and use
// that for dsr purposes instead. Typical case: text in 
p.
-   if (!prevNode.nextSibling 
prevNode.parentNode 
prevNode.parentNode !== node 
prevNode.parentNode.data.parsoid.dsr 
diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index a45fec1..7a2851a 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -2151,6 +2151,7 @@
 if ( spc.length ) {
 // Encapsulate in meta, so that these don't trigger paragraphs, but
 // can still be round-tripped and (potentially) edited.
+//return spc.join('');
 return [ new SelfclosingTagTk('meta',
 [new KV('typeof', 'mw:Placeholder')],
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4eba101b1b9a41529cbc87375b727fb9d2649e93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Customize shell; remove stale LocalSettings.php - change (mediawiki/vagrant)

2013-03-26 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Customize shell; remove stale LocalSettings.php
..


Customize shell; remove stale LocalSettings.php

- If auto-generated LocalSettings.php is present, but the database it specifies
  is not, assume it is left over from a previous VM instance and re-run
  install.php.
- Correct 'mediawiki' in .gitignore to '/mediawiki/', so it doesn't ignore
  files in puppet/modules/mediawiki.
- Add color.sh and phpsh.sh to /etc/profile.d: the former specifies a colorful
  prompt should be used, and the latter makes phpsh always execute with
  /vagrant/mediawiki as its cwd.
- Consume '--debug' flag from the command line; if it is present, pass it on to
  Puppet.
- Specify 'Ubuntu_64' os_type to VirtualBox.

Change-Id: Ic989d6b9ff56419ec77b4c6d5d2c8dcf5341a499
---
M .gitignore
M Vagrantfile
A puppet/modules/mediawiki/files/color.sh
A puppet/modules/mediawiki/files/phpsh.sh
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/phpsh.pp
6 files changed, 31 insertions(+), 5 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/.gitignore b/.gitignore
index 5fe9635..aca2ce6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .vagrant
 LocalSettings.php
 tags
-mediawiki
+/mediawiki/
diff --git a/Vagrantfile b/Vagrantfile
index 55bc87a..4c55edd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,6 @@
 system( '( nfsstat || nfsiostat ) /dev/null' ) and not $?.exitstatus
 end
 
-
 Vagrant.configure('2') do |config|
 
 config.vm.hostname = 'mediawiki-vagrant'
@@ -38,7 +37,8 @@
 nfs: host_supports_nfs?
 
 config.vm.provider :virtualbox do |vb|
-vb.customize ['modifyvm', :id, '--memory', '512']
+# See http://www.virtualbox.org/manual/ch08.html for additional 
options.
+vb.customize ['modifyvm', :id, '--memory', '512', '--ostype', 
'Ubuntu_64']
 end
 
 config.vm.provision :shell do |s|
@@ -50,7 +50,7 @@
 puppet.module_path = 'puppet/modules'
 puppet.manifests_path = 'puppet/manifests'
 puppet.manifest_file = 'site.pp'
-puppet.options = '--verbose'  # Add '--debug' for more output
+puppet.options = ['--verbose', ARGV.delete('--debug')].compact
 end
 
 end
diff --git a/puppet/modules/mediawiki/files/color.sh 
b/puppet/modules/mediawiki/files/color.sh
new file mode 100755
index 000..d6520b3
--- /dev/null
+++ b/puppet/modules/mediawiki/files/color.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export force_color_prompt=yes
diff --git a/puppet/modules/mediawiki/files/phpsh.sh 
b/puppet/modules/mediawiki/files/phpsh.sh
new file mode 100644
index 000..cb15d1b
--- /dev/null
+++ b/puppet/modules/mediawiki/files/phpsh.sh
@@ -0,0 +1,8 @@
+# Ensure that we're in an interactive bash session.
+[ -z $BASH_VERSION -o -z $PS1 ]  return
+phpsh () {
+  (
+cd /vagrant/mediawiki
+command phpsh $@
+  )
+}
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 277e486..4bb7451 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -22,6 +22,16 @@
ensure = absent,
}
 
+   # If an auto-generated LocalSettings.php file exists but the database it
+   # refers to is missing, assume it is residual of a discarded instance 
and
+   # delete it.
+   exec { 'check-settings':
+   command = 'rm /vagrant/mediawiki/LocalSettings.php 2/dev/null 
|| true',
+   require = [ Package['php5'], Exec['fetch-mediawiki'], 
Service['mysql'] ],
+   unless  = 'php /vagrant/mediawiki/maintenance/eval.php 
wfGetDB(-1) /dev/null',
+   before  = Exec['mediawiki-setup'],
+   }
+
apache::site { 'wiki':
ensure  = present,
content = template('mediawiki/mediawiki-apache-site.erb'),
diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp 
b/puppet/modules/mediawiki/manifests/phpsh.pp
index d1b775f..df44808 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -8,10 +8,16 @@
exec { 'pip-install-phpsh':
creates = '/usr/local/bin/phpsh',
command = 'pip install 
https://github.com/facebook/phpsh/tarball/master',
-   onlyif  = 'ping -c1 -W0.5 -q github.com',  # only if GitHub is 
reachable
+   onlyif  = 'ping -c1 -w0.5 -q github.com',  # only if GitHub is 
reachable
require = Package['php5', 'python-pip'],
}
 
+   file { '/etc/profile.d/phpsh.sh':
+   ensure = file,
+   mode   = '0755',
+   source = 'puppet:///modules/mediawiki/phpsh.sh',
+   }
+
file { '/etc/phpsh':
ensure = directory,
}

-- 
To view, visit

[MediaWiki-commits] [Gerrit] Update API parameter injection - change (mediawiki...ConfirmEdit)

2013-03-26 Thread jenkins-bot (Code Review)

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

Change subject: Update API parameter injection
..


Update API parameter injection

The ReCaptcha module was not injecting its parameters at all, so they
were not showing up in the auto-generated help. This is now fixed.

Also, the API recently added a new parameter to the APIGetAllowedParams hook
to differentiate between fetching the allowed parameter list for help
output and fetching it for processing within the module. ConfirmEdit
only needs to inject the parameters for the former, so it should check
this parameter if available.

Change-Id: Ia8c9a8b882ee3480b71bfb3f2345475506549819
---
M Captcha.php
M ConfirmEditHooks.php
M ReCaptcha.class.php
3 files changed, 31 insertions(+), 13 deletions(-)

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



diff --git a/Captcha.php b/Captcha.php
index 0f78d36..2d6afbf 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -577,15 +577,23 @@
 
/**
 * @param $module ApiBase
-* @param $params array
 * @return bool
 */
-   public function APIGetAllowedParams( $module, $params ) {
-   if ( !$module instanceof ApiEditPage ) {
-   return true;
+   protected function isAPICaptchaModule( $module ) {
+   return $module instanceof ApiEditPage;
+   }
+
+   /**
+* @param $module ApiBase
+* @param $params array
+* @param $flags int
+* @return bool
+*/
+   public function APIGetAllowedParams( $module, $params, $flags ) {
+   if ( $flags  $this-isAPICaptchaModule( $module ) ) {
+   $params['captchaword'] = null;
+   $params['captchaid'] = null;
}
-   $params['captchaword'] = null;
-   $params['captchaid'] = null;
 
return true;
}
@@ -596,11 +604,10 @@
 * @return bool
 */
public function APIGetParamDescription( $module, $desc ) {
-   if ( !$module instanceof ApiEditPage ) {
-   return true;
+   if ( $this-isAPICaptchaModule( $module ) ) {
+   $desc['captchaid'] = 'CAPTCHA ID from previous request';
+   $desc['captchaword'] = 'Answer to the CAPTCHA';
}
-   $desc['captchaid'] = 'CAPTCHA ID from previous request';
-   $desc['captchaword'] = 'Answer to the CAPTCHA';
 
return true;
}
diff --git a/ConfirmEditHooks.php b/ConfirmEditHooks.php
index 66e5199..bc85138 100644
--- a/ConfirmEditHooks.php
+++ b/ConfirmEditHooks.php
@@ -55,8 +55,9 @@
return self::getInstance()-confirmEmailUser( $from, $to, 
$subject, $text, $error );
}
 
-   public static function APIGetAllowedParams( $module, $params ) {
-   return self::getInstance()-APIGetAllowedParams( $module, 
$params );
+   // Default $flags to 1 for backwards-compatible behavior
+   public static function APIGetAllowedParams( $module, $params, $flags 
= 1 ) {
+   return self::getInstance()-APIGetAllowedParams( $module, 
$params, $flags );
}
 
public static function APIGetParamDescription( $module, $desc ) {
diff --git a/ReCaptcha.class.php b/ReCaptcha.class.php
index 59b31f4..cd274a9 100644
--- a/ReCaptcha.class.php
+++ b/ReCaptcha.class.php
@@ -81,11 +81,21 @@
return wfMessage( $name, $text )-isDisabled() ? wfMessage( 
'recaptcha-edit' )-text() : $text;
}
 
-   public function APIGetAllowedParams( $module, $params ) {
+   public function APIGetAllowedParams( $module, $params, $flags ) {
+   if ( $flags  $this-isAPICaptchaModule( $module ) ) {
+   $params['recaptcha_challenge_field'] = null;
+   $params['recaptcha_response_field'] = null;
+   }
+
return true;
}
 
public function APIGetParamDescription( $module, $desc ) {
+   if ( $this-isAPICaptchaModule( $module ) ) {
+   $desc['recaptcha_challenge_field'] = 'Field from the 
ReCaptcha widget';
+   $desc['recaptcha_response_field'] = 'Field from the 
ReCaptcha widget';
+   }
+
return true;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8c9a8b882ee3480b71bfb3f2345475506549819
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

[MediaWiki-commits] [Gerrit] Adding debian packaging. linking against libdb, adding upsta... - change (analytics/webstatscollector)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Adding debian packaging. linking against libdb, adding upstart 
conf file
..

Adding debian packaging.
linking against libdb, adding upstart conf file

Change-Id: Iac7b8c73ed87aa5aff3c8e9025d940a2a1367c73
---
M Makefile
A debian/README.debian
A debian/changelog
A debian/compat
A debian/control
A debian/dirs
A debian/files
A debian/links
A debian/rules
A debian/source/format
A webstats-collector.upstart.conf
11 files changed, 81 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/webstatscollector 
refs/changes/00/55900/1

diff --git a/Makefile b/Makefile
index 25451a7..708e24c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 #MacOSX MacPorts library paths
 CFLAGS+=-I/opt/local/include/
-LDFLAGS+=-L/opt/local/lib/ -ldb-4.3 -lpthread
+LDFLAGS+=-L/opt/local/lib/ -ldb -lpthread
 
 #LDFLAGS+=-ldb
 CFLAGS+=-Wall -g
@@ -25,3 +25,7 @@
 
 clean:
rm -f *.o collector filter
+
+install:
+   install collector filter $(DESTDIR)/usr/local/bin
+   install webstats-collector.upstart.conf 
$(DESTDIR)/etc/init/webstats-collector.conf
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 000..25ef8aa
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,8 @@
+The .deb packaging here is in no way an attempt to be good packaging.
+It is a quick and dirty pass at creating an installable webstatscollector 
package that is better than copying Domas' source around and installing it 
manually.
+
+This packaging includes an upstart script from which a collector service can 
be managed.  The collector service uses /a/webstats as its working directory.  
It will output and create a dumps/ directory there.
+
+To build this package:
+
+rm -f ../webstatscollector_0.1.orig.tar.gz  tar -cvzf 
../webstatscollector_0.1.orig.tar.gz .  debuild
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..8155d47
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+webstatscollector (0.1-1) unstable; urgency=low
+
+  * Initial package.
+
+ -- Andrew Otto (WMF) o...@wikimedia.org  Tue, 26 Mar 2013 15:31:54 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..93721a4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: webstatscollector
+Section: unknown
+Priority: extra
+Maintainer: Andrew Otto o...@wikimedia.org
+Build-Depends: debhelper (= 8.0.0), libdb4.8-dev
+Standards-Version: 3.9.2
+
+Package: webstatscollector
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Collects hourly statistics about WMF pageviews.
+ Binaries to collect hourly pageviews that are then
+ published at http://dumps.wikimedia.org/other/pageviews/.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000..a482961
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,6 @@
+usr
+usr/local
+usr/local/bin
+etc/init
+etc/init.d
+a/webstats
diff --git a/debian/files b/debian/files
new file mode 100644
index 000..6a4990d
--- /dev/null
+++ b/debian/files
@@ -0,0 +1,3 @@
+usr/local/bin/collector
+usr/local/bin/filter
+etc/init/webstats-collector.conf
\ No newline at end of file
diff --git a/debian/links b/debian/links
new file mode 100644
index 000..f273b89
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+lib/init/upstart-job etc/init.d/webstats-collector
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..95ec0b4
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+%:
+   dh $@
+
+override_dh_usrlocal:
+   # do nothing
+
+install: build
+   dh_installdirs
+   $(MAKE) install
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/webstats-collector.upstart.conf b/webstats-collector.upstart.conf
new file mode 100644
index 000..0d39fd5
--- /dev/null
+++ b/webstats-collector.upstart.conf
@@ -0,0 +1,17 @@
+# Note: This file is managed by Puppet.
+
+description webstatscollector collector process
+
+start on filesystem
+stop on runlevel 5
+
+respawn
+respawn limit 10 5
+umask 022
+
+setuid nobody
+setgid nogroup
+
+chdir /a/webstats
+
+exec

[MediaWiki-commits] [Gerrit] Remove mw:Placeholder encapsulation for optional newlines - change (mediawiki...Parsoid)

2013-03-26 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Remove mw:Placeholder encapsulation for optional newlines
..

Remove mw:Placeholder encapsulation for optional newlines

It seems that the paragraph handler is now smart enough to handle these
newlines more accurately, so this is no longer needed. Removing these newlines
avoids complications in the serializer, and fixes all semantic rt failures in
1993 NCAA Women's Division I Basketball Tournament. RT testing should
identify problems in the paragraph wrapper, if any.

Change-Id: Ibdb6ad47e2273e7ef2e606a89120d9221bef32f4
---
M js/lib/pegTokenizer.pegjs.txt
1 file changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/01/55901/1

diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index a45fec1..3762b12 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -2149,14 +2149,7 @@
   = spc:(n:[\n\r\t ] ([\n\r]) { return n })*
 {
 if ( spc.length ) {
-// Encapsulate in meta, so that these don't trigger paragraphs, but
-// can still be round-tripped and (potentially) edited.
-return [ new SelfclosingTagTk('meta',
-[new KV('typeof', 'mw:Placeholder')],
-{
-src: spc.join(''),
-tsr: [pos0, pos0 + spc.length]
-} ) ];
+return [spc.join('')];
 } else {
 return [];
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdb6ad47e2273e7ef2e606a89120d9221bef32f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Remove mw:Placeholder encapsulation for optional newlines - change (mediawiki...Parsoid)

2013-03-26 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: Remove mw:Placeholder encapsulation for optional newlines
..


Remove mw:Placeholder encapsulation for optional newlines

It seems that the paragraph handler is now smart enough to handle these
newlines more accurately, so this is no longer needed. Removing these newlines
avoids complications in the serializer, and fixes all semantic rt failures in
1993 NCAA Women's Division I Basketball Tournament. RT testing should
identify problems in the paragraph wrapper, if any.

Change-Id: Ibdb6ad47e2273e7ef2e606a89120d9221bef32f4
---
M js/lib/pegTokenizer.pegjs.txt
1 file changed, 1 insertion(+), 8 deletions(-)

Approvals:
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index a45fec1..3762b12 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -2149,14 +2149,7 @@
   = spc:(n:[\n\r\t ] ([\n\r]) { return n })*
 {
 if ( spc.length ) {
-// Encapsulate in meta, so that these don't trigger paragraphs, but
-// can still be round-tripped and (potentially) edited.
-return [ new SelfclosingTagTk('meta',
-[new KV('typeof', 'mw:Placeholder')],
-{
-src: spc.join(''),
-tsr: [pos0, pos0 + spc.length]
-} ) ];
+return [spc.join('')];
 } else {
 return [];
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb6ad47e2273e7ef2e606a89120d9221bef32f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Adding debian packaging. linking against libdb, adding upsta... - change (analytics/webstatscollector)

2013-03-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding debian packaging. linking against libdb, adding upstart 
conf file
..


Adding debian packaging.
linking against libdb, adding upstart conf file

Change-Id: Iac7b8c73ed87aa5aff3c8e9025d940a2a1367c73
---
M Makefile
A debian/README.debian
A debian/changelog
A debian/compat
A debian/control
A debian/dirs
A debian/files
A debian/links
A debian/rules
A debian/source/format
A webstats-collector.upstart.conf
11 files changed, 81 insertions(+), 1 deletion(-)

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



diff --git a/Makefile b/Makefile
index 25451a7..708e24c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 #MacOSX MacPorts library paths
 CFLAGS+=-I/opt/local/include/
-LDFLAGS+=-L/opt/local/lib/ -ldb-4.3 -lpthread
+LDFLAGS+=-L/opt/local/lib/ -ldb -lpthread
 
 #LDFLAGS+=-ldb
 CFLAGS+=-Wall -g
@@ -25,3 +25,7 @@
 
 clean:
rm -f *.o collector filter
+
+install:
+   install collector filter $(DESTDIR)/usr/local/bin
+   install webstats-collector.upstart.conf 
$(DESTDIR)/etc/init/webstats-collector.conf
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 000..25ef8aa
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,8 @@
+The .deb packaging here is in no way an attempt to be good packaging.
+It is a quick and dirty pass at creating an installable webstatscollector 
package that is better than copying Domas' source around and installing it 
manually.
+
+This packaging includes an upstart script from which a collector service can 
be managed.  The collector service uses /a/webstats as its working directory.  
It will output and create a dumps/ directory there.
+
+To build this package:
+
+rm -f ../webstatscollector_0.1.orig.tar.gz  tar -cvzf 
../webstatscollector_0.1.orig.tar.gz .  debuild
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..8155d47
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+webstatscollector (0.1-1) unstable; urgency=low
+
+  * Initial package.
+
+ -- Andrew Otto (WMF) o...@wikimedia.org  Tue, 26 Mar 2013 15:31:54 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..93721a4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: webstatscollector
+Section: unknown
+Priority: extra
+Maintainer: Andrew Otto o...@wikimedia.org
+Build-Depends: debhelper (= 8.0.0), libdb4.8-dev
+Standards-Version: 3.9.2
+
+Package: webstatscollector
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Collects hourly statistics about WMF pageviews.
+ Binaries to collect hourly pageviews that are then
+ published at http://dumps.wikimedia.org/other/pageviews/.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000..a482961
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,6 @@
+usr
+usr/local
+usr/local/bin
+etc/init
+etc/init.d
+a/webstats
diff --git a/debian/files b/debian/files
new file mode 100644
index 000..6a4990d
--- /dev/null
+++ b/debian/files
@@ -0,0 +1,3 @@
+usr/local/bin/collector
+usr/local/bin/filter
+etc/init/webstats-collector.conf
\ No newline at end of file
diff --git a/debian/links b/debian/links
new file mode 100644
index 000..f273b89
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+lib/init/upstart-job etc/init.d/webstats-collector
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..95ec0b4
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+%:
+   dh $@
+
+override_dh_usrlocal:
+   # do nothing
+
+install: build
+   dh_installdirs
+   $(MAKE) install
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/webstats-collector.upstart.conf b/webstats-collector.upstart.conf
new file mode 100644
index 000..0d39fd5
--- /dev/null
+++ b/webstats-collector.upstart.conf
@@ -0,0 +1,17 @@
+# Note: This file is managed by Puppet.
+
+description webstatscollector collector process
+
+start on filesystem
+stop on runlevel 5
+
+respawn
+respawn limit 10 5
+umask 022
+
+setuid nobody
+setgid nogroup
+
+chdir /a/webstats
+
+exec /usr/local/bin/collector

-- 
To view, visit https://gerrit.wikimedia.org/r/55900
To

[MediaWiki-commits] [Gerrit] mw.loader: Add debugging for mw.loader#canExpandStylesheetWith - change (mediawiki/core)

2013-03-26 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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


Change subject: mw.loader: Add debugging for mw.loader#canExpandStylesheetWith
..

mw.loader: Add debugging for mw.loader#canExpandStylesheetWith

Reports indicate something is incorrectly calling this, causing
uncaught exceptions. This will give us a stracktrace.

Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
---
M resources/mediawiki/mediawiki.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/55902/1

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 2ceb3ea..0d61302 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -461,6 +461,11 @@
 * @return {boolean} False if a new one must be created.
 */
function canExpandStylesheetWith( cssText ) {
+   // Debug hack to trace the source of garbage 
input to mw.loader
+   if ( typeof cssText !== 'string' ) {
+   throw new Error( 'Illegal invokation of 
path mw.loader#canExpandStylesheetWith' );
+   }
+
// Makes sure that cssText containing `@import`
// rules will end up in a new stylesheet (as 
those only work when
// placed at the start of a stylesheet; bug 
35562).

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.loader: Add debugging for mw.loader#canExpandStylesheetWith - change (mediawiki/core)

2013-03-26 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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


Change subject: mw.loader: Add debugging for mw.loader#canExpandStylesheetWith
..

mw.loader: Add debugging for mw.loader#canExpandStylesheetWith

Reports indicate something is incorrectly calling this, causing
uncaught exceptions. This will give us a stracktrace.

Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
---
M resources/mediawiki/mediawiki.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/55903/1

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 2ceb3ea..0d61302 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -461,6 +461,11 @@
 * @return {boolean} False if a new one must be created.
 */
function canExpandStylesheetWith( cssText ) {
+   // Debug hack to trace the source of garbage 
input to mw.loader
+   if ( typeof cssText !== 'string' ) {
+   throw new Error( 'Illegal invokation of 
path mw.loader#canExpandStylesheetWith' );
+   }
+
// Makes sure that cssText containing `@import`
// rules will end up in a new stylesheet (as 
those only work when
// placed at the start of a stylesheet; bug 
35562).

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Krinkle ttij...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.loader: Add debugging for mw.loader#canExpandStylesheetWith - change (mediawiki/core)

2013-03-26 Thread Krinkle (Code Review)

Krinkle has submitted this change and it was merged.

Change subject: mw.loader: Add debugging for mw.loader#canExpandStylesheetWith
..


mw.loader: Add debugging for mw.loader#canExpandStylesheetWith

Reports indicate something is incorrectly calling this, causing
uncaught exceptions. This will give us a stracktrace.

Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
---
M resources/mediawiki/mediawiki.js
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 2ceb3ea..0d61302 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -461,6 +461,11 @@
 * @return {boolean} False if a new one must be created.
 */
function canExpandStylesheetWith( cssText ) {
+   // Debug hack to trace the source of garbage 
input to mw.loader
+   if ( typeof cssText !== 'string' ) {
+   throw new Error( 'Illegal invokation of 
path mw.loader#canExpandStylesheetWith' );
+   }
+
// Makes sure that cssText containing `@import`
// rules will end up in a new stylesheet (as 
those only work when
// placed at the start of a stylesheet; bug 
35562).

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34a488247186677f3bb627a2f1dc4faac4dd2e9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf12
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update cronjobs for wikidata - change (operations/puppet)

2013-03-26 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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


Change subject: Update cronjobs for wikidata
..

Update cronjobs for wikidata

Change-Id: I8de0ed35e78403ab491d8dbe62a679ffa1aad819
---
M manifests/misc/maintenance.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/55904/1

diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 37c9e32..a35d381 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -240,7 +240,7 @@
 class misc::maintenance::wikidata( $enabled = inline_template(%= $::site == 
$::primary_site  %) ) {
cron {
wikibase-repo-prune:
-   command = /usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki 
--number-of-days=1 21  /var/log/wikidata/prune.log,
+   command = /usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki 
--number-of-days=3 21  /var/log/wikidata/prune.log,
user = mwdeploy,
minute = [0,15,30,45],
ensure = $enabled ?{
@@ -254,7 +254,7 @@
# This handles inserting jobs into client job queue, which then process 
the changes
cron {
wikibase-dispatch-changes:
-   command = /usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 300 21  /var/log/wikidata/dispatcher.log,
+   command = /usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 900 21  /var/log/wikidata/dispatcher.log,
user = mwdeploy,
minute = */5,
ensure = $enabled ?{
@@ -266,9 +266,9 @@
 
 cron {
 wikibase-dispatch-changes2:
-   command = /usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 420 21  /var/log/wikidata/dispatcher2.log,
+   command = /usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 900 21  /var/log/wikidata/dispatcher2.log,
user = mwdeploy,
-   minute = */7,
+   minute = */5,
ensure = $enabled ?{
true = present,
false = absent,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de0ed35e78403ab491d8dbe62a679ffa1aad819
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Show File usage on other wikis section - change (mediawiki...TimedMediaHandler)

2013-03-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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


Change subject: Show File usage on other wikis section
..

Show File usage on other wikis section

Both, GlobalUsage and TimedMediaText, hook into 'ImagePageAfterImageLinks'
But TimedMediaText reinitialize the hook variable $html therefore the text
of GlobalUsage is lost.

UNTESTED patch

Bug:46568
Change-Id: Ife93523fa00a1529f0765c757d59d2fa08563f50
---
M TimedMediaHandler.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 635a402..1807d86 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -229,7 +229,7 @@
// load the file:
$file = wfFindFile( $article-getTitle() );
if( self::isTranscodableFile( $file ) ){
-   $html = TranscodeStatusTable::getHTML( $file );
+   $html .= TranscodeStatusTable::getHTML( $file );
}
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife93523fa00a1529f0765c757d59d2fa08563f50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Make AFTv5 watchlist configurable - change (mediawiki...ArticleFeedbackv5)

2013-03-26 Thread Bsitu (Code Review)

Bsitu has submitted this change and it was merged.

Change subject: Make AFTv5 watchlist configurable
..


Make AFTv5 watchlist configurable

Change-Id: I65568456a23f2b0d54ccc254caaa24c1551b5506
---
M ArticleFeedbackv5.hooks.php
M ArticleFeedbackv5.php
M SpecialArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
5 files changed, 15 insertions(+), 6 deletions(-)

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



diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index 7b7d795..703ffef 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -216,6 +216,7 @@
$wgArticleFeedbackv5ThrottleThresholdPostsPerHour,
$wgArticleFeedbackv5TalkPageLink,
$wgArticleFeedbackv5WatchlistLink,
+   $wgArticleFeedbackv5Watchlist,
$wgArticleFeedbackv5DefaultSorts,
$wgArticleFeedbackv5LotteryOdds,
$wgArticleFeedbackv5MaxCommentLength;
@@ -234,6 +235,7 @@
$vars['wgArticleFeedbackv5SpecialWatchlistUrl'] = 
SpecialPage::getTitleFor( 'ArticleFeedbackv5Watchlist' )-getPrefixedText();
$vars['wgArticleFeedbackv5TalkPageLink'] = 
$wgArticleFeedbackv5TalkPageLink;
$vars['wgArticleFeedbackv5WatchlistLink'] = 
$wgArticleFeedbackv5WatchlistLink;
+   $vars['wgArticleFeedbackv5Watchlist'] = 
$wgArticleFeedbackv5Watchlist;
$vars['wgArticleFeedbackv5DefaultSorts'] = 
$wgArticleFeedbackv5DefaultSorts;
$vars['wgArticleFeedbackv5LotteryOdds'] = 
$wgArticleFeedbackv5LotteryOdds;
$vars['wgArticleFeedbackv5MaxCommentLength'] = 
$wgArticleFeedbackv5MaxCommentLength;
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index 36b8a11..56863e5 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -126,6 +126,9 @@
 // Defines whether or not there should be a link to the watchlisted feedback 
on the watchlist page
 $wgArticleFeedbackv5WatchlistLink = true;
 
+// Defines whether or not the special page for feedback on a user's 
watchlisted pages is enabled
+$wgArticleFeedbackv5Watchlist = true;
+
 // Email address to send oversight request emails to, if set to null no emails 
are sent
 $wgArticleFeedbackv5OversightEmails = null;
 
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index 860ef77..f4cecb8 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -338,8 +338,9 @@
 
// if we have a logged in user and are currently browsing the 
central feedback page,
// check if there is feedback on his/her watchlisted pages
+   global $wgArticleFeedbackv5Watchlist;
$watchlistLink = '';
-   if ( !$this-pageId  $user-getId() ) {
+   if ( $wgArticleFeedbackv5Watchlist  !$this-pageId  
$user-getId() ) {
$records = ArticleFeedbackv5Model::getWatchlistList(
'unreviewed',
$user
diff --git a/SpecialArticleFeedbackv5Watchlist.php 
b/SpecialArticleFeedbackv5Watchlist.php
index 7bbe1c5..9cbf3ad 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -39,11 +39,14 @@
 * @param $param string the parameter passed in the url
 */
public function execute( $param ) {
+   global $wgArticleFeedbackv5Watchlist;
+
$user = $this-getUser();
$out = $this-getOutput();
 
-   if ( $user-isAnon() ) {
-   $out-redirect(SpecialPage::getTitleFor( 
'ArticleFeedbackv5' )-getFullUrl());
+   // if watchlist not enabled or anon user is visiting, redirect 
to central feedback page
+   if ( !$wgArticleFeedbackv5Watchlist || $user-isAnon() ) {
+   $out-redirect( SpecialPage::getTitleFor( 
'ArticleFeedbackv5' )-getFullUrl() );
}
 
parent::execute( $param );
diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js 
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
index 2bcdf56..a73be16 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
@@ -5,8 +5,8 @@
 /*** Main entry point ***/
 jQuery( function( $ ) {
 
-   // Check if the talk page link can be shown
-   if ( mw.config.get( 'wgArticleFeedbackv5WatchlistLink' ) ) {
+   // Check if the watchlist is enabled  link can be shown
+   if ( mw.config.get( 'wgArticleFeedbackv5Watchlist' )  mw.config.get( 
'wgArticleFeedbackv5WatchlistLink' ) ) {
 
// Check if we're not dealing with anon user

[MediaWiki-commits] [Gerrit] (Bug 46419) New: By using Discuss on talk page the page ge... - change (mediawiki...ArticleFeedbackv5)

2013-03-26 Thread Bsitu (Code Review)

Bsitu has submitted this change and it was merged.

Change subject: (Bug 46419) New: By using Discuss on talk page the page gets 
unwatched
..


(Bug 46419) New: By using Discuss on talk page the page gets unwatched

Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d
---
M ArticleFeedbackv5.render.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Bsitu: Verified; Looks good to me, approved
  Se4598: Looks good to me, but someone else must approve



diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index f6adce6..fc1a5a8 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -931,7 +931,8 @@

'data-section-title' = $sectionTitleTruncated,

'data-section-content' = $sectionContent,

'data-section-edittime' = wfTimestampNow(),
-   
'data-section-edittoken' = $wgUser-getEditToken()
+   
'data-section-edittoken' = $wgUser-getEditToken(),
+   
'data-section-watchlist' = (int) $wgUser-isWatched( $discussPage )
),
wfMessage( 
articlefeedbackv5-form-$action-$discussType . ( $sectionExists ? '-exists' : 
'' ) )-text()
)
diff --git 
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 1147a70..6ad65c6 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -1744,6 +1744,7 @@
var content = $( e.target ).data( 
'section-content' );
var editTime = $( e.target ).data( 
'section-edittime' );
var editToken = $( e.target ).data( 
'section-edittoken' );
+   var watchlist = $( e.target ).data( 
'section-watchlist' );
 
var $form = $( '\
form method=post\
@@ -1753,6 +1754,7 @@
input type=hidden 
name=wpStarttime /\
input type=hidden 
name=wpEditToken /\
input type=hidden 
name=wpPreview /\
+   input type=hidden 
name=wpWatchthis /\
input type=submit /\
/form' );
 
@@ -1763,6 +1765,7 @@
$( '[name=wpStarttime]', $form ).val( 
editTime );
$( '[name=wpEditToken]', $form ).val( 
editToken );
$( '[name=wpPreview]', $form ).val( 1 );
+   $( '[name=wpWatchthis]', $form ).val( 
watchlist );
 
$( e.target ).append( $form );
$form

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Se4598 se4...@gmx.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] [Wikibase] Register special page alias file for the client - change (translatewiki)

2013-03-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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


Change subject: [Wikibase] Register special page alias file for the client
..

[Wikibase] Register special page alias file for the client

Change-Id: I4fa5fc662cfdabcf2af30edbbae489a91e36d4d1
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/06/55906/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 3371fb9..cbc9897 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1608,6 +1608,7 @@
 
 Wikibase - Client
 file = Wikibase/client/WikibaseClient.i18n.php
+aliasfile = Wikibase/client/WikibaseClient.i18n.alias.php
 magicfile = Wikibase/client/WikibaseClient.i18n.magic.php
 descmsg = wbc-desc
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fa5fc662cfdabcf2af30edbbae489a91e36d4d1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] [Wikibase] Register special page alias file for the client - change (translatewiki)

2013-03-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [Wikibase] Register special page alias file for the client
..


[Wikibase] Register special page alias file for the client

Change-Id: I4fa5fc662cfdabcf2af30edbbae489a91e36d4d1
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 3371fb9..cbc9897 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1608,6 +1608,7 @@
 
 Wikibase - Client
 file = Wikibase/client/WikibaseClient.i18n.php
+aliasfile = Wikibase/client/WikibaseClient.i18n.alias.php
 magicfile = Wikibase/client/WikibaseClient.i18n.magic.php
 descmsg = wbc-desc
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fa5fc662cfdabcf2af30edbbae489a91e36d4d1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com

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

1 2 3 >

1 - 100 of 285 matches

Mail list logo