[MediaWiki-commits] [Gerrit] Rem unused method - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Mwjames (Code Review)
Mwjames has uploaded a new change for review.

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


Change subject: Rem unused method
..

Rem unused method

Change-Id: I7c04f1c8a2e07f2b1e260d859353ad443f88cd2a
---
M includes/cache/CacheHandler.php
M includes/dic/SimpleDependencyBuilder.php
M tests/phpunit/includes/cache/CacheHandlerTest.php
3 files changed, 56 insertions(+), 78 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki 
refs/changes/06/93306/1

diff --git a/includes/cache/CacheHandler.php b/includes/cache/CacheHandler.php
index ae6e346..38500e7 100644
--- a/includes/cache/CacheHandler.php
+++ b/includes/cache/CacheHandler.php
@@ -6,20 +6,14 @@
 use BagOStuff;
 
 /**
- * This class is handling access to cacheable entities
+ * Encapsulate access to MW's BagOStuff class
  *
- * @file
+ * @ingroup SMW
  *
- * @license GNU GPL v2+
- * @since   1.9
+ * @licence GNU GPL v2+
+ * @since 1.9
  *
  * @author mwjames
- */
-
-/**
- * This class is handling access to cacheable entities
- *
- * @ingroup Handler
  */
 class CacheHandler {
 
@@ -28,9 +22,6 @@
 
/** @var string */
protected $key = false;
-
-   /** @var string */
-   protected $prefix;
 
/** @var boolean */
protected $cacheEnabled = false;
@@ -54,7 +45,7 @@
 *
 * @par Example:
 * @code
-*  $cache = new CacheHandler::newFromId()-key( 'Foo', 'Bar' )
+*  $cache = new CacheHandler::newFromId()-setkey( new 
CachIdGenerator( 'Foo' ) )
 *
 *  $cache-set( 'CacheableObject' )
 *  $cache-get() returns 'CacheableObject'
@@ -92,7 +83,6 @@
$cache = new self;
}
 
-   $cache-setCachePrefix( $GLOBALS['wgCachePrefix'] === 
false ? wfWikiID() : $GLOBALS['wgCachePrefix'] );
$cache-setCacheEnabled( true );
 
self::$instance[$cacheType] = $cache;
@@ -135,27 +125,6 @@
 */
public function getCache() {
return $this-cache;
-   }
-
-   /**
-* Generates and invokes a concatenated string containing 
prefix:smw:key
-*
-* @par Example:
-* @code
-*  $cache = new CacheHandler::newFromId()
-*
-*  $cache-key( 'Foo', 'Bar' ) generates prefix:smw:Foo:Bar
-* @endcode
-*
-* @since 1.9
-*
-* @param varargs
-*
-* @return CacheHandler
-*/
-   public function key( /* ... */ ) {
-   $this-key = $this-prefix . ':' . 'smw' . ':' . str_replace( ' 
', '_', implode( ':', func_get_args() ) );
-   return $this;
}
 
/**
@@ -210,22 +179,6 @@
 */
public function setCacheEnabled( $cacheEnabled ) {
$this-cacheEnabled = $this-getCache() instanceof BagOStuff ? 
(bool)$cacheEnabled : false;
-   return $this;
-   }
-
-   /**
-* Sets cache prefix
-*
-* @see $wgCachePrefix
-*
-* @since 1.9
-*
-* @param string $prefix
-*
-* @return CacheHandler
-*/
-   public function setCachePrefix( $prefix ) {
-   $this-prefix = $prefix;
return $this;
}
 
diff --git a/includes/dic/SimpleDependencyBuilder.php 
b/includes/dic/SimpleDependencyBuilder.php
index b1e2546..38c064f 100644
--- a/includes/dic/SimpleDependencyBuilder.php
+++ b/includes/dic/SimpleDependencyBuilder.php
@@ -279,7 +279,7 @@
}
 
if ( $objectScope === DependencyObject::SCOPE_SINGLETON ) {
-   $objectSignature = $this-singelton( $objectName, 
$objectSignature );
+   $objectSignature = $this-singleton( $objectName, 
$objectSignature );
}
 
$instance = is_callable( $objectSignature ) ? $objectSignature( 
$this ) : $objectSignature;
@@ -304,7 +304,7 @@
 *
 * @return Closure
 */
