From 1701f46f07447647e82ca43a642ff0192c36988c Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 25 Jun 2008 12:09:32 +0000
Subject: [PATCH] Fix for r36587: * Do not overwrite the previous found $tz
 when $wgLocaltimezone is set * Rename message name to a more specific one *
 Add message to the message files

---
 includes/parser/Parser.php            | 9 ++-------
 languages/messages/MessagesEn.php     | 1 +
 maintenance/language/messageTypes.inc | 1 +
 maintenance/language/messages.inc     | 1 +
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 43e3b229fc..a3b5d32004 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3697,7 +3697,7 @@ class Parser
 		 * (see also bug 12815)
 		 */
 		$ts = $this->mOptions->getTimestamp();
-		$tz = 'UTC';
+		$tz = wfMsgForContent( 'timezone-utc' );
 		if ( isset( $wgLocaltimezone ) ) {
 			$unixts = wfTimestamp( TS_UNIX, $ts );
 			$oldtz = getenv( 'TZ' );
@@ -3706,12 +3706,7 @@ class Parser
 			$tz = date( 'T', $unixts );  # might vary on DST changeover!
 			putenv( 'TZ='.$oldtz );
 		}
-		
-		$ctz = wfMsgForContent('timezone');
-		if (!wfEmptyMsg('timezone', $ctz)) {
-			$tz = $ctz;
-		}	
-					
+
 		$d = $wgContLang->timeanddate( $ts, false, false ) . " ($tz)";
 
 		# Variable replacement
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9bcc004926..1ff30b7b8f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3375,6 +3375,7 @@ You can also [[Special:Watchlist/edit|use the standard editor]].',
 # Signatures
 'signature'      => '[[{{ns:user}}:$1|$2]]', # do not translate or duplicate this message to other languages
 'signature-anon' => '[[{{#special:Contributions}}/$1|$2]]', # do not translate or duplicate this message to other languages
+'timezone-utc'   => 'UTC', # only translate this message to other languages if you have to change it
 
 # Core parser functions
 'unknown_extension_tag' => 'Unknown extension tag "$1"',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index da23f94281..a3cfe46f5f 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -310,6 +310,7 @@ $wgOptionalMessages = array(
 	'colon-separator',
 	'autocomment-prefix',
 	'listgrouprights-right-display',
+	'timezone-utc',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 882f0c0a99..251ccadf90 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2548,6 +2548,7 @@ $wgMessageStructure = array(
 	'signatures' => array(
 		'signature',
 		'signature-anon',
+		'timezone-utc',
 	),
 	'CoreParserFunctions' => array(
 		'unknown_extension_tag',
-- 
2.20.1