diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index cb874a53d..c2d0378f0 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -80,7 +80,7 @@ function setDepth(&$item, $depth, &$list, &$resultList) { - $resultList[] =& $item; + $resultList[$item->category_srl] =& $item; $item->depth = $depth; $siblingList = $item->category_srl; foreach($item->children as $child) diff --git a/modules/autoinstall/conf/info.xml b/modules/autoinstall/conf/info.xml index 5ba90756c..b2b1575df 100644 --- a/modules/autoinstall/conf/info.xml +++ b/modules/autoinstall/conf/info.xml @@ -1,27 +1,22 @@ - 자동설치 모듈 - Auto Installation Module + 쉬운 설치 + Easy-Installation 在线安装 관리자 모드에서 클릭으로 모듈/스킨/레이아웃/위젯/위젯스타일 등을 설치하는 모듈입니다. - Package management, automatic installation. + With this module, you can install and upgrade your programs including modules, skins, layouts, etc., from www.xpressengine.com by one-click. 很方便的在管理页面一键安装XE相关模块(模块/皮肤/布局/控件/控件样式等)。 0.1 - 2009-10-30 + 2009-11-11 system haneul - haneul - haneul haneul - haneul - haneul - haneul + haneul sol sol - sol - sol + sol diff --git a/modules/autoinstall/lang/en.lang.php b/modules/autoinstall/lang/en.lang.php new file mode 100644 index 000000000..6f8915182 --- /dev/null +++ b/modules/autoinstall/lang/en.lang.php @@ -0,0 +1,28 @@ +autoinstall = 'Easy-install'; + $lang->about_autoinstall = 'It helps you install/upgrade progams(skins) of XE.'; + $lang->package_update = 'Recent Update'; + $lang->package_downloaded_count = 'Download Count'; + $lang->need_update = "You need to update package list."; + + $lang->order_newest = "Newest"; + $lang->order_popular = "Popular"; + $lang->order_download = "Download"; + $lang->success_installed = "Installations succeeded."; + $lang->view_all_package = "View All"; + $lang->description_ftp_note = "If FTP configuration is not set, installation would not work. Please configure FTP information"; + $lang->description_update = "If you recently upgrade or install programs without easy installation module, pressing update will update the information of the programs."; + $lang->install = "Install"; + $lang->update = "Update"; + $lang->current_version = "Installed version"; + $lang->depending_programs = "This program depends on "; + $lang->require_update = "Update is required."; + $lang->require_installation = "Installation is required."; + $lang->description_install = "Installation process also install/update programs which this program depends on"; +?> diff --git a/modules/autoinstall/lang/ko.lang.php b/modules/autoinstall/lang/ko.lang.php index 35633c0c5..eaf01deed 100644 --- a/modules/autoinstall/lang/ko.lang.php +++ b/modules/autoinstall/lang/ko.lang.php @@ -5,8 +5,8 @@ * @brief Autoinstall(autoinstall) 모듈의 기본 언어팩 **/ - $lang->autoinstall = 'Autoinstall'; - $lang->about_autoinstall = 'Autoinstall은 XpressEngine의 자동설치 모듈입니다.'; + $lang->autoinstall = 'Easy-install'; + $lang->about_autoinstall = 'XpressEngine의 여러 프로그램을 쉽게 설치/업그레이드할 수 있도록 도와주는 모듈입니다.'; $lang->package_update = '최근 업데이트'; $lang->package_downloaded_count = '전체 다운로드'; $lang->need_update = "업데이트가 필요합니다."; @@ -18,4 +18,11 @@ $lang->view_all_package = "전체 보기"; $lang->description_ftp_note = "FTP 설정이 안되어있으면 설치가 진행되지 않습니다. FTP설정을 해주세요"; $lang->description_update = "새로 설치한 모듈의 버전 정보등은 업데이트를 눌러주시면 반영됩니다."; + $lang->install = "설치"; + $lang->update = "업데이트"; + $lang->current_version = "현재 설치 버전"; + $lang->depending_programs = "의존하고 있는 프로그램"; + $lang->require_update = "업데이트가 필요합니다."; + $lang->require_installation = "설치가 필요합니다."; + $lang->description_install = "설치를 진행하면, 이 프로그램이 의존하고 있는 모든 프로그램을 업데이트/설치 합니다."; ?> diff --git a/modules/autoinstall/lang/zh-CN.lang.php b/modules/autoinstall/lang/zh-CN.lang.php index b6e8a7d06..35293c843 100644 --- a/modules/autoinstall/lang/zh-CN.lang.php +++ b/modules/autoinstall/lang/zh-CN.lang.php @@ -18,4 +18,7 @@ $lang->view_all_package = "查看全部"; $lang->description_ftp_note = "请务必完成FTP设置，否则将无法在线安装(更新)相关模块。"; $lang->description_update = "新安装(更新)模块的版本信息，点击Update按钮后才能正常显示。"; + $lang->install = "Install"; + $lang->update = "Update"; + $lang->current_version = "Installed version"; ?> diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html index 7b57bbcf0..41b25d12a 100644 --- a/modules/autoinstall/tpl/install.html +++ b/modules/autoinstall/tpl/install.html @@ -2,17 +2,17 @@
-

{$package->title} ver. {$package->version} ( 현재버전: {$package->cur_version} (업데이트가 필요합니다.) 인스톨이 필요합니다. )

+

{$package->title} ver. {$package->version} ( {$lang->current_version}: {$package->cur_version} ({$lang->require_update}) {$lang->require_installation} )

-
의존하고 있는 프로그램 :
+
{$lang->depending_programs} :
sdfgsdfg {$dep->title} ver. {$dep->version} - - 현재버전: {$dep->cur_version} (업데이트가 필요합니다.) 인스톨이 필요합니다. + {$lang->current_version}: {$dep->cur_version} ({$lang->require_update}) {$lang->require_installation}
-

설치를 진행하면 의존성이 있는 모든 프로그램을 함께 설치합니다.

-

설치하기

+

{$lang->description_install}.

+

{$lang->install}

diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html index 24e4ea578..d0f42fd00 100644 --- a/modules/autoinstall/tpl/list.html +++ b/modules/autoinstall/tpl/list.html @@ -35,12 +35,12 @@ {htmlspecialchars($val->title)} ver. {htmlspecialchars($val->item_version)} - 현재 설치 버전 : {$val->current_version} + {$lang->current_version} : {$val->current_version} - 업데이트 + {$lang->update} - 인스톨 + {$lang->install}