From: leon <leon@roojs.com>
Date: Fri, 27 Oct 2023 05:22:20 +0000 (+0800)
Subject: TimeZone.php
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=15900c67ac2c0a667b153bd94f4cdd816b6ea6c8;p=Pman.Core

TimeZone.php
---

diff --git a/TimeZone.php b/TimeZone.php
index 6bb90893..9db0d0c5 100644
--- a/TimeZone.php
+++ b/TimeZone.php
@@ -115,16 +115,16 @@ class Pman_Core_TimeZone extends Pman
         return $date->format('P');
     }
 
-    static function toDisplayName($dt, $tz)
+    static function toDisplayArea($dt, $tz)
     {
         $ar = explode('/', $tz);
-        return $ar[0] . '/' . str_replace('_', ' ', $ar[1]) . ' (GMT ' . self::toTimeOffset($dt,$tz) . ')'; 
+        return str_replace('_', ' ', $ar[1]) . ' (GMT ' . self::toTimeOffset($dt,$tz) . ')';
+
     }
 
-    static function toDisplayArea($tz)
+    static function toDisplayName($dt, $tz)
     {
         $ar = explode('/', $tz);
-        return str_replace('_', ' ', $ar[1]);
-
+        return $ar[0] . '/' . self::toDisplayArea($dt, $tz);
     }
 }
\ No newline at end of file