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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-03-18 09:48:30 +08:00
parent 12cd13270b e741e9e3b2
commit 7e304d6718
7 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/lang/en.php
+13 -13
View File
@@ -14,7 +14,7 @@ $lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'Zdoo';
$lang->admin->safeIndex = 'Security';
$lang->admin->checkWeak = 'Weak Password Check';
$lang->admin->checkWeak = 'Check Weak Password';
$lang->admin->certifyMobile = 'Verify your cellphone';
$lang->admin->certifyEmail = 'Verify your Email';
$lang->admin->ztCompany = 'Verify your company';
@@ -24,13 +24,13 @@ $lang->admin->getCaptcha = 'Get Verification Code';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Setting';
$lang->admin->days = 'Valid Days';
$lang->admin->days = 'Valid Day';
$lang->admin->info = new stdclass();
$lang->admin->info->version = 'Current Version is %s. ';
$lang->admin->info->links = 'You can visit links below';
$lang->admin->info->account = 'Your ZenTao account is %s.';
$lang->admin->info->log = 'Log that is beyond valid days will be deleted and it has to run cron.';
$lang->admin->info->log = 'Log that exceeds valid days will be deleted and you have to run cron.';
$lang->admin->notice = new stdclass();
$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). %s then get the Latest ZenTao Upgrades and News.";
@@ -40,9 +40,9 @@ $lang->admin->notice->int = "『%s』should be a positive integer.";
$lang->admin->register = new stdclass();
$lang->admin->register->common = 'Bind Account';
$lang->admin->register->caption = 'Register in Zentao Community';
$lang->admin->register->click = 'Please Register here';
$lang->admin->register->lblAccount = 'at least 3 characters pls; contains letters and numbers.';
$lang->admin->register->lblPasswd = 'at least 6 characters pls; contains letters and numbers.';
$lang->admin->register->click = 'Register here';
$lang->admin->register->lblAccount = '>= 3 characters; contains letters and numbers.';
$lang->admin->register->lblPasswd = '>= 6 characters; contains letters and numbers.';
$lang->admin->register->submit = 'Register';
$lang->admin->register->bind = "Binding Exsit Account";
$lang->admin->register->success = "You have registered with us!";
@@ -53,20 +53,20 @@ $lang->admin->bind->success = "Account is linked!";
$lang->admin->safe = new stdclass();
$lang->admin->safe->common = 'Security Policy';
$lang->admin->safe->set = 'Password Strength';
$lang->admin->safe->password = 'Password Strength';
$lang->admin->safe->set = 'Strong Password';
$lang->admin->safe->password = 'Strong Password';
$lang->admin->safe->weak = 'Weak Password';
$lang->admin->safe->reason = 'Type';
$lang->admin->safe->checkWeak = 'Weak Password';
$lang->admin->safe->changeWeak = 'Your password is weak. Change it.';
$lang->admin->safe->modifyPasswordFirstLogin = 'Change password after first login';
$lang->admin->safe->changeWeak = 'Require to change weak password';
$lang->admin->safe->modifyPasswordFirstLogin = 'Require to change password after first login';
$lang->admin->safe->modeList[0] = 'N/A';
$lang->admin->safe->modeList[1] = 'Medium';
$lang->admin->safe->modeList[2] = 'Strong';
$lang->admin->safe->modeRuleList[1] = 'Contains upper and lower case, numbers. Length >= 6';
$lang->admin->safe->modeRuleList[2] = 'Contains upper and lower case, numbers and special characters. Length >= 10.';
$lang->admin->safe->modeRuleList[1] = ' upper and lower case, numbers. Length >= 6';
$lang->admin->safe->modeRuleList[2] = ' upper and lower case, numbers and special characters. Length >= 10.';
$lang->admin->safe->reasonList['weak'] = 'Common Weak Password';
$lang->admin->safe->reasonList['account'] = 'Same as your account';
@@ -77,5 +77,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as your DOB';
$lang->admin->safe->modifyPasswordList[1] = 'Yes';
$lang->admin->safe->modifyPasswordList[0] = 'No';
$lang->admin->safe->noticeMode = 'Password will be checked when login, add and edit user.';
$lang->admin->safe->noticeMode = 'Password will be checked when Login, Add and Edit user.';
$lang->admin->safe->noticeStrong = '';
module/bug/lang/en.php
+2 -2
View File
@@ -41,7 +41,7 @@ $lang->bug->openedBy = 'Created by';
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'AssignToMe';
$lang->bug->assignedTo = 'Assign To';
$lang->bug->assignBug = 'Assign To';
$lang->bug->assignedToAB = 'To';
$lang->bug->assignedDate = 'Assigned';
@@ -56,7 +56,7 @@ $lang->bug->deadline = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Closed By';
$lang->bug->closedDate = 'Closed';
$lang->bug->duplicateBug = 'Duplicate';
$lang->bug->duplicateBug = 'Duplicate Bug ID';
$lang->bug->lastEditedBy = 'Edited By';
$lang->bug->linkBug = 'Linked Bug';
$lang->bug->linkBugs = 'Link Bug';
module/dev/lang/en.php
+3 -3
View File
@@ -11,10 +11,10 @@ $lang->dev->desc = 'Description';
$lang->dev->noParams = 'No Parameters';
$lang->dev->post = 'POST Parameters';
$lang->dev->paramRange = 'Range of values: %s';
$lang->dev->paramRange = 'Parameter Range: %s';
$lang->dev->paramDate = 'Date format: YY-mm-dd. such as 2019-01-01';
$lang->dev->paramColor = 'Color format: #RGB. such as #3da7f5';
$lang->dev->paramMailto = "Use account. Separate multiple accounts by ','.";
$lang->dev->paramMailto = "Use account. Separate accounts by ','.";
$lang->dev->fields = array();
$lang->dev->fields['id'] = 'ID';
@@ -116,4 +116,4 @@ $lang->dev->groupList['message'] = 'Message';
$lang->dev->endGroupList['admin'] = 'Admin';
$lang->dev->endGroupList['system'] = 'System';
$lang->dev->endGroupList['other'] = 'Others';
$lang->dev->endGroupList['other'] = 'Other';
module/entry/lang/en.php
+10 -10
View File
@@ -7,10 +7,10 @@ $lang->entry->log = 'Log';
$lang->entry->setting = 'Setting';
$lang->entry->browse = 'Browse';
$lang->entry->create = 'Create';
$lang->entry->create = 'Add Entry';
$lang->entry->edit = 'Edit';
$lang->entry->delete = 'Delete';
$lang->entry->createKey = 'Regenerate';
$lang->entry->createKey = 'Create Key';
$lang->entry->id = 'ID';
$lang->entry->name = 'Name';
@@ -18,7 +18,7 @@ $lang->entry->account = 'Account';
$lang->entry->code = 'Code';
$lang->entry->key = 'Key';
$lang->entry->ip = 'IP';
$lang->entry->desc = 'Desc';
$lang->entry->desc = 'Description';
$lang->entry->createdBy = 'Created By';
$lang->entry->createdDate = 'Created';
$lang->entry->editedby = 'Edited By';
@@ -32,17 +32,17 @@ $lang->entry->notify = 'Notify';
$lang->entry->note = new stdClass();
$lang->entry->note->name = 'Name';
$lang->entry->note->code = 'Alias should be letters and numbers.';
$lang->entry->note->ip = "Use comma to seperate IPs. IP segment is supported, e.g. 192.168.1.*";
$lang->entry->note->code = 'Alias should be letters and numbers';
$lang->entry->note->ip = "Use comma to seperate IP. IP segment is supported, e.g. 192.168.1.*";
$lang->entry->note->allIP = 'All';
$lang->entry->note->account = 'Account for entry.';
$lang->entry->note->account = 'Authenticated account in the entry';
$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Param code is missing.';
$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Param token is missing.';
$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Code is missing.';
$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Token is missing.';
$lang->entry->errmsg['SESSION_CODE_MISSING'] = 'Session code is missing.';
$lang->entry->errmsg['EMPTY_KEY'] = 'Entry key is missing.';
$lang->entry->errmsg['EMPTY_KEY'] = 'Key is missing.';
$lang->entry->errmsg['INVALID_TOKEN'] = 'Invalid token.';
$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'Session verification failed.';
$lang->entry->errmsg['IP_DENIED'] = 'IP is denied.';
$lang->entry->errmsg['ACCOUNT_UNBOUND'] = 'Account is not bound.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Entry key is missing.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Key is missing.';
module/mail/lang/en.php
+17 -17
View File
@@ -4,7 +4,7 @@ $lang->mail->index = 'Home';
$lang->mail->detect = 'Testing';
$lang->mail->edit = 'Edit Settings';
$lang->mail->save = 'Save';
$lang->mail->test = 'Email Sending Test';
$lang->mail->test = 'Sending Test';
$lang->mail->reset = 'Reset';
$lang->mail->resend = 'Resend';
$lang->mail->browse = 'Email List';
@@ -17,14 +17,14 @@ $lang->mail->sendcloudUser = 'Sync Contact';
$lang->mail->agreeLicense = 'Yes';
$lang->mail->disagree = 'No';
$lang->mail->turnon = 'Turn On Mail';
$lang->mail->turnon = 'EMail Notification';
$lang->mail->async = 'Async Sending';
$lang->mail->fromAddress = 'Sender Email';
$lang->mail->fromName = 'Sender';
$lang->mail->domain = 'Zentao Domain';
$lang->mail->domain = 'ZenTao Domain';
$lang->mail->host = 'SMTP Server';
$lang->mail->port = 'SMTP Port';
$lang->mail->auth = 'Validation Required';
$lang->mail->auth = 'SMTP Validation';
$lang->mail->username = 'SMTP Account';
$lang->mail->password = 'SMTP Password';
$lang->mail->secure = 'Encryption';
@@ -34,7 +34,7 @@ $lang->mail->accessKey = 'Access Key';
$lang->mail->secretKey = 'Secret Key';
$lang->mail->license = 'ZenTao Cloud Notice';
$lang->mail->selectMTA = 'Select MTA(Mail Transfer Agent)';
$lang->mail->selectMTA = 'Select MTA (Mail Transfer Agent)';
$lang->mail->smtp = 'SMTP';
$lang->mail->syncedUser = 'Synchronized';
@@ -42,12 +42,12 @@ $lang->mail->unsyncUser = 'Not Synchronized';
$lang->mail->sync = 'Synchronize';
$lang->mail->remove = 'Remove';
$lang->mail->toList = 'Addressee';
$lang->mail->toList = 'Recipient';
$lang->mail->ccList = 'Copy to';
$lang->mail->subject = 'Subject';
$lang->mail->createdBy = 'Sender';
$lang->mail->createdDate = 'Added Date';
$lang->mail->sendTime = 'Send Date';
$lang->mail->createdDate = 'Added';
$lang->mail->sendTime = 'Send';
$lang->mail->status = 'Status';
$lang->mail->failReason = 'Fail Reason';
@@ -64,8 +64,8 @@ $lang->mail->debugList[0] = 'Off';
$lang->mail->debugList[1] = 'Normal';
$lang->mail->debugList[2] = 'High';
$lang->mail->authList[1] = 'Required';
$lang->mail->authList[0] = 'Not Required';
$lang->mail->authList[1] = 'Yes';
$lang->mail->authList[0] = 'No';
$lang->mail->secureList[''] = 'Plain';
$lang->mail->secureList['ssl'] = 'ssl';
@@ -75,16 +75,16 @@ $lang->mail->more = 'More';
$lang->mail->noticeResend = 'Sent it again!';
$lang->mail->inputFromEmail = 'Sender Email';
$lang->mail->nextStep = 'Next';
$lang->mail->successSaved = 'Configuration has been saved.';
$lang->mail->successSaved = 'Setting is saved.';
$lang->mail->testSubject = 'Testing Email';
$lang->mail->testContent = 'Email configured!';
$lang->mail->testContent = 'Email is set!';
$lang->mail->successSended = 'Sent!';
$lang->mail->confirmDelete = 'Do you want to delete it?';
$lang->mail->sendmailTips = 'Note: Email author will not receive this email.';
$lang->mail->needConfigure = 'Email configuration is not found. Please cinfigure the Email first.';
$lang->mail->sendmailTips = 'Note: Email sender will not receive this email.';
$lang->mail->needConfigure = 'Email setting is not found. Please set up the Email first.';
$lang->mail->connectFail = 'Connection to ZenTao failed.';
$lang->mail->centifyFail = 'Verification failed. Please try to bind again!';
$lang->mail->nofsocket = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
$lang->mail->nofsocket = 'fsocket related function has been deactivated. EMails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.';
$lang->mail->disableSecure = 'No openssl. Disable ssl and tls.';
$lang->mail->sendCloudFail = 'Failed. Reason:';
@@ -95,7 +95,7 @@ $lang->mail->sendCloudHelp = <<<EOD
EOD;
$lang->mail->sendCloudSuccess = 'Done';
$lang->mail->closeSendCloud = 'Close';
$lang->mail->addressWhiteList = 'Please add to the whilte list of email server to avoid being blocked';
$lang->mail->addressWhiteList = 'Add email address to the whiltelist of email server to avoid being blocked';
$lang->mail->ztCloudNotice = <<<EOD
@@ -109,4 +109,4 @@ $lang->mail->ztCloudNotice = <<<EOD
EOD;
$lang->mail->placeholder = new stdclass();
$lang->mail->placeholder->password = 'Some mail server needs auth code, refer to your mail supplier.';
$lang->mail->placeholder->password = 'Some Email servers require auth code, refer to your Email service provider.';
module/task/control.php
+1
View File
@@ -1271,6 +1271,7 @@ class task extends control
if($this->session->taskOnlyCondition)
{
$tasks = $this->dao->select('*')->from(TABLE_TASK)->alias('t1')->where($this->session->taskQueryCondition)
->andWhere('parent')->le(0)
->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
->orderBy($sort)->fetchAll('id');
module/webhook/lang/en.php
+4 -4
View File
@@ -2,13 +2,13 @@
$lang->webhook->common = 'Webhook';
$lang->webhook->list = 'Hook List';
$lang->webhook->api = 'API';
$lang->webhook->entry = 'Application';
$lang->webhook->entry = 'Entry';
$lang->webhook->log = 'Log';
$lang->webhook->assigned = 'Assign To';
$lang->webhook->setting = 'Setting';
$lang->webhook->browse = 'Browse';
$lang->webhook->create = 'Add Application';
$lang->webhook->create = 'Create';
$lang->webhook->edit = 'Edit';
$lang->webhook->delete = 'Delete';
@@ -23,7 +23,7 @@ $lang->webhook->product = "{$lang->productCommon}";
$lang->webhook->project = "{$lang->projectCommon}";
$lang->webhook->params = 'Params';
$lang->webhook->action = 'Action';
$lang->webhook->desc = 'Desc';
$lang->webhook->desc = 'Description';
$lang->webhook->createdBy = 'Created By';
$lang->webhook->createdDate = 'Created';
$lang->webhook->editedby = 'Edited By';
@@ -59,7 +59,7 @@ $lang->webhook->note->async = 'If the send type is asynchronous, you need open
$lang->webhook->note->product = "All actions will trigger the hook if the {$lang->productCommon} is empty, else only actions of the {$lang->productCommon} will trigger it.";
$lang->webhook->note->project = "All actions will trigger the hook if the {$lang->projectCommon} is empty, else only actions of the {$lang->projectCommon} will trigger it.";
$lang->webhook->note->typeList['bearychat'] = 'Add a zentao bot in bearychat and get the webhook address.';
$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook address.';
$lang->webhook->note->typeList['dingding'] = 'Add a customed bot in dingding and get the webhook address.';
$lang->webhook->note->typeList['default'] = 'Get webhook address from others';