[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add transitionary config for timeline

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

Change subject: Add transitionary config for timeline
..


Add transitionary config for timeline

Change-Id: I715fde3054e4fba56a37836a624d778bc45fc91a
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2ead599..9dfca8e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -679,13 +679,12 @@
// MergeFonts("FreeSerif.ttf");
// SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF 
Regular", "Regular", "");
// Generate("FreeSansWMF.ttf", "", 4 );
-   $wgTimelineSettings->fontFile = 'FreeSansWMF.ttf';
+   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'FreeSansWMF.ttf';
} elseif ( $lang == 'zh' ) {
-   $wgTimelineSettings->fontFile = 'unifont-5.1.20080907.ttf';
+   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'unifont-5.1.20080907.ttf';
}
-   $wgTimelineSettings->fileBackend = 'local-multiwrite';
-   $wgTimelineSettings->ploticusCommand = '/usr/bin/ploticus';
-   $wgTimelineSettings->epochTimestamp = '2013060100';
+   $wgTimelineSettings->fileBackend = $wgTimelineFileBackend = 
'local-multiwrite';
+   $wgTimelineSettings->epochTimestamp = $wgTimelineEpochTimestamp = 
'2013060100';
 }
 
 putenv( "GDFONTPATH=/srv/mediawiki/fonts" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I715fde3054e4fba56a37836a624d778bc45fc91a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add transitionary config for timeline

2016-08-05 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

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

Change subject: Add transitionary config for timeline
..

Add transitionary config for timeline

Change-Id: I715fde3054e4fba56a37836a624d778bc45fc91a
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2ead599..9dfca8e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -679,13 +679,12 @@
// MergeFonts("FreeSerif.ttf");
// SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF 
Regular", "Regular", "");
// Generate("FreeSansWMF.ttf", "", 4 );
-   $wgTimelineSettings->fontFile = 'FreeSansWMF.ttf';
+   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'FreeSansWMF.ttf';
} elseif ( $lang == 'zh' ) {
-   $wgTimelineSettings->fontFile = 'unifont-5.1.20080907.ttf';
+   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'unifont-5.1.20080907.ttf';
}
-   $wgTimelineSettings->fileBackend = 'local-multiwrite';
-   $wgTimelineSettings->ploticusCommand = '/usr/bin/ploticus';
-   $wgTimelineSettings->epochTimestamp = '2013060100';
+   $wgTimelineSettings->fileBackend = $wgTimelineFileBackend = 
'local-multiwrite';
+   $wgTimelineSettings->epochTimestamp = $wgTimelineEpochTimestamp = 
'2013060100';
 }
 
 putenv( "GDFONTPATH=/srv/mediawiki/fonts" );

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

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

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