merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-07-06 08:29:10 +00:00
parent 762ebbf445
commit 289973781a
200 changed files with 2296 additions and 1827 deletions

View file

@ -159,7 +159,7 @@ function display_gallery_image(obj, is_first_display) {
var source_filename = obj.image_url;
var tmp_arr = source_filename.split('/');
var filename = tmp_arr[tmp_arr.length-1];
xInnerHtml("zone_gallery_image_filename_"+obj.srl, "<a href='#' onclick=\"winopen('"+source_filename+"');return false;\">"+unescape(filename)+"</a>");
xInnerHtml("zone_gallery_image_filename_"+obj.srl, "<a href='#' onclick=\"winopen('"+source_filename+"');return false;\">"+decodeURI(filename)+"</a>");
// 네이게이션 영역의 숫자 변경
var zone_navigator = xGetElementById("zone_gallery_navigator_status_"+obj.srl);

View file

@ -153,6 +153,7 @@
**/
function triggerEditorComponentCompile(&$content) {
if(Context::getResponseMethod()!='HTML') return new Object();
if(Mobile::isFromMobilePhone()) return new Object();
$module_info = Context::get('module_info');
$module_srl = $module_info->module_srl;
@ -184,6 +185,7 @@
}
$content = $this->transComponent($content);
return new Object();
}
/**

View file

@ -2,10 +2,11 @@
/* ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
░░ * @File : common/lang/vi.lang.php ░░
░░ * @Author : zero (zero@nzeo.com) ░░
░░ * @Trans : Đào Đức Duy (ducduy.dao.vn@vietxe.net) ░░
░░ * @Website: http://vietxe.net ░░
░░ * @Trans : DucDuy Dao (webmaster@xpressengine.vn) ░░
░░ * @Website: http://xpressengine.vn ░░
░░ * @Brief : Vietnamese Language Pack (Only basic words are included here) ░░
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ */
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
*/
$lang->editor = 'WYSIWYG toàn diện';
$lang->component_name = 'Thành phần';
@ -120,7 +121,7 @@
$lang->edit->help_align_left = 'Căn trái';
$lang->edit->help_align_center = 'Căn giữa';
$lang->edit->help_align_right = 'Căn phải';
$lang->edit->help_align_justify = 'Align justity';
$lang->edit->help_align_justify = 'Đều hai bên';
$lang->edit->help_add_indent = 'Thụt vào';
$lang->edit->help_remove_indent = 'Giãn ra';
$lang->edit->help_list_number = 'Thứ tự số';
@ -213,7 +214,7 @@
$lang->edit->minimize_list = 'Thu nhỏ';
$lang->edit->move = 'Di chuyển';
$lang->edit->refresh = 'Refresh';
$lang->edit->refresh = 'Làm mới';
$lang->edit->materials = 'Vật liệu';
$lang->edit->temporary_savings = 'Danh sách lưu tạm thời';
@ -223,10 +224,10 @@
$lang->edit->paging_next_help = 'Chuyển tới trang tiếp.';
$lang->edit->toc = 'Board của nội dung';
$lang->edit->close_help = '도움말 닫기';
$lang->edit->close_help = 'Đóng hướng dẫn';
$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
$lang->edit->confirm_submit_without_saving = 'Nội dung chưa được lưu.\\nBạn có chắc chắn muốn gửi không?';
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
$lang->edit->image_align = 'Sắp xếp hình ảnh';
$lang->edit->attached_files = 'File đính kèm';
?>

View file

@ -227,6 +227,6 @@
$lang->edit->confirm_submit_without_saving = '尚有未保存的段落。\\n确定要提交吗';
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
$lang->edit->image_align = '图片对齐';
$lang->edit->attached_files = '附件';
?>

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.2">
<title xml:lang="ko">XpressEditor Skin</title>
<title xml:lang="es">XpressEditor Skin</title>
<title xml:lang="en">XpressEditor Skin</title>
<title xml:lang="es">XpressEditor Skin</title>
<title xml:lang="en">XpressEditor Skin</title>
<title xml:lang="vi">XpressEditor Skin</title>
<title xml:lang="jp">XpressEditorスキン</title>
<title xml:lang="zh-CN">XpressEditor皮肤</title>
@ -32,11 +32,11 @@
<date>2009-03-22</date>
<author email_address="gonom9@gmail.com" link="http://mygony.com">
<name xml:lang="ko">행복한고니</name>
<name xml:lang="es">gony</name>
<name xml:lang="en">gony</name>
<name xml:lang="es">gony</name>
<name xml:lang="en">gony</name>
<name xml:lang="vi">gony</name>
<name xml:lang="jp">gony</name>
<name xml:lang="zh-CN">gony</name>
<name xml:lang="zh-CN">gony</name>
<name xml:lang="zh-TW">gony</name>
</author>
<colorset>

View file

@ -34,8 +34,8 @@
<date>2009-05-23</date>
<author email_address="webmaster@naradesign.net" link="http://naradesign.net">
<name xml:lang="ko">정찬명</name>
<name xml:lang="zh-CN">Chan-Myung Jeong</name>
<name xml:lang="zh-TW">Chan-Myung Jeong</name>
<name xml:lang="zh-CN">Chan-Myung Jeong</name>
<name xml:lang="zh-TW">Chan-Myung Jeong</name>
<name xml:lang="jp">Chan-Myung Jeong</name>
<name xml:lang="en">Chan-Myung Jeong</name>
<name xml:lang="vi">Chan-Myung Jeong</name>

View file

@ -33,7 +33,7 @@
<date>2009-04-17</date>
<author email_address="webmaster@naradesign.net" link="http://naradesign.net">
<name xml:lang="ko">정찬명</name>
<name xml:lang="zh-CN">Chan-Myung Jeong</name>
<name xml:lang="zh-CN">Chan-Myung Jeong</name>
<name xml:lang="zh-TW">Chan-Myung Jeong</name>
<name xml:lang="jp">Chan-Myung Jeong</name>
<name xml:lang="vi">Chan-Myung Jeong</name>