Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/system/time.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/system/time.py	(revision 40266)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/system/time.py	(working copy)
@@ -38,11 +38,13 @@
                 pass
             mark_expire_all(get_model('apv', ['system', 'SystemInfo']))
             return
-            
+
         def _get_system_timezone(self):
             self.cli.set_enable()
             result = self.cli.cmd('show system timezone',
                                   RegexParser('system timezone "(?P<tz>.*)"', MATCHONE))
+            if "Asia/China/Most of China(GMT+08:00)" in result['tz']:
+                result['tz'] = "Asia/ROC/Taiwan Time"
             return result['tz']
 
         def _get_query_set(self):
@@ -62,6 +64,8 @@
 
         def _update_system_timezone(self, instance):
             self.cli.set_config()
+            if "Asia/ROC/Taiwan Time" in instance.system_timezone:
+                instance.system_timezone = "Asia/China/Most of China(GMT+08:00)"
             result = self.cli.cmd('system timezone "%s"' % instance.system_timezone,
                                   BlankParser(nonblank_exception=CLICmdError, supplement=True))
             mark_expire_all(get_model('apv', ['system', 'SystemInfo']))
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/tzmap.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/tzmap.py	(revision 40266)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/tzmap.py	(working copy)
@@ -27,8 +27,7 @@
         ('Brunei', SortedDict([
             ('Brunei', None)
         ])),
-        ('China', SortedDict([
-            ('Most of China(GMT+08:00)', None),
+        ('ROC', SortedDict([
             ('Taiwan Time', None),
         ])),
         ('Cambodia', SortedDict([