Issue 1321 fixed languages of module install and update

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10310 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-03-05 06:10:50 +00:00
parent 3257297dbb
commit fab30803b4
6 changed files with 46 additions and 15 deletions

View file

@ -313,15 +313,24 @@
$module_list = $oModuleModel->getModuleList();
if(is_array($module_list))
{
$isUpdated = false;
$needUpdate = false;
$addTables = false;
foreach($module_list AS $key=>$value)
{
if($value->need_install || $value->need_update)
$isUpdated = true;
if($value->need_install)
{
$addTables = true;
}
if($value->need_update)
{
$needUpdate = true;
}
}
}
Context::set('module_list', $module_list);
Context::set('isUpdated', $isUpdated);
Context::set('needUpdate', $isUpdated);
Context::set('addTables', $addTables);
Context::set('needUpdate', $needUpdate);
// gathering enviroment check
$mainVersion = join('.', array_slice(explode('.', __ZBXE_VERSION__), 0, 2));

View file

@ -1068,6 +1068,18 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
<value xml:lang="ko"><![CDATA[업데이트 가능]]></value>
<value xml:lang="en"><![CDATA[Update Available]]></value>
</item>
<item name="need_update_and_table">
<value xml:lang="ko"><![CDATA[DB Table 생성과 모듈 업데이트 필요]]></value>
<value xml:lang="en"><![CDATA[Need to Create DB Table and Update Module]]></value>
</item>
<item name="need_update">
<value xml:lang="ko"><![CDATA[모듈 업데이트 필요]]></value>
<value xml:lang="en"><![CDATA[Need to Update Module]]></value>
</item>
<item name="need_table">
<value xml:lang="ko"><![CDATA[DB Table 생성 필요]]></value>
<value xml:lang="en"><![CDATA[Need to Create DB Table]]></value>
</item>
<item name="admin_menu_setup">
<value xml:lang="ko"><![CDATA[관리자 메뉴 설정]]></value>
<value xml:lang="en"><![CDATA[Admin Menu Setup]]></value>

View file

@ -15,15 +15,17 @@
</div>
</form>
<!--@end-->
<!--@if($isUpdated)-->
<!--@if($addTables || $needUpdate)-->
<div class="message update">
<h2>{$lang->update_available}</h2>
<h2 cond="$needUpdate && $addTables">{$lang->need_update_and_table}</h2>
<h2 cond="$needUpdate && !$addTables">{$lang->need_update}</h2>
<h2 cond="!$needUpdate && $addTables">{$lang->need_table}</h2>
<ul>
<!--@foreach($module_list AS $key => $value)-->
<!--@if($value->need_install)-->
<li><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$value->module}</a> - <a href="#" onclick="doInstallModule('{$value->module}');return false;">{$lang->cmd_install}</a></li>
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><a href="#" onclick="doInstallModule('{$value->module}');return false;">{$lang->cmd_create_db_table}</a></span></li>
<!--@else if($value->need_update)-->
<li><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$value->module}</a> - <a href="#" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_update}</a></li>
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><a href="#" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_module_update}</a></li>
<!--@end-->
<!--@end-->
</ul>