Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* ajdust for task #5833.

Browse Source
This commit is contained in:
wangyidong
2019-06-21 16:49:57 +08:00
parent d95272a45b
commit 7beed222b9
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/translate/css/index.css
+1
View File
@@ -4,3 +4,4 @@
.panel .text-progress{color:#999;}
.panel p{padding-bottom:5px;}
.item .pull-right{color:#999;}
.table-condensed td, .table-condensed th{padding:2px !important;}
module/translate/lang/zh-cn.php
+2
View File
@@ -24,6 +24,7 @@ $lang->translate->refreshPage = '刷新';
$lang->translate->builtIn = '内置语言';
$lang->translate->finished = '翻译完成';
$lang->translate->progress = '完成 %s';
$lang->translate->count = '（%s 种）';
$lang->translate->finishedLang = '已经完成的语言';
$lang->translate->translatingLang = '正在翻译的语言';
@@ -38,3 +39,4 @@ $lang->translate->statusList['changed'] = '已改变';
$lang->translate->notice = new stdclass();
$lang->translate->notice->failDirPriv = "目录没有写入权限，请修改权限。<br /><code>%s</code>";
$lang->translate->notice->failCopyFile = "复制文件%s到%s失败，请检查权限！";
$lang->translate->notice->failUnique = "已经有代号 %s 的记录";
module/translate/model.php
+11 -4
View File
@@ -20,15 +20,22 @@ class translateModel extends model
if(dao::isError()) return false;
$langs = empty($this->config->global->langs) ? array() : json_decode($this->config->global->langs, true);
if(isset($langs[$data->code]))
{
dao::$errors['message'][] = sprintf($this->lang->translate->notice->failUnique, $data->code);
return false;
}
$langs[$data->code] = $data;
$this->loadModel('setting')->setItem('system.common.global.langs', json_encode($langs));
$modules = glob($this->app->getModuleRoot() . '*');
foreach($modules as $modulePath)
{
$moduleName = basename($modulePath);
$moduleName = basename($modulePath);
$this->initModuleLang($moduleName, $data->code, $data->reference);
$mainLangFile = $modulePath . DS . 'lang' . DS . $data->reference . '.php';
$this->initModuleLang($moduleName, $data->code);
if(file_exists($mainLangFile))
{
$targetFile = $modulePath . DS . 'lang' . DS . $data->code . '.php';
@@ -51,11 +58,11 @@ class translateModel extends model
return true;
}
public function initModuleLang($moduleName, $langCode)
public function initModuleLang($moduleName, $langCode, $referLang)
{
$flow = $this->config->global->flow;
$now = helper::now();
$initLangs = $this->getModuleLangs($moduleName, $langCode);
$initLangs = $this->getModuleLangs($moduleName, $referLang);
foreach($initLangs as $key => $value)
{
$translation = new stdclass();
module/translate/view/index.html.php
+4 -4
View File
@@ -6,7 +6,7 @@
<div class='panel'>
<div class='panel-heading'>
<div class='panel-title'><?php echo $lang->translate->finishedLang;?></div>
<div class='panel-actions'><?php echo "(" . count($finishedLangs) . ")";?></div>
<div class='panel-actions'><?php printf($lang->translate->count, count($finishedLangs));?></div>
</div>
<div class='panel-body'>
<?php foreach($finishedLangs as $langKey => $langName):?>
@@ -22,15 +22,15 @@
<div class='panel'>
<div class='panel-heading'>
<div class='panel-title'><?php echo $lang->translate->translatingLang;?></div>
<div class='panel-actions'><?php echo "(" . count($translatingLangs) . ")";?></div>
<div class='panel-actions'><?php printf($lang->translate->count, count($translatingLangs));?></div>
</div>
<div class='panel-body'>
<table class='table table-form'>
<table class='table table-form table-condensed'>
<?php foreach($translatingLangs as $langKey => $data):?>
<tr>
<th class='text-left'><?php echo $data->name;?></th>
<td class='text-progress text-center'><?php printf($lang->translate->progress, ($data->progress * 100) . '%');?></td>
<td class='w-50px'><?php echo html::a(inlink('chooseModule', "language=$langKey"), $lang->translate->common, '', "class='btn btn-sm'");?></td>
<td class='w-50px'><?php echo html::a(inlink('chooseModule', "language=$langKey"), $lang->translate->common, '', "class='btn btn-mini'");?></td>
</tr>
<?php endforeach;?>
</table>