http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88190
Revision: 88190
Author: robla
Date: 2011-05-15 14:51:01 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Bug 28715 - Display what the server default timezone is in the timezone
selection preference.
Modified Paths:
--------------
trunk/phase3/includes/Preferences.php
trunk/phase3/languages/messages/MessagesEn.php
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2011-05-15 14:48:15 UTC (rev
88189)
+++ trunk/phase3/includes/Preferences.php 2011-05-15 14:51:01 UTC (rev
88190)
@@ -1180,9 +1180,16 @@
static function getTimezoneOptions() {
$opt = array();
- global $wgLocalTZoffset;
-
- $opt[wfMsg( 'timezoneuseserverdefault' )] =
"System|$wgLocalTZoffset";
+ global $wgLocalTZoffset, $wgLocaltimezone;
+ // Check that $wgLocalTZoffset is the same as $wgLocaltimezone
+ if ( $wgLocalTZoffset == date('Z') / 60 ) {
+ $server_tz_msg = wfMsg( 'timezoneuseserverdefault',
$wgLocaltimezone );
+ }
+ else {
+ $tzstring = sprintf( '%+03d:%02d', floor(
$wgLocalTZoffset / 60 ), abs( $wgLocalTZoffset ) % 60 );
+ $server_tz_msg = wfMsg( 'timezoneuseserverdefault',
$tzstring );
+ }
+ $opt[$server_tz_msg] = "System|$wgLocalTZoffset";
$opt[wfMsg( 'timezoneuseoffset' )] = 'other';
$opt[wfMsg( 'guesstimezone' )] = 'guess';
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-05-15 14:48:15 UTC
(rev 88189)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-05-15 14:51:01 UTC
(rev 88190)
@@ -1791,7 +1791,7 @@
'savedprefs' => 'Your preferences have been saved.',
'timezonelegend' => 'Time zone:',
'localtime' => 'Local time:',
-'timezoneuseserverdefault' => 'Use server default',
+'timezoneuseserverdefault' => 'Use wiki default ($1)',
'timezoneuseoffset' => 'Other (specify offset)',
'timezoneoffset' => 'Offset¹:',
'servertime' => 'Server time:',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
