Bug 28715 - Display what the server default timezone is in the timezone selection...

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 1331181..617f3c1 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1180,9 +1180,16 @@ class Preferences {
        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';
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 01c9c7f..c994283 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1791,7 +1791,7 @@ Here's a randomly-generated value you can use: $1",
 '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:',