From 60e7014ef76ae2bdd9adc6ba8ae8a7bac8f45b5b Mon Sep 17 00:00:00 2001 From: jinianlan Date: Wed, 10 Jul 2019 13:41:13 +0800 Subject: [PATCH] * finish task #6020,#6009,#6007,#5949 --- module/common/view/datatable.fix.html.php | 2 +- module/doc/control.php | 6 +++--- module/doc/model.php | 2 +- module/doc/view/index.html.php | 2 +- module/mail/lang/en.php | 2 +- module/user/lang/en.php | 2 +- module/webhook/lang/en.php | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index f0a271f871..6e8952895d 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -49,7 +49,7 @@ $(function()
-

datatable->showModule?>

+

datatable->showModule?>

'> diff --git a/module/doc/control.php b/module/doc/control.php index a4a9a78c04..0a14865855 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -44,7 +44,7 @@ class doc extends control $pager = new pager(0, 5, 1); $this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast); - $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID"); $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index'); @@ -334,7 +334,7 @@ class doc extends control $this->product->setMenu($this->product->getPairs(), $lib->product); $this->lang->set('menugroup.doc', 'product'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } elseif($this->from == 'project') { @@ -343,7 +343,7 @@ class doc extends control $this->project->setMenu($this->project->getPairs('nocode'), $lib->project); $this->lang->set('menugroup.doc', 'project'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } else { diff --git a/module/doc/model.php b/module/doc/model.php index 4103fc5574..ef28dc72e0 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -102,7 +102,7 @@ class docModel extends model } $actions = $this->setFastMenu($fastLib); - $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : ''; + $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : ''; $this->lang->modulePageActions = $actions; } diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index af4d93ed4d..abde04b2ba 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -125,7 +125,7 @@
-
project->undone . ($app->getClientLang() == 'en' ? ' ' : '') ."{$lang->projectCommon}s";?>
+
project->undone . ($app->getClientLang() == 'en' ? ' ' : '') .($app->getClientLang()=='en'? "{$lang->projectCommon}s": "$lang->projectCommon");?>
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index bbfa40c099..07b54eea35 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -99,7 +99,7 @@ $lang->mail->sendCloudHelp = <<mail->sendCloudSuccess = 'Done'; $lang->mail->closeSendCloud = 'Close SendCloud'; -$lang->mail->addressWhiteList = 'Add it to the whiltelist of your email server to avoid being blocked'; +$lang->mail->addressWhiteList = 'Add it to the whiltelist of your email server to avoid being blocked.'; $lang->mail->ztCloudNotice = <<user->closedBy = 'ClosedBy%s'; $lang->user->reviewedBy = 'ReviewedBy%s'; $lang->user->canceledBy = 'CancelledBy%s'; -$lang->user->testTask2Him = 'AssignTo%s'; +$lang->user->testTask2Him = 'AssignedTo%s'; $lang->user->case2Him = 'CaseAssignedTo%s'; $lang->user->caseByHim = 'CaseCreatedBy%s'; diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php index e2bea9c193..41d21098f9 100644 --- a/module/webhook/lang/en.php +++ b/module/webhook/lang/en.php @@ -56,7 +56,7 @@ $lang->webhook->trimWords = ''; $lang->webhook->note = new stdClass(); $lang->webhook->note->async = 'If the sending type is asynchronous, you have to go to Admin-System to turn on the cron.'; -$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it."; +$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of selected {$lang->productCommon} will trigger it."; $lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it."; $lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.';