From 0f00e85e311955b3f84dde559da6b5a2ab5c3cda Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 26 Mar 2007 00:27:59 +0000
Subject: merge from 3.0 branch till 1769.

---
 framework/Web/UI/WebControls/THtmlArea.php    | 3 ++-
 framework/Web/UI/WebControls/TImageButton.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index f70f8d25..91f0f033 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -85,6 +85,7 @@ class THtmlArea extends TTextBox
 			'ar' => 'ar',
 			'ca' => 'ca',
 			'cs' => 'cs',
+			'cy' => 'cy', //available since 3.0.7
 			'da' => 'da',
 			'de' => 'de',
 			'el' => 'el',
@@ -118,7 +119,7 @@ class THtmlArea extends TTextBox
 			'vi' => 'vi',
 			'zh' => 'zh_cn_utf8',
 			'zh_CN' => 'zh_cn_utf8',
-			'zh_HK' => 'zh_tw_utf8',
+			//'zh_HK' => 'zh_tw_utf8', removed from 3.0.7
 			'zh_TW' => 'zh_tw_utf8'
 		);
 
diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index 5ac0493c..f5c331c1 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -403,4 +403,4 @@ class TImageClickEventParameter extends TEventParameter
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3