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

* code for task #5827.

Browse Source
This commit is contained in:
wangyidong
2019-06-21 16:21:49 +08:00
parent e4ca8efe7b
commit d95272a45b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/translate/control.php
+4
View File
@@ -162,6 +162,10 @@ class translate extends control
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
$this->view->title = $this->lang->translate->module;
$this->view->position[] = html::a($this->createLink('translate', 'index'), $this->lang->translate->common);
$this->view->position[] = $this->lang->translate->module;
$this->view->referItems = $this->translate->getModuleLangs($module, $referLang);
$this->view->translations = $this->translate->getTranslations($language, $module);
$this->view->moduleGroup = $moduleGroup;
module/translate/lang/zh-cn.php
+1
View File
@@ -11,6 +11,7 @@
$lang->translate->common = '翻译';
$lang->translate->index = '首页';
$lang->translate->addLang = '新增语言';
$lang->translate->module = '翻译模块';
$lang->translate->chooseModule = '选择翻译模块';
$lang->translate->name = '语言名称';
module/translate/model.php
+2 -2
View File
@@ -142,7 +142,7 @@ class translateModel extends model
if(preg_match( '/; *\/\//', $value)) $value = preg_replace('/; *\/\/.*/', '', $value);
$value = trim($value, ';');
/* Trim ['] or ["] when not [.] . */
if(preg_match('/["\'] *\./', $value) == 0 and preg_match('/\. *[\'"]/', $value) == 0)
if(preg_match('/["\'] *\.[^\.]/', $value) == 0 and preg_match('/[^\.]\. *["\']/', $value) == 0)
{
if($value{0} == '"' or $value{0} == "'") $value = trim($value, $value{0});
}
@@ -374,7 +374,7 @@ class translateModel extends model
{
$result = true;
if($value == 'new stdclass()') $result = false;
if(strpos($value, '$') === 0 and strpos($value, '$lang->productCommon') === false and strpos($value, '$lang->projectCommon') === false and preg_match('/["\'] *\./', $value) == 0 and preg_match('/\. *["\']/', $value) == 0) $result = false;
if(strpos($value, '$') === 0 and strpos($value, '$lang->productCommon') === false and strpos($value, '$lang->projectCommon') === false and preg_match('/["\'] *\.[^\.]/', $value) == 0 and preg_match('/[^\.]\. *["\']/', $value) == 0) $result = false;
if($value == '$lang->productCommon' or $value == '$lang->projectCommon') $result = false;
return $result;