diff --git a/db/zentao.sql b/db/zentao.sql index abb15224af..3144399922 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1138,23 +1138,6 @@ CREATE TABLE IF NOT EXISTS `zt_repo` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_relation`; -CREATE TABLE `zt_relation` ( - `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `program` mediumint(8) NOT NULL, - `product` mediumint(8) NOT NULL, - `project` mediumint(8) NOT NULL, - `AType` char(30) NOT NULL, - `AID` mediumint(8) NOT NULL, - `AVersion` char(30) NOT NULL, - `relation` char(30) NOT NULL, - `BType` char(30) NOT NULL, - `BID` mediumint(8) NOT NULL, - `BVersion` char(30) NOT NULL, - `extra` char(30) NOT NULL, - UNIQUE KEY `relation` (`relation`,`AType`,`BType`, `AID`, `BID`) -) ENGINE='MyISAM' DEFAULT CHARSET=utf8; - -- DROP TABLE IF EXISTS `zt_repobranch`; CREATE TABLE IF NOT EXISTS `zt_repobranch` ( `repo` mediumint(8) unsigned NOT NULL, diff --git a/lib/wechatapi/wechatapi.class.php b/lib/wechatapi/wechatapi.class.php index 80b4f1bb93..ae867a2117 100644 --- a/lib/wechatapi/wechatapi.class.php +++ b/lib/wechatapi/wechatapi.class.php @@ -59,7 +59,7 @@ class wechatapi $users = array(); foreach($depts->deptList as $deptID) { - $response = $this->queryAPI($this->apiUrl . "user/simplelist?access_token={$this->token}&department_id={$deptID}"); + $response = $this->queryAPI($this->apiUrl . "user/simplelist?access_token={$this->token}&department_id={$deptID}&fetch_child=1"); if($this->isError()) return array('result' => 'fail', 'message' => $this->errors); foreach($response->userlist as $user) $users[$user->name] = $user->userid; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index f14dd5fb21..09de919c0c 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -20,7 +20,7 @@ $lang->admin->certifyMobile = 'Verify your cellphone'; $lang->admin->certifyEmail = 'Verify your Email'; $lang->admin->ztCompany = 'Verify your company'; $lang->admin->captcha = 'Verification Code'; -$lang->admin->getCaptcha = 'Get Verification Code'; +$lang->admin->getCaptcha = 'Send Verification Code'; $lang->admin->api = 'API'; $lang->admin->log = 'Log'; @@ -40,13 +40,13 @@ $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 = 'Register here'; +$lang->admin->register->caption = 'ZenTao Community Signup'; +$lang->admin->register->click = 'Sign Up'; $lang->admin->register->lblAccount = '>= 3 letters and numbers'; $lang->admin->register->lblPasswd = '>= 6 letters and numbers'; -$lang->admin->register->submit = 'Register'; +$lang->admin->register->submit = 'Submit'; $lang->admin->register->bind = "Bind Exsiting Account"; -$lang->admin->register->success = "You have registered!"; +$lang->admin->register->success = "You have signed up!"; $lang->admin->bind = new stdclass(); $lang->admin->bind->caption = 'Link Account'; diff --git a/module/ci/lang/en.php b/module/ci/lang/en.php index 4d1df04d71..6222482a2a 100644 --- a/module/ci/lang/en.php +++ b/module/ci/lang/en.php @@ -1,6 +1,6 @@ ci->common = 'CI'; -$lang->ci->job = 'Construction'; +$lang->ci->job = 'Job'; $lang->ci->task = 'Task'; $lang->ci->history = 'History'; diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php index 69d5eeca79..0b0dbb8d0b 100644 --- a/module/compile/lang/en.php +++ b/module/compile/lang/en.php @@ -1,16 +1,16 @@ compile->common = 'Build'; -$lang->compile->browse = 'Build Histories'; -$lang->compile->logs = 'Build Logs'; +$lang->compile->browse = 'Build History'; +$lang->compile->logs = 'Build Log'; $lang->compile->id = 'ID'; $lang->compile->name = 'Name'; -$lang->compile->status = 'Build Status'; -$lang->compile->time = 'Build Time'; +$lang->compile->status = 'Status'; +$lang->compile->time = 'Time'; -$lang->compile->statusList['success'] = 'Success'; -$lang->compile->statusList['failure'] = 'Fail'; +$lang->compile->statusList['success'] = 'Done'; +$lang->compile->statusList['failure'] = 'Failed'; $lang->compile->statusList['created'] = 'Created'; -$lang->compile->statusList['building'] = 'Building'; -$lang->compile->statusList['create_fail'] = 'Fail to create'; -$lang->compile->statusList['timeout'] = 'Exec Timeout'; +$lang->compile->statusList['building'] = 'Creating'; +$lang->compile->statusList['create_fail'] = 'Failed to create'; +$lang->compile->statusList['timeout'] = 'Timeout'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 19b9c73137..6d938f56ad 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -21,13 +21,13 @@ $lang->install->officeDomain = 'https://www.zentao.pm'; $lang->install->start = 'Start'; $lang->install->keepInstalling = 'Continue installing this version'; -$lang->install->seeLatestRelease = 'View latest version'; +$lang->install->seeLatestRelease = 'View the latest version'; $lang->install->welcome = 'Thanks for choosing ZenTao!'; $lang->install->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2'; $lang->install->desc = <<Z Public License. It integrates with Product Management, Project Management, QA Management, Document Management, Todo Management, Company Management etc. ZenTao is a perfect choice for managing software development projects. +ZenTao ALM is an open source software released under Z Public License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects. -ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by Nature Easy Soft. Third-party developers/organizations can develop extensions or customize ZenTao accordingly. +ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly. EOT; $lang->install->links = <<EasyCorp. @@ -46,11 +46,11 @@ $lang->install->checking = 'System Checkup'; $lang->install->ok = 'Passed(√)'; $lang->install->fail = 'Failed(×)'; $lang->install->loaded = 'Loaded'; -$lang->install->unloaded = 'Not Loaded'; +$lang->install->unloaded = 'Not loaded'; $lang->install->exists = 'Found '; $lang->install->notExists = 'Not found '; $lang->install->writable = 'Writable '; -$lang->install->notWritable= 'Not Writable '; +$lang->install->notWritable= 'Not writable '; $lang->install->phpINI = 'PHP ini File'; $lang->install->checkItem = 'Item'; $lang->install->current = 'Current Setting'; @@ -114,14 +114,14 @@ $lang->install->workingList['onlyTask'] = 'Only Task Management'; $lang->install->errorConnectDB = 'Connection to the database Failed. '; $lang->install->errorDBName = 'Database name should exclude “.” '; $lang->install->errorCreateDB = 'Failed to create the database.'; -$lang->install->errorTableExists = 'The data table has existed. If ZenTao has been installed before, please return to last step and clear data. Then continue the installation.'; +$lang->install->errorTableExists = 'The data table has existed. If ZenTao has been installed before, please return to the previous step and clear data, then continue the installation.'; $lang->install->errorCreateTable = 'Failed to create the table.'; -$lang->install->errorImportDemoData = 'Failed to import demo data.'; +$lang->install->errorImportDemoData = 'Failed to import the demo data.'; -$lang->install->setConfig = 'Create configuration file'; +$lang->install->setConfig = 'Create config file'; $lang->install->key = 'Item'; $lang->install->value = 'Value'; -$lang->install->saveConfig = 'Save config'; +$lang->install->saveConfig = 'Save config file'; $lang->install->save2File = '
Copy the content in the text box above and save it to " %s ". You can change this configuration file later.
'; $lang->install->saved2File = 'The configuration file has been saved to " %s ". You can change this file later.'; $lang->install->errorNotSaveConfig = 'The configuration file is not saved.'; @@ -161,32 +161,32 @@ $lang->install->cronList['moduleName=report&methodName=remind'] = 'Daily T $lang->install->cronList['moduleName=svn&methodName=run'] = 'Synchronize SVN'; $lang->install->cronList['moduleName=git&methodName=run'] = 'Synchronize GIT'; $lang->install->cronList['moduleName=backup&methodName=backup'] = 'Backup Data'; -$lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchronize sending Message'; -$lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronize sending Webhook'; -$lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete overdue logs'; +$lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchronize sending message'; +$lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronize sending webhook'; +$lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete expired logs'; $lang->install->cronList['moduleName=todo&methodName=createCycle'] = 'Create recurring todos'; -$lang->install->cronList['moduleName=ci&methodName=initQueue'] = 'Create recurring jenkins'; +$lang->install->cronList['moduleName=ci&methodName=initQueue'] = 'Create recurring Jenkins'; $lang->install->cronList['moduleName=ci&methodName=checkBuildStatus'] = 'Synchronize Jenkins Status'; $lang->install->cronList['moduleName=ci&methodName=exec'] = 'Execute Jenkins'; $lang->install->success = "Installed!"; -$lang->install->login = 'Login ZenTao'; -$lang->install->register = 'Register in ZenTao Community'; +$lang->install->login = 'ZenTao Login'; +$lang->install->register = 'ZenTao Community Signup'; $lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register on ZenTao(www.zentao.pm).

+

You have installed ZenTao %s. Please delete install.php.

Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'ranzhi', 'ydisk', 'meshiot'); -$lang->install->promotion = "Products also from Nature Easy Soft:"; +$lang->install->promotion = "Products also from EasyCorp:"; $lang->install->chanzhi = new stdclass(); $lang->install->chanzhi->name = 'ZSITE'; $lang->install->chanzhi->logo = 'images/main/chanzhi.ico'; $lang->install->chanzhi->url = 'http://www.zsite.net'; $lang->install->chanzhi->desc = << -
  • Article, Blog, Manual, Member, Shop, Forum, Feedback……
    • +
  • Article, Blog, Manual, Member, Shop, Forum, Feedback
  • Customize page at will by Theme, Effect, Widget, CSS, JS and layout
  • Support both desktop and mobile in one system
  • Highly optimized for search engines
    • @@ -200,8 +200,8 @@ $lang->install->ranzhi->url = 'http://www.zdoo.org'; $lang->install->ranzhi->desc = <<
  • CRM: Customer Management and Order Tracking
    • -
  • OA: Approve, Announce, Trip, Leave and so on.
    • -
  • Project，Task and Document management
    • +
  • OA: Approve, Announce, Trip, Leave and more
    • +
  • Project, Task and Document management
  • Cash: Income, Expense, Transfer, Invest and Debt
    • EOD; diff --git a/module/jenkins/lang/en.php b/module/jenkins/lang/en.php index 4e2c99ff52..1f00f56672 100644 --- a/module/jenkins/lang/en.php +++ b/module/jenkins/lang/en.php @@ -1,6 +1,6 @@ jenkins->common = 'Jenkins'; -$lang->jenkins->browse = 'Browse Jenkins'; +$lang->jenkins->browse = 'Jenkins'; $lang->jenkins->create = 'Create Jenkins'; $lang->jenkins->edit = 'Edit Jenkins'; $lang->jenkins->delete = 'Delete'; @@ -8,9 +8,9 @@ $lang->jenkins->confirmDelete = 'Do you want to delete this Jenkins server?'; $lang->jenkins->id = 'ID'; $lang->jenkins->name = 'Name'; -$lang->jenkins->url = 'Service URL'; +$lang->jenkins->url = 'URL'; $lang->jenkins->token = 'Token'; -$lang->jenkins->account = 'UserName'; +$lang->jenkins->account = 'Username'; $lang->jenkins->password = 'Password'; $lang->jenkins->lblCreate = 'Create Jenkins Server'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index c5a6defba5..3361c15e74 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -14,13 +14,13 @@ $lang->my->requirement = 'My Requirements'; $lang->my->myProject = "My {$lang->projectCommon}s"; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamics'; -$lang->my->editProfile = 'Edit Profile'; +$lang->my->editProfile = 'Edit'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind from Zdoo'; $lang->my->manageContacts = 'Manage Contact'; $lang->my->deleteContacts = 'Delete Contact'; $lang->my->shareContacts = 'Public'; -$lang->my->limited = 'Limited Actions (Users can only edit the content that is involved themselves.)'; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; $lang->my->score = 'My Points'; $lang->my->scoreRule = 'Point Rules'; $lang->my->noTodo = 'No todos yet. ';