summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorxue <>2007-03-26 00:27:59 +0000
committerxue <>2007-03-26 00:27:59 +0000
commit0f00e85e311955b3f84dde559da6b5a2ab5c3cda (patch)
treeccb93c4e2d056c69209307fcb680fc23a9c57370 /framework/Web/UI
parentcbee2945d1858f7f256b44a3fbfe816dc0202f4d (diff)
merge from 3.0 branch till 1769.
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/WebControls/THtmlArea.php3
-rw-r--r--framework/Web/UI/WebControls/TImageButton.php2
2 files changed, 3 insertions, 2 deletions
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
+?>