[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseLocalisationUpdate into Commo... - change (operations/mediawiki-config)

2016-07-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Cleanup: Move never-altered UseLocalisationUpdate into 
CommonSettings
..


Cleanup: Move never-altered UseLocalisationUpdate into CommonSettings

Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 9 insertions(+), 14 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index be55be8..af91155 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1840,16 +1840,15 @@
 $wgDefaultUserOptions['usebetatoolbar'] = 1;
 $wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
 
-if ( $wmgUseLocalisationUpdate ) {
-   wfLoadExtension( 'LocalisationUpdate' );
-   $wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
-   $wgLocalisationUpdateRepository = 'local';
-   $wgLocalisationUpdateRepositories['local'] = [
-   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
-   'extension' => 
'/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
-   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
-   ];
-}
+# LocalisationUpdate
+wfLoadExtension( 'LocalisationUpdate' );
+$wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
+$wgLocalisationUpdateRepository = 'local';
+$wgLocalisationUpdateRepositories['local'] = [
+   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
+   'extension' => '/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
+   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
+];
 
 if ( $wmgEnableLandingCheck ) {
require_once(  "$IP/extensions/LandingCheck/LandingCheck.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bad7666..a738d3e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12220,10 +12220,6 @@
'default' => 1024,
 ],
 
-'wmgUseLocalisationUpdate' => [
-   'default' => true,
-],
-
 'wmgUseLiquidThreads' => [
 //
 // 
!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseLocalisationUpdate into Commo... - change (operations/mediawiki-config)

2016-06-03 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered UseLocalisationUpdate into 
CommonSettings
..

Cleanup: Move never-altered UseLocalisationUpdate into CommonSettings

Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 9 insertions(+), 14 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7bffb3f..8620ab1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1783,16 +1783,15 @@
 $wgDefaultUserOptions['usebetatoolbar'] = 1;
 $wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
 
-if ( $wmgUseLocalisationUpdate ) {
-   require_once( 
"$IP/extensions/LocalisationUpdate/LocalisationUpdate.php" );
-   $wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
-   $wgLocalisationUpdateRepository = 'local';
-   $wgLocalisationUpdateRepositories['local'] = [
-   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
-   'extension' => 
'/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
-   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
-   ];
-}
+# LocalisationUpdate
+require_once( "$IP/extensions/LocalisationUpdate/LocalisationUpdate.php" );
+$wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
+$wgLocalisationUpdateRepository = 'local';
+$wgLocalisationUpdateRepositories['local'] = [
+   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
+   'extension' => '/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
+   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
+];
 
 if ( $wmgEnableLandingCheck ) {
require_once(  "$IP/extensions/LandingCheck/LandingCheck.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cbe89f4..dc6c220 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12175,10 +12175,6 @@
'default' => 1024,
 ],
 
-'wmgUseLocalisationUpdate' => [
-   'default' => true,
-],
-
 'wmgUseLiquidThreads' => [
 //
 // 
!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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