-   private function singelton( $objectName, $objectSignature ) {
+   private function singleton( $objectName, $objectSignature ) {
 
$objectName = 'sing_' . $objectName;
 
diff --git a/tests/phpunit/includes/cache/CacheHandlerTest.php 
b/tests/phpunit/includes/cache/CacheHandlerTest.php
index 67d5734..94bd045 100644
--- a/tests/phpunit/includes/cache/CacheHandlerTest.php
+++ b/tests/phpunit/includes/cache/CacheHandlerTest.php
@@ -35,7 +35,7 @@
 *
 * @return CacheHandler
 */
-   private function getInstance() {
+   private function newInstance() {
return new CacheHandler( new HashBagOStuff );
}
 
@@ -43,8 +43,8 @@
 * @since 1.9
 */
public function testConstructor() {
-   $this-assertInstanceOf( $this-getClass(), 
$this-getInstance() );
-   

[MediaWiki-commits] [Gerrit] don't normalize amount if it doesn't exist - change (wikimedia...crm)

2013-11-03 Thread Adamw (Code Review)
Adamw has uploaded a new change for review.

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


Change subject: don't normalize amount if it doesn't exist
..

don't normalize amount if it doesn't exist

Some messages don't have an amount and currency.  So just chill.

Change-Id: I9b977ba3f54ddbcd95c216748805f3557ef485c4
---
M sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/07/93307/1

diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
index 042c253..995f692 100644
--- a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
@@ -567,7 +567,12 @@
  * @return array
  */
 function wmf_civicrm_normalize_contribution_amounts( $msg ) {
-
+
+if ( empty( $msg['gross'] ) or empty( $msg['currency'] ) ) {
+// just... don't
+return $msg;
+}
+
 if ( empty( $msg['original_gross'] ) ) {
 $msg['original_gross'] = $msg['gross'];
 }
@@ -589,7 +594,7 @@
 $settlement_convert = exchange_rate_convert($msg['original_currency'], 
1, $msg['date']) / exchange_rate_convert($settlement_currency, 1, $msg['date']);
 }
 catch (Exception $ex) {
-wmf_common_failmail( 'wmf_civicrm', UNKNOWN_CURRENCY: exchange rate 
will be fudged as '1':  . $ex-getMessage(), $msg );
+wmf_common_failmail( 'wmf_civicrm', UNKNOWN_CURRENCY: exchange rate 
for '{$msg['original_currency']}' will be fudged as '1':  . $ex-getMessage(), 
$msg );
 $settlement_convert = 1;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b977ba3f54ddbcd95c216748805f3557ef485c4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Rem unused method - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Rem unused method
..


Rem unused method

Change-Id: I7c04f1c8a2e07f2b1e260d859353ad443f88cd2a
---
M includes/cache/CacheHandler.php
M includes/dic/SimpleDependencyBuilder.php
M tests/phpunit/includes/cache/CacheHandlerTest.php
3 files changed, 56 insertions(+), 78 deletions(-)

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



diff --git a/includes/cache/CacheHandler.php b/includes/cache/CacheHandler.php
index ae6e346..38500e7 100644
--- a/includes/cache/CacheHandler.php
+++ b/includes/cache/CacheHandler.php
@@ -6,20 +6,14 @@
 use BagOStuff;
 
 /**
- * This class is handling access to cacheable entities
+ * Encapsulate access to MW's BagOStuff class
  *
- * @file
+ * @ingroup SMW
  *
- * @license GNU GPL v2+
- * @since   1.9
+ * @licence GNU GPL v2+
+ * @since 1.9
  *
  * @author mwjames
- */
-
-/**
- * This class is handling access to cacheable entities
- *
- * @ingroup Handler
  */
 class CacheHandler {
 
@@ -28,9 +22,6 @@
 
/** @var string */
protected $key = false;
-
-   /** @var string */
-   protected $prefix;
 
/** @var boolean */
protected $cacheEnabled = false;
@@ -54,7 +45,7 @@
 *
 * @par Example:
 * @code
-*  $cache = new CacheHandler::newFromId()-key( 'Foo', 'Bar' )
+*  $cache = new CacheHandler::newFromId()-setkey( new 
CachIdGenerator( 'Foo' ) )
 *
 *  $cache-set( 'CacheableObject' )
 *  $cache-get() returns 'CacheableObject'
@@ -92,7 +83,6 @@
$cache = new self;
}
 
-   $cache-setCachePrefix( $GLOBALS['wgCachePrefix'] === 
false ? wfWikiID() : $GLOBALS['wgCachePrefix'] );
$cache-setCacheEnabled( true );
 
self::$instance[$cacheType] = $cache;
@@ -135,27 +125,6 @@
 */
public function getCache() {
return $this-cache;
-   }
-
-   /**
-* Generates and invokes a concatenated string containing 
prefix:smw:key
-*
-* @par Example:
-* @code
-*  $cache = new CacheHandler::newFromId()
-*
-*  $cache-key( 'Foo', 'Bar' ) generates prefix:smw:Foo:Bar
-* @endcode
-*
-* @since 1.9
-*
-* @param varargs
-*
-* @return CacheHandler
-*/
-   public function key( /* ... */ ) {
-   $this-key = $this-prefix . ':' . 'smw' . ':' . str_replace( ' 
', '_', implode( ':', func_get_args() ) );
-   return $this;
}
 
/**
@@ -210,22 +179,6 @@
 */
public function setCacheEnabled( $cacheEnabled ) {
$this-cacheEnabled = $this-getCache() instanceof BagOStuff ? 
(bool)$cacheEnabled : false;
-   return $this;
-   }
-
-   /**
-* Sets cache prefix
-*
-* @see $wgCachePrefix
-*
-* @since 1.9
-*
-* @param string $prefix
-*
-* @return CacheHandler
-*/
-   public function setCachePrefix( $prefix ) {
-   $this-prefix = $prefix;
return $this;
}
 
diff --git a/includes/dic/SimpleDependencyBuilder.php 
b/includes/dic/SimpleDependencyBuilder.php
index b1e2546..38c064f 100644
--- a/includes/dic/SimpleDependencyBuilder.php
+++ b/includes/dic/SimpleDependencyBuilder.php
@@ -279,7 +279,7 @@
}
 
if ( $objectScope === DependencyObject::SCOPE_SINGLETON ) {
-   $objectSignature = $this-singelton( $objectName, 
$objectSignature );
+   $objectSignature = $this-singleton( $objectName, 
$objectSignature );
}
 
$instance = is_callable( $objectSignature ) ? $objectSignature( 
$this ) : $objectSignature;
@@ -304,7 +304,7 @@
 *
 * @return Closure
 */
-   private function singelton( $objectName, $objectSignature ) {
+   private function singleton( $objectName, $objectSignature ) {
 
$objectName = 'sing_' . $objectName;
 
diff --git a/tests/phpunit/includes/cache/CacheHandlerTest.php 
b/tests/phpunit/includes/cache/CacheHandlerTest.php
index 67d5734..94bd045 100644
--- a/tests/phpunit/includes/cache/CacheHandlerTest.php
+++ b/tests/phpunit/includes/cache/CacheHandlerTest.php
@@ -35,7 +35,7 @@
 *
 * @return CacheHandler
 */
-   private function getInstance() {
+   private function newInstance() {
return new CacheHandler( new HashBagOStuff );
}
 
@@ -43,8 +43,8 @@
 * @since 1.9
 */
public function testConstructor() {
-   $this-assertInstanceOf( $this-getClass(), 
$this-getInstance() );
-   $this-assertInstanceOf( 'BagOStuff', 

[MediaWiki-commits] [Gerrit] Add uoi_user_registration for PostgreSQL - change (mediawiki...OpenID)

2013-11-03 Thread Wikinaut (Code Review)
Wikinaut has submitted this change and it was merged.

Change subject: Add uoi_user_registration for PostgreSQL
..


Add uoi_user_registration for PostgreSQL

* bump version 3.43 20131103
* added uoi_user_registration field to the user_openid table
* provide separate schema update functions for MySQL and PostgreSQL,
  bail explicitly on other databases
* use database-specific timestamp conversion

Bug: 34844
Bug: 34846
Change-Id: I0c102e270e261c5da89247c6f43ee3b2bf3bb10d
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
M README
M SpecialOpenID.body.php
M TODO
M patches/openid_table.pg.sql
7 files changed, 43 insertions(+), 6 deletions(-)

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



diff --git a/CHANGES b/CHANGES
index a71999b..b2b0d5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 CHANGES
 ===
 
+3.43  20131103  bug 34844 and 34846
+add uoi_user_registration for PostgreSQL
+add uoi_user_registration field to the user_openid table
+separate schema update functions for MySQL and PostgreSQL
+bail explicitly on other databases
+database-specific timestamp
 3.42  20131004  fixed a problem with label text on the preferences tab.
 inverted internal hide/show OpenID property name,
 but kept the default meaning show OpenID on user pages
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 87cb650..8341680 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -471,6 +471,21 @@
 * @return bool
 */
public static function onLoadExtensionSchemaUpdates( $updater = null ) {
+   switch ( $updater-getDB()-getType() ) {
+   case mysql:
+   return self::MySQLSchemaUpdates( $updater );
+   case postgres:
+   return self::PostgreSQLSchemaUpdates( $updater );
+   default:
+   throw new MWException(OpenID does not support 
{$updater-getDB()-getType()} yet.);
+   }
+   }
+
+   /**
+* @param $updater MysqlUpdater
+* @return bool
+*/
+   public static function MySQLSchemaUpdates( $updater = null ) {
// = 1.17 support
$updater-addExtensionTable( 'user_openid',
dirname( __FILE__ ) . '/patches/openid_table.sql' );
@@ -495,6 +510,22 @@
}
 
/**
+* @param $updater PostgresUpdater
+* @return bool
+*/
+   public static function PostgreSQLSchemaUpdates( $updater = null ) {
+   $base = dirname( __FILE__ ) . '/patches';
+   foreach ( array (
+   array( 'addTable', 'user_openid', $base . 
'/openid_table.pg.sql', true ),
+   array( 'addPgField', 'user_openid', 
'uoi_user_registration', 'TIMESTAMPTZ' ),
+   ) as $update ) {
+   $updater-addExtensionUpdate( $update );
+   }
+
+   return true;
+   }
+
+   /**
 * @return string
 */
private static function getOpenIDSmallLogoUrl() {
diff --git a/OpenID.php b/OpenID.php
index f6a9a08..f67fcce 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
 }
 
-define( 'MEDIAWIKI_OPENID_VERSION', '3.42 20131004' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.43 20131103' );
 
 $path = dirname( __FILE__ );
 set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . 
get_include_path() );
@@ -417,7 +417,6 @@
 $wgHooks['ArticleViewHeader'][] = 'OpenIDHooks::onArticleViewHeader';
 $wgHooks['SpecialPage_initList'][] = 'OpenIDHooks::onSpecialPage_initList';
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'OpenIDHooks::onLoadExtensionSchemaUpdates';
-
 $wgHooks['DeleteAccount'][] = 'OpenIDHooks::onDeleteAccount';
 $wgHooks['MergeAccountFromTo'][] = 'OpenIDHooks::onMergeAccountFromTo';
 
diff --git a/README b/README
index 6519555..6081f53 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 MediaWiki OpenID extension README
-version 3.41 20131003
+version 3.43 20131103
 
 Homepage and manual
 http://www.mediawiki.org/wiki/Extension:OpenID
diff --git a/SpecialOpenID.body.php b/SpecialOpenID.body.php
index 3ab236d..2c49437 100644
--- a/SpecialOpenID.body.php
+++ b/SpecialOpenID.body.php
@@ -475,7 +475,7 @@
array(
'uoi_user' = $user-getId(),
'uoi_openid' = $url,
-   'uoi_user_registration' = wfTimestamp( TS_MW )
+   'uoi_user_registration' = $dbw-timestamp()
),
__METHOD__
);
diff --git a/TODO b/TODO
index 983529b..3687822 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 TO-DO LIST
-Status: 3.30 20130505
+Status: 3.43 20131103
 
 Bugs

[MediaWiki-commits] [Gerrit] Cache donate.wikimedia.org in ulsfo as well - change (operations/dns)

2013-11-03 Thread Mark Bergsma (Code Review)
Mark Bergsma has submitted this change and it was merged.

Change subject: Cache donate.wikimedia.org in ulsfo as well
..


Cache donate.wikimedia.org in ulsfo as well

Change-Id: Iff7cad5481fca144dd7649876990583d78ee572c
---
M config-geo
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/config-geo b/config-geo
index c753786..797a655 100644
--- a/config-geo
+++ b/config-geo
@@ -235,11 +235,12 @@
}
}
donate = {
-   map = generic-map
+   map = ulsfo-migration-map
dcmap = {
pmtpa = donate-lb.pmtpa.wikimedia.org.
eqiad = donate-lb.eqiad.wikimedia.org.
esams = donate-lb.esams.wikimedia.org.
+   ulsfo = donate-lb.ulsfo.wikimedia.org.
}
}
# text

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff7cad5481fca144dd7649876990583d78ee572c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Fold ulsfo-migration-map changes into generic-map - change (operations/dns)

2013-11-03 Thread Mark Bergsma (Code Review)
Mark Bergsma has uploaded a new change for review.

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


Change subject: Fold ulsfo-migration-map changes into generic-map
..

Fold ulsfo-migration-map changes into generic-map

The ulsfo migration is now complete, and geodns is consistent
across all geodns records again. Therefore we no longer need
the ulsfo-migration map.

Change-Id: I36298fd2e6f622e4886cd9fc610e912db9bb54b9
---
M config-geo
1 file changed, 26 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/08/93308/1

diff --git a/config-geo b/config-geo
index 797a655..48ffe25 100644
--- a/config-geo
+++ b/config-geo
@@ -3,112 +3,6 @@
generic-map = {
geoip_db = /usr/share/GeoIP/GeoIPv6.dat
geoip_db_v4_overlay = /usr/share/GeoIP/GeoIP.dat
-   datacenters = [eqiad pmtpa esams]
-   map = {
-   # use ISO 3166-2 official names
-   AF = esams,
-   AS = {
-   AE = esams, # United Arab Emirates
-   AM = esams, # Armenia
-   AZ = esams, # Azerbaijan
-   BH = esams, # Bahrain
-   CN = eqiad, # China
-   CY = esams, # Cyprus
-   GE = esams, # Georgia
-   IL = esams, # Israel
-   IQ = esams, # Iraq
-   IR = esams, # Iran (Islamic Republic 
of)
-   JO = esams, # Jordan
-   JP = eqiad, # Japan
-   KH = eqiad, # Cambodia
-   KP = eqiad, # Korea, Democratic 
People's Republic of
-   KR = eqiad, # Korea, Republic of
-   KW = esams, # Kuwait
-   LA = eqiad, # Lao People's Democratic 
Republic
-   LB = esams, # Lebanon
-   MN = eqiad, # Mongolia
-   MY = eqiad, # Malaysia
-   OM = esams, # Oman
-   PH = eqiad, # Philippines
-   PS = esams, # Palestine, State of
-   QA = esams, # Qatar
-   SA = esams, # Saudi Arabia
-   SG = eqiad, # Singapore
-   SY = esams, # Syrian Arab Republic
-   TH = eqiad, # Thailand
-   TW = eqiad, # Taiwan, Province of China
-   VN = eqiad, # Viet Nam
-   YE = esams, # Yemen
-   },
-   EU = {
-   AD = esams, # Andorra
-   AL = esams, # Albania
-   AT = esams, # Austria
-   AX = esams, # Åland Islands
-   BA = esams, # Bosnia and Herzegowina
-   BE = esams, # Belgium
-   BG = esams, # Bulgaria
-   BY = esams, # Belarus
-   CH = esams, # Switzerland
-   CZ = esams, # Czech Republic
-   DE = esams, # Germany
-   DK = esams, # Denmark
-   EE = esams, # Estonia
-   ES = esams, # Spain
-   EU = esams, # Europe
-   FI = esams, # Finland
-   FO = esams, # Faroe Islands
-   FR = esams, # France
-   GB = esams, # United Kingdom
-   GG = esams, # Guernsey
-   GI = esams, # Gibraltar
-   GR = esams, # Greece
-   HR = esams, # Croatia (local name 
Hrvatska)
-   HU = esams, # Hungary
-   IE = esams, # Ireland
-   IM = esams, # Isle of Man
- 

[MediaWiki-commits] [Gerrit] Fold ulsfo-migration-map changes into generic-map - change (operations/dns)

2013-11-03 Thread Mark Bergsma (Code Review)
Mark Bergsma has submitted this change and it was merged.

Change subject: Fold ulsfo-migration-map changes into generic-map
..


Fold ulsfo-migration-map changes into generic-map

The ulsfo migration is now complete, and geodns is consistent
across all geodns records again. Therefore we no longer need
the ulsfo-migration map.

Change-Id: I36298fd2e6f622e4886cd9fc610e912db9bb54b9
---
M config-geo
1 file changed, 26 insertions(+), 124 deletions(-)

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



diff --git a/config-geo b/config-geo
index 797a655..48ffe25 100644
--- a/config-geo
+++ b/config-geo
@@ -3,112 +3,6 @@
generic-map = {
geoip_db = /usr/share/GeoIP/GeoIPv6.dat
geoip_db_v4_overlay = /usr/share/GeoIP/GeoIP.dat
-   datacenters = [eqiad pmtpa esams]
-   map = {
-   # use ISO 3166-2 official names
-   AF = esams,
-   AS = {
-   AE = esams, # United Arab Emirates
-   AM = esams, # Armenia
-   AZ = esams, # Azerbaijan
-   BH = esams, # Bahrain
-   CN = eqiad, # China
-   CY = esams, # Cyprus
-   GE = esams, # Georgia
-   IL = esams, # Israel
-   IQ = esams, # Iraq
-   IR = esams, # Iran (Islamic Republic 
of)
-   JO = esams, # Jordan
-   JP = eqiad, # Japan
-   KH = eqiad, # Cambodia
-   KP = eqiad, # Korea, Democratic 
People's Republic of
-   KR = eqiad, # Korea, Republic of
-   KW = esams, # Kuwait
-   LA = eqiad, # Lao People's Democratic 
Republic
-   LB = esams, # Lebanon
-   MN = eqiad, # Mongolia
-   MY = eqiad, # Malaysia
-   OM = esams, # Oman
-   PH = eqiad, # Philippines
-   PS = esams, # Palestine, State of
-   QA = esams, # Qatar
-   SA = esams, # Saudi Arabia
-   SG = eqiad, # Singapore
-   SY = esams, # Syrian Arab Republic
-   TH = eqiad, # Thailand
-   TW = eqiad, # Taiwan, Province of China
-   VN = eqiad, # Viet Nam
-   YE = esams, # Yemen
-   },
-   EU = {
-   AD = esams, # Andorra
-   AL = esams, # Albania
-   AT = esams, # Austria
-   AX = esams, # Åland Islands
-   BA = esams, # Bosnia and Herzegowina
-   BE = esams, # Belgium
-   BG = esams, # Bulgaria
-   BY = esams, # Belarus
-   CH = esams, # Switzerland
-   CZ = esams, # Czech Republic
-   DE = esams, # Germany
-   DK = esams, # Denmark
-   EE = esams, # Estonia
-   ES = esams, # Spain
-   EU = esams, # Europe
-   FI = esams, # Finland
-   FO = esams, # Faroe Islands
-   FR = esams, # France
-   GB = esams, # United Kingdom
-   GG = esams, # Guernsey
-   GI = esams, # Gibraltar
-   GR = esams, # Greece
-   HR = esams, # Croatia (local name 
Hrvatska)
-   HU = esams, # Hungary
-   IE = esams, # Ireland
-   IM = esams, # Isle of Man
-   IS = 

[MediaWiki-commits] [Gerrit] Fix fatal error in non-Vector skins by removing nav tabs - change (mediawiki...Translate)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix fatal error in non-Vector skins by removing nav tabs
..


Fix fatal error in non-Vector skins by removing nav tabs

It is slow and complex and doesn't work nicely with the new
translation interface.

Bug: 56409
Change-Id: Ib093dd67d79181fecf06f4dca5a1c02d0540085e
---
M Translate.i18n.php
M Translate.php
M TranslateEditAddons.php
3 files changed, 0 insertions(+), 137 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Translate.i18n.php b/Translate.i18n.php
index 7ef775f..160929a 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -82,9 +82,6 @@
'translate-edit-tmmatch' = '$1% match',
'translate-use-suggestion' = 'Replace current translation with this 
suggestion.',
 
-   'translate-edit-tab-prev' = '',
-   'translate-edit-tab-next' = '',
-   'translate-edit-tab-list' = 'Message list',
'translate-edit-nopermission' = 'You need permission to translate 
messages.',
'translate-edit-askpermission' = 'Request permission',
 
diff --git a/Translate.php b/Translate.php
index 0ce9eb1..d9ece8a 100644
--- a/Translate.php
+++ b/Translate.php
@@ -126,7 +126,6 @@
 $wgHooks['ApiTokensGetTokenTypes'][] = 
'ApiTranslationStash::injectTokenFunction';
 // Register hooks.
 $wgHooks['EditPage::showEditForm:initial'][] = 'TranslateEditAddons::addTools';
-$wgHooks['SkinTemplateNavigation'][] = 
'TranslateEditAddons::addNavigationTabs';
 $wgHooks['AlternateEdit'][] = 'TranslateEditAddons::intro';
 $wgHooks['EditPageBeforeEditButtons'][] = 'TranslateEditAddons::buttonHack';
 $wgHooks['EditPage::showEditForm:fields'][] = 
'TranslateEditAddons::keepFields';
diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index f847fd0..2fa55d5 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -17,139 +17,6 @@
  */
 class TranslateEditAddons {
/**
-* Add some tabs for navigation for users who do not use Ajax interface.
-* Hook: SkinTemplateNavigation
-*/
-   static function addNavigationTabs( Skin $skin, array $tabs ) {
-   $title = $skin-getTitle();
-   $handle = new MessageHandle( $title );
-
-   if ( !$handle-isValid() ) {
-   return true;
-   }
-
-   $group = $handle-getGroup();
-   // Happens when translation page move is in progress
-   if ( !$group ) {
-   return true;
-   }
-
-   $index = $next = $prev = $key = null;
-   if ( $skin-getUser()-isAllowed( 'translate' ) ) {
-   self::figureNextPrevMessages( $handle, $key, $index, 
$next, $prev );
-   }
-
-   $id = $group-getId();
-   $code = $handle-getCode();
-
-   $translate = SpecialPage::getTitleFor( 'Translate' );
-   $fragment = htmlspecialchars( #msg_$key );
-
-   $nav_params = array();
-   $nav_params['loadgroup'] = $id;
-   $nav_params['action'] = $skin-getRequest()-getText( 'action', 
'edit' );
-
-   $tabindex = 2;
-
-   /**
-* @var $prev Title
-*/
-   if ( $prev !== null ) {
-   $data = array(
-   'text' = wfMessage( 'translate-edit-tab-prev' 
)-text(),
-   'href' = $prev-getLocalUrl( $nav_params ),
-   );
-   self::addTab( $skin, $tabs, 'prev', $data, $tabindex );
-   }
-
-   $params = array(
-   'group' = $id,
-   'language' = $code,
-   'task' = 'view',
-   'offset' = max( 0, $index - 250 ),
-   'limit' = 500,
-   );
-   $data = array(
-   'text' = wfMessage( 'translate-edit-tab-list' 
)-text(),
-   'href' = $translate-getLocalUrl( $params ) . 
$fragment,
-   );
-   self::addTab( $skin, $tabs, 'list', $data, $tabindex );
-
-   /**
-* @var $next Title
-*/
-   if ( $next !== null ) {
-   $data = array(
-   'text' = wfMessage( 'translate-edit-tab-next' 
)-text(),
-   'href' = $next-getLocalUrl( $nav_params ),
-   );
-   self::addTab( $skin, $tabs, 'next', $data, $tabindex );
-   }
-
-   return true;
-   }
-
-   protected static function addTab( $skin, $tabs, $name, $data, $index 
) {
-   // SkinChihuahua is an exception for 

[MediaWiki-commits] [Gerrit] Send traffic from Japan and Korea to ulsfo - change (operations/dns)

2013-11-03 Thread Mark Bergsma (Code Review)
Mark Bergsma has submitted this change and it was merged.

Change subject: Send traffic from Japan and Korea to ulsfo
..


Send traffic from Japan and Korea to ulsfo

Change-Id: I59f1e11f5aa66d5fd9c9de21f4bcbfc20d441dc0
---
M config-geo
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/config-geo b/config-geo
index 48ffe25..9cbd181 100644
--- a/config-geo
+++ b/config-geo
@@ -19,10 +19,10 @@
IQ = esams, # Iraq
IR = esams, # Iran (Islamic Republic 
of)
JO = esams, # Jordan
-   JP = eqiad, # Japan
+   JP = ulsfo, # Japan
KH = eqiad, # Cambodia
-   KP = eqiad, # Korea, Democratic 
People's Republic of
-   KR = eqiad, # Korea, Republic of
+   KP = ulsfo, # Korea, Democratic 
People's Republic of
+   KR = ulsfo, # Korea, Republic of
KW = esams, # Kuwait
LA = eqiad, # Lao People's Democratic 
Republic
LB = esams, # Lebanon

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59f1e11f5aa66d5fd9c9de21f4bcbfc20d441dc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Send traffic from Japan and Korea to ulsfo - change (operations/dns)

2013-11-03 Thread Mark Bergsma (Code Review)
Mark Bergsma has uploaded a new change for review.

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


Change subject: Send traffic from Japan and Korea to ulsfo
..

Send traffic from Japan and Korea to ulsfo

Change-Id: I59f1e11f5aa66d5fd9c9de21f4bcbfc20d441dc0
---
M config-geo
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/09/93309/1

diff --git a/config-geo b/config-geo
index 48ffe25..9cbd181 100644
--- a/config-geo
+++ b/config-geo
@@ -19,10 +19,10 @@
IQ = esams, # Iraq
IR = esams, # Iran (Islamic Republic 
of)
JO = esams, # Jordan
-   JP = eqiad, # Japan
+   JP = ulsfo, # Japan
KH = eqiad, # Cambodia
-   KP = eqiad, # Korea, Democratic 
People's Republic of
-   KR = eqiad, # Korea, Republic of
+   KP = ulsfo, # Korea, Democratic 
People's Republic of
+   KR = ulsfo, # Korea, Republic of
KW = esams, # Kuwait
LA = eqiad, # Lao People's Democratic 
Republic
LB = esams, # Lebanon

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59f1e11f5aa66d5fd9c9de21f4bcbfc20d441dc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/core)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: update language_by_size
..

update language_by_size

Change-Id: Ia8f2490d8b7bc58343fbf7455113bbbe0564
---
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
6 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/10/93310/1

diff --git a/pywikibot/families/wikinews_family.py 
b/pywikibot/families/wikinews_family.py
index b17e76f..52875ad 100644
--- a/pywikibot/families/wikinews_family.py
+++ b/pywikibot/families/wikinews_family.py
@@ -13,7 +13,7 @@
 self.languages_by_size = [
 'sr', 'en', 'fr', 'pl', 'de', 'it', 'es', 'pt', 'ru', 'zh', 'ja',
 'ca', 'sv', 'ta', 'el', 'cs', 'ar', 'fa', 'uk', 'fi', 'ro', 'tr',
-'he', 'bg', 'sq', 'no', 'ko', 'bs', 'eo',
+'he', 'bg', 'sq', 'no', 'ko', 'eo', 'bs',
 ]
 
 self.langs = dict([(lang, '%s.wikinews.org' % lang)
diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 8c7597f..803c7ea 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -14,30 +14,30 @@
 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ceb',
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fi', 'fa', 'id', 'cs',
 'ko', 'hu', 'ar', 'ms', 'ro', 'sr', 'min', 'tr', 'kk', 'sk', 'eo',
-'da', 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
+'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
 'gl', 'nn', 'simple', 'hy', 'la', 'az', 'el', 'sh', 'oc', 'th',
 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'te', 'ht', 'tt',
 'be-x-old', 'lv', 'cy', 'sq', 'bs', 'mg', 'br', 'jv', 'lb', 'mr',
 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'pnb', 'bn',
-'zh-yue', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'ga', 'gu', 'scn',
-'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia',
-'bug', 'kn', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
-'hif', 'zh-min-nan', 'mn', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
+'zh-yue', 'ga', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'gu', 'scn',
+'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'kn',
+'ia', 'bug', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
+'hif', 'mn', 'zh-min-nan', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
 'sa', 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'pa', 'se', 
'li',
 'mi', 'fo', 'co', 'ilo', 'gan', 'bo', 'frr', 'glk', 'rue', 'bcl',
-'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'ce',
+'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'ce', 'xmf', 'gv',
 'or', 'diq', 'zea', 'kv', 'km', 'pag', 'mhr', 'csb', 'dv', 'vep',
-'nrm', 'rm', 'hak', 'koi', 'udm', 'lad', 'wuu', 'lij',
+'nrm', 'hak', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu',
 'zh-classical', 'sc', 'fur', 'stq', 'mt', 'ug', 'ay', 'so', 'pi',
 'bh', 'nov', 'ksh', 'gn', 'kw', 'gag', 'ang', 'pcd', 'as', 'eml',
-'nv', 'ext', 'ace', 'szl', 'frp', 'mwl', 'ie', 'ln', 'pfl', 'krc',
+'nv', 'ace', 'ext', 'szl', 'frp', 'ie', 'mwl', 'ln', 'pfl', 'krc',
 'lez', 'xal', 'haw', 'pdc', 'rw', 'crh', 'dsb', 'to', 'arc', 'kl',
 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lo', 'lbe', 'wo', 'mdf',
-'jbo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
+'kbd', 'jbo', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
 'ltg', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu',
 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'pih', 'sm', 'bm', 
'iu',
-'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'tyv', 'om', 'fj', 'ti', 'ts',
-'ks', 'sg', 've', 'rn', 'tw', 'st', 'dz', 'cr', 'ak', 'tum', 'ik',
+'ss', 'pnt', 'sd', 'ki', 'ee', 'tyv', 'ha', 'om', 'fj', 'ti', 'ts',
+'ks', 'tw', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik',
 'lg', 'ff', 'ny', 'ch', 'xh',
 ]
 
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index 6f104db..05b9186 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -13,9 +13,9 @@
 self.languages_by_size = [
 'pl', 'en', 'it', 'ru', 'fr', 'de', 'pt', 'es', 'cs', 'sk', 'bg',
 'bs', 'tr', 'sl', 'uk', 'he', 'lt', 'eo', 'el', 'fa', 'zh', 'id',
- 

[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: update language_by_size
..

update language_by_size

Change-Id: Icf8ca8eeab53f6e26015f08d1092aa49ff344405
---
M families/wikinews_family.py
M families/wikipedia_family.py
M families/wikiquote_family.py
M families/wikisource_family.py
M families/wikivoyage_family.py
M families/wiktionary_family.py
6 files changed, 21 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/11/93311/1

diff --git a/families/wikinews_family.py b/families/wikinews_family.py
index 953df00..1aeaffd 100644
--- a/families/wikinews_family.py
+++ b/families/wikinews_family.py
@@ -13,7 +13,7 @@
 self.languages_by_size = [
 'sr', 'en', 'fr', 'pl', 'de', 'it', 'es', 'pt', 'ru', 'zh', 'ja',
 'ca', 'sv', 'ta', 'el', 'cs', 'ar', 'fa', 'uk', 'fi', 'ro', 'tr',
-'he', 'bg', 'sq', 'no', 'ko', 'bs', 'eo',
+'he', 'bg', 'sq', 'no', 'ko', 'eo', 'bs',
 ]
 
 self.langs = dict([(lang, '%s.wikinews.org' % lang)
diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index 42d7801..322f535 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -14,30 +14,30 @@
 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ceb',
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fi', 'fa', 'id', 'cs',
 'ko', 'hu', 'ar', 'ms', 'ro', 'sr', 'min', 'tr', 'kk', 'sk', 'eo',
-'da', 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
+'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
 'gl', 'nn', 'simple', 'hy', 'la', 'az', 'el', 'sh', 'oc', 'th',
 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'te', 'ht', 'tt',
 'be-x-old', 'lv', 'cy', 'sq', 'bs', 'mg', 'br', 'jv', 'lb', 'mr',
 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'pnb', 'bn',
-'zh-yue', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'ga', 'gu', 'scn',
-'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia',
-'bug', 'kn', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
-'hif', 'zh-min-nan', 'mn', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
+'zh-yue', 'ga', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'gu', 'scn',
+'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'kn',
+'ia', 'bug', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
+'hif', 'mn', 'zh-min-nan', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
 'sa', 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'pa', 'se', 
'li',
 'mi', 'fo', 'co', 'ilo', 'gan', 'bo', 'frr', 'glk', 'rue', 'bcl',
-'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'ce',
+'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'ce', 'xmf', 'gv',
 'or', 'diq', 'zea', 'kv', 'km', 'pag', 'mhr', 'csb', 'dv', 'vep',
-'nrm', 'rm', 'hak', 'koi', 'udm', 'lad', 'wuu', 'lij',
+'nrm', 'hak', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu',
 'zh-classical', 'sc', 'fur', 'stq', 'mt', 'ug', 'ay', 'so', 'pi',
 'bh', 'nov', 'ksh', 'gn', 'kw', 'gag', 'ang', 'pcd', 'as', 'eml',
-'nv', 'ext', 'ace', 'szl', 'frp', 'mwl', 'ie', 'ln', 'pfl', 'krc',
+'nv', 'ace', 'ext', 'szl', 'frp', 'ie', 'mwl', 'ln', 'pfl', 'krc',
 'lez', 'xal', 'haw', 'pdc', 'rw', 'crh', 'dsb', 'to', 'arc', 'kl',
 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lo', 'lbe', 'wo', 'mdf',
-'jbo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
+'kbd', 'jbo', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
 'ltg', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu',
 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'pih', 'sm', 'bm', 
'iu',
-'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'tyv', 'om', 'fj', 'ti', 'ts',
-'ks', 'sg', 've', 'rn', 'tw', 'st', 'dz', 'cr', 'ak', 'tum', 'ik',
+'ss', 'pnt', 'sd', 'ki', 'ee', 'tyv', 'ha', 'om', 'fj', 'ti', 'ts',
+'ks', 'tw', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik',
 'lg', 'ff', 'ny', 'ch', 'xh',
 ]
 
@@ -446,7 +446,7 @@
 'gl': u'Conversa Wikipedia',
 'glk': u'بحث Wikipedia',
 'gn': u'Vikipetã myangekõi',
-'got': u'̸̹̓ Wikipedia ̲̰̰̳̰̿͂̾ͅ',
+'got': u'??? Wikipedia ?',
 'gu': u'વિકિપીડિયા ચર્ચા',
 'gv': u'Resooney Wikipedia',
 'ha': u'Wikipedia talk',
diff --git a/families/wikiquote_family.py b/families/wikiquote_family.py
index 113b882..46c40cc 100644
--- a/families/wikiquote_family.py
+++ b/families/wikiquote_family.py
@@ -13,9 +13,9 @@
 

[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has submitted this change and it was merged.

Change subject: update language_by_size
..


update language_by_size

Change-Id: Icf8ca8eeab53f6e26015f08d1092aa49ff344405
---
M families/wikinews_family.py
M families/wikipedia_family.py
M families/wikiquote_family.py
M families/wikisource_family.py
M families/wikivoyage_family.py
M families/wiktionary_family.py
6 files changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/families/wikinews_family.py b/families/wikinews_family.py
index 953df00..1aeaffd 100644
--- a/families/wikinews_family.py
+++ b/families/wikinews_family.py
@@ -13,7 +13,7 @@
 self.languages_by_size = [
 'sr', 'en', 'fr', 'pl', 'de', 'it', 'es', 'pt', 'ru', 'zh', 'ja',
 'ca', 'sv', 'ta', 'el', 'cs', 'ar', 'fa', 'uk', 'fi', 'ro', 'tr',
-'he', 'bg', 'sq', 'no', 'ko', 'bs', 'eo',
+'he', 'bg', 'sq', 'no', 'ko', 'eo', 'bs',
 ]
 
 self.langs = dict([(lang, '%s.wikinews.org' % lang)
diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index 42d7801..322f535 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -14,30 +14,30 @@
 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ceb',
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fi', 'fa', 'id', 'cs',
 'ko', 'hu', 'ar', 'ms', 'ro', 'sr', 'min', 'tr', 'kk', 'sk', 'eo',
-'da', 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
+'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
 'gl', 'nn', 'simple', 'hy', 'la', 'az', 'el', 'sh', 'oc', 'th',
 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'te', 'ht', 'tt',
 'be-x-old', 'lv', 'cy', 'sq', 'bs', 'mg', 'br', 'jv', 'lb', 'mr',
 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'pnb', 'bn',
-'zh-yue', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'ga', 'gu', 'scn',
-'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia',
-'bug', 'kn', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
-'hif', 'zh-min-nan', 'mn', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
+'zh-yue', 'ga', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'gu', 'scn',
+'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'kn',
+'ia', 'bug', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
+'hif', 'mn', 'zh-min-nan', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
 'sa', 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'pa', 'se', 
'li',
 'mi', 'fo', 'co', 'ilo', 'gan', 'bo', 'frr', 'glk', 'rue', 'bcl',
-'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'ce',
+'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'ce', 'xmf', 'gv',
 'or', 'diq', 'zea', 'kv', 'km', 'pag', 'mhr', 'csb', 'dv', 'vep',
-'nrm', 'rm', 'hak', 'koi', 'udm', 'lad', 'wuu', 'lij',
+'nrm', 'hak', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu',
 'zh-classical', 'sc', 'fur', 'stq', 'mt', 'ug', 'ay', 'so', 'pi',
 'bh', 'nov', 'ksh', 'gn', 'kw', 'gag', 'ang', 'pcd', 'as', 'eml',
-'nv', 'ext', 'ace', 'szl', 'frp', 'mwl', 'ie', 'ln', 'pfl', 'krc',
+'nv', 'ace', 'ext', 'szl', 'frp', 'ie', 'mwl', 'ln', 'pfl', 'krc',
 'lez', 'xal', 'haw', 'pdc', 'rw', 'crh', 'dsb', 'to', 'arc', 'kl',
 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lo', 'lbe', 'wo', 'mdf',
-'jbo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
+'kbd', 'jbo', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
 'ltg', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu',
 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'pih', 'sm', 'bm', 
'iu',
-'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'tyv', 'om', 'fj', 'ti', 'ts',
-'ks', 'sg', 've', 'rn', 'tw', 'st', 'dz', 'cr', 'ak', 'tum', 'ik',
+'ss', 'pnt', 'sd', 'ki', 'ee', 'tyv', 'ha', 'om', 'fj', 'ti', 'ts',
+'ks', 'tw', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik',
 'lg', 'ff', 'ny', 'ch', 'xh',
 ]
 
@@ -446,7 +446,7 @@
 'gl': u'Conversa Wikipedia',
 'glk': u'بحث Wikipedia',
 'gn': u'Vikipetã myangekõi',
-'got': u'̸̹̓ Wikipedia ̲̰̰̳̰̿͂̾ͅ',
+'got': u'??? Wikipedia ?',
 'gu': u'વિકિપીડિયા ચર્ચા',
 'gv': u'Resooney Wikipedia',
 'ha': u'Wikipedia talk',
diff --git a/families/wikiquote_family.py b/families/wikiquote_family.py
index 113b882..46c40cc 100644
--- a/families/wikiquote_family.py
+++ b/families/wikiquote_family.py
@@ -13,9 +13,9 @@
 self.languages_by_size = [
 'pl', 'en', 'it', 

[MediaWiki-commits] [Gerrit] .pep8 config file from core - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has submitted this change and it was merged.

Change subject: .pep8 config file from core
..


.pep8 config file from core

Change-Id: Ic29a5e4e96c552c9495d56530116f1c6462b6dd4
---
A .pep8
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.pep8 b/.pep8
new file mode 100644
index 000..7fc70c5
--- /dev/null
+++ b/.pep8
@@ -0,0 +1,4 @@
+[pep8]
+ignore = E122,E127,E241,E502
+exclude = ./wiktionary/wiktionarypage.py
+max_line_length = 256

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic29a5e4e96c552c9495d56530116f1c6462b6dd4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: update language_by_size
..


update language_by_size

Change-Id: Ia8f2490d8b7bc58343fbf7455113bbbe0564
---
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
6 files changed, 20 insertions(+), 20 deletions(-)

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



diff --git a/pywikibot/families/wikinews_family.py 
b/pywikibot/families/wikinews_family.py
index b17e76f..52875ad 100644
--- a/pywikibot/families/wikinews_family.py
+++ b/pywikibot/families/wikinews_family.py
@@ -13,7 +13,7 @@
 self.languages_by_size = [
 'sr', 'en', 'fr', 'pl', 'de', 'it', 'es', 'pt', 'ru', 'zh', 'ja',
 'ca', 'sv', 'ta', 'el', 'cs', 'ar', 'fa', 'uk', 'fi', 'ro', 'tr',
-'he', 'bg', 'sq', 'no', 'ko', 'bs', 'eo',
+'he', 'bg', 'sq', 'no', 'ko', 'eo', 'bs',
 ]
 
 self.langs = dict([(lang, '%s.wikinews.org' % lang)
diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 8c7597f..803c7ea 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -14,30 +14,30 @@
 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ceb',
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fi', 'fa', 'id', 'cs',
 'ko', 'hu', 'ar', 'ms', 'ro', 'sr', 'min', 'tr', 'kk', 'sk', 'eo',
-'da', 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
+'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi',
 'gl', 'nn', 'simple', 'hy', 'la', 'az', 'el', 'sh', 'oc', 'th',
 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'te', 'ht', 'tt',
 'be-x-old', 'lv', 'cy', 'sq', 'bs', 'mg', 'br', 'jv', 'lb', 'mr',
 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'pnb', 'bn',
-'zh-yue', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'ga', 'gu', 'scn',
-'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia',
-'bug', 'kn', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
-'hif', 'zh-min-nan', 'mn', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
+'zh-yue', 'ga', 'ur', 'sw', 'bpy', 'io', 'ky', 'ne', 'gu', 'scn',
+'tg', 'nds', 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'kn',
+'ia', 'bug', 'nap', 'bat-smg', 'am', 'map-bms', 'wa', 'ckb', 'gd',
+'hif', 'mn', 'zh-min-nan', 'arz', 'mzn', 'yi', 'vec', 'sah', 'nah',
 'sa', 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'pa', 'se', 
'li',
 'mi', 'fo', 'co', 'ilo', 'gan', 'bo', 'frr', 'glk', 'rue', 'bcl',
-'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'ce',
+'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'ce', 'xmf', 'gv',
 'or', 'diq', 'zea', 'kv', 'km', 'pag', 'mhr', 'csb', 'dv', 'vep',
-'nrm', 'rm', 'hak', 'koi', 'udm', 'lad', 'wuu', 'lij',
+'nrm', 'hak', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu',
 'zh-classical', 'sc', 'fur', 'stq', 'mt', 'ug', 'ay', 'so', 'pi',
 'bh', 'nov', 'ksh', 'gn', 'kw', 'gag', 'ang', 'pcd', 'as', 'eml',
-'nv', 'ext', 'ace', 'szl', 'frp', 'mwl', 'ie', 'ln', 'pfl', 'krc',
+'nv', 'ace', 'ext', 'szl', 'frp', 'ie', 'mwl', 'ln', 'pfl', 'krc',
 'lez', 'xal', 'haw', 'pdc', 'rw', 'crh', 'dsb', 'to', 'arc', 'kl',
 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lo', 'lbe', 'wo', 'mdf',
-'jbo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
+'kbd', 'jbo', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'na', 
'tet',
 'ltg', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu',
 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'pih', 'sm', 'bm', 
'iu',
-'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'tyv', 'om', 'fj', 'ti', 'ts',
-'ks', 'sg', 've', 'rn', 'tw', 'st', 'dz', 'cr', 'ak', 'tum', 'ik',
+'ss', 'pnt', 'sd', 'ki', 'ee', 'tyv', 'ha', 'om', 'fj', 'ti', 'ts',
+'ks', 'tw', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik',
 'lg', 'ff', 'ny', 'ch', 'xh',
 ]
 
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index 6f104db..05b9186 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -13,9 +13,9 @@
 self.languages_by_size = [
 'pl', 'en', 'it', 'ru', 'fr', 'de', 'pt', 'es', 'cs', 'sk', 'bg',
 'bs', 'tr', 'sl', 'uk', 'he', 'lt', 'eo', 'el', 'fa', 'zh', 'id',
-'hu', 'fi', 'ca', 'sv', 'nl', 

[MediaWiki-commits] [Gerrit] Made the revision history deletion page's radio buttons less... - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Made the revision history deletion page's radio buttons less 
confusing   Changed the radio button to 'Visible' and 'Hidden' from 'Yes' and 
'No' and changed the respective label messages.
..


Made the revision history deletion page's radio buttons less confusing
 
Changed the radio button to 'Visible' and 'Hidden' from 'Yes' and 'No' and
changed the respective label messages.

Bug: 56210
Change-Id: I4263e9e15241bb705b288b2bb65f9915557bf472
---
M languages/messages/MessagesEn.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index c0df101..7b62d29 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1710,15 +1710,15 @@
 * Inappropriate personal information
 *: ''home addresses and telephone numbers, social security numbers, etc.'',
 'revdelete-legend'= 'Set visibility restrictions',
-'revdelete-hide-text' = 'Hide revision text',
+'revdelete-hide-text' = 'Revision text',
 'revdelete-hide-image'= 'Hide file content',
 'revdelete-hide-name' = 'Hide action and target',
-'revdelete-hide-comment'  = 'Hide edit summary',
-'revdelete-hide-user' = Hide editor's username/IP address,
+'revdelete-hide-comment'  = 'Edit summary',
+'revdelete-hide-user' = Editor's username/IP address,
 'revdelete-hide-restricted'   = 'Suppress data from administrators as well as 
others',
 'revdelete-radio-same'= '(do not change)',
-'revdelete-radio-set' = 'Yes',
-'revdelete-radio-unset'   = 'No',
+'revdelete-radio-set' = 'Visible',
+'revdelete-radio-unset'   = 'Hidden',
 'revdelete-suppress'  = 'Suppress data from administrators as well as 
others',
 'revdelete-unsuppress'= 'Remove restrictions on restored revisions',
 'revdelete-log'   = 'Reason:',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4263e9e15241bb705b288b2bb65f9915557bf472
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.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] (Bug 56531): Ignore Version ID for SVN repository - change (pywikibot/core)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: (Bug 56531): Ignore Version ID for SVN repository
..

(Bug 56531): Ignore Version ID for SVN repository

SVN repository does not replace ID keyword and searching for
the keyword ID does raise an exception.
Thus we ignore that part of code.

Maybe we could get this information from version.py but because
that code does not work properly yet, this could be a second
part.

Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71
---
M pywikibot/bot.py
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/13/93313/1

diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index ca06ce0..546af0e 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -630,7 +630,12 @@
 # or `$Id$`.
 m = re.search(r\$Id
   r: (\w+) \$, ver)
-pywikibot.output(u'Pywikipediabot r%s' % m.group(1))
+if m:
+pywikibot.output(u'Pywikipediabot r%s' % m.group(1))
+else:
+# Version ID not availlable on SVN repository.
+# Maybe these informations should be imported from version.py
+pywikibot.output(u'Pywikipediabot SVN repository') 
 pywikibot.output(u'Python %s' % sys.version)
 
 if do_help:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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


[MediaWiki-commits] [Gerrit] Missing coma, fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885 - change (pywikibot/core)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: Missing coma, fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885
..

Missing coma, fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885

Change-Id: I9f27ac6146fbad60a45bdb480835bebf0fae42cc
---
M scripts/featured.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/14/93314/1

diff --git a/scripts/featured.py b/scripts/featured.py
index a7027f6..f2b692e 100644
--- a/scripts/featured.py
+++ b/scripts/featured.py
@@ -145,7 +145,7 @@
 template_good = {
 '_default': ['Link GA'],
 'ar': [u'وصلة مقالة جيدة'],
-'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA']
+'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA'],
 'da': ['Link GA', 'Link AA'],
 'eo': ['LigoLeginda'],
 'es': ['Bueno'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f27ac6146fbad60a45bdb480835bebf0fae42cc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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


[MediaWiki-commits] [Gerrit] Missing coma, fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: Missing coma, fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac
..

Missing coma,
fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac

Change-Id: If5f554768be40a1e873cef385c6767e29b353a8f
---
M featured.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/15/93315/1

diff --git a/featured.py b/featured.py
index 1c330f6..bf624e0 100644
--- a/featured.py
+++ b/featured.py
@@ -118,7 +118,7 @@
 template_good = {
 '_default': ['Link GA'],
 'ar': [u'وصلة مقالة جيدة'],
-'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA']
+'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA'],
 'da': ['Link GA', 'Link AA'],
 'eo': ['LigoLeginda'],
 'es': ['Bueno'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5f554768be40a1e873cef385c6767e29b353a8f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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


[MediaWiki-commits] [Gerrit] Missing coma, fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac - change (pywikibot/compat)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Missing coma, fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac
..


Missing coma,
fix for I0bc8939795157fd6c4926ca931d21a6dec8348ac

Change-Id: If5f554768be40a1e873cef385c6767e29b353a8f
---
M featured.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/featured.py b/featured.py
index 1c330f6..bf624e0 100644
--- a/featured.py
+++ b/featured.py
@@ -118,7 +118,7 @@
 template_good = {
 '_default': ['Link GA'],
 'ar': [u'وصلة مقالة جيدة'],
-'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA']
+'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA'],
 'da': ['Link GA', 'Link AA'],
 'eo': ['LigoLeginda'],
 'es': ['Bueno'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5f554768be40a1e873cef385c6767e29b353a8f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Split Api Module into lovely small functions - change (mediawiki...Thanks)

2013-11-03 Thread Addshore (Code Review)
Addshore has uploaded a new change for review.

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


Change subject: Split Api Module into lovely small functions
..

Split Api Module into lovely small functions

Change-Id: I77abd54a50090229c7f3a3daa239bcb185702e46
---
M ApiThank.php
1 file changed, 98 insertions(+), 60 deletions(-)


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

diff --git a/ApiThank.php b/ApiThank.php
index 62ecad5..e487912 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -7,78 +7,115 @@
  */
 class ApiThank extends ApiBase {
public function execute() {
-   global $wgThanksLogging;
+   $this-dieIfEchoNotInstalled();
 
+   $user = $this-getUser();
+   $this-dieOnBadUser( $user );
+
+   $params = $this-extractRequestParams();
+   $revision = $this-getRevisionFromParams( $params );
+
+   if ( $this-userAlreadySentThanksForRevision( $user, $revision 
) ) {
+   $this-markResultSuccess();
+   } else {
+   $this-sendThanks(
+   $user,
+   $revision,
+   $this-getSourceFromParams( $params )
+   );
+   }
+   }
+
+   private function userAlreadySentThanksForRevision( User $user, Revision 
$revision ) {
+   return $user-getRequest()-getSessionData( 
thanks-thanked-{$revision-getId()} );
+   }
+
+   private function dieIfEchoNotInstalled() {
if ( !class_exists( 'EchoNotifier' ) ) {
$this-dieUsage( 'Echo is not installed on this wiki', 
'echonotinstalled' );
}
+   }
 
-   $agent = $this-getUser();
-   if ( $agent-isAnon() ) {
+   private function dieOnBadUser( User $user ) {
+   if ( $user-isAnon() ) {
$this-dieUsage( 'Anonymous users cannot send thanks', 
'notloggedin' );
-   }
-   if ( $agent-pingLimiter( 'thanks-notification' ) ) {
+   } elseif ( $user-pingLimiter( 'thanks-notification' ) ) {
$this-dieUsageMsg( array( 'actionthrottledtext' ) );
-   }
-   if ( $agent-isBlocked() ) {
+   } elseif ( $user-isBlocked() ) {
$this-dieUsageMsg( array( 'blockedtext' ) );
}
-   $params = $this-extractRequestParams();
-   $rev = Revision::newFromId( $params['rev'] );
-   $result = array();
-   if ( !$rev ) {
+   }
+
+   private function getRevisionFromParams( $params ) {
+   $revision = Revision::newFromId( $params['rev'] );
+   if ( !$revision ) {
$this-dieUsage( 'Revision ID is not valid', 
'invalidrevision' );
-   } elseif ( $rev-isDeleted( Revision::DELETED_TEXT ) ) {
+   } elseif ( $revision-isDeleted( Revision::DELETED_TEXT ) ) {
$this-dieUsage( 'Revision has been deleted', 
'revdeleted' );
-   } else {
-   // Do not send notification if session data says it 
has already been sent
-   if ( !$agent-getRequest()-getSessionData( 
thanks-thanked-{$rev-getId()} ) ) {
-   $title = Title::newFromID( $rev-getPage() );
-   if ( !$title ) {
-   $this-dieUsage( 'Page title could not 
be retrieved', 'notitle' );
-   }
-
-   // Get the user ID of the user who performed 
the edit
-   $recipient = $rev-getUser();
-
-   if ( !$recipient ) {
-   $this-dieUsage( 'No valid recipient 
found', 'invalidrecipient' );
-   } else {
-   // Set the source of the thanks, e.g. 
'diff' or 'history'
-   if ( $params['source'] ) {
-   $source = trim( 
$params['source'] );
-   } else {
-   $source = 'undefined';
-   }
-   // Create the notification via Echo 
extension
-   EchoEvent::create( array(
-   'type' = 'edit-thank',
-   'title' = $title,
-   'extra' = array(
-   'revid' = 
$rev-getId(),
-   

[MediaWiki-commits] [Gerrit] Missing coma, fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885 - change (pywikibot/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Missing coma, fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885
..


Missing coma,
fix for I9dba878cbf02ea31d362ef499b1bd3e84f1ea885

Change-Id: I9f27ac6146fbad60a45bdb480835bebf0fae42cc
---
M scripts/featured.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scripts/featured.py b/scripts/featured.py
index a7027f6..f2b692e 100644
--- a/scripts/featured.py
+++ b/scripts/featured.py
@@ -145,7 +145,7 @@
 template_good = {
 '_default': ['Link GA'],
 'ar': [u'وصلة مقالة جيدة'],
-'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA']
+'ca': [u'Enllaç AB', 'Lien BA', 'Abo', 'Link GA'],
 'da': ['Link GA', 'Link AA'],
 'eo': ['LigoLeginda'],
 'es': ['Bueno'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f27ac6146fbad60a45bdb480835bebf0fae42cc
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] changed Misspelled global variable in SecurePasswords.php - change (mediawiki...SecurePasswords)

2013-11-03 Thread Gerrit Patch Uploader (Code Review)
Gerrit Patch Uploader has uploaded a new change for review.

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


Change subject: changed Misspelled global variable in SecurePasswords.php
..

changed Misspelled global variable in SecurePasswords.php

Bug: 51378
Change-Id: Iab00a64f8936709a507f6c62e7f5b1b7db736781
---
M SecurePasswords.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/SecurePasswords.php b/SecurePasswords.php
old mode 100644
new mode 100755
index 04ffca4..2798eb6
--- a/SecurePasswords.php
+++ b/SecurePasswords.php
@@ -20,7 +20,7 @@
'usercheck' = true, #Should we disallow passwords that are the same as 
the username?
'wordcheck' = function_exists( 'pspell_check' ), #Should we check the 
password against a dictionary to make sure that it is not a word?
 );
-$wgSecurePasswordSpecialChars = '.|\/!@#$%^*\(\)-_=+\[\]{}`~,?\';: '; # 
Character class of special characters for a regex
+$wgSecurePasswordsSpecialChars = '.|\/!@#$%^*\(\)-_=+\[\]{}`~,?\';: '; # 
Character class of special characters for a regex
 $wgSecurePasswordsSecretKeys = array(false, false, false); #MUST be customized 
in LocalSettings.php!
 
 $wgExtensionCredits['other'][] = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab00a64f8936709a507f6c62e7f5b1b7db736781
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePasswords
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Durga94 durgasubramania...@gmail.com

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


[MediaWiki-commits] [Gerrit] Move span class=plainlinks out of i18n - change (mediawiki...Flow)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Move span class=plainlinks out of i18n
..


Move span class=plainlinks out of i18n

Change-Id: If9ce4beefc41ad1680ebcadd2234118cfd8e4d87
---
M Flow.i18n.php
M includes/Log/Formatter.php
M templates/history-line.html.php
M templates/post-history.html.php
M templates/topic-history.html.php
5 files changed, 32 insertions(+), 18 deletions(-)

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



diff --git a/Flow.i18n.php b/Flow.i18n.php
index 0a5aa30..e096cfc 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -12,10 +12,10 @@
'flow-specialpage' = '$1 ndash; Flow',
 
'log-name-flow' = 'Flow activity log',
-   'logentry-delete-flow-delete-post' = '$1 {{GENDER:$2|deleted}} a span 
class=plainlinks[$4 comment]/span on [[$3]]',
-   'logentry-delete-flow-restore-post' = '$1 {{GENDER:$2|restored}} a 
span class=plainlinks[$4 comment]/span on [[$3]]',
-   'logentry-suppress-flow-censor-post' = '$1 {{GENDER:$2|suppressed}} a 
span class=plainlinks[$4 comment]/span on [[$3]]',
-   'logentry-suppress-flow-restore-post' = '$1 {{GENDER:$2|deleted}} a 
span class=plainlinks[$4 comment]/span on [[$3]]',
+   'logentry-delete-flow-delete-post' = '$1 {{GENDER:$2|deleted}} a [$4 
comment] on [[$3]]',
+   'logentry-delete-flow-restore-post' = '$1 {{GENDER:$2|restored}} a [$4 
comment] on [[$3]]',
+   'logentry-suppress-flow-censor-post' = '$1 {{GENDER:$2|suppressed}} a 
[$4 comment] on [[$3]]',
+   'logentry-suppress-flow-restore-post' = '$1 {{GENDER:$2|deleted}} a 
[$4 comment] on [[$3]]',
 
'flow-user-anonymous' = 'Anonymous',
'flow-user-moderated' = 'Moderated user',
@@ -90,25 +90,25 @@
 
'flow-edit-title-submit' = 'Change title',
 
-   'flow-rev-message-edit-post' = '[[User:$1|$1]] {{GENDER:$1|edited}} a 
span class=plainlinks[$2 comment]/span',
-   'flow-rev-message-reply' = '[[User:$1|$1]] {{GENDER:$1|added}} a span 
class=plainlinks[$2 comment]/span.',
+   'flow-rev-message-edit-post' = '[[User:$1|$1]] {{GENDER:$1|edited}} a 
[$2 comment]',
+   'flow-rev-message-reply' = '[[User:$1|$1]] {{GENDER:$1|added}} a [$2 
comment].',
'flow-rev-message-reply-bundle' = '$1 {{PLURAL:$1|comment|comments}} 
were added.',
-   'flow-rev-message-new-post' = '[[User:$1|$1]] {{GENDER:$1|created}} 
the topic span class=plainlinks[$2 $3]/span.',
-   'flow-rev-message-hid-post' = '[[User:$1|$1]] {{GENDER:$1|hid}} a 
span class=plainlinks[$3 comment]/span.',
-   'flow-rev-message-edit-title' = '[[User:$1|$1]] {{GENDER:$1|edited}} 
the topic title to span class=plainlinks[$2 $3]/span.',
+   'flow-rev-message-new-post' = '[[User:$1|$1]] {{GENDER:$1|created}} 
the topic [$2 $3].',
+   'flow-rev-message-hid-post' = '[[User:$1|$1]] {{GENDER:$1|hid}} a [$3 
comment].',
+   'flow-rev-message-edit-title' = '[[User:$1|$1]] {{GENDER:$1|edited}} 
the topic title to [$2 $3].',
'flow-rev-message-create-header' = [[User:$1|$1]] 
{{GENDER:$1|created}} the board header.,
'flow-rev-message-edit-header' = [[User:$1|$1]] {{GENDER:$1|edited}} 
the board header.,
-   'flow-rev-message-restored-post' = '[[User:$1|$1]] 
{{GENDER:$1|restored}} a span class=plainlinks[$3 comment]/span.',
-   'flow-rev-message-deleted-post' = '[[User:$1|$1]] 
{{GENDER:$1|deleted}} a span class=plainlinks[$3 comment]/span.',
-   'flow-rev-message-censored-post' = '[[User:$1|$1]] 
{{GENDER:$1|suppressed}} a span class=plainlinks[$3 comment]/span.',
+   'flow-rev-message-restored-post' = '[[User:$1|$1]] 
{{GENDER:$1|restored}} a [$3 comment].',
+   'flow-rev-message-deleted-post' = '[[User:$1|$1]] 
{{GENDER:$1|deleted}} a [$3 comment].',
+   'flow-rev-message-censored-post' = '[[User:$1|$1]] 
{{GENDER:$1|suppressed}} a [$3 comment].',
 
'flow-topic-history' = '$1 Topic History',
'flow-post-history' = 'Comment by {{GENDER:$2|$2}} Post History',
'flow-history-last4' = 'Last 4 hours',
'flow-history-day' = 'Today',
'flow-history-week' = 'Last week',
-   'flow-history-pages-topic' = 'Appears on span class=plainlinks[$1 
$2 board]/span',
-   'flow-history-pages-post' = 'Appears on span class=plainlinks[$1 
$2]/span',
+   'flow-history-pages-topic' = 'Appears on [$1 $2 board]',
+   'flow-history-pages-post' = 'Appears on [$1 $2]',
'flow-topic-participants' = '{{PLURAL:$1|$3 started this 
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and {{PLURAL:$2|other|others}}|0=No 
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4',
'flow-topic-comments' = '{{PLURAL:$1|0=Be the first to 
comment!|Comment ($1)}}',
 
diff --git a/includes/Log/Formatter.php b/includes/Log/Formatter.php
index c24cb00..659cf28 100644
--- a/includes/Log/Formatter.php
+++ b/includes/Log/Formatter.php
@@ -23,7 +23,7 @@
// 

[MediaWiki-commits] [Gerrit] Fix misspelled global variable - change (mediawiki...SecurePasswords)

2013-11-03 Thread Siebrand (Code Review)
Siebrand has submitted this change and it was merged.

Change subject: Fix misspelled global variable
..


Fix misspelled global variable

Bug: 51378
Change-Id: Iab00a64f8936709a507f6c62e7f5b1b7db736781
---
M SecurePasswords.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/SecurePasswords.php b/SecurePasswords.php
old mode 100644
new mode 100755
index 04ffca4..2798eb6
--- a/SecurePasswords.php
+++ b/SecurePasswords.php
@@ -20,7 +20,7 @@
'usercheck' = true, #Should we disallow passwords that are the same as 
the username?
'wordcheck' = function_exists( 'pspell_check' ), #Should we check the 
password against a dictionary to make sure that it is not a word?
 );
-$wgSecurePasswordSpecialChars = '.|\/!@#$%^*\(\)-_=+\[\]{}`~,?\';: '; # 
Character class of special characters for a regex
+$wgSecurePasswordsSpecialChars = '.|\/!@#$%^*\(\)-_=+\[\]{}`~,?\';: '; # 
Character class of special characters for a regex
 $wgSecurePasswordsSecretKeys = array(false, false, false); #MUST be customized 
in LocalSettings.php!
 
 $wgExtensionCredits['other'][] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab00a64f8936709a507f6c62e7f5b1b7db736781
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePasswords
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Durga94 durgasubramania...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] No title case - change (mediawiki...Flow)

2013-11-03 Thread Matthias Mullie (Code Review)
Matthias Mullie has uploaded a new change for review.

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


Change subject: No title case
..

No title case

Change-Id: Iacaa3198e0b9a8d0ef7f39ae2724eba1c0fe479c
---
M Flow.i18n.php
1 file changed, 8 insertions(+), 9 deletions(-)


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

diff --git a/Flow.i18n.php b/Flow.i18n.php
index e096cfc..c58b9a9 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -102,8 +102,9 @@
'flow-rev-message-deleted-post' = '[[User:$1|$1]] 
{{GENDER:$1|deleted}} a [$3 comment].',
'flow-rev-message-censored-post' = '[[User:$1|$1]] 
{{GENDER:$1|suppressed}} a [$3 comment].',
 
-   'flow-topic-history' = '$1 Topic History',
-   'flow-post-history' = 'Comment by {{GENDER:$2|$2}} Post History',
+   'flow-board-history' = '$1 history',
+   'flow-topic-history' = '$1 topic history',
+   'flow-post-history' = 'Comment by {{GENDER:$2|$2}} post history',
'flow-history-last4' = 'Last 4 hours',
'flow-history-day' = 'Today',
'flow-history-week' = 'Last week',
@@ -111,8 +112,6 @@
'flow-history-pages-post' = 'Appears on [$1 $2]',
'flow-topic-participants' = '{{PLURAL:$1|$3 started this 
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and {{PLURAL:$2|other|others}}|0=No 
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4',
'flow-topic-comments' = '{{PLURAL:$1|0=Be the first to 
comment!|Comment ($1)}}',
-
-   'flow-board-history' = '$1 History',
 
'flow-comment-restored' = 'Restored comment',
'flow-comment-deleted' = 'Deleted comment',
@@ -423,6 +422,11 @@
 * $1: Username of the user who moderated the comment. Can be used for GENDER
 * $2: Username of the user who had posted the comment. Can be used for GENDER
 * $3: Permalink to the comment',
+   'flow-board-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Board history page.
+
+Parameters:
+* $1 - the title to which the flow board belongs
+{{Identical|History}}',
'flow-topic-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Topic history page.
 
 Parameters:
@@ -456,11 +460,6 @@
 
 Parameters:
 * $1 - The amount of comments on this topic, can be used for PLURAL',
-   'flow-board-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Board history page.
-
-Parameters:
-* $1 - the title to which the flow board belongs
-{{Identical|History}}',
'flow-comment-restored' = 'Used as revision comment when the post has 
been restored.
 
 See also:

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

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

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


[MediaWiki-commits] [Gerrit] Ensure that links are displayed - change (mediawiki...MobileFrontend)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Ensure that links are displayed
..


Ensure that links are displayed

Change-Id: I0be967d9f838c960f2d682e6c24a3e204cbe7b9d
---
M MobileFrontend.i18n.php
1 file changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index ca6c3b2..165a432 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -83,7 +83,7 @@
'mobile-frontend-history' = 'View edit history of this page.',
'mobile-frontend-history-404-title' = 'Bad title given',
'mobile-frontend-history-404-desc' = Cannot look at history for a 
page that doesn't exist. It may have been deleted or you may have followed a 
bad link.,
-   'mobile-frontend-history-summary' = 'Page history for [[$1]]',
+   'mobile-frontend-history-summary' = 'Page history for [[:$1]]',
'mobile-frontend-last-modified-date' = 'Last modified on $1, at $2',
'mobile-frontend-last-modified-seconds' = 'Last modified 
{{PLURAL:$1|$1 second|$1 seconds}} ago',
'mobile-frontend-last-modified-minutes' = 'Last modified 
{{PLURAL:$1|$1 minute|$1 minutes}} ago',
@@ -1528,7 +1528,7 @@
'mobile-frontend-history' = Ver l'historial d'ediciones d'esta 
páxina.,
'mobile-frontend-history-404-title' = 'Diose un títulu enquivocáu',
'mobile-frontend-history-404-desc' = Nun pue vese l'historial d'una 
páxina que nun esiste. Pue ser porque se desanició o porque siguió un enllaz 
malu.,
-   'mobile-frontend-history-summary' = 'Historial de páxina pa [[$1]]',
+   'mobile-frontend-history-summary' = 'Historial de páxina pa [[:$1]]',
'mobile-frontend-last-modified-date' = 'Últimu cambéu el $1 a les $2',
'mobile-frontend-last-modified-seconds' = 'Últimu cambéu hai 
{{PLURAL:$1|$1 segundu|$1 segundos}}',
'mobile-frontend-last-modified-minutes' = 'Últimu cambéu hai 
{{PLURAL:$1|$1 minutu|$1 minutos}}',
@@ -3085,7 +3085,7 @@
'mobile-frontend-password-placeholder' = 'Heslo',
'mobile-frontend-login' = 'Přihlásit se',
'mobile-frontend-history' = 'Zobrazit historii editací této stránky.',
-   'mobile-frontend-history-summary' = 'Historie stránky [[$1]]',
+   'mobile-frontend-history-summary' = 'Historie stránky [[:$1]]',
'mobile-frontend-last-modified-date' = 'Naposledy upraveno $1 v $2',
'mobile-frontend-last-modified-seconds' = 'Naposledy změněno před 
{{PLURAL:$1|$1 sekundou|$1 sekundami}}',
'mobile-frontend-last-modified-minutes' = 'Naposledy změněno před 
{{PLURAL:$1|$1 minutou|$1 minutami}}',
@@ -3943,7 +3943,7 @@
'mobile-frontend-history' = 'Die Versionsgeschichte dieser Seite 
ansehen.',
'mobile-frontend-history-404-title' = 'Ungültigen Titel angegeben',
'mobile-frontend-history-404-desc' = 'Für eine nicht vorhandene Seite 
kann keine Versionsgeschichte angezeigt werden. Entweder wurde die Seite 
gelöscht oder du bist einem ungültigen Link gefolgt.',
-   'mobile-frontend-history-summary' = 'Versionsgeschichte für [[$1]]',
+   'mobile-frontend-history-summary' = 'Versionsgeschichte für [[:$1]]',
'mobile-frontend-last-modified-date' = 'Zuletzt geändert am $1 um $2',
'mobile-frontend-last-modified-seconds' = 'Zuletzt geändert vor 
{{PLURAL:$1|einer Sekunde|$1 Sekunden}}',
'mobile-frontend-last-modified-minutes' = 'Zuletzt geändert vor 
{{PLURAL:$1|einer Minute|$1 Minuten}}',
@@ -5954,7 +5954,7 @@
'mobile-frontend-history' = 'Afficher l’historique des modifications 
de cette page.',
'mobile-frontend-history-404-title' = 'Mauvais titre fourni',
'mobile-frontend-history-404-desc' = 'Impossible de regarder 
l’historique d’une page qui n’existe pas. Elle peut avoir été supprimée ou vous 
pouvez avoir suivi un mauvais lien.',
-   'mobile-frontend-history-summary' = 'Historique de la page [[$1]]',
+   'mobile-frontend-history-summary' = 'Historique de la page [[:$1]]',
'mobile-frontend-last-modified-date' = 'Dernière modification le $1, à 
$2',
'mobile-frontend-last-modified-seconds' = 'Dernière modification il y 
a {{PLURAL:$1|$1 seconde|$1 secondes}}',
'mobile-frontend-last-modified-minutes' = 'Dernière modification il y 
a {{PLURAL:$1|$1 minute|$1 minutes}}',
@@ -8701,7 +8701,7 @@
'mobile-frontend-history' = 'Vedi la cronologia di questa pagina.',
'mobile-frontend-history-404-title' = 'Specificato titolo non valido',
'mobile-frontend-history-404-desc' = 'Non può essere mostrata la 
cronologia per una pagina che non esiste. Potrebbe essere stata cancellata o 
hai seguito un collegamento malformato.',
-   'mobile-frontend-history-summary' = 'Cronologia di [[$1]]',
+   'mobile-frontend-history-summary' = 'Cronologia di [[:$1]]',

[MediaWiki-commits] [Gerrit] check argument to removeClaims() so that if single claim is ... - change (pywikibot/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: check argument to removeClaims() so that if single claim is 
provided it will make a one element list with that claim
..


check argument to removeClaims() so that if single claim is provided it will 
make a one element list with that claim

Change-Id: Icc4a842e874f7f6cf341872c305e41b942087163
---
M pywikibot/page.py
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 78ce1d0..ca159fd 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2670,7 +2670,12 @@
 
 Removes the claims from the item
 @type claims: list
+
 
+# this check allows single claims to be remove by pushing them into a
+# list of length one.
+if isinstance(claims, pywikibot.Claim):
+claims = [claims]
 self.repo.removeClaims(claims, **kwargs)
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc4a842e874f7f6cf341872c305e41b942087163
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Maximilianklein isa...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] [Translate] Remove deleted message keys - change (translatewiki)

2013-11-03 Thread Raimond Spekking (Code Review)
Raimond Spekking has submitted this change and it was merged.

Change subject: [Translate] Remove deleted message keys
..


[Translate] Remove deleted message keys

https://gerrit.wikimedia.org/r/#/c/93176/1/Translate.i18n.php,unified

Change-Id: Ib1f020e8c383cd00b1100ba1e7bb6f841a3d64da
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index e630907..91094bb 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1624,7 +1624,6 @@
 file = Translate/Translate.i18n.php
 aliasfile = Translate/Translate.alias.php
 optional = translate-page-paging-links, supportedlanguages-portallink, 
supportedlanguages-portallink-nocldr
-optional = translate-edit-tab-next, translate-edit-tab-prev
 optional = group-translate-proofr.css, group-translate-proofr.js
 ignored = translate-edit-tag-warning, supportedlanguages-localsummary
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1f020e8c383cd00b1100ba1e7bb6f841a3d64da
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


[MediaWiki-commits] [Gerrit] [Translate] Remove deleted message keys - change (translatewiki)

2013-11-03 Thread Raimond Spekking (Code Review)
Raimond Spekking has uploaded a new change for review.

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


Change subject: [Translate] Remove deleted message keys
..

[Translate] Remove deleted message keys

https://gerrit.wikimedia.org/r/#/c/93176/1/Translate.i18n.php,unified

Change-Id: Ib1f020e8c383cd00b1100ba1e7bb6f841a3d64da
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index e630907..91094bb 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1624,7 +1624,6 @@
 file = Translate/Translate.i18n.php
 aliasfile = Translate/Translate.alias.php
 optional = translate-page-paging-links, supportedlanguages-portallink, 
supportedlanguages-portallink-nocldr
-optional = translate-edit-tab-next, translate-edit-tab-prev
 optional = group-translate-proofr.css, group-translate-proofr.js
 ignored = translate-edit-tag-warning, supportedlanguages-localsummary
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1f020e8c383cd00b1100ba1e7bb6f841a3d64da
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] update namespace aliases for vikidia family, - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has uploaded a new change for review.

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


Change subject: update namespace aliases for vikidia family,
..

update namespace aliases for vikidia family,

new family sites ru + it

Change-Id: I1589b7ec56b33a4d698103d81797b5bf28723190
---
M families/vikidia_family.py
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/20/93320/1

diff --git a/families/vikidia_family.py b/families/vikidia_family.py
index bbc6006..95a52e7 100644
--- a/families/vikidia_family.py
+++ b/families/vikidia_family.py
@@ -13,6 +13,8 @@
 self.langs = {
 'fr': 'fr.vikidia.org',
 'es': 'es.vikidia.org',
+'it': 'it.vikidia.org',
+'ru': 'ru.vikidia.org',
 }
 
 self.namespaces[1] = {
@@ -24,11 +26,14 @@
 'es': [u'Mensajes de usuario', u'Usuario Discusión'],
 }
 self.namespaces[4] = {
-'_default': [u'Vikidia', self.namespaces[4]['_default']], # 
REQUIRED
+'_default': [u'Vikidia', self.namespaces[4]['_default']],
+'fr': [u'Vikidia', u'VD'],
 }
 self.namespaces[5] = {
 '_default': [u'Discussion Vikidia', 
self.namespaces[5]['_default']],
-'es' : u'Conversación acerca de Vikidia',
+'es': u'Conversación acerca de Vikidia',
+'it': u'Discussioni Vikidia',
+'ru': u'Обсуждение Vikidia',
 }
 self.namespaces[6] = {
 'fr': [u'Fichier', u'Image'],
@@ -60,12 +65,14 @@
 'es': u'Conversación de proyecto',
 }
 self.namespaces[102] = {
-'fr': u'Portail',
 'es': u'Portal',
+'fr': u'Portail',
+'it': u'Portale',
 }
 self.namespaces[103] = {
-'fr': u'Discussion Portail',
 'es': u'Conversación acerca de portal',
+'fr': u'Discussion Portail',
+'it': u'Discussioni portale',
 }
 self.namespaces[104] = {
 'fr': u'Quiz',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1589b7ec56b33a4d698103d81797b5bf28723190
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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


[MediaWiki-commits] [Gerrit] update namespace aliases for vikidia family, - change (pywikibot/compat)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: update namespace aliases for vikidia family,
..


update namespace aliases for vikidia family,

new family sites ru + it

Change-Id: I1589b7ec56b33a4d698103d81797b5bf28723190
---
M families/vikidia_family.py
1 file changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/families/vikidia_family.py b/families/vikidia_family.py
index bbc6006..95a52e7 100644
--- a/families/vikidia_family.py
+++ b/families/vikidia_family.py
@@ -13,6 +13,8 @@
 self.langs = {
 'fr': 'fr.vikidia.org',
 'es': 'es.vikidia.org',
+'it': 'it.vikidia.org',
+'ru': 'ru.vikidia.org',
 }
 
 self.namespaces[1] = {
@@ -24,11 +26,14 @@
 'es': [u'Mensajes de usuario', u'Usuario Discusión'],
 }
 self.namespaces[4] = {
-'_default': [u'Vikidia', self.namespaces[4]['_default']], # 
REQUIRED
+'_default': [u'Vikidia', self.namespaces[4]['_default']],
+'fr': [u'Vikidia', u'VD'],
 }
 self.namespaces[5] = {
 '_default': [u'Discussion Vikidia', 
self.namespaces[5]['_default']],
-'es' : u'Conversación acerca de Vikidia',
+'es': u'Conversación acerca de Vikidia',
+'it': u'Discussioni Vikidia',
+'ru': u'Обсуждение Vikidia',
 }
 self.namespaces[6] = {
 'fr': [u'Fichier', u'Image'],
@@ -60,12 +65,14 @@
 'es': u'Conversación de proyecto',
 }
 self.namespaces[102] = {
-'fr': u'Portail',
 'es': u'Portal',
+'fr': u'Portail',
+'it': u'Portale',
 }
 self.namespaces[103] = {
-'fr': u'Discussion Portail',
 'es': u'Conversación acerca de portal',
+'fr': u'Discussion Portail',
+'it': u'Discussioni portale',
 }
 self.namespaces[104] = {
 'fr': u'Quiz',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1589b7ec56b33a4d698103d81797b5bf28723190
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Add composer.json - change (mediawiki...ProofreadPage)

2013-11-03 Thread Tpt (Code Review)
Tpt has uploaded a new change for review.

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


Change subject: Add composer.json
..

Add composer.json

Change-Id: I1f6758abf77dc8c8c19afe4f9563ee18fdb61e86
---
A composer.json
1 file changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..2f1e194
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+   name: mediawiki/proofread-page,
+   type: mediawiki-extension,
+   description: The ProofreadPage extension adds book proofreading 
capacity to MediaWiki. It can render a book either as a column of OCR text 
beside a column of scanned images, or broken into its logical organization 
(such as chapters or poems) using transclusion.,
+   homepage: https://www.mediawiki.org/wiki/Extension:ProofreadPage;,
+   license: GPL-2.0+,
+   require: {
+   composer/installers: *
+   },
+   suggest: {
+   mediawiki/labeled-section-transclusion: Allows to transclude 
only a part of a page
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f6758abf77dc8c8c19afe4f9563ee18fdb61e86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr

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


[MediaWiki-commits] [Gerrit] Mostly fixed issue with alt. forms only (no default form) fo... - change (mediawiki...SemanticForms)

2013-11-03 Thread Yaron Koren (Code Review)
Yaron Koren has uploaded a new change for review.

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


Change subject: Mostly fixed issue with alt. forms only (no default form) for 
red links
..

Mostly fixed issue with alt. forms only (no default form) for red links

Change-Id: I0a261595ab30762a61f61141da57e01889b5c55d
---
M includes/SF_FormLinker.php
M specials/SF_FormEdit.php
2 files changed, 18 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/22/93322/1

diff --git a/includes/SF_FormLinker.php b/includes/SF_FormLinker.php
index 9454b6a..a80ded8 100644
--- a/includes/SF_FormLinker.php
+++ b/includes/SF_FormLinker.php
@@ -209,7 +209,9 @@
if ( count( $default_forms )  0 ) {
$form_edit_url = $fe_url . / . $default_forms[0] . 
/ . SFUtils::titleURLString( $target_page_title );
} else {
-   $form_edit_url = $fe_url . / . 
SFUtils::titleURLString( $target_page_title );
+   $form_edit_url = $fe_url;
+   $form_edit_url .= ( strpos( $form_edit_url, ? ) ) ? 
 : ?;
+   $form_edit_url .= target=$target_page_title;
}
foreach ( $alt_forms as $i = $alt_form ) {
$form_edit_url .= ( strpos( $form_edit_url, ? ) ) ? 
 : ?;
diff --git a/specials/SF_FormEdit.php b/specials/SF_FormEdit.php
index 3b9c12d..9d7affa 100644
--- a/specials/SF_FormEdit.php
+++ b/specials/SF_FormEdit.php
@@ -137,6 +137,14 @@
} else {
$pageTitle = wfMessage( 
'sf_formedit_createtitle', $result[ 'form' ], $targetName )-text();
}
+   } elseif ( count( $alt_forms )  0 ) {
+   // We use the 'creating' message here, instead of
+   // 'sf_formedit_createtitlenotarget', to differentiate
+   // between a page with no (default) form, and one with
+   // no target; in English they'll show up as
+   // Creating ... and Create ..., respectively.
+   // Does this make any difference? Who knows.
+   $pageTitle = wfMessage( 'creating', $targetName 
)-text();
} elseif ( $result[ 'form' ] == '' ) {  //FIXME: This looks 
weird; a simple else should be enough, right?
// display error message if the form is not specified 
in the URL
$pageTitle = wfMessage( 'formedit' )-text();
@@ -146,8 +154,13 @@
 
$wgOut-setPageTitle( $pageTitle );
if ( count( $alt_forms )  0 ) {
-   $text .= 'div class=infoMessage' . wfMessage( 
'sf_formedit_altforms' )-escaped() . ' ';
-   $text .= self::printAltFormsList( $alt_forms, 
$targetName );
+   $text .= 'div class=infoMessage';
+   if ( $result[ 'form' ] != '' ) {
+   $text .= wfMessage( 'sf_formedit_altforms' 
)-escaped();
+   } else {
+   $text .= wfMessage( 'sf_formedit_altformsonly' 
)-escaped();
+   }
+   $text .= ' ' . self::printAltFormsList( $alt_forms, 
$targetName );
$text .= /div\n;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a261595ab30762a61f61141da57e01889b5c55d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com

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


[MediaWiki-commits] [Gerrit] Mostly fixed issue with alt. forms only (no default form) fo... - change (mediawiki...SemanticForms)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Mostly fixed issue with alt. forms only (no default form) for 
red links
..


Mostly fixed issue with alt. forms only (no default form) for red links

Change-Id: I0a261595ab30762a61f61141da57e01889b5c55d
---
M includes/SF_FormLinker.php
M specials/SF_FormEdit.php
2 files changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/includes/SF_FormLinker.php b/includes/SF_FormLinker.php
index 9454b6a..a80ded8 100644
--- a/includes/SF_FormLinker.php
+++ b/includes/SF_FormLinker.php
@@ -209,7 +209,9 @@
if ( count( $default_forms )  0 ) {
$form_edit_url = $fe_url . / . $default_forms[0] . 
/ . SFUtils::titleURLString( $target_page_title );
} else {
-   $form_edit_url = $fe_url . / . 
SFUtils::titleURLString( $target_page_title );
+   $form_edit_url = $fe_url;
+   $form_edit_url .= ( strpos( $form_edit_url, ? ) ) ? 
 : ?;
+   $form_edit_url .= target=$target_page_title;
}
foreach ( $alt_forms as $i = $alt_form ) {
$form_edit_url .= ( strpos( $form_edit_url, ? ) ) ? 
 : ?;
diff --git a/specials/SF_FormEdit.php b/specials/SF_FormEdit.php
index 3b9c12d..9d7affa 100644
--- a/specials/SF_FormEdit.php
+++ b/specials/SF_FormEdit.php
@@ -137,6 +137,14 @@
} else {
$pageTitle = wfMessage( 
'sf_formedit_createtitle', $result[ 'form' ], $targetName )-text();
}
+   } elseif ( count( $alt_forms )  0 ) {
+   // We use the 'creating' message here, instead of
+   // 'sf_formedit_createtitlenotarget', to differentiate
+   // between a page with no (default) form, and one with
+   // no target; in English they'll show up as
+   // Creating ... and Create ..., respectively.
+   // Does this make any difference? Who knows.
+   $pageTitle = wfMessage( 'creating', $targetName 
)-text();
} elseif ( $result[ 'form' ] == '' ) {  //FIXME: This looks 
weird; a simple else should be enough, right?
// display error message if the form is not specified 
in the URL
$pageTitle = wfMessage( 'formedit' )-text();
@@ -146,8 +154,13 @@
 
$wgOut-setPageTitle( $pageTitle );
if ( count( $alt_forms )  0 ) {
-   $text .= 'div class=infoMessage' . wfMessage( 
'sf_formedit_altforms' )-escaped() . ' ';
-   $text .= self::printAltFormsList( $alt_forms, 
$targetName );
+   $text .= 'div class=infoMessage';
+   if ( $result[ 'form' ] != '' ) {
+   $text .= wfMessage( 'sf_formedit_altforms' 
)-escaped();
+   } else {
+   $text .= wfMessage( 'sf_formedit_altformsonly' 
)-escaped();
+   }
+   $text .= ' ' . self::printAltFormsList( $alt_forms, 
$targetName );
$text .= /div\n;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a261595ab30762a61f61141da57e01889b5c55d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@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] Adding a timestamp according to this bug https://bugzilla.wi... - change (mediawiki/core)

2013-11-03 Thread Mayankmadan (Code Review)
Mayankmadan has uploaded a new change for review.

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


Change subject: Adding a timestamp according to this bug 
https://bugzilla.wikimedia.org/show_bug.cgi?id=28278
..

Adding a timestamp according to this bug 
https://bugzilla.wikimedia.org/show_bug.cgi?id=28278

Change-Id: I42cd0da35a2ed20748374afbe1a02773cd941136
---
M maintenance/update.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/93323/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 378217f..25665e5 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -81,6 +81,7 @@
}
 
function execute() {
+   $time1 = time();
global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
 
if ( !$wgAllowSchemaUpdates  !( $this-hasOption( 'force' ) 
|| $this-hasOption( 'schema' ) || $this-hasOption( 'noschema' ) ) ) {
@@ -130,6 +131,7 @@
if ( !$this-hasOption( 'quick' ) ) {
$this-output( Abort with control-c in the next five 
seconds (skip this countdown with --quick) ...  );
wfCountDown( 5 );
+   $time1 = time();
}
 
$shared = $this-hasOption( 'doshared' );
@@ -164,8 +166,10 @@
if ( !$this-hasOption( 'nopurge' ) ) {
$updater-purgeCache();
}
+   $time2 = time();
 
$this-output( \nDone.\n );
+   $this-output( \nThe job took . gmdate(i:s, $time2-$time1). 
\n);
}
 
function afterFinalSetup() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42cd0da35a2ed20748374afbe1a02773cd941136
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mayankmadan maddiema...@gmail.com

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


[MediaWiki-commits] [Gerrit] Clarify the tog-previewonfirst preference - change (mediawiki/core)

2013-11-03 Thread Nemo bis (Code Review)
Nemo bis has uploaded a new change for review.

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


Change subject: Clarify the tog-previewonfirst preference
..

Clarify the tog-previewonfirst preference

It just means that it shows your the preview if you try to save and have not 
seen
a preview already, as far as I know.

I've never used this preference but as far as I know the description is wrong,
whatever first edit is supposed to mean (first edit to the wiki? to the page?
today?). It's probably a lapsus for first submit as in action=submit, but that
is definitely exposing too much detail.

Change-Id: I90a56e067dbbf1a3bcff873e9dd892aded96af8a
---
M languages/messages/MessagesEn.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 7b62d29..37116b1 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -675,7 +675,7 @@
 'tog-watchdeletion'   = 'Add pages and files I delete to my 
watchlist',
 'tog-minordefault'= 'Mark all edits minor by default',
 'tog-previewontop'= 'Show preview before edit box',
-'tog-previewonfirst'  = 'Show preview on first edit',
+'tog-previewonfirst'  = 'Show preview at least once before saving',
 'tog-nocache' = 'Disable browser page caching',
 'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist 
is changed',
 'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',

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

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

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


[MediaWiki-commits] [Gerrit] Add per project sums of editors - change (analytics/geowiki)

2013-11-03 Thread QChris (Code Review)
Hello Milimetric,

I'd like you to do a code review.  Please visit

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

to review the following change.

Change subject: Add per project sums of editors
..

Add per project sums of editors

Change-Id: I46949dd80ff346cad99cc5d1b59274a653a90187
---
M scripts/make_limn_files.py
1 file changed, 63 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/geowiki 
refs/changes/26/93326/1

diff --git a/scripts/make_limn_files.py b/scripts/make_limn_files.py
index df5f698..058eb19 100755
--- a/scripts/make_limn_files.py
+++ b/scripts/make_limn_files.py
@@ -77,6 +77,8 @@
 
 
 def write_project_mysql(proj, cursor, basedir, country_graphs=False):
+# This function's structure got copy/pasted to write_project_summed_mysql.
+# Please apply fixes to this function also to write_project_summed_mysql.
 logger.debug('writing project datasource for: %s', proj)
 limn_id = proj + '_all'
 limn_name = '%s Editors by Country' % proj.upper()
@@ -104,6 +106,55 @@
 title = '%s Editors in %s' % (proj.upper(), country)
 graph_id = '%s_%s' % (proj, re.sub('\W+', ' ', 
country).strip().replace(' ', '_').lower())
 source.write_graph(metric_ids=[country], basedir=basedir, 
title=title, graph_id=graph_id)
+
+
+def write_project_summed_mysql(proj, cursor, basedir):
+Write out per project sums of editors
+
+Keyword arguments:
+proj -- string. The name of the project in the database
+(e.g.: 'en' for enwiki).
+cursor -- database connection. Used to obtain the data.
+basedir -- string. Path to the data repository to store the computed
+data in.
+
+# dumb copy/paste of write_project_mysql to get daily per project active
+# editor counts. Please apply fixes to this function also to
+# write_project_mysql.
+logger.debug('writing summed project datasource for: %s', proj)
+limn_id = proj + 'wiki_editor_counts'
+limn_name = proj + 'wiki editors (Tentative)'
+
+if sql.paramstyle == 'qmark':
+query = SELECT cohort, end, CONCAT(project, 'wiki') AS 
wikified_project, SUM(count)
+FROM erosen_geocode_active_editors_country
+WHERE project = ? AND end = start + INTERVAL 30 day
+GROUP BY cohort, end, project
+logger.debug('making query: %s', query)
+elif sql.paramstyle == 'format':
+query = SELECT cohort, end, CONCAT(project, 'wiki') AS 
wikified_project, SUM(count)
+FROM erosen_geocode_active_editors_country
+WHERE project = %s AND end = start + INTERVAL 30 day
+GROUP BY cohort, end, project
+cursor.execute(query, [proj])
+proj_rows = cursor.fetchall()
+
+logger.debug('len(proj_rows): %d', len(proj_rows))
+if not proj_rows and sql.paramstyle == 'format':
+logger.debug('No results for query: %s', query % proj)
+return
+limn_rows = make_limn_rows(proj_rows, 'wikified_project', 'SUM(count)')
+source = limnpy.DataSource(limn_id, limn_name, limn_rows, 
limn_group=LIMN_GROUP)
+source.write(basedir=basedir)
+graph = source.get_graph(metric_ids = ['%swiki (5+)' % project])
+graph.graph['desc'] = This graph currently mis-reports by counting each
+editor once for each country associated to the IP addresses used by
+the editor.
+
+drop_callout_widget(graph)
+graph.write(basedir)
+
+
 
 
 def write_project_top_k_mysql(proj, cursor,  basedir, k=10):
@@ -327,7 +378,7 @@
 return projects
 
 
-def process_project_par((project, basedir)):
+def process_project_par((project, basedir_private, basedir_public)):
 try:
 logger.info('processing project: %s', project)
 db = sql.connect(read_default_file=args.source_sql_cnf, 
db=args.source_db_name)
@@ -335,18 +386,20 @@
 
 # db = sql.connect('/home/erosen/src/editor-geocoding/geowiki.sqlite')
 
-write_project_mysql(project, cursor, basedir)
-write_project_top_k_mysql(project, cursor, basedir, k=args.k)
-#write_project_country_language(project, cursor, basedir)
+write_project_mysql(project, cursor, basedir_private)
+write_project_top_k_mysql(project, cursor, basedir_private, k=args.k)
+write_project_summed_mysql(project, cursor, basedir_public)
+#write_project_country_language(project, cursor, basedir_private)
 except:
 logger.exception('caught exception in process:')
 raise
 
-def process_project(project, cursor, basedir):
+def process_project(project, cursor, basedir_private, basedir_public):
 logger.info('processing project: %s (%d/%d)', project, i, len(projects))
-write_project_mysql(project, cursor, basedir)
-write_project_top_k_mysql(project, cursor, basedir, k=args.k)
-#write_project_country_language(project, cursor, basedir)
+

[MediaWiki-commits] [Gerrit] Remove obtrusive styles for q - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Remove obtrusive styles for q
..


Remove obtrusive styles for q

Bug: 55591
Change-Id: Ibbc89d3b97df606476e019a70621ffd055ccf0dc
---
M skins/common/commonElements.css
1 file changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/skins/common/commonElements.css b/skins/common/commonElements.css
index 76ec4af..742f839 100644
--- a/skins/common/commonElements.css
+++ b/skins/common/commonElements.css
@@ -157,15 +157,12 @@
margin-bottom: .1em;
 }
 
+/* IE 6 and 7 lack support for quotes aroud the q element ('::before' and 
'::after'
+   pseudoelements, 'quotes' property). Let's italicize it instead (using the 
star hack). */
 q {
-   font-family: Times, Times New Roman, serif;
-   font-style: italic;
+   *font-style: italic;
 }
-/* Disabled for now
-blockquote {
-   font-family: Times, Times New Roman, serif;
-   font-style: italic;
-}*/
+
 pre, code, tt, kbd, samp, .mw-code {
/*
 * Some browsers will render the monospace text too small, namely 
Firefox, Chrome and Safari.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbc89d3b97df606476e019a70621ffd055ccf0dc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@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] Change output format of Gerrit review count gsql to JSON_SINGLE - change (operations/puppet)

2013-11-03 Thread Ori.livneh (Code Review)
Ori.livneh has submitted this change and it was merged.

Change subject: Change output format of Gerrit review count gsql to JSON_SINGLE
..


Change output format of Gerrit review count gsql to JSON_SINGLE

In JSON mode records are output as JSON objects using the column names as
the property names, one object per line. In JSON_SINGLE mode the whole
result set is output as a single JSON object.

Bug: 52329
Change-Id: Ifbb8176fc6212d93a7e11398a0b9118a5c8ba0a4
---
M manifests/gerrit.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index d991e11..a943049 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -293,7 +293,7 @@
cron { list_reviewer_counts:
# This is useful information about the distribution of 
reviewers.
# Gerrit's rest api doesn't provide an easy way to get this 
data.
-   command = ssh -p 29418 localhost gerrit gsql --format JSON -c 
\'SELECT changes.change_id AS change_id, COUNT(DISTINCT 
patch_set_approvals.account_id) AS reviewer_count FROM changes LEFT JOIN 
patch_set_approvals ON (changes.change_id = patch_set_approvals.change_id) 
GROUP BY changes.change_id'\  /var/www/reviewer-counts.json,
+   command = ssh -p 29418 localhost gerrit gsql --format 
JSON_SINGLE -c \'SELECT changes.change_id AS change_id, COUNT(DISTINCT 
patch_set_approvals.account_id) AS reviewer_count FROM changes LEFT JOIN 
patch_set_approvals ON (changes.change_id = patch_set_approvals.change_id) 
GROUP BY changes.change_id'\  /var/www/reviewer-counts.json,
user = gerrit2,
hour = 1
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbb8176fc6212d93a7e11398a0b9118a5c8ba0a4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Fix a little error in the text - change (mediawiki...LinkedWiki)

2013-11-03 Thread Karima Rafes (Code Review)
Karima Rafes has uploaded a new change for review.

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


Change subject: Fix a little error in the text
..

Fix a little error in the text

Change-Id: Iaa8c3d5b5cd50bceab679827d67252191ce5c085
---
M LinkedWiki.i18n.php
M LinkedWiki.php
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkedWiki 
refs/changes/27/93327/1

diff --git a/LinkedWiki.i18n.php b/LinkedWiki.i18n.php
index 1536b87..1846eae 100644
--- a/LinkedWiki.i18n.php
+++ b/LinkedWiki.i18n.php
@@ -6,13 +6,13 @@
'linkedwiki-test' = 'test',
'linkedwiki-date' = 'H:i:s m/d/Y',
'linkedwiki-refresh' = 'Refresh',
-   'linkedwiki-durate' = 'Durate of query',
+   'linkedwiki-duration' = 'Duration of query',
 );
 
 $messages['fr'] = array(
 'linkedwiki-test' = 'test',
 'linkedwiki-date' = 'H:i:s d/m/Y',
 'linkedwiki-refresh' = 'Rafraîchir',
-'linkedwiki-durate' = 'Durée du calcul',
+'linkedwiki-duration' = 'Durée du calcul',
 );
 
diff --git a/LinkedWiki.php b/LinkedWiki.php
index 68cebd2..1fb76c5 100644
--- a/LinkedWiki.php
+++ b/LinkedWiki.php
@@ -629,7 +629,7 @@
 function  efSparqlParserFunction_footer($duration,$querySparqlWiki,$endpoint 
,$classHeaders = '',$headers = ''){
$today = date(wfMessage( 'linkedwiki-date' )-text());
return $today . -- [{{fullurl:{{FULLPAGENAME}}|action=purge}} 
.wfMessage( 'linkedwiki-refresh' )-text().] -- .
-wfMessage( 'linkedwiki-durate' )-text(). :.
+wfMessage( 'linkedwiki-duration' )-text(). :.
 round($duration, 3) .s  ;
 //Version : 
[{{canonicalurl:Special:Specialexportcsv}}?query={{urlencode:$querySparqlWiki}}$endpoint={{urlencode:$querySparqlWiki}}classHeaders={{urlencode:$querySparqlWiki}}headers={{urlencode:$querySparqlWiki}}
 CSV] ;
 }
@@ -650,7 +650,7 @@
//$url = preg_replace( '/(\?[^\?]*$)/i', 
,$wgRequest-getRequestURL()) . ?action=purge;
//$url = $wgRequest-getRequestURL() . ?action=purge;
return $today . -- a href=\.$url.\.wfMessage( 
'linkedwiki-refresh' )-text()./a -- .
-wfMessage( 'linkedwiki-durate' )-text(). :.
+wfMessage( 'linkedwiki-duration' )-text(). :.
 round($duration, 3) .s -- a class=\csv\ style=\cursor: pointer;\ 
CSV/a;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa8c3d5b5cd50bceab679827d67252191ce5c085
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes karima.ra...@gmail.com

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


[MediaWiki-commits] [Gerrit] Correct database name - change (translatewiki)

2013-11-03 Thread Nikerabbit (Code Review)
Nikerabbit has uploaded a new change for review.

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


Change subject: Correct database name
..

Correct database name

Change-Id: Ie4468d77e40b763e2dfcaf188c5e808255e257d1
---
M puppet/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/puppet/site.pp b/puppet/site.pp
index dbee3f3..358ce9e 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -20,7 +20,7 @@
   include users
 
   class { 'backup':
-databases = ['mediawiki'],
+databases = ['translatewiki_net'],
   }
 
   class { 'wiki':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4468d77e40b763e2dfcaf188c5e808255e257d1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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


[MediaWiki-commits] [Gerrit] Add sitemap generation to cron - change (translatewiki)

2013-11-03 Thread Nikerabbit (Code Review)
Nikerabbit has uploaded a new change for review.

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


Change subject: Add sitemap generation to cron
..

Add sitemap generation to cron

Change-Id: Ifc15146b11fc5f3f7049e881e6e45ac3ce0f57dc
---
M puppet/modules/wiki/templates/wikimaintenance.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/29/93329/1

diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb 
b/puppet/modules/wiki/templates/wikimaintenance.erb
index 91c48c0..ec22067 100644
--- a/puppet/modules/wiki/templates/wikimaintenance.erb
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -2,3 +2,4 @@
 * * * * * %= @user % nice php 
/www/translatewiki.net/w/maintenance/runJobs.php --exclusive --maxtime=50 
--procs=1 --memory-limit=250M  /www/translatewiki.net/w/logs/jobqueue 2 
/dev/null
 */5 * * * * %= @user % nice php 
/www/sandbox.translatewiki.net/w/maintenance/runJobs.php --exclusive 
--maxtime=50 --procs=1 --memory-limit=250M  
/www/sandbox.translatewiki.net/w/logs/jobqueue 2 /dev/null
 @weekly www-data find /www/translatewiki.net/w/images/thumb/ -name *.png 
-type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1 /dev/null
+@weekly %= @user = nice php 
/www/translatewiki.net/w/maintenance/generateSitemap.php --fspath 
/www/translatewiki.net/sitemap/ --skip-redirects --urlpath 
https://translatewiki.net/sitemap/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc15146b11fc5f3f7049e881e6e45ac3ce0f57dc
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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


[MediaWiki-commits] [Gerrit] No title case - change (mediawiki...Flow)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: No title case
..


No title case

Change-Id: Iacaa3198e0b9a8d0ef7f39ae2724eba1c0fe479c
---
M Flow.i18n.php
1 file changed, 8 insertions(+), 9 deletions(-)

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



diff --git a/Flow.i18n.php b/Flow.i18n.php
index e096cfc..c58b9a9 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -102,8 +102,9 @@
'flow-rev-message-deleted-post' = '[[User:$1|$1]] 
{{GENDER:$1|deleted}} a [$3 comment].',
'flow-rev-message-censored-post' = '[[User:$1|$1]] 
{{GENDER:$1|suppressed}} a [$3 comment].',
 
-   'flow-topic-history' = '$1 Topic History',
-   'flow-post-history' = 'Comment by {{GENDER:$2|$2}} Post History',
+   'flow-board-history' = '$1 history',
+   'flow-topic-history' = '$1 topic history',
+   'flow-post-history' = 'Comment by {{GENDER:$2|$2}} post history',
'flow-history-last4' = 'Last 4 hours',
'flow-history-day' = 'Today',
'flow-history-week' = 'Last week',
@@ -111,8 +112,6 @@
'flow-history-pages-post' = 'Appears on [$1 $2]',
'flow-topic-participants' = '{{PLURAL:$1|$3 started this 
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and {{PLURAL:$2|other|others}}|0=No 
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4',
'flow-topic-comments' = '{{PLURAL:$1|0=Be the first to 
comment!|Comment ($1)}}',
-
-   'flow-board-history' = '$1 History',
 
'flow-comment-restored' = 'Restored comment',
'flow-comment-deleted' = 'Deleted comment',
@@ -423,6 +422,11 @@
 * $1: Username of the user who moderated the comment. Can be used for GENDER
 * $2: Username of the user who had posted the comment. Can be used for GENDER
 * $3: Permalink to the comment',
+   'flow-board-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Board history page.
+
+Parameters:
+* $1 - the title to which the flow board belongs
+{{Identical|History}}',
'flow-topic-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Topic history page.
 
 Parameters:
@@ -456,11 +460,6 @@
 
 Parameters:
 * $1 - The amount of comments on this topic, can be used for PLURAL',
-   'flow-board-history' = 'Used as codenowikih1/nowiki/code 
heading and HTML title in the Board history page.
-
-Parameters:
-* $1 - the title to which the flow board belongs
-{{Identical|History}}',
'flow-comment-restored' = 'Used as revision comment when the post has 
been restored.
 
 See also:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacaa3198e0b9a8d0ef7f39ae2724eba1c0fe479c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Correct database name - change (translatewiki)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Correct database name
..


Correct database name

Change-Id: Ie4468d77e40b763e2dfcaf188c5e808255e257d1
---
M puppet/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/site.pp b/puppet/site.pp
index dbee3f3..358ce9e 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -20,7 +20,7 @@
   include users
 
   class { 'backup':
-databases = ['mediawiki'],
+databases = ['translatewiki_net'],
   }
 
   class { 'wiki':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4468d77e40b763e2dfcaf188c5e808255e257d1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@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] Fix cite parser tests - change (mediawiki...Cite)

2013-11-03 Thread Hoo man (Code Review)
Hoo man has uploaded a new change for review.

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


Change subject: Fix cite parser tests
..

Fix cite parser tests

broken by I82fb4d7 in core

Change-Id: I13b919bb07ee2344a00d64e56593a372a199c5b1
---
M citeParserTests.txt
1 file changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/citeParserTests.txt b/citeParserTests.txt
index 3076eeb..052cd56 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -311,16 +311,20 @@
 !! result
 pAAAsup id=cite_ref-1 class=referencea href=#cite_note-1[参 
1]/a/supBBBsup id=cite_ref-2 class=referencea href=#cite_note-2[注 
1]/a/supCCCsup id=cite_ref-3 class=referencea href=#cite_note-3[参 
2]/a/sup
 /p
-dldtrefs
-/dt/dl
+dl
+dtrefs
+/dt
+/dl
 ol class=references
 li id=cite_note-1span class=mw-cite-backlinka 
href=#cite_ref-1↑/a/span span class=reference-textref a/span
 /li
 li id=cite_note-3span class=mw-cite-backlinka 
href=#cite_ref-3↑/a/span span class=reference-textref c/span
 /li
 /ol
-dldtnotes
-/dt/dl
+dl
+dtnotes
+/dt
+/dl
 ol class=references
 li id=cite_note-2span class=mw-cite-backlinka 
href=#cite_ref-2↑/a/span span class=reference-textnote b/span
 /li

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

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

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


[MediaWiki-commits] [Gerrit] Only load RL modules when a ref tag is being used - change (mediawiki...Cite)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Only load RL modules when a ref tag is being used
..


Only load RL modules when a ref tag is being used

Bug: 55684
Change-Id: I8f7528ef8468bf3fa1c901fd6dc67b5eebc0cbd6
---
M Cite.php
M Cite_body.php
2 files changed, 7 insertions(+), 20 deletions(-)

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



diff --git a/Cite.php b/Cite.php
index 4b2f70f..045bb8c 100644
--- a/Cite.php
+++ b/Cite.php
@@ -18,8 +18,6 @@
  */
 
 $wgHooks['ParserFirstCallInit'][] = 'wfCite';
-$wgHooks['BeforePageDisplay'][] = 'wfCiteBeforePageDisplay';
-
 
 $wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,
@@ -97,23 +95,5 @@
'styles' = 'ext.rtlcite.css',
'position' = 'top',
 );
-
-/**
- * @param $out OutputPage
- * @param $sk Skin
- * @return bool
- */
-function wfCiteBeforePageDisplay( $out, $sk ) {
-   global $wgCiteEnablePopups;
-
-   $out-addModules( 'ext.cite' );
-   if ( $wgCiteEnablePopups ) {
-   $out-addModules( 'ext.cite.popups' );
-   }
-
-   /* RTL support quick-fix module */
-   $out-addModuleStyles( 'ext.rtlcite' );
-   return true;
-}
 
 /**#@-*/
diff --git a/Cite_body.php b/Cite_body.php
index 27432f4..08c6072 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -155,6 +155,7 @@
 * @return string
 */
function ref( $str, $argv, $parser ) {
+   global $wgCiteEnablePopups;
if ( $this-mInCite ) {
return htmlspecialchars( ref$str/ref );
} else {
@@ -162,6 +163,12 @@
$this-mInCite = true;
$ret = $this-guardedRef( $str, $argv, $parser );
$this-mInCite = false;
+   $parserOutput = $parser-getOutput();
+   $parserOutput-addModules( 'ext.cite' );
+   if ( $wgCiteEnablePopups ) {
+   $parserOutput-addModules( 'ext.cite.popups' );
+   }
+   $parserOutput-addModuleStyles( 'ext.rtlcite' );
return $ret;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f7528ef8468bf3fa1c901fd6dc67b5eebc0cbd6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: PleaseStand pleasest...@live.com
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Fix cite parser tests - change (mediawiki...Cite)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix cite parser tests
..


Fix cite parser tests

broken by I82fb4d7 in core

Change-Id: I13b919bb07ee2344a00d64e56593a372a199c5b1
---
M citeParserTests.txt
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/citeParserTests.txt b/citeParserTests.txt
index 3076eeb..052cd56 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -311,16 +311,20 @@
 !! result
 pAAAsup id=cite_ref-1 class=referencea href=#cite_note-1[参 
1]/a/supBBBsup id=cite_ref-2 class=referencea href=#cite_note-2[注 
1]/a/supCCCsup id=cite_ref-3 class=referencea href=#cite_note-3[参 
2]/a/sup
 /p
-dldtrefs
-/dt/dl
+dl
+dtrefs
+/dt
+/dl
 ol class=references
 li id=cite_note-1span class=mw-cite-backlinka 
href=#cite_ref-1↑/a/span span class=reference-textref a/span
 /li
 li id=cite_note-3span class=mw-cite-backlinka 
href=#cite_ref-3↑/a/span span class=reference-textref c/span
 /li
 /ol
-dldtnotes
-/dt/dl
+dl
+dtnotes
+/dt
+/dl
 ol class=references
 li id=cite_note-2span class=mw-cite-backlinka 
href=#cite_ref-2↑/a/span span class=reference-textnote b/span
 /li

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13b919bb07ee2344a00d64e56593a372a199c5b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] mw.inspect: add report for mw.loader.store - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: mw.inspect: add report for mw.loader.store
..


mw.inspect: add report for mw.loader.store

Adds a 'store' report to mw.inspect, which outputs:
* Whether localStorage module caching is enabled.
* Cache hit / miss counts.
* Number of items purged from the cache.
* Total size of the cache blob in localStorage.

Rather than duplicate the logic that converted a numeric byte count to a
human-readable format, I moved it to new helper function: humanSize.

Change-Id: I5b98322ba843f32e6a99829b4cf3d8fb0bc61514
---
M resources/mediawiki/mediawiki.inspect.js
1 file changed, 25 insertions(+), 3 deletions(-)

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



diff --git a/resources/mediawiki/mediawiki.inspect.js 
b/resources/mediawiki/mediawiki.inspect.js
index 668aa2a..d93254b 100644
--- a/resources/mediawiki/mediawiki.inspect.js
+++ b/resources/mediawiki/mediawiki.inspect.js
@@ -14,6 +14,13 @@
} );
}
 
+   function humanSize( bytes ) {
+   if ( !$.isNumeric( bytes ) || bytes === 0 ) { return bytes; }
+   var i = 0, units = [ '', ' kB', ' MB', ' GB', ' TB', ' PB' ];
+   for ( ; bytes = 1024; bytes /= 1024 ) { i++; }
+   return bytes.toFixed( 1 ) + units[i];
+   }
+
/**
 * @class mw.inspect
 * @singleton
@@ -181,9 +188,7 @@
 
// Convert size to human-readable string.
$.each( modules, function ( i, module ) {
-   module.size = module.size  1024 ?
-   ( module.size / 1024 ).toFixed( 
2 ) + ' KB' :
-   ( module.size !== null ? 
module.size + ' B' : null );
+   module.size = humanSize( module.size );
} );
 
return modules;
@@ -214,6 +219,23 @@
} );
sortByProperty( modules, 'allSelectors', true );
return modules;
+   },
+
+   /**
+* Report stats on mw.loader.store: the number of 
localStorage
+* cache hits and misses, the number of items purged 
from the
+* cache, and the total size of the module blob in 
localStorage.
+*/
+   store: function () {
+   var raw, stats = { enabled: 
mw.loader.store.enabled };
+   if ( stats.enabled ) {
+   $.extend( stats, mw.loader.store.stats 
);
+   try {
+   raw = localStorage.getItem( 
mw.loader.store.getStoreKey() );
+   stats.totalSize = humanSize( 
$.byteLength( raw ) );
+   } catch (e) {}
+   }
+   return [stats];
}
}
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b98322ba843f32e6a99829b4cf3d8fb0bc61514
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@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] Add composer.json - change (mediawiki...ProofreadPage)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Add composer.json
..


Add composer.json

Change-Id: I1f6758abf77dc8c8c19afe4f9563ee18fdb61e86
---
A composer.json
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/composer.json b/composer.json
new file mode 100644
index 000..2c114ec
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+   name: mediawiki/proofread-page,
+   type: mediawiki-extension,
+   description: The ProofreadPage extension adds book proofreading 
capacity to MediaWiki. It can render a book either as a column of OCR text 
beside a column of scanned images, or broken into its logical organization 
(such as chapters or poems) using transclusion.,
+   homepage: https://www.mediawiki.org/wiki/Extension:ProofreadPage;,
+   license: GPL-2.0+,
+   require: {
+   composer/installers: *
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f6758abf77dc8c8c19afe4f9563ee18fdb61e86
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Rtdwivedi ellydwivedi2...@gmail.com
Gerrit-Reviewer: Tpt thoma...@hotmail.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] Hygiene: Remove unused LESS mixin - change (mediawiki...MobileFrontend)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Remove unused LESS mixin
..


Hygiene: Remove unused LESS mixin

Change-Id: I66a46d2f48949af7f0359346051176c0435f1312
---
M less/mixins.less
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/less/mixins.less b/less/mixins.less
index c33899d..852d29f 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -39,11 +39,6 @@
background-image: linear-gradient( @startColor @startPos, @endColor 
@endPos ); // Standard
 }
 
-.background-alpha( @r, @g, @b, @a ) {
-   background: rgb(@r, @g, @b);
-   background: rgba(@r, @g, @b, @a);
-}
-
 .transform( @transform ) {
-webkit-transform: @transform;
transform: @transform;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66a46d2f48949af7f0359346051176c0435f1312
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Don't show Send code button when email is already confirme... - change (mediawiki/core)

2013-11-03 Thread IAlex (Code Review)
IAlex has uploaded a new change for review.

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


Change subject: Don't show Send code button when email is already confirmed 
on Special:ConfirmEmail
..

Don't show Send code button when email is already confirmed on 
Special:ConfirmEmail

Bug: 56443
Change-Id: I6fca42ea4568c13bca6b10e19d17e023ed0eacca
---
M RELEASE-NOTES-1.23
M includes/specials/SpecialConfirmemail.php
2 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/93394/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index c9b56b9..3a5ee0b 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -24,6 +24,8 @@
   changes and watchlist) and the talk page message indicator are now correctly
   updated when the user is viewing old revisions of pages, instead of always
   acting as if the latest revision was being viewed.
+* (bug 56443) Special:ConfirmEmail no longer shows a Mail a confirmation code
+  when the email address is already confirmed.
 
 === API changes in 1.23 ===
 
diff --git a/includes/specials/SpecialConfirmemail.php 
b/includes/specials/SpecialConfirmemail.php
index 3828b1c..6757990 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -90,19 +90,17 @@
} else {
$out-addWikiText( $status-getWikiText( 
'confirmemail_sendfailed' ) );
}
+   } elseif ( $user-isEmailConfirmed() ) {
+   // date and time are separate parameters to facilitate 
localisation.
+   // $time is kept for backward compat reasons.
+   // 'emailauthenticated' is also used in 
SpecialPreferences.php
+   $lang = $this-getLanguage();
+   $emailAuthenticated = 
$user-getEmailAuthenticationTimestamp();
+   $time = $lang-userTimeAndDate( $emailAuthenticated, 
$user );
+   $d = $lang-userDate( $emailAuthenticated, $user );
+   $t = $lang-userTime( $emailAuthenticated, $user );
+   $out-addWikiMsg( 'emailauthenticated', $time, $d, $t );
} else {
-   if ( $user-isEmailConfirmed() ) {
-   // date and time are separate parameters to 
facilitate localisation.
-   // $time is kept for backward compat reasons.
-   // 'emailauthenticated' is also used in 
SpecialPreferences.php
-   $lang = $this-getLanguage();
-   $emailAuthenticated = 
$user-getEmailAuthenticationTimestamp();
-   $time = $lang-userTimeAndDate( 
$emailAuthenticated, $user );
-   $d = $lang-userDate( $emailAuthenticated, 
$user );
-   $t = $lang-userTime( $emailAuthenticated, 
$user );
-   $out-addWikiMsg( 'emailauthenticated', $time, 
$d, $t );
-   }
-
if ( $user-isEmailConfirmationPending() ) {
$out-wrapWikiMsg(
div class=\error 
mw-confirmemail-pending\\n$1\n/div,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fca42ea4568c13bca6b10e19d17e023ed0eacca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch

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


[MediaWiki-commits] [Gerrit] Hygiene: Button style cleanup on diff view - change (mediawiki...MobileFrontend)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Hygiene: Button style cleanup on diff view
..

Hygiene: Button style cleanup on diff view

Reverts changes to button.less introducing in in c5c6558 and provides an
alternative fix for Thank you button styling. Removing scoping from
current button styling would cause a lot of redundant CSS in new
overlays.

Change-Id: I723e17d14d8046a2dba40d8f76598d7b3eed5fac
---
M includes/specials/SpecialMobileDiff.php
M less/common/buttons.less
2 files changed, 47 insertions(+), 39 deletions(-)


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

diff --git a/includes/specials/SpecialMobileDiff.php 
b/includes/specials/SpecialMobileDiff.php
index 8aa5b8c..1aceee1 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -206,7 +206,7 @@
 
$output-addHtml(
Html::openElement( 'div', array( 'id' = 
'mw-mf-userinfo',
-   'class' = 'position-fixed' ) )
+   'class' = 'buttonBar position-fixed' ) )
);
 
$userId = $this-rev-getUser();
diff --git a/less/common/buttons.less b/less/common/buttons.less
index cae4979..72eca6d 100644
--- a/less/common/buttons.less
+++ b/less/common/buttons.less
@@ -10,47 +10,55 @@
line-height: 1;
cursor: pointer;
margin: 0;
-   padding: .8em 1.2em;
-   text-align: center;
-   border: 1px #33589f solid;
-   color: white;
-   .vertical-gradient( #3670C8, @blueBase );
+}
 
-   :hover {
-   .vertical-gradient( #4c84da, #3f77d7 );
-   }
-
-   :active {
-   .vertical-gradient( #2d5ea9, #2a549c );
-   }
-
-   :visited {
-   color: #fff;
-   }
-
-   :disabled {
-   @disabledColor: lighten( desaturate( #3f77d7, 15% ), 10% );
-   color: lighten( #3f77d7, 30% );;
-   .vertical-gradient( @disabledColor,@disabledColor );
-   border-color: darken( @disabledColor, 5% );
-   }
-
-   .cancel {
-   background: #777;
-   border: 1px #666 solid;
-   }
-
-   .inline {
-   display: inline;
-   padding: 0;
-   line-height: inherit;
-   color: #002bb8;
-   background: none;
-   border: none;
-   text-shadow: none;
+.content,
+.buttonBar {
+   .button,
+   button,
+   input[type=submit] {
+   padding: .8em 1.2em;
+   text-align: center;
+   border: 1px #33589f solid;
+   color: white;
+   .vertical-gradient( #3670C8, @blueBase );
 
:hover {
-   text-decoration: underline;
+   .vertical-gradient( #4c84da, #3f77d7 );
+   }
+
+   :active {
+   .vertical-gradient( #2d5ea9, #2a549c );
+   }
+
+   :visited {
+   color: #fff;
+   }
+
+   :disabled {
+   @disabledColor: lighten( desaturate( #3f77d7, 15% ), 
10% );
+   color: lighten( #3f77d7, 30% );;
+   .vertical-gradient( @disabledColor,@disabledColor );
+   border-color: darken( @disabledColor, 5% );
+   }
+
+   .cancel {
+   background: #777;
+   border: 1px #666 solid;
+   }
+
+   .inline {
+   display: inline;
+   padding: 0;
+   line-height: inherit;
+   color: #002bb8;
+   background: none;
+   border: none;
+   text-shadow: none;
+
+   :hover {
+   text-decoration: underline;
+   }
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I723e17d14d8046a2dba40d8f76598d7b3eed5fac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Use getSite function, not constructor, as docs say, fixing b... - change (pywikibot/compat)

2013-11-03 Thread UltrasonicNXT (Code Review)
UltrasonicNXT has uploaded a new change for review.

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


Change subject: Use getSite function, not constructor, as docs say, fixing bug 
with script
..

Use getSite function, not constructor, as docs say, fixing bug with script

Change-Id: Ic947805d22d7f64e33b924c1e4449606431678fa
---
M imagetransfer.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/05/93405/1

diff --git a/imagetransfer.py b/imagetransfer.py
index f4c9ee7..a950d48 100644
--- a/imagetransfer.py
+++ b/imagetransfer.py
@@ -360,7 +360,7 @@
 targetLang = pywikibot.getSite().language
 if not targetFamily:
 targetFamily = pywikibot.getSite().family
-targetSite = pywikibot.Site(targetLang, targetFamily)
+targetSite = pywikibot.getSite(targetLang, targetFamily)
 bot = ImageTransferBot(gen, interwiki=interwiki, targetSite=targetSite,
keep_name=keep_name)
 bot.run()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic947805d22d7f64e33b924c1e4449606431678fa
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com

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


[MediaWiki-commits] [Gerrit] Use getSite function, not constructor, as docs say, fixing b... - change (pywikibot/compat)

2013-11-03 Thread Xqt (Code Review)
Xqt has submitted this change and it was merged.

Change subject: Use getSite function, not constructor, as docs say, fixing bug 
with script
..


Use getSite function, not constructor, as docs say, fixing bug with script

Change-Id: Ic947805d22d7f64e33b924c1e4449606431678fa
---
M imagetransfer.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/imagetransfer.py b/imagetransfer.py
index f4c9ee7..a950d48 100644
--- a/imagetransfer.py
+++ b/imagetransfer.py
@@ -360,7 +360,7 @@
 targetLang = pywikibot.getSite().language
 if not targetFamily:
 targetFamily = pywikibot.getSite().family
-targetSite = pywikibot.Site(targetLang, targetFamily)
+targetSite = pywikibot.getSite(targetLang, targetFamily)
 bot = ImageTransferBot(gen, interwiki=interwiki, targetSite=targetSite,
keep_name=keep_name)
 bot.run()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic947805d22d7f64e33b924c1e4449606431678fa
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Regression: Error styling - change (mediawiki...MobileFrontend)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Regression: Error styling
..

Regression: Error styling

* Fix the styling of toast error messages so that they show the alarm and
a black background
* Reinstore errors when JavaScript disabled (see Nearby for example)

Change-Id: I6b5b98414ceeac6b467b1b7ef29a4cfd8a81a149
---
M less/common/common-js.less
M less/common/common.less
2 files changed, 8 insertions(+), 5 deletions(-)


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

diff --git a/less/common/common-js.less b/less/common/common-js.less
index ca3b391..3115325 100644
--- a/less/common/common-js.less
+++ b/less/common/common-js.less
@@ -1,10 +1,5 @@
 @import ../mixins.less;
 
-.error {
-   color: #C85353;
-   background: #FAE1E1 !important;
-}
-
 .loading {
 
.spinner {
diff --git a/less/common/common.less b/less/common/common.less
index add18ec..51dde3d 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -1,5 +1,13 @@
 @import ../mixins.less;
 
+.mw-mf-overlay,
+#content_wrapper {
+   .error {
+   color: #C85353;
+   background: #FAE1E1 !important;
+   }
+}
+
 .mw-mf-image-replacement {
font-style: italic;
color: #706E6E;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b5b98414ceeac6b467b1b7ef29a4cfd8a81a149
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Move the nfs-noid upstart job into an 'nfs' directory. - change (operations/puppet)

2013-11-03 Thread Andrew Bogott (Code Review)
Andrew Bogott has uploaded a new change for review.

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


Change subject: Move the nfs-noid upstart job into an 'nfs' directory.
..

Move the nfs-noid upstart job into an 'nfs' directory.

This was broken during the move to the generic module.

Change-Id: I2408e86978bea75f6837c0ea33cbd2ff5ed40028
---
R files/nfs/upstart-nfs-noidmap.conf
M manifests/role/labsnfs.pp
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/93407/1

diff --git a/modules/generic/files/upstart/nfs-noidmap.conf 
b/files/nfs/upstart-nfs-noidmap.conf
similarity index 100%
rename from modules/generic/files/upstart/nfs-noidmap.conf
rename to files/nfs/upstart-nfs-noidmap.conf
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index fdc57b5..94cb297 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -34,8 +34,8 @@
content = template(labsnfs/auto.time.project.erb);
}
 
-file { /etc/init/nfs-noidmap.conf:
-source = puppet:///files/upstart/nfs-noidmap.conf
-}
+   file { /etc/init/nfs-noidmap.conf:
+   source = puppet:///files/nfs/upstart-nfs-noidmap.conf
+   }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2408e86978bea75f6837c0ea33cbd2ff5ed40028
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Move the nfs-noid upstart job into an 'nfs' directory. - change (operations/puppet)

2013-11-03 Thread Andrew Bogott (Code Review)
Andrew Bogott has submitted this change and it was merged.

Change subject: Move the nfs-noid upstart job into an 'nfs' directory.
..


Move the nfs-noid upstart job into an 'nfs' directory.

This was broken during the move to the generic module.

Change-Id: I2408e86978bea75f6837c0ea33cbd2ff5ed40028
---
R files/nfs/upstart-nfs-noidmap.conf
M manifests/role/labsnfs.pp
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/generic/files/upstart/nfs-noidmap.conf 
b/files/nfs/upstart-nfs-noidmap.conf
similarity index 100%
rename from modules/generic/files/upstart/nfs-noidmap.conf
rename to files/nfs/upstart-nfs-noidmap.conf
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index fdc57b5..94cb297 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -34,8 +34,8 @@
content = template(labsnfs/auto.time.project.erb);
}
 
-file { /etc/init/nfs-noidmap.conf:
-source = puppet:///files/upstart/nfs-noidmap.conf
-}
+   file { /etc/init/nfs-noidmap.conf:
+   source = puppet:///files/nfs/upstart-nfs-noidmap.conf
+   }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2408e86978bea75f6837c0ea33cbd2ff5ed40028
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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] Vector: Set media screen on styles.less - change (mediawiki/core)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Vector: Set media screen on styles.less
..

Vector: Set media screen on styles.less

This prevents the styles from overriding the print stylesheet.
Follows-up Ica0b69ad950, which removed it.

Bug: 56366
Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
---
M skins/vector/styles-beta.less
M skins/vector/styles.less
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/93408/1

diff --git a/skins/vector/styles-beta.less b/skins/vector/styles-beta.less
index 62e3d55..e51e8f4 100644
--- a/skins/vector/styles-beta.less
+++ b/skins/vector/styles-beta.less
@@ -1,9 +1,12 @@
 @import variables.less;
 @import beta/variables.less;
+@media screen {
 @import screen.less;
 @import beta/screen.less;
 @import externalLinks.less;
 @import collapsibleNav.less;
+}
+
 @media screen and (min-width: 982px) {
@import screen-hd.less;
 }
diff --git a/skins/vector/styles.less b/skins/vector/styles.less
index a5db63c..fde7094 100644
--- a/skins/vector/styles.less
+++ b/skins/vector/styles.less
@@ -1,7 +1,9 @@
 @import variables.less;
+@media screen {
 @import screen.less;
 @import externalLinks.less;
 @import collapsibleNav.less;
+}
 
 @media screen and (min-width: 982px) {
@import screen-hd.less;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Use $dbw since it's a master database - change (mediawiki...CentralAuth)

2013-11-03 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review.

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


Change subject: Use $dbw since it's a master database
..

Use $dbw since it's a master database

Change-Id: Iabfca566c03b9b368488bbbadbcfe4c2ed393062
---
M CentralAuthUser.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index f51dbe5..9906e8a 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -171,9 +171,9 @@
 
// Get the master. We want to make sure we've got up to date 
information
// since we're caching it.
-   $dbr = self::getCentralDB();
+   $dbw = self::getCentralDB();
 
-   $row = $dbr-selectRow(
+   $row = $dbw-selectRow(
array( 'globaluser', 'localuser' ),
array(
'gu_id', 'lu_wiki', 'gu_salt', 'gu_password', 
'gu_auth_token',

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

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

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


[MediaWiki-commits] [Gerrit] Use $dbw since it's a master database - change (mediawiki...CentralAuth)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Use $dbw since it's a master database
..


Use $dbw since it's a master database

Change-Id: Iabfca566c03b9b368488bbbadbcfe4c2ed393062
---
M CentralAuthUser.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index f51dbe5..9906e8a 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -171,9 +171,9 @@
 
// Get the master. We want to make sure we've got up to date 
information
// since we're caching it.
-   $dbr = self::getCentralDB();
+   $dbw = self::getCentralDB();
 
-   $row = $dbr-selectRow(
+   $row = $dbw-selectRow(
array( 'globaluser', 'localuser' ),
array(
'gu_id', 'lu_wiki', 'gu_salt', 'gu_password', 
'gu_auth_token',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabfca566c03b9b368488bbbadbcfe4c2ed393062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Check key exists before using the value - change (mediawiki...CentralAuth)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Check key exists before using the value
..


Check key exists before using the value

This stops an annoying NOTICE in logs

Change-Id: I13e9f0fc2d1e42c70a6be53ddc3fd32d915860ff
---
M specials/SpecialCentralAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/specials/SpecialCentralAuth.php b/specials/SpecialCentralAuth.php
index 8b603e6..92c160b 100644
--- a/specials/SpecialCentralAuth.php
+++ b/specials/SpecialCentralAuth.php
@@ -433,7 +433,7 @@
 * @return String
 */
function formatBlockStatus( $row ) {
-   if ( $row['blocked'] ) {
+   if ( isset( $row['blocked'] )  $row['blocked'] ) {
if ( $row['block-expiry'] == 'infinity' ) {
$reason = $row['block-reason'];
return $this-msg( 
'centralauth-admin-blocked-indef', array( $reason ) )-parse();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13e9f0fc2d1e42c70a6be53ddc3fd32d915860ff
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Style main page last modified link correctly - change (mediawiki...MobileFrontend)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Style main page last modified link correctly
..

Style main page last modified link correctly

Don't add top-bar class
Bug: 56262

Change-Id: I034a99cdbfaebdc3bf8d96f0a5315484ec9528cc
---
M includes/skins/SkinMobileBeta.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/skins/SkinMobileBeta.php 
b/includes/skins/SkinMobileBeta.php
index 1fdadf1..074b26a 100644
--- a/includes/skins/SkinMobileBeta.php
+++ b/includes/skins/SkinMobileBeta.php
@@ -22,7 +22,9 @@
 
protected function getHistoryLink( Title $title ) {
$link = parent::getHistoryLink( $title );
-   $link['class'] = 'top-bar';
+   if ( !$title-isMainPage() ) {
+   $link['class'] = 'top-bar';
+   }
return $link;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I034a99cdbfaebdc3bf8d96f0a5315484ec9528cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Some renaming - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Mwjames (Code Review)
Mwjames has uploaded a new change for review.

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


Change subject: Some renaming
..

Some renaming

Change-Id: Ifa490815ee9fe23fa8c20f54f307455cfb02381b
---
M SemanticMediaWiki.classes.php
M docs/context.md
R includes/SemanticData.php
M includes/Setup.php
M includes/UpdateObserver.php
M includes/api/Base.php
M includes/context/EmptyContext.php
R includes/context/ExtensionContext.php
M includes/dic/SharedDependencyContainer.php
M includes/hooks/FunctionHookRegistry.php
M includes/jobs/JobBase.php
M includes/parserhooks/ParserFunctionFactory.php
M tests/phpunit/includes/ContentProcessorTemplateTransclusionTest.php
M tests/phpunit/includes/ContentProcessorTest.php
M tests/phpunit/includes/FactboxMagicWordsTest.php
M tests/phpunit/includes/SetupTest.php
M tests/phpunit/includes/StoreUpdaterTest.php
M tests/phpunit/includes/UpdateObserverTest.php
R tests/phpunit/includes/context/ExtensionContextTest.php
M tests/phpunit/includes/dic/SharedDependencyContainerTest.php
M tests/phpunit/includes/hooks/ArticlePurgeTest.php
M tests/phpunit/includes/hooks/BaseTemplateToolboxTest.php
M tests/phpunit/includes/hooks/BeforePageDisplayTest.php
M tests/phpunit/includes/hooks/FunctionHookDBIntegrationTest.php
M tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
M tests/phpunit/includes/hooks/LinksUpdateConstructedTest.php
M tests/phpunit/includes/hooks/NewRevisionFromEditCompleteTest.php
M tests/phpunit/includes/hooks/OutputPageParserOutputTest.php
M tests/phpunit/includes/hooks/ParserAfterTidyTest.php
M tests/phpunit/includes/hooks/SkinAfterContentTest.php
M tests/phpunit/includes/hooks/SpecialStatsAddExtraTest.php
M tests/phpunit/includes/hooks/TitleMoveCompleteTest.php
M tests/phpunit/includes/jobs/UpdateDispatcherJobTest.php
M tests/phpunit/includes/jobs/UpdateJobTest.php
34 files changed, 75 insertions(+), 75 deletions(-)


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

diff --git a/SemanticMediaWiki.classes.php b/SemanticMediaWiki.classes.php
index 94a532b..b719538 100644
--- a/SemanticMediaWiki.classes.php
+++ b/SemanticMediaWiki.classes.php
@@ -25,7 +25,7 @@
'SMWInfolink'   = 'includes/SMW_Infolink.php',
'SMWOutputs'= 'includes/SMW_Outputs.php',
'SMW\ContentProcessor'  = 'includes/ContentProcessor.php',
-   'SMW\SemanticData'  = 'includes/SMW_SemanticData.php',
+   'SMW\SemanticData'  = 'includes/SemanticData.php',
'SMWPageLister' = 'includes/SMW_PageLister.php',
 
'SMW\DataValueFactory'  = 'includes/DataValueFactory.php',
@@ -104,7 +104,7 @@
 
// Context
'SMW\EmptyContext'  = 'includes/context/EmptyContext.php',
-   'SMW\BaseContext'   = 'includes/context/BaseContext.php',
+   'SMW\ExtensionContext'  = 
'includes/context/ExtensionContext.php',
'SMW\ContextResource'   = 
'includes/context/ContextResource.php',
'SMW\ContextAware'  = 'includes/context/ContextAware.php',
'SMW\ContextInjector'   = 
'includes/context/ContextInjector.php',
diff --git a/docs/context.md b/docs/context.md
index 275b758..faf4d4f 100644
--- a/docs/context.md
+++ b/docs/context.md
@@ -4,7 +4,7 @@
 * ContextResource describes an interface to access Store, Settings, and a 
DependencyBuilder context
 * ContextAware describes an interface to access a context object
 * ContextInjector describes an interface to inject an context object
-* BaseContext implements the ContextResource interface
+* ExtensionContext implements the ContextResource interface
 * EmptyContext implements the ContextResource interface, returning null objects
 
  Example
@@ -26,7 +26,7 @@
public function withContext() {
 
if ( $this-context === null ) {
-   $this-context = new BaseContext();
+   $this-context = new ExtensionContext();
}
 
return $this-context;
@@ -59,11 +59,11 @@
 }
 ```
 ```php
-$foo = new Foo( new BaseContext() );
+$foo = new Foo( new ExtensionContext() );
 $baz = $foo-getBaz();
 
 $bar = new Bar();
-$bar-invokeContext( new BaseContext() );
+$bar-invokeContext( new ExtensionContext() );
 $baz = $bar-getBaz();
 ```
 
diff --git a/includes/SMW_SemanticData.php b/includes/SemanticData.php
similarity index 100%
rename from includes/SMW_SemanticData.php
rename to includes/SemanticData.php
diff --git a/includes/Setup.php b/includes/Setup.php
index 118924f..65c214a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -99,7 +99,7 @@
public function withContext() {
 
if ( $this-context === null ) {
-   $this-context = new BaseContext();
+   $this-context = new ExtensionContext();
}
 
  

[MediaWiki-commits] [Gerrit] Some renaming - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Some renaming
..


Some renaming

Change-Id: Ifa490815ee9fe23fa8c20f54f307455cfb02381b
---
M SemanticMediaWiki.classes.php
M docs/context.md
R includes/SemanticData.php
M includes/Setup.php
M includes/UpdateObserver.php
M includes/api/Base.php
M includes/context/EmptyContext.php
R includes/context/ExtensionContext.php
M includes/dic/SharedDependencyContainer.php
M includes/hooks/FunctionHookRegistry.php
M includes/jobs/JobBase.php
M includes/parserhooks/ParserFunctionFactory.php
M tests/phpunit/includes/ContentProcessorTemplateTransclusionTest.php
M tests/phpunit/includes/ContentProcessorTest.php
M tests/phpunit/includes/FactboxMagicWordsTest.php
M tests/phpunit/includes/SetupTest.php
M tests/phpunit/includes/StoreUpdaterTest.php
M tests/phpunit/includes/UpdateObserverTest.php
R tests/phpunit/includes/context/ExtensionContextTest.php
M tests/phpunit/includes/dic/SharedDependencyContainerTest.php
M tests/phpunit/includes/hooks/ArticlePurgeTest.php
M tests/phpunit/includes/hooks/BaseTemplateToolboxTest.php
M tests/phpunit/includes/hooks/BeforePageDisplayTest.php
M tests/phpunit/includes/hooks/FunctionHookDBIntegrationTest.php
M tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
M tests/phpunit/includes/hooks/LinksUpdateConstructedTest.php
M tests/phpunit/includes/hooks/NewRevisionFromEditCompleteTest.php
M tests/phpunit/includes/hooks/OutputPageParserOutputTest.php
M tests/phpunit/includes/hooks/ParserAfterTidyTest.php
M tests/phpunit/includes/hooks/SkinAfterContentTest.php
M tests/phpunit/includes/hooks/SpecialStatsAddExtraTest.php
M tests/phpunit/includes/hooks/TitleMoveCompleteTest.php
M tests/phpunit/includes/jobs/UpdateDispatcherJobTest.php
M tests/phpunit/includes/jobs/UpdateJobTest.php
34 files changed, 75 insertions(+), 75 deletions(-)

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



diff --git a/SemanticMediaWiki.classes.php b/SemanticMediaWiki.classes.php
index 94a532b..b719538 100644
--- a/SemanticMediaWiki.classes.php
+++ b/SemanticMediaWiki.classes.php
@@ -25,7 +25,7 @@
'SMWInfolink'   = 'includes/SMW_Infolink.php',
'SMWOutputs'= 'includes/SMW_Outputs.php',
'SMW\ContentProcessor'  = 'includes/ContentProcessor.php',
-   'SMW\SemanticData'  = 'includes/SMW_SemanticData.php',
+   'SMW\SemanticData'  = 'includes/SemanticData.php',
'SMWPageLister' = 'includes/SMW_PageLister.php',
 
'SMW\DataValueFactory'  = 'includes/DataValueFactory.php',
@@ -104,7 +104,7 @@
 
// Context
'SMW\EmptyContext'  = 'includes/context/EmptyContext.php',
-   'SMW\BaseContext'   = 'includes/context/BaseContext.php',
+   'SMW\ExtensionContext'  = 
'includes/context/ExtensionContext.php',
'SMW\ContextResource'   = 
'includes/context/ContextResource.php',
'SMW\ContextAware'  = 'includes/context/ContextAware.php',
'SMW\ContextInjector'   = 
'includes/context/ContextInjector.php',
diff --git a/docs/context.md b/docs/context.md
index 275b758..faf4d4f 100644
--- a/docs/context.md
+++ b/docs/context.md
@@ -4,7 +4,7 @@
 * ContextResource describes an interface to access Store, Settings, and a 
DependencyBuilder context
 * ContextAware describes an interface to access a context object
 * ContextInjector describes an interface to inject an context object
-* BaseContext implements the ContextResource interface
+* ExtensionContext implements the ContextResource interface
 * EmptyContext implements the ContextResource interface, returning null objects
 
  Example
@@ -26,7 +26,7 @@
public function withContext() {
 
if ( $this-context === null ) {
-   $this-context = new BaseContext();
+   $this-context = new ExtensionContext();
}
 
return $this-context;
@@ -59,11 +59,11 @@
 }
 ```
 ```php
-$foo = new Foo( new BaseContext() );
+$foo = new Foo( new ExtensionContext() );
 $baz = $foo-getBaz();
 
 $bar = new Bar();
-$bar-invokeContext( new BaseContext() );
+$bar-invokeContext( new ExtensionContext() );
 $baz = $bar-getBaz();
 ```
 
diff --git a/includes/SMW_SemanticData.php b/includes/SemanticData.php
similarity index 100%
rename from includes/SMW_SemanticData.php
rename to includes/SemanticData.php
diff --git a/includes/Setup.php b/includes/Setup.php
index 118924f..65c214a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -99,7 +99,7 @@
public function withContext() {
 
if ( $this-context === null ) {
-   $this-context = new BaseContext();
+   $this-context = new ExtensionContext();
}
 
return $this-context;
diff --git 

[MediaWiki-commits] [Gerrit] Vector: Set media screen on styles.less - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Vector: Set media screen on styles.less
..


Vector: Set media screen on styles.less

This prevents the styles from overriding the print stylesheet.
Follows-up Ica0b69ad950, which removed it.

Bug: 56366
Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
---
M skins/vector/styles-beta.less
M skins/vector/styles.less
2 files changed, 14 insertions(+), 7 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  Jdlrobson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/skins/vector/styles-beta.less b/skins/vector/styles-beta.less
index 62e3d55..a76b639 100644
--- a/skins/vector/styles-beta.less
+++ b/skins/vector/styles-beta.less
@@ -1,9 +1,13 @@
 @import variables.less;
 @import beta/variables.less;
-@import screen.less;
-@import beta/screen.less;
-@import externalLinks.less;
-@import collapsibleNav.less;
+
+@media screen {
+   @import screen.less;
+   @import beta/screen.less;
+   @import externalLinks.less;
+   @import collapsibleNav.less;
+}
+
 @media screen and (min-width: 982px) {
@import screen-hd.less;
 }
diff --git a/skins/vector/styles.less b/skins/vector/styles.less
index a5db63c..bd45851 100644
--- a/skins/vector/styles.less
+++ b/skins/vector/styles.less
@@ -1,7 +1,10 @@
 @import variables.less;
-@import screen.less;
-@import externalLinks.less;
-@import collapsibleNav.less;
+
+@media screen {
+   @import screen.less;
+   @import externalLinks.less;
+   @import collapsibleNav.less;
+}
 
 @media screen and (min-width: 982px) {
@import screen-hd.less;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@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] Vector: Set media screen on styles.less - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Vector: Set media screen on styles.less
..


Vector: Set media screen on styles.less

This prevents the styles from overriding the print stylesheet.
Follows-up Ica0b69ad950, which removed it.

Bug: 56366
Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
(cherry picked from commit 98ef2d9b7e0290bd33378007fd4d45a7d60da1ab)
---
M skins/vector/styles-beta.less
M skins/vector/styles.less
2 files changed, 14 insertions(+), 7 deletions(-)

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



diff --git a/skins/vector/styles-beta.less b/skins/vector/styles-beta.less
index 62e3d55..a76b639 100644
--- a/skins/vector/styles-beta.less
+++ b/skins/vector/styles-beta.less
@@ -1,9 +1,13 @@
 @import variables.less;
 @import beta/variables.less;
-@import screen.less;
-@import beta/screen.less;
-@import externalLinks.less;
-@import collapsibleNav.less;
+
+@media screen {
+   @import screen.less;
+   @import beta/screen.less;
+   @import externalLinks.less;
+   @import collapsibleNav.less;
+}
+
 @media screen and (min-width: 982px) {
@import screen-hd.less;
 }
diff --git a/skins/vector/styles.less b/skins/vector/styles.less
index a5db63c..bd45851 100644
--- a/skins/vector/styles.less
+++ b/skins/vector/styles.less
@@ -1,7 +1,10 @@
 @import variables.less;
-@import screen.less;
-@import externalLinks.less;
-@import collapsibleNav.less;
+
+@media screen {
+   @import screen.less;
+   @import externalLinks.less;
+   @import collapsibleNav.less;
+}
 
 @media screen and (min-width: 982px) {
@import screen-hd.less;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3979a90f828ff808deae2f7fcc5c1dd7e83e9b67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@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 readme - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Mwjames (Code Review)
Mwjames has uploaded a new change for review.

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


Change subject: Update readme
..

Update readme

Change-Id: I2a62d38bcafe8988d47f96ad6e4f0c8d48ea
---
M RELEASE-NOTES-1.9
1 file changed, 10 insertions(+), 6 deletions(-)


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

diff --git a/RELEASE-NOTES-1.9 b/RELEASE-NOTES-1.9
index 16d20cc..95d0940 100644
--- a/RELEASE-NOTES-1.9
+++ b/RELEASE-NOTES-1.9
@@ -31,6 +31,11 @@
 * (Bug 43932) Enable html tags support for non-list results in 
SMW\ListResultPrinter
 * (Bug 44275) Enable .data( 'sortkey' ) support in SMW\ListResultPrinter
 
+* (eb764db) Add \SMW\PropertyAnnotatorDecorator
+* (e0f3f4d) Refactor   \SMW\RefreshJob
+* (2a44b00) Register #show as callback
+* (f33fd12) Add \SMW\ExtensionContext and \SMW\ContextAware
+* (a33411f) Add \SMW\Api\BrowseBySubject
 * (40e7572) Renamed SMWDISerializer to \SMW\Serializers\QueryResultSerializer
 * (a0b08fe) Add \SMW\Serializes\SemanticDataSerializer
 * (02635a1) Replace SkinTemplateToolboxEnd hook with SMW\BaseTemplat...
@@ -41,12 +46,11 @@
 * (ed52df7) (Bug 50844) Special:Properties search form
 * (332982b) SMW\Subobject, SMW\SubobjectParserFunction use SMW\HashIdGenerator
 * (ec5dd46) Introducing SMW\SimpleDependencyBuilder and 
SMW\SharedDependencyContainer
-* (18d17a5) Adds SMW\StoreUpdater
-* (71dbba1) Adds SMW\ObservableDispatcher
-* (6d5a3c5) Adss SMW\JobBase
-* (dc28899) Adds SMW\UpdateDispatcherJob
-* (be56922) Adds SMW\FunctionHookRegistry
-* (83fee62) (Bug 51498) SMW\RedirectBuilder
+* (18d17a5) Add SMW\StoreUpdater
+* (71dbba1) Add SMW\ObservableDispatcher
+* (6d5a3c5) Add SMW\JobBase
+* (dc28899) Add SMW\UpdateDispatcherJob
+* (be56922) Add SMW\FunctionHookRegistry
 * (c8a2f97) SMW\ApiAsk + SMW\ApiAskArgs fix bug 51091
 * (8bcee83) (Bug 44696) AskApi to support valid XML
 * (a949f04) (Bug 33181) Special:Concepts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a62d38bcafe8988d47f96ad6e4f0c8d48ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames jamesin.hongkon...@gmail.com

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


[MediaWiki-commits] [Gerrit] Update readme - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Mwjames (Code Review)
Mwjames has submitted this change and it was merged.

Change subject: Update readme
..


Update readme

Change-Id: I2a62d38bcafe8988d47f96ad6e4f0c8d48ea
---
M RELEASE-NOTES-1.9
1 file changed, 10 insertions(+), 6 deletions(-)

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



diff --git a/RELEASE-NOTES-1.9 b/RELEASE-NOTES-1.9
index 16d20cc..95d0940 100644
--- a/RELEASE-NOTES-1.9
+++ b/RELEASE-NOTES-1.9
@@ -31,6 +31,11 @@
 * (Bug 43932) Enable html tags support for non-list results in 
SMW\ListResultPrinter
 * (Bug 44275) Enable .data( 'sortkey' ) support in SMW\ListResultPrinter
 
+* (eb764db) Add \SMW\PropertyAnnotatorDecorator
+* (e0f3f4d) Refactor   \SMW\RefreshJob
+* (2a44b00) Register #show as callback
+* (f33fd12) Add \SMW\ExtensionContext and \SMW\ContextAware
+* (a33411f) Add \SMW\Api\BrowseBySubject
 * (40e7572) Renamed SMWDISerializer to \SMW\Serializers\QueryResultSerializer
 * (a0b08fe) Add \SMW\Serializes\SemanticDataSerializer
 * (02635a1) Replace SkinTemplateToolboxEnd hook with SMW\BaseTemplat...
@@ -41,12 +46,11 @@
 * (ed52df7) (Bug 50844) Special:Properties search form
 * (332982b) SMW\Subobject, SMW\SubobjectParserFunction use SMW\HashIdGenerator
 * (ec5dd46) Introducing SMW\SimpleDependencyBuilder and 
SMW\SharedDependencyContainer
-* (18d17a5) Adds SMW\StoreUpdater
-* (71dbba1) Adds SMW\ObservableDispatcher
-* (6d5a3c5) Adss SMW\JobBase
-* (dc28899) Adds SMW\UpdateDispatcherJob
-* (be56922) Adds SMW\FunctionHookRegistry
-* (83fee62) (Bug 51498) SMW\RedirectBuilder
+* (18d17a5) Add SMW\StoreUpdater
+* (71dbba1) Add SMW\ObservableDispatcher
+* (6d5a3c5) Add SMW\JobBase
+* (dc28899) Add SMW\UpdateDispatcherJob
+* (be56922) Add SMW\FunctionHookRegistry
 * (c8a2f97) SMW\ApiAsk + SMW\ApiAskArgs fix bug 51091
 * (8bcee83) (Bug 44696) AskApi to support valid XML
 * (a949f04) (Bug 33181) Special:Concepts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a62d38bcafe8988d47f96ad6e4f0c8d48ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames jamesin.hongkon...@gmail.com
Gerrit-Reviewer: Mwjames jamesin.hongkon...@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] Move the DeferredUpdates hierarchy to its own directory - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Move the DeferredUpdates hierarchy to its own directory
..


Move the DeferredUpdates hierarchy to its own directory

The grouping makes at least as much sense as job/, and certainly makes
more sense than cache/. With directories named after base classes, it is
fairly easy to tell what should go where. The grouping of
DeferredUpdates, DataUpdate and CallableUpdate would surely be
uncontroversial.

The move of SearchUpdate out of search/ demonstrates the conflict between
arrangement by module versus arrangement by type, which is the most
difficult design question here. I think arrangement by type is more
consistent with e.g. the arrangement of the core root, i.e. tests/,
resources/, maintenance/, etc. where a given feature will have its files
split up into a mostly type-based hierarchy.

I also tidied up AutoLoader.php by moving includes/content to the correct
location, sorted alphabetically by subdirectory.

Verified with AutoLoaderTest.

Change-Id: Ib369411d0caca38e72978084aa57348f1b892ed0
---
M includes/AutoLoader.php
M includes/SiteStats.php
R includes/deferred/CallableUpdate.php
R includes/deferred/DataUpdate.php
R includes/deferred/DeferredUpdates.php
R includes/deferred/HTMLCacheUpdate.php
R includes/deferred/LinksUpdate.php
R includes/deferred/SearchUpdate.php
A includes/deferred/SiteStatsUpdate.php
R includes/deferred/SqlDataUpdate.php
R includes/deferred/SquidUpdate.php
R includes/deferred/ViewCountUpdate.php
12 files changed, 274 insertions(+), 252 deletions(-)

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



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index dbba500..da85438 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -65,9 +65,6 @@
'Cookie' = 'includes/Cookie.php',
'CookieJar' = 'includes/Cookie.php',
'CurlHttpRequest' = 'includes/HttpFunctions.php',
-   'DeferrableUpdate' = 'includes/DeferredUpdates.php',
-   'DeferredUpdates' = 'includes/DeferredUpdates.php',
-   'MWCallableUpdate' = 'includes/CallableUpdate.php',
'DeprecatedGlobal' = 'includes/DeprecatedGlobal.php',
'DerivativeRequest' = 'includes/WebRequest.php',
'DiffHistoryBlob' = 'includes/HistoryBlob.php',
@@ -155,8 +152,6 @@
'Licenses' = 'includes/Licenses.php',
'Linker' = 'includes/Linker.php',
'LinkFilter' = 'includes/LinkFilter.php',
-   'LinksUpdate' = 'includes/LinksUpdate.php',
-   'LinksDeletionUpdate' = 'includes/LinksUpdate.php',
'LocalisationCache' = 'includes/cache/LocalisationCache.php',
'LocalisationCache_BulkLoad' = 'includes/cache/LocalisationCache.php',
'MagicWord' = 'includes/MagicWord.php',
@@ -212,14 +207,11 @@
'RevisionList' = 'includes/RevisionList.php',
'RSSFeed' = 'includes/Feed.php',
'Sanitizer' = 'includes/Sanitizer.php',
-   'DataUpdate' = 'includes/DataUpdate.php',
-   'SqlDataUpdate' = 'includes/SqlDataUpdate.php',
'ScopedCallback' = 'includes/ScopedCallback.php',
'ScopedPHPTimeout' = 'includes/ScopedPHPTimeout.php',
'SiteConfiguration' = 'includes/SiteConfiguration.php',
'SiteStats' = 'includes/SiteStats.php',
'SiteStatsInit' = 'includes/SiteStats.php',
-   'SiteStatsUpdate' = 'includes/SiteStats.php',
'Skin' = 'includes/Skin.php',
'SkinTemplate' = 'includes/SkinTemplate.php',
'SpecialCreateAccount' = 'includes/SpecialPage.php',
@@ -261,7 +253,6 @@
'UserCache' = 'includes/cache/UserCache.php',
'UserMailer' = 'includes/UserMailer.php',
'UserRightsProxy' = 'includes/UserRightsProxy.php',
-   'ViewCountUpdate' = 'includes/ViewCountUpdate.php',
'WantedQueryPage' = 'includes/QueryPage.php',
'WatchedItem' = 'includes/WatchedItem.php',
'WebRequest' = 'includes/WebRequest.php',
@@ -287,21 +278,6 @@
'ZhClient' = 'includes/ZhClient.php',
'ZipDirectoryReader' = 'includes/ZipDirectoryReader.php',
'ZipDirectoryReaderError' = 'includes/ZipDirectoryReader.php',
-
-   # content handler
-   'AbstractContent' = 'includes/content/AbstractContent.php',
-   'ContentHandler' = 'includes/content/ContentHandler.php',
-   'Content' = 'includes/content/Content.php',
-   'CssContentHandler' = 'includes/content/CssContentHandler.php',
-   'CssContent' = 'includes/content/CssContent.php',
-   'JavaScriptContentHandler' = 
'includes/content/JavaScriptContentHandler.php',
-   'JavaScriptContent' = 'includes/content/JavaScriptContent.php',
-   'MessageContent' = 'includes/content/MessageContent.php',
-   'MWContentSerializationException' = 
'includes/content/ContentHandler.php',
-   'TextContentHandler' = 'includes/content/TextContentHandler.php',
-   'TextContent' = 

[MediaWiki-commits] [Gerrit] Fix pluralization (is/are) - change (mediawiki...BetaFeatures)

2013-11-03 Thread Shirayuki (Code Review)
Shirayuki has uploaded a new change for review.

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


Change subject: Fix pluralization (is/are)
..

Fix pluralization (is/are)

Spotted by McDutchie
http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Mw-ui-feature-requirements-browser/en

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


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

diff --git a/BetaFeatures.i18n.php b/BetaFeatures.i18n.php
index de4f1e5..21fa6f6 100644
--- a/BetaFeatures.i18n.php
+++ b/BetaFeatures.i18n.php
@@ -32,7 +32,7 @@
'mw-ui-feature-user-count'  = '{{PLURAL:$1|One user has|$1 users 
have}} enabled this feature.',
 
'mw-ui-feature-requirements-betafeatures' = 'This feature requires the 
following {{PLURAL:$1|feature|features}} to be enabled:',
-   'mw-ui-feature-requirements-browser' = 'The following 
{{PLURAL:$1|browser|browsers}} are not supported:',
+   'mw-ui-feature-requirements-browser' = 'The following 
{{PLURAL:$1|browser is|browsers are}} not supported:',
'mw-ui-feature-requirements-javascript' = 'This feature requires 
JavaScript.',
'mw-ui-feature-requirements-skins' = 'This feature requires you to be 
using {{PLURAL:$1|the following skin|one of the following skins}}:',
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I440c1946819fcc5ad012a9c573028bf0411814ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
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] [WIP] Refactoring CE NWBlockImageNode - change (mediawiki...VisualEditor)

2013-11-03 Thread Mooeypoo (Code Review)
Mooeypoo has uploaded a new change for review.

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


Change subject: [WIP] Refactoring CE NWBlockImageNode
..

[WIP] Refactoring CE NWBlockImageNode

This is meant to change image so it uses figure and a standard CSS structure,
so we can visualize the changes of attributes like 'type' and 'alignment'
without constantly destroying and rebuilding nested div structures for images.

Change-Id: I40065acd9fd59d30f94b5336736d4986e8de15aa
---
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
M modules/ve-mw/ce/styles/ve.ce.Node.css
3 files changed, 146 insertions(+), 75 deletions(-)


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

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index 1859003..32d9e4d 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -17,73 +17,70 @@
  * @param {Object} [config] Configuration options
  */
 ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) {
-   var captionModel, captionView, type;
+   var captionModel, captionView;
 
// Parent constructor
ve.ce.BranchNode.call( this, model, config );
 
-   type = this.model.getAttribute( 'type' );
+   // Properties
+   this.type = this.model.getAttribute( 'type' );
+   this.alignment = this.model.getAttribute( 'align' );
+   this.size = {
+   'width': this.model.getAttribute( 'width' ),
+   'height': this.model.getAttribute( 'height' )
+   };
 
-   if ( this.model.getAttribute( 'align' ) === 'center' ) {
-   this.$.addClass( 'center' );
-   this.$thumb = this.$$( 'div' ).appendTo( this.$ );
-   } else {
-   this.$thumb = this.$;
-   }
-
-   this.$thumbInner = this.$$( 'div' )
-   .addClass( 'thumbinner' )
-   .css( 'width', parseInt( this.model.getAttribute( 'width' ), 10 
) + 2 );
-
+   // Build DOM:
this.$a = this.$$( 'a' )
.addClass( 'image' )
.attr( 'href', this.getResolvedAttribute( 'href' ) );
 
this.$image = this.$$( 'img' )
.attr( 'src', this.getResolvedAttribute( 'src' ) )
-   .attr( 'width', this.model.getAttribute( 'width' ) )
-   .attr( 'height', this.model.getAttribute( 'height' ) )
+   .attr( 'width', this.size.width )
+   .attr( 'height', this.size.height )
.appendTo( this.$a );
 
-   this.$inner = this.$$( 'div' ).addClass( 
've-ce-mwBlockImageNode-inner' );
+   this.$wrapper = this.$$( 'div' )
+   .addClass( 've-ce-mwBlockImageNode-inner' )
+   .append( this.$a );
 
-   if ( type === 'none' || type === 'frameless' ) {
-   this.$thumb.addClass(
+   this.$figure = this.$$( 'figure' )
+   .appendTo( this.$ )
+   .append( this.$wrapper );
+
+   this.$.addClass( 've-ce-mwBlockImageNode-type-' + this.type );
+   this.$.addClass( 've-ce-mwBlockImageNode-align-' + this.alignment );
+
+   // Update size:
+   this.updateSize( this.size.height, this.size.width );
+
+   // Mixin constructors
+   ve.ce.MWImageNode.call( this, this.$wrapper, this.$image );
+
+   if ( this.type === 'none' || this.type === 'frameless' ) {
+   this.$.addClass(
this.getCssClass( 'none', this.model.getAttribute( 
'align' ) )
);
-   this.$a.appendTo( this.$thumb );
-
-   // For centered images, this.$thumb is full width, so wrap
-   // this.$image in another div and use that for selection
-   this.$inner
-   .append( this.$image )
-   .appendTo( this.$a );
} else {
// Type frame, thumb and the default
this.$image.addClass( 'thumbimage' );
-   this.$thumb
-   .addClass( 'thumb' );
-   this.$a.appendTo( this.$thumbInner );
-   this.$thumbInner.appendTo( this.$thumb );
-
-   // For centered images, this.$thumb is full width, so wrap
-   // this.$thumbInner in another div and use that for selection
-   this.$inner
-   .append( this.$thumbInner )
-   .appendTo( this.$thumb );
+   this.$figure.addClass( 'borderwrap' );
+   this.$.addClass( 'thumb' );
}
 
-   // Mixin constructors
-   ve.ce.MWImageNode.call( this, this.$inner, this.$image );
-
// I smell a caption!
-   if ( type !== 'none'  type !== 'frameless'  
this.model.children.length === 1 ) {
+   

[MediaWiki-commits] [Gerrit] Implement a JS - Java bridge. - change (apps...wikipedia)

2013-11-03 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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


Change subject: Implement a JS - Java bridge.
..

Implement a JS - Java bridge.

- Two way message sending and receiving on both JS  Java ends.
- Bridge makes sure that events are fired onLoad.
- Loads pages by injecting data via JS into an empty HTML page, than
  just injecting HTML directly into the WebView.
- Set base URL in the base HTML page so that images load
- Load only the lead sections of articles (for now!)

Change-Id: Ie189816d2a9f68c3a750b175d06695e0f970c42c
---
A wikipedia/src/main/java/org/wikimedia/wikipedia/CommunicationBridge.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageFetchTask.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
3 files changed, 114 insertions(+), 2 deletions(-)


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

diff --git 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/CommunicationBridge.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/CommunicationBridge.java
new file mode 100644
index 000..aae20c7
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/CommunicationBridge.java
@@ -0,0 +1,94 @@
+package org.wikimedia.wikipedia;
+
+import android.util.Log;
+import android.webkit.ConsoleMessage;
+import android.webkit.JsPromptResult;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Two way communications bridge between JS in a WebView and Java.
+ */
+public class CommunicationBridge {
+private final WebView webView;
+
+private final HashMapString, ArrayListJSEventListener eventListeners;
+
+private boolean isDOMReady = false;
+private final ArrayListString pendingJSMessages = new 
ArrayListString();
+
+public interface JSEventListener {
+public void onMessage(String messageType, JSONObject messagePayload);
+}
+
+public CommunicationBridge(final WebView webView) {
+this.webView = webView;
+webView.setWebChromeClient(new CommunicatingChrome());
+eventListeners = new HashMapString, ArrayListJSEventListener();
+this.addListener(DOMLoaded, new JSEventListener() {
+@Override
+public void onMessage(String messageType, JSONObject 
messagePayload) {
+isDOMReady = true;
+for(String jsString : pendingJSMessages) {
+CommunicationBridge.this.webView.loadUrl(jsString);
+}
+}
+});
+}
+
+public void addListener(String type, JSEventListener listener) {
+if (eventListeners.containsKey(type)) {
+eventListeners.get(type).add(listener);
+} else {
+ArrayListJSEventListener listeners = new 
ArrayListJSEventListener();
+listeners.add(listener);
+eventListeners.put(type, listeners);
+}
+}
+
+public void sendMessage(String messageName, JSONObject messageData) {
+
+StringBuilder jsString = new StringBuilder();
+jsString.append(javascript:bridge.handleMessage( )
+.append(\).append(messageName).append(\,)
+.append(messageData.toString())
+.append( ););
+if (!isDOMReady) {
+pendingJSMessages.add(jsString.toString());
+} else {
+webView.loadUrl(jsString.toString());
+}
+}
+
+private class CommunicatingChrome extends WebChromeClient {
+@Override
+public boolean onJsPrompt(WebView view, String url, String message, 
String defaultValue, JsPromptResult result) {
+try {
+JSONObject messagePack = new JSONObject(message);
+String type = messagePack.getString(type);
+if (!eventListeners.containsKey(type)) {
+throw new RuntimeException(No such message type 
registered:  + type);
+}
+ArrayListJSEventListener listeners = 
eventListeners.get(type);
+for (JSEventListener listener : listeners) {
+listener.onMessage(type, 
messagePack.getJSONObject(payload));
+}
+result.confirm();
+} catch (JSONException e) {
+throw new RuntimeException(e);
+}
+return true;
+}
+
+@Override
+public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
+Log.d(WikipediaWeb, consoleMessage.sourceId() + : + 
consoleMessage.lineNumber() +  -  + consoleMessage.message());
+return true;
+}
+}
+}
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageFetchTask.java 

[MediaWiki-commits] [Gerrit] Add doc - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Jeroen De Dauw (Code Review)
Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Add doc
..

Add doc

Change-Id: If35c932c6983a8dc2f0d1d2b4ba493df168a23a8
---
M includes/datavalues/SMW_DataValue.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/includes/datavalues/SMW_DataValue.php 
b/includes/datavalues/SMW_DataValue.php
index 11cbafd..fe66fb6 100644
--- a/includes/datavalues/SMW_DataValue.php
+++ b/includes/datavalues/SMW_DataValue.php
@@ -137,8 +137,11 @@
 * The given value is a string as supplied by some user. An alternative
 * label for printout might also be specified.
 *
+* The third argument was added in SMW 1.9 and should not be used from 
outside SMW.
+*
 * @param string $value
 * @param mixed $caption
+* @param boolean $ignoreAllowedValues
 */
public function setUserValue( $value, $caption = false, 
$ignoreAllowedValues = false ) {
wfProfileIn( 'SMWDataValue::setUserValue (SMW)' );

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

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

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


[MediaWiki-commits] [Gerrit] Check for lead section properly - change (apps...wikipedia)

2013-11-03 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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


Change subject: Check for lead section properly
..

Check for lead section properly

Sections with id=0 will always be treated as the lead
Change-Id: Ib641e0438c42879ffe6b4e872aa8cc58518733d5
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
index 75f1768..7512aa7 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
@@ -37,7 +37,7 @@
 }
 
 public boolean isLead() {
-return level == 0;
+return id == 0;
 }
 
 public int getId() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib641e0438c42879ffe6b4e872aa8cc58518733d5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Add doc - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Jeroen De Dauw (Code Review)
Jeroen De Dauw has submitted this change and it was merged.

Change subject: Add doc
..


Add doc

Change-Id: If35c932c6983a8dc2f0d1d2b4ba493df168a23a8
---
M includes/datavalues/SMW_DataValue.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/datavalues/SMW_DataValue.php 
b/includes/datavalues/SMW_DataValue.php
index 11cbafd..fe66fb6 100644
--- a/includes/datavalues/SMW_DataValue.php
+++ b/includes/datavalues/SMW_DataValue.php
@@ -137,8 +137,11 @@
 * The given value is a string as supplied by some user. An alternative
 * label for printout might also be specified.
 *
+* The third argument was added in SMW 1.9 and should not be used from 
outside SMW.
+*
 * @param string $value
 * @param mixed $caption
+* @param boolean $ignoreAllowedValues
 */
public function setUserValue( $value, $caption = false, 
$ignoreAllowedValues = false ) {
wfProfileIn( 'SMWDataValue::setUserValue (SMW)' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If35c932c6983a8dc2f0d1d2b4ba493df168a23a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Ignore allowed values when the LIKE comparator is used - change (mediawiki...SemanticMediaWiki)

2013-11-03 Thread Jeroen De Dauw (Code Review)
Jeroen De Dauw has submitted this change and it was merged.

Change subject: Ignore allowed values when the LIKE comparator is used
..


Ignore allowed values when the LIKE comparator is used

Includes a new flag that signals whether allowed values should be processed 
(default) or ignored.

Bug: 21893
Change-Id: If35c932c6983a8dc2f0d1d2b4ba493df168a23a9
---
M includes/datavalues/SMW_DataValue.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/includes/datavalues/SMW_DataValue.php 
b/includes/datavalues/SMW_DataValue.php
index 411265f..11cbafd 100644
--- a/includes/datavalues/SMW_DataValue.php
+++ b/includes/datavalues/SMW_DataValue.php
@@ -140,7 +140,7 @@
 * @param string $value
 * @param mixed $caption
 */
-   public function setUserValue( $value, $caption = false ) {
+   public function setUserValue( $value, $caption = false, 
$ignoreAllowedValues = false ) {
wfProfileIn( 'SMWDataValue::setUserValue (SMW)' );
 
$this-m_dataitem = null;
@@ -163,7 +163,7 @@
$this-addError( wfMessage( 'smw_parseerror' 
)-inContentLanguage()-text() );
}
 
-   if ( $this-isValid() ) {
+   if ( $this-isValid()  !$ignoreAllowedValues ) {
$this-checkAllowedValues();
}
 
@@ -419,7 +419,12 @@
 
self::prepareValue( $value, $comparator );
 
-   $this-setUserValue( $value );
+   if( $comparator == SMW_CMP_LIKE ) {
+   // ignore allowed values when the LIKE comparator is 
used (BUG 21893)
+   $this-setUserValue( $value, false, true );
+   } else {
+   $this-setUserValue( $value );
+   }
 
if ( $this-isValid() ) {
return new SMWValueDescription( $this-getDataItem(), 
$this-m_property, $comparator );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If35c932c6983a8dc2f0d1d2b4ba493df168a23a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Rcdeboer remcocdeb...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Markus Kroetzsch mar...@semantic-mediawiki.org
Gerrit-Reviewer: Mwjames jamesin.hongkon...@gmail.com
Gerrit-Reviewer: Nischayn22 nischay...@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] Delay loading of jquery.uls.grid until needed - change (mediawiki...UniversalLanguageSelector)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Delay loading of jquery.uls.grid until needed
..


Delay loading of jquery.uls.grid until needed

Change-Id: I790333ac03a4103bed757867acfd1b44a7e00525
---
M Resources.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/Resources.php b/Resources.php
index a88d82a..41ae36d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -26,6 +26,7 @@
'ext.uls.buttons',
'ext.uls.languagesettings',
'ext.uls.webfonts',
+   'jquery.uls.grid',
'jquery.i18n',
'mediawiki.api.parse',
),
@@ -89,6 +90,7 @@
'ext.uls.buttons',
'ext.uls.languagesettings',
'ext.uls.ime',
+   'jquery.uls.grid',
'jquery.ime',
'jquery.i18n',
),
@@ -118,6 +120,7 @@
'dependencies' = array(
'ext.uls.buttons',
'ext.uls.preferences',
+   'jquery.uls.grid',
),
 ) + $resourcePaths;
 
@@ -189,7 +192,6 @@
),
'dependencies' = array(
'jquery.i18n',
-   'jquery.uls.grid',
'jquery.uls.data',
),
 ) + $resourcePaths;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I790333ac03a4103bed757867acfd1b44a7e00525
Gerrit-PatchSet: 2
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] Introduce includes/utils directory - change (mediawiki/core)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Introduce includes/utils directory
..


Introduce includes/utils directory

These are classes that provide facilities for use by any caller, are
independent of user interface, and have a limited set of dependencies on
the rest of MediaWiki. See the README file for a more precise
definition.

These classes cannot go in includes/libs because of a dependency on the
MediaWiki framework, such as wfDebug() or MWException, but they are
otherwise similar. I thought it would be useful to put them in their own
directory, to make them more discoverable, and as part of a general
program of reducing clutter in the base includes/ directory.

I've probably missed a few classes which could be included here, but the
following classes were considered and were rejected for now:

* Fallback: single caller only
* GitInfo: getViewers() has inappropriate dependencies
* HttpFunctions: depends on configuration, $wgTitle
* PoolCounter: depends on configuration
* CacheHelper: depends on IContextSource, wfMemc()

Also moved a couple of classes into libs/ instead, where that seemed to
be more appropriate.

Change-Id: I274cff805b7d694b728a89b764a049cd62d320fe
---
M includes/AutoLoader.php
R includes/libs/ScopedPHPTimeout.php
R includes/libs/XmlTypeCheck.php
R includes/utils/ArrayUtils.php
R includes/utils/Cdb.php
R includes/utils/Cdb_PHP.php
R includes/utils/ConfEditor.php
R includes/utils/HashRing.php
R includes/utils/IP.php
R includes/utils/MWCryptRand.php
R includes/utils/MWFunction.php
R includes/utils/MappedIterator.php
A includes/utils/README
R includes/utils/ScopedCallback.php
R includes/utils/StringUtils.php
R includes/utils/UIDGenerator.php
R includes/utils/ZipDirectoryReader.php
17 files changed, 40 insertions(+), 29 deletions(-)

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



diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index da85438..1417c77 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -33,7 +33,6 @@
'AjaxDispatcher' = 'includes/AjaxDispatcher.php',
'AjaxResponse' = 'includes/AjaxResponse.php',
'AlphabeticPager' = 'includes/Pager.php',
-   'ArrayUtils' = 'includes/ArrayUtils.php',
'Article' = 'includes/Article.php',
'AtomFeed' = 'includes/Feed.php',
'AuthPlugin' = 'includes/AuthPlugin.php',
@@ -47,28 +46,17 @@
'Categoryfinder' = 'includes/Categoryfinder.php',
'CategoryPage' = 'includes/CategoryPage.php',
'CategoryViewer' = 'includes/CategoryViewer.php',
-   'CdbFunctions' = 'includes/Cdb_PHP.php',
-   'CdbReader' = 'includes/Cdb.php',
-   'CdbReader_DBA' = 'includes/Cdb.php',
-   'CdbReader_PHP' = 'includes/Cdb_PHP.php',
-   'CdbWriter' = 'includes/Cdb.php',
-   'CdbWriter_DBA' = 'includes/Cdb.php',
-   'CdbWriter_PHP' = 'includes/Cdb_PHP.php',
'ChangesFeed' = 'includes/ChangesFeed.php',
'ChangeTags' = 'includes/ChangeTags.php',
'ChannelFeed' = 'includes/Feed.php',
'Collation' = 'includes/Collation.php',
'ConcatenatedGzipHistoryBlob' = 'includes/HistoryBlob.php',
-   'ConfEditor' = 'includes/ConfEditor.php',
-   'ConfEditorParseError' = 'includes/ConfEditor.php',
-   'ConfEditorToken' = 'includes/ConfEditor.php',
'Cookie' = 'includes/Cookie.php',
'CookieJar' = 'includes/Cookie.php',
'CurlHttpRequest' = 'includes/HttpFunctions.php',
'DeprecatedGlobal' = 'includes/DeprecatedGlobal.php',
'DerivativeRequest' = 'includes/WebRequest.php',
'DiffHistoryBlob' = 'includes/HistoryBlob.php',
-   'DoubleReplacer' = 'includes/StringUtils.php',
'DummyLinker' = 'includes/Linker.php',
'Dump7ZipOutput' = 'includes/Export.php',
'DumpBZip2Output' = 'includes/Export.php',
@@ -84,7 +72,6 @@
'EditPage' = 'includes/EditPage.php',
'EmailNotification' = 'includes/UserMailer.php',
'ErrorPageError' = 'includes/Exception.php',
-   'ExplodeIterator' = 'includes/StringUtils.php',
'FakeTitle' = 'includes/FakeTitle.php',
'Fallback' = 'includes/Fallback.php',
'FatalError' = 'includes/Exception.php',
@@ -99,8 +86,6 @@
'FormOptions' = 'includes/FormOptions.php',
'FormSpecialPage' = 'includes/SpecialPage.php',
'GitInfo' = 'includes/GitInfo.php',
-   'HashRing' = 'includes/HashRing.php',
-   'HashtableReplacer' = 'includes/StringUtils.php',
'HistoryBlob' = 'includes/HistoryBlob.php',
'HistoryBlobCurStub' = 'includes/HistoryBlob.php',
'HistoryBlobStub' = 'includes/HistoryBlob.php',
@@ -142,7 +127,6 @@
'IncludableSpecialPage' = 'includes/SpecialPage.php',
'IndexPager' = 'includes/Pager.php',
'Interwiki' = 'includes/interwiki/Interwiki.php',
-   'IP' = 'includes/IP.php',

[MediaWiki-commits] [Gerrit] Define autonym css class - change (mediawiki...UniversalLanguageSelector)

2013-11-03 Thread Santhosh (Code Review)
Santhosh has uploaded a new change for review.

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


Change subject: Define autonym css class
..

Define autonym css class

Follow up: I10b8658e29c03b136b4475c4c69ace33e5628a98 and
I48b0cc4a19c3ddd8d00f585faf31046d8ba6bf9c

Define this class in MW ULS since jquery.uls removed this class
definition

Change-Id: I5e52feb6a53362378b382b06727ac6e671e0f91a
---
M resources/css/ext.uls.css
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 620691a..927a90c 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -141,3 +141,7 @@
 #p-lang ul {
font-family: 'Autonym', sans-serif;
 }
+
+.autonym {
+   font-family: 'Autonym', sans-serif;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e52feb6a53362378b382b06727ac6e671e0f91a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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] Handle links being clicked - change (apps...wikipedia)

2013-11-03 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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


Change subject: Handle links being clicked
..

Handle links being clicked

Uses Otto for communication between activities. Much cleaner.

Change-Id: I23aff52790af11109aa80ee2d248a01216e342d8
---
M wikipedia/assets/main.js
M wikipedia/pom.xml
A wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java
6 files changed, 104 insertions(+), 8 deletions(-)


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

diff --git a/wikipedia/assets/main.js b/wikipedia/assets/main.js
index ef56e98..2d09436 100644
--- a/wikipedia/assets/main.js
+++ b/wikipedia/assets/main.js
@@ -3,8 +3,22 @@
 bridge.sendMessage( DOMLoaded, {} );
 };
 
+function forEach( list, fun ) {
+// Hack from 
https://developer.mozilla.org/en-US/docs/Web/API/NodeList#Workarounds
+// To let me use forEach on things like NodeList objects
+Array.prototype.forEach.call( list, fun );
+}
+
 bridge.registerListener( displayLeadSection, function( payload ) {
 document.getElementById( content ).innerHTML += 
payload.leadSectionHTML;
+function clickHandler() {
+bridge.sendMessage( 'linkClicked', { href: 
event.target.getAttribute( href ) });
+console.log(Link clicked!);
+return false;
+}
+forEach(document.querySelectorAll( a ), function() {
+this.onclick = clickHandler;
+});
 });
 
 } )();
\ No newline at end of file
diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml
index 8575576..9834868 100644
--- a/wikipedia/pom.xml
+++ b/wikipedia/pom.xml
@@ -32,6 +32,11 @@
 artifactIdjson/artifactId
 version1.0-SNAPSHOT/version
 /dependency
+dependency
+groupIdcom.squareup/groupId
+artifactIdotto/artifactId
+version1.3.4/version
+/dependency
/dependencies
build
finalName${project.artifactId}/finalName
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
new file mode 100644
index 000..38cd142
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
@@ -0,0 +1,51 @@
+package org.wikimedia.wikipedia;
+
+import android.content.Context;
+import android.util.Log;
+import com.squareup.otto.Bus;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Handles any html links coming from a {@link PageViewFragment}
+ */
+public class LinkHandler implements CommunicationBridge.JSEventListener {
+private final Context context;
+private final CommunicationBridge bridge;
+private final Bus bus;
+
+public static class NewWikiPageNavigationEvent {
+private final PageTitle title;
+
+public NewWikiPageNavigationEvent(PageTitle title) {
+this.title = title;
+}
+
+public PageTitle getTitle() {
+return title;
+}
+}
+
+public LinkHandler(Context context, CommunicationBridge bridge) {
+this.context = context;
+this.bridge = bridge;
+this.bus = ((WikipediaApp)context.getApplicationContext()).getBus();
+
+this.bridge.addListener(linkClicked, this);
+}
+
+@Override
+public void onMessage(String messageType, JSONObject messagePayload) {
+try {
+String href = messagePayload.getString(href);
+if (href.startsWith(/wiki/)) {
+// TODO: Handle fragments
+String pageName = href.replace(/wiki/, );
+bus.post(new NewWikiPageNavigationEvent(new PageTitle(null, 
pageName)));
+}
+Log.d(Wikipedia, Link clicked was  + href);
+} catch (JSONException e) {
+throw new RuntimeException(e);
+}
+}
+}
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
index 42d5189..63bc012 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
@@ -4,16 +4,24 @@
 import android.support.v4.app.FragmentActivity;
 import android.view.*;
 import android.widget.*;
+import com.squareup.otto.Bus;
+import com.squareup.otto.Subscribe;
 
 public class PageActivity extends FragmentActivity {
 
 Button pageGoButton;
 EditText pageNameText;
 
+private Bus bus;
+
 @Override
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 

[MediaWiki-commits] [Gerrit] Do not keeep all of past page fragments fully in memory - change (apps...wikipedia)

2013-11-03 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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


Change subject: Do not  keeep all of past page fragments fully in memory
..

Do not  keeep all of past page fragments fully in memory

We're still saving their state, so the pages will come right back
up. We might want to discard them after some depth to preserve
memory, but that can come later.

This means we lose the scroll position when you hit back, but
that needs to be solved anyway in the 'fragment re-created'
case for supporting rotates, etc - so will get to it eventually.

Change-Id: I0f4368bf9cd2b6d5365e1c8db28a3c140c07863f
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
index 63bc012..e08a5bf 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
@@ -37,7 +37,7 @@
 private void displayNewPage(PageTitle title) {
 PageViewFragment pageFragment = new PageViewFragment(title);
 getSupportFragmentManager().beginTransaction()
-.add(R.id.content_frame, pageFragment)
+.replace(R.id.content_frame, pageFragment)
 .addToBackStack(null)
 .commit();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f4368bf9cd2b6d5365e1c8db28a3c140c07863f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Handle external links - change (apps...wikipedia)

2013-11-03 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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


Change subject: Handle external links
..

Handle external links

Change-Id: I8c94b6fe9d621c50dfd9c0c75796c939d315360b
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
1 file changed, 17 insertions(+), 1 deletion(-)


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

diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
index 38cd142..1bdd059 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
@@ -1,6 +1,8 @@
 package org.wikimedia.wikipedia;
 
 import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.util.Log;
 import com.squareup.otto.Bus;
 import org.json.JSONException;
@@ -34,16 +36,30 @@
 this.bridge.addListener(linkClicked, this);
 }
 
+private void handleExternalLink(String href) {
+Intent intent = new Intent();
+intent.setAction(Intent.ACTION_VIEW);
+intent.setData(Uri.parse(href));
+context.startActivity(intent);
+}
+
 @Override
 public void onMessage(String messageType, JSONObject messagePayload) {
 try {
 String href = messagePayload.getString(href);
+if (href.startsWith(//)) {
+// That's a protocol specific link! Make it https!
+href = https: + href;
+}
+Log.d(Wikipedia, Link clicked was  + href);
 if (href.startsWith(/wiki/)) {
 // TODO: Handle fragments
 String pageName = href.replace(/wiki/, );
 bus.post(new NewWikiPageNavigationEvent(new PageTitle(null, 
pageName)));
+} else {
+// Assume everything else is an external link... for now!
+handleExternalLink(href);
 }
-Log.d(Wikipedia, Link clicked was  + href);
 } catch (JSONException e) {
 throw new RuntimeException(e);
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c94b6fe9d621c50dfd9c0c75796c939d315360b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Introduce WebRequest::getProtocol() - change (mediawiki/core)

2013-11-03 Thread Tim Starling (Code Review)
Tim Starling has uploaded a new change for review.

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


Change subject: Introduce WebRequest::getProtocol()
..

Introduce WebRequest::getProtocol()

The use of static server detection outside of its intended use case
(i.e. at the start of DefaultSettings.php), for example in r93258, was
an architectural error. Every other bit of information about the web
request in non-setup code comes from non-static methods of WebRequest,
which allows the request object to be meaningfully replaced or
subclassed. The situation became increasingly ridiculous as more
callers of WebRequest::detectServer() were introduced. Two of the
callers were calling it non-statically! I suppose they had the right
idea, in a way.

Using a non-static call allows caching, which is a nice additional
benefit.

WebRequest::detectProtocolAndStdPort() was introduced in r93258 as part of
the introduction of WebRequest::detectServer(). It was basically
useless. Grep indicates there was only one caller in core and WMF
deployed extensions, and it is patched here.

Change-Id: Ia0a61e98fbff7a46ceaeebcb02236e5eac3df0e1
---
M includes/GlobalFunctions.php
M includes/WebRequest.php
M includes/Wiki.php
M includes/specials/SpecialUserlogin.php
4 files changed, 35 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/93425/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index ef0ec2c..5900d07 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -495,7 +495,7 @@
  *no valid URL can be constructed
  */
 function wfExpandUrl( $url, $defaultProto = PROTO_CURRENT ) {
-   global $wgServer, $wgCanonicalServer, $wgInternalServer;
+   global $wgServer, $wgCanonicalServer, $wgInternalServer, $wgRequest;
$serverUrl = $wgServer;
if ( $defaultProto === PROTO_CANONICAL ) {
$serverUrl = $wgCanonicalServer;
@@ -505,7 +505,7 @@
$serverUrl = $wgInternalServer;
}
if ( $defaultProto === PROTO_CURRENT ) {
-   $defaultProto = WebRequest::detectProtocol() . '://';
+   $defaultProto = $wgRequest-getProtocol() . '://';
}
 
// Analyze $serverUrl to obtain its protocol
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index b17cb9e..574643d 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -50,6 +50,12 @@
 */
private $ip;
 
+   /**
+* Cached URL protocol
+* @var string
+*/
+   private $protocol;
+
public function __construct() {
/// @todo FIXME: This preemptive de-quoting can interfere with 
other web libraries
///and increases our memory footprint. It would be 
cleaner to do on
@@ -160,7 +166,8 @@
 * @return string
 */
public static function detectServer() {
-   list( $proto, $stdPort ) = self::detectProtocolAndStdPort();
+   $proto = self::detectProtocol();
+   $stdPort = $proto === 'https' ? 443 : 80;
 
$varNames = array( 'HTTP_HOST', 'SERVER_NAME', 'HOSTNAME', 
'SERVER_ADDR' );
$host = 'localhost';
@@ -189,25 +196,32 @@
}
 
/**
+* Detect the protocol from $_SERVER.
+* This is for use prior to Setup.php, when no WebRequest object is 
available.
+* At other times, use the non-static function getProtocol().
+*
 * @return array
 */
-   public static function detectProtocolAndStdPort() {
+   public static function detectProtocol() {
if ( ( isset( $_SERVER['HTTPS'] )  $_SERVER['HTTPS'] == 'on' 
) ||
( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) 
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) ) {
-   $arr = array( 'https', 443 );
+   return 'https';
} else {
-   $arr = array( 'http', 80 );
+   return 'http';
}
return $arr;
}
 
/**
+* Get the current URL protocol (http or https)
 * @return string
 */
-   public static function detectProtocol() {
-   list( $proto, ) = self::detectProtocolAndStdPort();
-   return $proto;
+   public function getProtocol() {
+   if ( $this-protocol === null ) {
+   $this-protocol = WebRequest::detectProtocol();
+   }
+   return $this-protocol;
}
 
/**
@@ -1385,6 +1399,10 @@
$this-notImplemented( __METHOD__ );
}
 
+   public function getProtocol() {
+   $this-notImplemented( __METHOD__ );
+   }
+
/**
 * @param string $name The name of the header to get (case 

[MediaWiki-commits] [Gerrit] tool labs exec_environ: add python-twitter package - change (operations/puppet)

2013-11-03 Thread Jeremyb (Code Review)
Jeremyb has uploaded a new change for review.

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


Change subject: tool labs exec_environ: add python-twitter package
..

tool labs exec_environ: add python-twitter package

morebots needs this to tweet !log msgs

Change-Id: I16530b704c06922b97540f7184f7cd3c0890fab9
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 585c036..6b0a2b4 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -126,6 +126,7 @@
   'python-rsvg',
   'python-scipy',
   'python-sqlalchemy',
+  'python-twitter',
   'python-twisted',
   'python-uwsgi',
   'python-virtualenv',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16530b704c06922b97540f7184f7cd3c0890fab9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jeremyb jer...@tuxmachine.com

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


[MediaWiki-commits] [Gerrit] Move Entity specific classes into EntityStore NS - change (mediawiki...WikibaseQueryEngine)

2013-11-03 Thread Jeroen De Dauw (Code Review)
Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Move Entity specific classes into EntityStore NS
..

Move Entity specific classes into EntityStore NS

This makes it consistent with the rest of the component

Change-Id: Ia52c892d9fdb0a5e49052d1eb63be8464d5af5e6
---
R src/SQLStore/EntityStore/EntityInserter.php
R src/SQLStore/EntityStore/EntityRemover.php
R src/SQLStore/EntityStore/EntityTable.php
R src/SQLStore/EntityStore/EntityUpdater.php
M src/SQLStore/SQLStore.php
M src/SQLStore/Writer.php
R tests/Phpunit/SQLStore/EntityStore/EntityInserterTest.php
R tests/Phpunit/SQLStore/EntityStore/EntityRemoverTest.php
R tests/Phpunit/SQLStore/EntityStore/EntityTableTest.php
R tests/Phpunit/SQLStore/EntityStore/EntityUpdaterTest.php
M tests/Phpunit/SQLStore/WriterTest.php
11 files changed, 28 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQueryEngine 
refs/changes/27/93427/1

diff --git a/src/SQLStore/EntityInserter.php 
b/src/SQLStore/EntityStore/EntityInserter.php
similarity index 90%
rename from src/SQLStore/EntityInserter.php
rename to src/SQLStore/EntityStore/EntityInserter.php
index 188e510..548154d 100644
--- a/src/SQLStore/EntityInserter.php
+++ b/src/SQLStore/EntityStore/EntityInserter.php
@@ -1,8 +1,7 @@
 ?php
 
-namespace Wikibase\QueryEngine\SQLStore;
+namespace Wikibase\QueryEngine\SQLStore\EntityStore;
 
-use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\Entity;
 use Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimInserter;
 
diff --git a/src/SQLStore/EntityRemover.php 
b/src/SQLStore/EntityStore/EntityRemover.php
similarity index 92%
rename from src/SQLStore/EntityRemover.php
rename to src/SQLStore/EntityStore/EntityRemover.php
index 3693bdd..38fea05 100644
--- a/src/SQLStore/EntityRemover.php
+++ b/src/SQLStore/EntityStore/EntityRemover.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace Wikibase\QueryEngine\SQLStore;
+namespace Wikibase\QueryEngine\SQLStore\EntityStore;
 
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\Entity;
diff --git a/src/SQLStore/EntityTable.php 
b/src/SQLStore/EntityStore/EntityTable.php
similarity index 95%
rename from src/SQLStore/EntityTable.php
rename to src/SQLStore/EntityStore/EntityTable.php
index e5c47be..3e3b666 100644
--- a/src/SQLStore/EntityTable.php
+++ b/src/SQLStore/EntityStore/EntityTable.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace Wikibase\QueryEngine\SQLStore;
+namespace Wikibase\QueryEngine\SQLStore\EntityStore;
 
 use Wikibase\Database\QueryInterface\QueryInterface;
 use Wikibase\Entity;
diff --git a/src/SQLStore/EntityUpdater.php 
b/src/SQLStore/EntityStore/EntityUpdater.php
similarity index 91%
rename from src/SQLStore/EntityUpdater.php
rename to src/SQLStore/EntityStore/EntityUpdater.php
index f0880d8..1354b17 100644
--- a/src/SQLStore/EntityUpdater.php
+++ b/src/SQLStore/EntityStore/EntityUpdater.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace Wikibase\QueryEngine\SQLStore;
+namespace Wikibase\QueryEngine\SQLStore\EntityStore;
 
 use Wikibase\Entity;
 
diff --git a/src/SQLStore/SQLStore.php b/src/SQLStore/SQLStore.php
index 43933a0..0f385ae 100644
--- a/src/SQLStore/SQLStore.php
+++ b/src/SQLStore/SQLStore.php
@@ -14,6 +14,10 @@
 use Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimRowBuilder;
 use Wikibase\QueryEngine\SQLStore\Engine\DescriptionMatchFinder;
 use Wikibase\QueryEngine\SQLStore\Engine\Engine;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityInserter;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityRemover;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityTable;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityUpdater;
 use Wikibase\QueryEngine\SQLStore\Setup\Installer;
 use Wikibase\QueryEngine\SQLStore\Setup\Uninstaller;
 use Wikibase\QueryEngine\SQLStore\Setup\Updater;
diff --git a/src/SQLStore/Writer.php b/src/SQLStore/Writer.php
index e1a77ef..b62007a 100644
--- a/src/SQLStore/Writer.php
+++ b/src/SQLStore/Writer.php
@@ -2,10 +2,11 @@
 
 namespace Wikibase\QueryEngine\SQLStore;
 
-use Wikibase\Claim;
 use Wikibase\Entity;
 use Wikibase\QueryEngine\QueryStoreWriter;
-use Wikibase\QueryEngine\SQLStore\SnakStore\ValuelessSnakRow;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityInserter;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityRemover;
+use Wikibase\QueryEngine\SQLStore\EntityStore\EntityUpdater;
 
 /**
  * Class responsible for writing information to the SQLStore.
diff --git a/tests/Phpunit/SQLStore/EntityInserterTest.php 
b/tests/Phpunit/SQLStore/EntityStore/EntityInserterTest.php
similarity index 92%
rename from tests/Phpunit/SQLStore/EntityInserterTest.php
rename to tests/Phpunit/SQLStore/EntityStore/EntityInserterTest.php
index 0be4507..551c3f7 100644
--- a/tests/Phpunit/SQLStore/EntityInserterTest.php
+++ b/tests/Phpunit/SQLStore/EntityStore/EntityInserterTest.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace 

[MediaWiki-commits] [Gerrit] Do not run tests for Wikibase Query and QueryEngine - change (integration/zuul-config)

2013-11-03 Thread Jeroen De Dauw (Code Review)
Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Do not run tests for Wikibase Query and QueryEngine
..

Do not run tests for Wikibase Query and QueryEngine

The existing configuration is broken, so Jenkins is voting -2
for all commits. Fixing the configuration requires getting a dependency
from GitHub, which currently appears to not be supported.

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


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

diff --git a/layout.yaml b/layout.yaml
index a8ba592..eb489f9 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2475,16 +2475,6 @@
   - name: extension-unittests
 extname: WikibaseDataModel
 
-  - name: mediawiki/extensions/WikibaseQueryEngine
-template:
-  - name: extension-unittests
-extname: WikibaseQueryEngine
-
-  - name: mediawiki/extensions/WikibaseQuery
-template:
-  - name: extension-unittests
-extname: WikibaseQuery
-
   - name: mediawiki/extensions/Wikidata
 template:
   - name: extension-unittests

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I548949dc61e7e41b246efc6e71a76f7e6afddca2
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

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


[MediaWiki-commits] [Gerrit] WIP dedupe report - change (wikimedia...tools)

2013-11-03 Thread Adamw (Code Review)
Adamw has uploaded a new change for review.

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


Change subject: WIP dedupe report
..

WIP dedupe report

Change-Id: Id2c31473b956661cf3add6799faa3d8f33204489
---
M civicrm/civicrm.py
A civicrm/contact.py
A dedupe/diff.py
A dedupe/generate_report.py
A dedupe/refine_matches.py
M dedupe/review_queue.py
6 files changed, 213 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/29/93429/1

diff --git a/civicrm/civicrm.py b/civicrm/civicrm.py
index 347d934..b1d3bb8 100644
--- a/civicrm/civicrm.py
+++ b/civicrm/civicrm.py
@@ -1,5 +1,6 @@
 import MySQLdb as Dbi
 
+# TODO: from database import db
 db_conn = False
 
 class Civicrm(object):
diff --git a/civicrm/contact.py b/civicrm/contact.py
new file mode 100644
index 000..4a61e7e
--- /dev/null
+++ b/civicrm/contact.py
@@ -0,0 +1,37 @@
+from database import db
+
+class Contact(object):
+@staticmethod
+def get_contact_nea(contact_id):
+query = db.Query()
+query.columns.extend([
+contact.id AS contact_id,
+contact.display_name AS name,
+email.email AS email,
+
+CONCAT(
+addr.street_address,
+', ', addr.postal_code,
+', ', COALESCE(state.abbreviation, state.name),
+', ', COALESCE(country.iso_code, country.name)
+) AS address
+,
+])
+query.tables.extend([
+civicrm_contact contact,
+civicrm_email email ON email.contact_id = %(id)s,
+civicrm_address addr ON addr.contact_id = %(id)s,
+civicrm_country country ON country.id = addr.country_id,
+civicrm_state_province state ON state.id = 
addr.state_province_id,
+])
+query.where.extend([
+contact.id = %(id)s,
+])
+query.params.update({
+id: contact_id,
+})
+result = db.get_db().execute(query)
+if result:
+return result[0]
+else:
+return None
diff --git a/dedupe/diff.py b/dedupe/diff.py
new file mode 100644
index 000..d96573d
--- /dev/null
+++ b/dedupe/diff.py
@@ -0,0 +1,62 @@
+from difflib import SequenceMatcher
+
+class CharDiffer(object):
+def __init__(self, a, b):
+self.a = a
+self.b = b
+self.make_diff()
+
+def make_diff(self):
+if not self.a and not self.b:
+self.diffs = []
+elif not self.a:
+self.diffs = [('insert', 0, 0, 0, len(self.b) - 1)]
+elif not self.b:
+self.diffs = [('delete', 0, len(self.a) - 1), 0, 0]
+else:
+self.diffs = SequenceMatcher(a=self.a, b=self.b).get_opcodes()
+
+def render_text(self):
+self.format = 'text'
+return self.render()
+
+def render_html(self):
+self.format = 'html'
+return self.render()
+
+def render(self):
+if not self.diffs or (len(self.diffs) == 1 and self.diffs[0][0] == 
'equal'):
+return self.render_indentical()
+
+out = 
+for operation, i1, i2, j1, j2 in self.diffs:
+if operation == 'replace':
+out += self.render_replacement(self.a[i1:i2], self.b[j1:j2])
+elif operation == 'delete':
+out += self.render_removed(self.a[i1:i2])
+elif operation == 'insert':
+out += self.render_added(self.b[j1:j2])
+elif operation == 'equal':
+out += self.a[i1:i2]
+return out
+
+def render_replacement(self, x, y):
+return self.render_removed(x) + self.render_added(y)
+
+def render_removed(self, s):
+if self.format is 'text':
+return [-%s-] % (s, )
+elif self.format is 'html':
+return 'span class=removed%s/span' % (s, )
+
+def render_added(self, s):
+if self.format is 'text':
+return [+%s+] % (s, )
+elif self.format is 'html':
+return 'span class=added%s/span' % (s, )
+
+def render_indentical(self):
+if self.format is 'text':
+return --same--
+elif self.format is 'html':
+return mdash;samemdash;
diff --git a/dedupe/generate_report.py b/dedupe/generate_report.py
new file mode 100755
index 000..b021dd5
--- /dev/null
+++ b/dedupe/generate_report.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+from process.globals import load_config
+load_config(dedupe)
+
+from review_queue import ReviewQueue
+import json
+
+queue = ReviewQueue.get_matches()
+print html
+head
+style type=text/css
+table {
+border-collapse:collapse;
+}
+table, th, td {
+border: 1px solid black;
+}
+th {
+background: grey;
+}
+.added {
+font-weight: bold;
+}
+.removed {
+text-decoration: line-through;
+}
+/style
+/head
+body

[MediaWiki-commits] [Gerrit] Make Special:UserProfile look like an article page - change (mediawiki...MobileFrontend)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Make Special:UserProfile look like an article page
..

Make Special:UserProfile look like an article page

* Remove superfluous DIV (combine content and profile)

Change-Id: I52f48e2ad96506bcb680449967bbcd22c18be36a
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/specials/SpecialUserProfile.php
M less/common/pageactions.less
M less/specials/userprofile.less
5 files changed, 31 insertions(+), 21 deletions(-)


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

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 2e4bedd..44468af 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -213,7 +213,7 @@
div class=header
?php
$this-html( 'menuButton' );
-   if ( $this-isSpecialPage ) {
+   if ( isset( 
$data['specialPageHeader' ] ) ) {
echo 
$data['specialPageHeader'];
} else {
?
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index d456d82..18a9b20 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -251,10 +251,12 @@
 
$htmlHeader = $out-getProperty( 'mobile.htmlHeader' );
if ( $title-isSpecialPage() ) {
-   if ( !$htmlHeader ) {
-   $htmlHeader = Html::element( 'h1', array(), 
$pageHeading );
+   if ( !$out-getProperty( 'mobile.useStandardHeader' ) ) 
{
+   if ( !$htmlHeader ) {
+   $htmlHeader = Html::element( 'h1', 
array(), $pageHeading );
+   }
+   $tpl-set( 'specialPageHeader', $htmlHeader );
}
-   $tpl-set( 'specialPageHeader', $htmlHeader );
} else {
$preBodyText = Html::rawElement( 'h1', array( 'id' = 
'section_0' ), $pageHeading );
$tpl-set( 'prebodytext', $preBodyText );
diff --git a/includes/specials/SpecialUserProfile.php 
b/includes/specials/SpecialUserProfile.php
index 5e3b520..a768792 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -84,23 +84,13 @@
return $html;
}
 
-   protected function setUserProfileUIElements() {
+   protected function getTalkLink() {
// replace secondary icon
$attrs = array(
'class' = 'talk',
-   'id' = 'secondary-button',
'href' = 
$this-targetUser-getTalkPage()-getLocalUrl(),
);
-   $secondaryButton = Html::element( 'a', $attrs, $this-msg( 
'mobile-frontend-profile-usertalk' ) );
-
-   // define heading
-   $heading = Html::element( 'h1', array(), 
$this-targetUser-getName() );
-
-   // set values
-   /** @var SkinMobile $skin */
-   $skin = $this-getSkin();
-   $skin-setTemplateVariable( 'secondaryButton', $secondaryButton 
);
-   $skin-setTemplateVariable( 'specialPageHeader', $heading );
+   return Html::element( 'a', $attrs, $this-msg( 
'mobile-frontend-profile-usertalk' ) );
}
 
// FIXME: Change this into 404 error
@@ -167,6 +157,8 @@
public function executeWhenAvailable( $par ) {
wfProfileIn( __METHOD__ );
$out = $this-getOutput();
+   $out-setProperty( 'mobile.useStandardHeader', true );
+   $out-setProperty( 'unstyledContent', true );
$this-addModules();
$out-setPageTitle( $this-msg( 'mobile-frontend-profile-title' 
) );
if ( $par ) {
@@ -175,9 +167,10 @@
if ( $this-targetUser-getId() ) {
// prepare content
$this-userInfo = new MobileUserInfo( 
$this-targetUser );
-   $this-setUserProfileUIElements();
-   $html = Html::openElement( 'div', array( 
'class' = 'profile' ) )
+   $html = Html::openElement( 'div', array( 
'class' = 'content profile' ) )
+   . Html::element( 'h1', array(), 
$this-targetUser-getName() )
   

[MediaWiki-commits] [Gerrit] Begin Special:UserProfile overhaul - change (mediawiki...MobileFrontend)

2013-11-03 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

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


Change subject: Begin Special:UserProfile overhaul
..

Begin Special:UserProfile overhaul

* Temporary add MORE grays
** Yet introduce @grayMid, @grayDark and @grayLight variables
to avoid introduction of yet another tone of gray. It's expected
that we can standardise on our grays at a later date using these
variables, changing where necessary.

Change-Id: I168f5faa11c58a93691f10807491accedc865143
---
M MobileFrontend.i18n.php
M includes/specials/SpecialUserProfile.php
D less/specials/images/profile/activity.png
D less/specials/images/profile/registration.png
D less/specials/images/profile/thanks.png
M less/specials/userprofile.less
M less/variables.less
7 files changed, 99 insertions(+), 108 deletions(-)


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

diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index a9d3de3..d19745c 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -332,20 +332,17 @@
 
// Special:UserProfile
'mobile-frontend-profile-title' = 'User profile',
-   'mobile-frontend-profile-contributions' = 
'[[Special:Contributions/$1|{{PLURAL:$2|1 edit|$2 edits|0=No edits|501=More 
than 500 edits}}]] and
-[[Special:Uploads/$1|{{PLURAL:$3|1 upload|$3 uploads|0=no uploads|501=more 
than 500 uploads}}]] in the last 30 days.',
'mobile-frontend-profile-last-upload-caption' = 'Last upload by 
{{GENDER:$1|$1}}, {{PLURAL:$2|yesterday|$2 days ago|0=today}}.',
-   'mobile-frontend-profile-registration' = '$1 has been contributing to 
{{SITENAME}} for {{PLURAL:$2|$2 day|$2 days}} and {{GENDER:$1|has made}} 
{{PLURAL:$3|$3 edit|$3 edits}}.',
'mobile-frontend-profile-usertalk' = 'View talk page.',
'mobile-frontend-profile-noargs' = 'Please provide a username to view 
a profile.',
'mobile-frontend-profile-nouser' = 'Non-existent or invalid username',
'mobile-frontend-profile-yours' = 'Visit your profile page.',
'mobile-frontend-profile-userpage-link' = 'Visit user page.',
-   'mobile-frontend-profile-user-desc-1' = '{{GENDER:$1|This user}} is a 
new editor.',
-   'mobile-frontend-profile-user-desc-2' = '{{GENDER:$1|This user}} is a 
somewhat experienced editor.',
-   'mobile-frontend-profile-user-desc-3' = '{{GENDER:$1|This user}} is a 
prolific editor.',
'mobile-frontend-requires-optin' = 'This page is not available unless 
you opt into our beta mode. Visit the [[Special:MobileOptions|settings page]] 
to opt in.',
'mobile-frontend-profile-last-thanked' = '{{GENDER:$1|Last thanked}} 
by [[Special:UserProfile/$1|$1]] for an edit to [[$2]].',
+   'mobile-frontend-profile-footer-days' = 'Member for {{PLURAL:$2|1 
day|$2 days}} with [[Special:Contributions/$1|{{PLURAL:$3|1 edit|$3 edits}}]] 
and [[Special:Uploads/$1|{{PLURAL:$4|1 upload|$4 uploads|500=500+ uploads}}]].',
+   'mobile-frontend-profile-footer-months' = 'Member for over 
{{PLURAL:$2|1 month|$2 months}} with [[Special:Contributions/$1|{{PLURAL:$3|1 
edit|$3 edits}}]] and [[Special:Uploads/$1|{{PLURAL:$4|1 upload|$4 
uploads|500=500+ uploads}}]].',
+   'mobile-frontend-profile-footer-years' = 'Member for over 
{{PLURAL:$2|1 year|$2 years}} with [[Special:Contributions/$1|{{PLURAL:$3|1 
edit|$3 edits}}]] and [[Special:Uploads/$1|{{PLURAL:$4|1 upload|$4 
uploads|500=500+ uploads}}]].',
 
// geo not a hack
'mobile-frontend-geonotahack' = 'Near this page',
@@ -943,6 +940,23 @@
 * $1 - name of user who thanked, can be used for GENDER
 * $2 - title of page for editing which the thank was given
 * $3 - (optional) name of user who was thanked, for GENDER support',
+   'mobile-frontend-profile-footer-days' = 'Generates the informative 
footer on Special:UserProfile
+
+Parameters:
+* $1 - Number of days the user has been a member for.
+* $2 - Username of user (used for link generation)
+* $3 - Number of edits
+* $4 - Number of uploads, capped to 500',
+
+   'mobile-frontend-profile-footer-months' = 'See 
{{msg-mw|mobile-frontend-profile-footer-days}} with one variation:
+
+Parameters:
+* $1 - Number of full months the user has been a member for',
+   'mobile-frontend-profile-footer-years' = 'See 
{{msg-mw|mobile-frontend-profile-footer-days}} with one variation:
+
+Parameters:
+* $1 - Number of full years the user has been a member for',
+
'mobile-frontend-geonotahack' = 'Label for button that shows pages 
near a given page',
 );
 
diff --git a/includes/specials/SpecialUserProfile.php 
b/includes/specials/SpecialUserProfile.php
index 77b9ae8..5e3b520 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -39,7 +39,7 @@
$title = $file-getTitle();
$ts = new MWTimestamp( $file-getTimestamp() );
 

[MediaWiki-commits] [Gerrit] payments as empty hash for lvs service ips in eqiad - change (operations/puppet)

2013-11-03 Thread ArielGlenn (Code Review)
ArielGlenn has uploaded a new change for review.

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


Change subject: payments as empty hash for lvs service ips in eqiad
..

payments as empty hash for lvs service ips in eqiad

the template doesn't like it to be missing entirely

Change-Id: Ie9724aaaf38a6e6122768e1345ae6ed3707cdcd1
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/93432/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index b980b5d..2af1f63 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -336,6 +336,7 @@
},
'payments' = {
'pmtpa' = 208.80.152.213,
+   'eqiad' = {},
},
'apaches' = {
'pmtpa' = 10.2.1.1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9724aaaf38a6e6122768e1345ae6ed3707cdcd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] payments as empty hash for lvs service ips in eqiad - change (operations/puppet)

2013-11-03 Thread ArielGlenn (Code Review)
ArielGlenn has submitted this change and it was merged.

Change subject: payments as empty hash for lvs service ips in eqiad
..


payments as empty hash for lvs service ips in eqiad

the template doesn't like it to be missing entirely

Change-Id: Ie9724aaaf38a6e6122768e1345ae6ed3707cdcd1
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index b980b5d..2af1f63 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -336,6 +336,7 @@
},
'payments' = {
'pmtpa' = 208.80.152.213,
+   'eqiad' = {},
},
'apaches' = {
'pmtpa' = 10.2.1.1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9724aaaf38a6e6122768e1345ae6ed3707cdcd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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


[MediaWiki-commits] [Gerrit] Add sitemap generation to cron - change (translatewiki)

2013-11-03 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Add sitemap generation to cron
..


Add sitemap generation to cron

Change-Id: Ifc15146b11fc5f3f7049e881e6e45ac3ce0f57dc
---
M puppet/modules/wiki/templates/wikimaintenance.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb 
b/puppet/modules/wiki/templates/wikimaintenance.erb
index 91c48c0..ec22067 100644
--- a/puppet/modules/wiki/templates/wikimaintenance.erb
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -2,3 +2,4 @@
 * * * * * %= @user % nice php 
/www/translatewiki.net/w/maintenance/runJobs.php --exclusive --maxtime=50 
--procs=1 --memory-limit=250M  /www/translatewiki.net/w/logs/jobqueue 2 
/dev/null
 */5 * * * * %= @user % nice php 
/www/sandbox.translatewiki.net/w/maintenance/runJobs.php --exclusive 
--maxtime=50 --procs=1 --memory-limit=250M  
/www/sandbox.translatewiki.net/w/logs/jobqueue 2 /dev/null
 @weekly www-data find /www/translatewiki.net/w/images/thumb/ -name *.png 
-type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1 /dev/null
+@weekly %= @user = nice php 
/www/translatewiki.net/w/maintenance/generateSitemap.php --fspath 
/www/translatewiki.net/sitemap/ --skip-redirects --urlpath 
https://translatewiki.net/sitemap/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc15146b11fc5f3f7049e881e6e45ac3ce0f57dc
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@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