| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -2548,6 +2548,7 @@ |
| 2549 | 2549 | 'signatures' => array( |
| 2550 | 2550 | 'signature', |
| 2551 | 2551 | 'signature-anon', |
| | 2552 | + 'timezone-utc', |
| 2552 | 2553 | ), |
| 2553 | 2554 | 'CoreParserFunctions' => array( |
| 2554 | 2555 | 'unknown_extension_tag', |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -310,6 +310,7 @@ |
| 311 | 311 | 'colon-separator', |
| 312 | 312 | 'autocomment-prefix', |
| 313 | 313 | 'listgrouprights-right-display', |
| | 314 | + 'timezone-utc', |
| 314 | 315 | ); |
| 315 | 316 | |
| 316 | 317 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -3697,7 +3697,7 @@ |
| 3698 | 3698 | * (see also bug 12815) |
| 3699 | 3699 | */ |
| 3700 | 3700 | $ts = $this->mOptions->getTimestamp(); |
| 3701 | | - $tz = 'UTC'; |
| | 3701 | + $tz = wfMsgForContent( 'timezone-utc' ); |
| 3702 | 3702 | if ( isset( $wgLocaltimezone ) ) { |
| 3703 | 3703 | $unixts = wfTimestamp( TS_UNIX, $ts ); |
| 3704 | 3704 | $oldtz = getenv( 'TZ' ); |
| — | — | @@ -3706,12 +3706,7 @@ |
| 3707 | 3707 | $tz = date( 'T', $unixts ); # might vary on DST changeover! |
| 3708 | 3708 | putenv( 'TZ='.$oldtz ); |
| 3709 | 3709 | } |
| 3710 | | - |
| 3711 | | - $ctz = wfMsgForContent('timezone'); |
| 3712 | | - if (!wfEmptyMsg('timezone', $ctz)) { |
| 3713 | | - $tz = $ctz; |
| 3714 | | - } |
| 3715 | | - |
| | 3710 | + |
| 3716 | 3711 | $d = $wgContLang->timeanddate( $ts, false, false ) . " ($tz)"; |
| 3717 | 3712 | |
| 3718 | 3713 | # Variable replacement |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -3375,6 +3375,7 @@ |
| 3376 | 3376 | # Signatures |
| 3377 | 3377 | 'signature' => '[[{{ns:user}}:$1|$2]]', # do not translate or duplicate this message to other languages |
| 3378 | 3378 | 'signature-anon' => '[[{{#special:Contributions}}/$1|$2]]', # do not translate or duplicate this message to other languages |
| | 3379 | +'timezone-utc' => 'UTC', # only translate this message to other languages if you have to change it |
| 3379 | 3380 | |
| 3380 | 3381 | # Core parser functions |
| 3381 | 3382 | 'unknown_extension_tag' => 'Unknown extension tag "$1"', |