branch/3.1: merged bugfixes from trunk/ up to current

1 files changed, 79 insertions, 23 deletions

diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 8d55c074..efdea8a3 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -83,71 +83,127 @@ class THtmlArea extends TTextBox
 	 */

 	private static $_langs = array(

 			'ar' => 'ar',

+			'az' => 'az',

+			'be' => 'be',

+			'bg' => 'bg',

+			'bn' => 'bn',

+			'br' => 'br',

+			'bs' => 'bs',

 			'ca' => 'ca',

+			'ch' => 'ch',

+			'cn' => 'cn',

 			'cs' => 'cs',

-			'cy' => 'cy', //available since 3.0.7

+			'cy' => 'cy',

 			'da' => 'da',

 			'de' => 'de',

+			'dv' => 'dv',

 			'el' => 'el',

 			'en' => 'en',

+			'eo' => 'eo',

 			'es' => 'es',

+			'et' => 'et',

+			'eu' => 'eu',

 			'fa' => 'fa',

 			'fi' => 'fi',

 			'fr' => 'fr',

-			'fr_CA' => 'fr_ca',

+			'gl' => 'gl',

+			'gu' => 'gu',

 			'he' => 'he',

+			'hi' => 'hi',

+			'hr' => 'hr',

 			'hu' => 'hu',

+			'hy' => 'hy',

+			'ia' => 'ia',

+			'id' => 'id',

 			'is' => 'is',

 			'it' => 'it',

-			'ja' => 'ja_utf-8',

+			'ja' => 'ja',

+			'ka' => 'ka',

+			'kl' => 'kl',

+			'km' => 'km',

 			'ko' => 'ko',

+			'lb' => 'lb',

+			'lt' => 'lt',

+			'lv' => 'lv',

+			'mk' => 'mk',

+			'ml' => 'ml',

+			'mn' => 'mn',

+			'ms' => 'ms',

+			'my' => 'my',

 			'nb' => 'nb',

 			'nl' => 'nl',

 			'nn' => 'nn',

+			'no' => 'no',

 			'pl' => 'pl',

+			'ps' => 'ps',

 			'pt' => 'pt',

-			'pt_BR' => 'pt_br',

 			'ro' => 'ro',

 			'ru' => 'ru',

+			'sc' => 'sc',

+			'se' => 'se',

 			'si' => 'si',

 			'sk' => 'sk',

+			'sl' => 'sl',

 			'sq' => 'sq',

 			'sr' => 'sr',

-			'sv' => 'sv_utf8',

+			'sv' => 'sv',

+			'ta' => 'ta',

+			'te' => 'te',

 			'th' => 'th',

+			'tn' => 'tn',

 			'tr' => 'tr',

+			'tt' => 'tt',

+			'tw' => 'tw',

+			'uk' => 'vi',

+			'ur' => 'vi',

 			'vi' => 'vi',

-			'zh' => 'zh_cn_utf8',

-			'zh_CN' => 'zh_cn_utf8',

-			//'zh_HK' => 'zh_tw_utf8', removed from 3.0.7

-			'zh_TW' => 'zh_tw_utf8'

+			'zh_CN' => 'zh-cn',

+			'zh_TW' => 'zh-tw',

+			'zh' => 'zh',

+			'zu' => 'zu',

 		);

 

 	/**

 	 * @var array list of default plugins to load, override using getAvailablePlugins();

 	 */

 	private static $_plugins = array(

-		'style',

-		'layer',

-		'table',

-		'save',

 		'advhr',

-//		'advimage',

-//		'advlink',

+		'advimage',

+		'advlink',

+		'advlist',

+		'autolink',

+		'autoresize',

+		'autosave',

+		'bbcode',

+		'contextmenu',

+		'directionality',

 		'emotions',

+		'example',

+		'fullpage',

+		'fullscreen',

 		'iespell',

+		'inlinepopups',

 		'insertdatetime',

-		'preview',

+		'layer',

+		'legacyoutput',

+		'lists',

 		'media',

-		'searchreplace',

-		'print',

-		'contextmenu',

-		'paste',

-		'directionality',

-		'fullscreen',

+		'nonbreaking',

 		'noneditable',

+		'pagebreak',

+		'paste',

+		'preview',

+		'print',

+		'save',

+		'searchreplace',

+		'spellchecker',

+		'style',

+		'tabfocus',

+		'table',

+		'template',

 		'visualchars',

-		'nonbreaking',

+		'wordc',

+		'wordcount',

 		'xhtmlxtras'

 	);