From f3fe8c7d1d8d32f383e9ec7820b8a26953e0a792 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 23 Jun 2025 15:47:01 +0800 Subject: [PATCH 1/6] * [bug#63588,done,0.1h] set default branch. --- module/tree/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tree/control.php b/module/tree/control.php index c0d32e3596..6f42b96547 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -243,7 +243,7 @@ class tree extends control if($showProduct) { $product = $this->loadModel('product')->getById($module->root); - $this->view->branches = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($module->root, 'withClosed') : array(); + $this->view->branches = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($module->root, 'withClosed') : array(0); $this->view->product = $product; $this->view->products = $this->product->getPairs('', $product->program); if($product->shadow) $showProduct = false; From 5da54a183946a5b1a5ec437f828ce29a74a87da5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 23 Jun 2025 15:49:36 +0800 Subject: [PATCH 2/6] * [bug#63589,done,0.1h] process testtask's status. --- module/execution/zen.php | 1 + module/project/zen.php | 1 + module/testtask/control.php | 2 ++ 3 files changed, 4 insertions(+) diff --git a/module/execution/zen.php b/module/execution/zen.php index ce6bab3272..71ea479f3a 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -471,6 +471,7 @@ class executionZen extends execution $lastProduct = ''; foreach($tasks as $taskID => $task) { + $task->status = $this->processStatus('testtask', $task); $task->rowspan = 0; if($lastProduct !== $task->product) { diff --git a/module/project/zen.php b/module/project/zen.php index ab54f44f6b..c0e5527820 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -1736,6 +1736,7 @@ class projectZen extends project $lastProduct = ''; foreach($tasks as $taskID => $task) { + $task->status = $this->processStatus('testtask', $task); $task->rowspan = 0; if($lastProduct !== $task->product) { diff --git a/module/testtask/control.php b/module/testtask/control.php index 877f03e4b1..faec68fa19 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -115,6 +115,8 @@ class testtask extends control $users = $this->loadModel('user')->getPairs('noclosed|noletter'); foreach($testtasks as $testtask) { + $testtask->status = $this->processStatus('testtask', $testtask); + if(empty($testtask->members)) continue; $members = array(); From ed1a185416a0917a515a7f063970c3467897f04a Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 23 Jun 2025 07:50:01 +0000 Subject: [PATCH 3/6] * [bug#63421] Replace upgrade to index for the url when upgrade doc template. --- module/upgrade/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index c48d6279c4..b1e9f5d477 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -11147,6 +11147,7 @@ class upgradeModel extends model /* 历史版本的文档模板中，文章显示链接，点击链接查看文章的具体内容。*/ /* In the historical version of the template, the article displays a link. Click on the link to view the content of the article. */ $articleLink = helper::createLink('baseline', 'view', "articleID={$template->id}"); + $articleLink = $this->config->requestType == 'GET' ? str_replace('upgrade.php?', 'index.php?', $articleLink) : $articleLink; $templateHtml .= "{$template->title}
"; } else From 9451fa44648b732a387211f99f2ea732c2812314 Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 23 Jun 2025 16:33:30 +0800 Subject: [PATCH 4/6] * [task#145383,done,2h] Check execution priviledge for task list in document block. --- module/doc/control.php | 14 ++++++++++++-- module/doc/js/zentaolist.ui.js | 12 ++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 5dce560170..fc1d1f63ec 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -202,12 +202,22 @@ class doc extends control } else { + $data = (array)zget($blockData->content, 'data', array()); + if($type == 'task') + { + foreach($data as $taskID => $task) + { + $task->canView = $this->execution->checkPriv($task->execution); + $data[$taskID] = $task; + } + } + $this->app->loadClass('pager', true); $this->view->idList = (array)zget($blockData->content, 'idList', array()); $this->view->cols = (array)zget($blockData->content, 'cols', array()); - $this->view->data = (array)zget($blockData->content, 'data', array()); - $this->view->pager = new pager(count($this->view->data), 10); + $this->view->data = $data; + $this->view->pager = new pager(count($data), 10); } $this->view->type = $type; diff --git a/module/doc/js/zentaolist.ui.js b/module/doc/js/zentaolist.ui.js index 8d2468d163..aa4fb31f32 100644 --- a/module/doc/js/zentaolist.ui.js +++ b/module/doc/js/zentaolist.ui.js @@ -280,6 +280,18 @@ window.renderCell = function(result, info) if(info.row.data.reviewedDate == '0000-00-00') info.row.data.reviewedDate = ''; } + if(blockType == 'task') + { + if(result) + { + if(info.col.name == 'name' && !info.row.data.canView) + { + result.shift(); + result.push({html: info.row.data.name}); + } + } + } + return result; }; From ce531aced9d95b21a629bcf97da05969999482b5 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 23 Jun 2025 17:31:38 +0800 Subject: [PATCH 5/6] * [perf story #75382] Adjust ztSessionHandler class. --- framework/base/router.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/base/router.class.php b/framework/base/router.class.php index 3b0c43af6e..b12ff34579 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -3827,7 +3827,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return string */ - public function getSessionFile(string $id): string + public function getSessionFile($id): string { if(!empty($this->sessionFile)) return $this->sessionFile; if(!preg_match('/^\w+$/', $id)) return false; @@ -3847,7 +3847,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return bool */ - public function open(string $savePath, string $sessionName): bool + public function open($savePath, $sessionName): bool { $this->sessSavePath = $savePath; $this->sessionName = $sessionName; @@ -3872,7 +3872,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return string|false */ - public function read(string $id): string|false + public function read($id): string|false { $sessFile = $this->getSessionFile($id); if(!$sessFile) return false; @@ -3888,7 +3888,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return bool */ - public function write(string $id, string $sessData): bool + public function write($id, $sessData): bool { $sessFile = $this->getSessionFile($id); if(!$sessFile) return true; @@ -3907,7 +3907,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return bool */ - public function destroy(string $id): bool + public function destroy($id): bool { $sessFile = $this->getSessionFile($id); if(file_exists($sessFile)) unlink($sessFile); @@ -3922,7 +3922,7 @@ class ztSessionHandler implements SessionHandlerInterface * @access public * @return int|false */ - public function gc(int $maxlifeTime): int|false + public function gc($maxlifeTime): int|false { $time = time(); $count = 0; From 6d935373bb6739447f208a4fe1e9ccaabb5f7509 Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Mon, 23 Jun 2025 18:12:58 +0800 Subject: [PATCH 6/6] * Fix revise the English translation. --- module/admin/css/register.ui.css | 6 +++--- module/admin/lang/de.php | 33 +++++++++++++++-------------- module/admin/lang/en.php | 35 ++++++++++++++++--------------- module/admin/lang/fr.php | 33 +++++++++++++++-------------- module/admin/lang/zh-cn.php | 3 ++- module/admin/ui/register.html.php | 8 ++++--- module/install/lang/de.php | 1 + module/install/lang/en.php | 2 +- module/install/lang/fr.php | 1 + module/install/lang/zh-tw.php | 1 + 10 files changed, 66 insertions(+), 57 deletions(-) diff --git a/module/admin/css/register.ui.css b/module/admin/css/register.ui.css index 2df24b750a..e2e41f3c91 100644 --- a/module/admin/css/register.ui.css +++ b/module/admin/css/register.ui.css @@ -12,7 +12,7 @@ .no-label-code {width: 32rem; margin-left: 0.9rem;} .no-label-input {height: 40px;} #captchaImageLabel {margin-top: -1.5rem;} -#captchaImage {width: 8rem; margin-left: 0.8rem; display: inline;} +#captchaImage {width: 7rem; margin-left: 0.8rem; display: inline;} #checkMobileSenderID {display: inline; cursor: pointer;} #captcha-btn {width: 7rem; line-height: 40px; padding-left: 2rem; font-size: 15px; color: #0084FF;} .form-agree-ux {color: #5A6D88;} @@ -32,7 +32,7 @@ button[type="submit"] {height: 40px; width: 120px;} .z-bind-info-website {font-size: 18px; color: #666; margin-bottom: 4px; width: 10rem; display: flex;} .z-bind-info-website span {width: 10rem; display: flex;} .z-bind-info-mobile {font-size: 15px;} -.z-unbind-btn {border: 1px solid #E6ECF8; color: #0084FF; border-radius: 16px; padding: 6px 16px; margin-left: 12rem; font-size: 15px; line-height: 15px; width: 6rem;} +.z-unbind-btn {border: 1px solid #E6ECF8; color: #0084FF; border-radius: 16px; padding: 6px 16px; margin-left: 11rem; font-size: 15px; line-height: 15px; width: 7rem;} .z-plan-info {margin-top: 20px; padding-top: 20px;} .z-plan-info-box {margin-top: -2px; margin-left: 12px;} .z-plan-info-box a {color: #0084FF; text-decoration: none;} @@ -42,7 +42,7 @@ button[type="submit"] {height: 40px; width: 120px;} .switch {min-height: 16px;} .z-switch-toggle {height: 24px; background: #0084FF; border-radius: 12px; position: relative;} .z-footer-btn {margin-top: 24px; display: flex; justify-content: center; align-items: center; height: 40px;} -.z-footer-btn button {height: 40px; width: 120px; font-size: 16px;} +.z-footer-btn button {height: 40px; width: 146px; font-size: 16px;} .z-bind-info {border: 1px solid #f0f0f0; border-radius: 5px;height: 4.4rem;} .z-plan-info {border: 1px solid #f0f0f0; border-radius: 5px;height: 3.6rem;} .install-logo {position: relative; top: 3rem; left: 3rem; float: left; margin-right: -12rem;} diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 77a61a1807..25469f4cfa 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -188,7 +188,7 @@ $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-par $lang->admin->menuSetting['ai']['name'] = 'AI Configurations'; $lang->admin->menuSetting['ai']['desc'] = 'Support configuration and management of AI auto-suggestions, AI mini-programs, and large language models.'; $lang->admin->menuSetting['adminregister']['name'] = 'ZenTao community'; -$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management package, technical support services, and experience a version demo.'; +$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management resources, tech support, and try out demo versions.'; $lang->admin->updateDynamics = 'Dynamics'; $lang->admin->updatePatch = 'Patch'; @@ -225,37 +225,38 @@ $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); -$lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->registerTitle = 'Join Us'; $lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; $lang->admin->register->loginFailedMobile = 'Please provide your phone number'; $lang->admin->register->loginFailedCode = 'Please fill in the verification code'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; -$lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; -$lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->register->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; +$lang->admin->register->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; $lang->admin->register->mobile = 'phone number'; $lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; +$lang->admin->register->sendCode = 'Get code'; $lang->admin->register->join = 'join the'; $lang->admin->register->joinDesc = 'and help us understand the usage of the product'; $lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; +$lang->admin->register->sure = 'Confirm'; +$lang->admin->register->unBindText = 'Disconnect'; +$lang->admin->register->welcome = 'Welcome to the ZenTao community! Here you can explore:'; +$lang->admin->register->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->register->advantage1 = 'PM resources'; +$lang->admin->register->advantage2 = 'Technical support'; +$lang->admin->register->advantage3 = 'Demos'; +$lang->admin->register->advantage4 = 'User manual'; +$lang->admin->register->goCommunity = 'Visit Community'; $lang->admin->register->enterMobile = 'Please enter your phone number'; $lang->admin->register->enterCode = 'Please enter the verification code'; $lang->admin->register->goBack = 'back'; $lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->register->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?'; $lang->admin->register->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->register->cancelButton = 'Cancel'; +$lang->admin->register->unbindButton = 'Disconnect'; $lang->admin->register->uxPlan = new stdclass(); $lang->admin->register->uxPlan->agree = 'Agreed'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index a60f61c0d3..cfb4380df1 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -187,8 +187,8 @@ $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; $lang->admin->menuSetting['ai']['name'] = 'AI Configurations'; $lang->admin->menuSetting['ai']['desc'] = 'Support configuration and management of AI auto-suggestions, AI mini-programs, and large language models.'; -$lang->admin->menuSetting['adminregister']['name'] = 'ZenTao community'; -$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management package, technical support services, and experience a version demo.'; +$lang->admin->menuSetting['adminregister']['name'] = 'ZenTao Community'; +$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management resources, tech support, and try out demo versions.'; $lang->admin->updateDynamics = 'Dynamics'; $lang->admin->updatePatch = 'Patch'; @@ -225,37 +225,38 @@ $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); -$lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->registerTitle = 'Join Us'; $lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; $lang->admin->register->loginFailedMobile = 'Please provide your phone number'; $lang->admin->register->loginFailedCode = 'Please fill in the verification code'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; -$lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; -$lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->register->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; +$lang->admin->register->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; $lang->admin->register->mobile = 'phone number'; $lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; +$lang->admin->register->sendCode = 'Get code'; $lang->admin->register->join = 'join the'; $lang->admin->register->joinDesc = 'and help us understand the usage of the product'; $lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; +$lang->admin->register->sure = 'Confirm'; +$lang->admin->register->unBindText = 'Disconnect'; +$lang->admin->register->welcome = 'Welcome to the ZenTao community! Here you can explore:'; +$lang->admin->register->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->register->advantage1 = 'PM resources'; +$lang->admin->register->advantage2 = 'Technical support'; +$lang->admin->register->advantage3 = 'Demos'; +$lang->admin->register->advantage4 = 'User manual'; +$lang->admin->register->goCommunity = 'Visit Community'; $lang->admin->register->enterMobile = 'Please enter your phone number'; $lang->admin->register->enterCode = 'Please enter the verification code'; $lang->admin->register->goBack = 'back'; $lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->register->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?'; $lang->admin->register->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->register->cancelButton = 'Cancel'; +$lang->admin->register->unbindButton = 'Disconnect'; $lang->admin->register->uxPlan = new stdclass(); $lang->admin->register->uxPlan->agree = 'Agreed'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index a54be57dd4..e0801aacf6 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -188,7 +188,7 @@ $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-par $lang->admin->menuSetting['ai']['name'] = 'AI Configurations'; $lang->admin->menuSetting['ai']['desc'] = 'Support configuration and management of AI auto-suggestions, AI mini-programs, and large language models.'; $lang->admin->menuSetting['adminregister']['name'] = 'ZenTao community'; -$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management package, technical support services, and experience a version demo.'; +$lang->admin->menuSetting['adminregister']['desc'] = 'Get the project management resources, tech support, and try out demo versions.'; $lang->admin->updateDynamics = 'Dynamics'; $lang->admin->updatePatch = 'Patch'; @@ -225,37 +225,38 @@ $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); -$lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->registerTitle = 'Join Us'; $lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; $lang->admin->register->loginFailedMobile = 'Please provide your phone number'; $lang->admin->register->loginFailedCode = 'Please fill in the verification code'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; -$lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; -$lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->register->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; +$lang->admin->register->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; $lang->admin->register->mobile = 'phone number'; $lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; +$lang->admin->register->sendCode = 'Get code'; $lang->admin->register->join = 'join the'; $lang->admin->register->joinDesc = 'and help us understand the usage of the product'; $lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; +$lang->admin->register->sure = 'Confirm'; +$lang->admin->register->unBindText = 'Disconnect'; +$lang->admin->register->welcome = 'Welcome to the ZenTao community! Here you can explore:'; +$lang->admin->register->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->register->advantage1 = 'PM resources'; +$lang->admin->register->advantage2 = 'Technical support'; +$lang->admin->register->advantage3 = 'Demos'; +$lang->admin->register->advantage4 = 'User manual'; +$lang->admin->register->goCommunity = 'Visit Community'; $lang->admin->register->enterMobile = 'Please enter your phone number'; $lang->admin->register->enterCode = 'Please enter the verification code'; $lang->admin->register->goBack = 'back'; $lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->register->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?'; $lang->admin->register->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->register->cancelButton = 'Cancel'; +$lang->admin->register->unbindButton = 'Disconnect'; $lang->admin->register->uxPlan = new stdclass(); $lang->admin->register->uxPlan->agree = 'Agreed'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 909b289410..bb868340c6 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -240,9 +240,10 @@ $lang->admin->register->sendCode = '获取验证码'; $lang->admin->register->join = '加入'; $lang->admin->register->joinDesc = '帮助我们了解产品使用情况。'; $lang->admin->register->captchaTip = '请输入图形验证码'; -$lang->admin->register->sure = '确定'; +$lang->admin->register->sure = '  确定'; $lang->admin->register->unBindText = '解绑'; $lang->admin->register->welcome = '欢迎您加入禅道社区。在这里，您可以获得：'; +$lang->admin->register->welcomeForBound = '您已加入禅道社区。在这里，您可以获得:'; $lang->admin->register->advantage1 = '项目管理大礼包'; $lang->admin->register->advantage2 = '技术支持服务'; $lang->admin->register->advantage3 = '体验各版本Demo'; diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index ad6f5f1ab3..bc800e862e 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -49,10 +49,12 @@ else $skip = ''; } +$welcomeText = $bindCommunity ? $lang->admin->register->welcomeForBound : $lang->admin->register->welcome; + $header[] = div ( setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'), $lang->admin->register->welcome), + div(setClass('main-title text-xl'), $welcomeText), div(setClass('sub-title'), icon(setClass('icon icon-diamond')), $lang->admin->register->advantage1), div(setClass('sub-title'), icon(setClass('icon icon-team')), $lang->admin->register->advantage2), div(setClass('sub-title'), icon(setClass('icon icon-statistic')), $lang->admin->register->advantage3), @@ -92,7 +94,7 @@ if($bindCommunity) ( icon ( - setClass('icon icon-rocket') + setClass('icon icon-unlink') ), setData(array('position' => 'center', 'toggle' => 'modal', 'target' => '#positionModal')), setClass('btn btn-primary z-unbind-btn'), @@ -315,7 +317,7 @@ else setID('checkMobileSenderID'), setClass('px-4'), set::type('primary'), - $lang->admin->register->sure, + html(nl2br($lang->admin->register->sure)), on::click()->call('checkMobileSender', '#checkMobileSenderID'), ) diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 0b380f0f0f..e61d2957c1 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -312,6 +312,7 @@ $lang->install->register = 'Bei ZenTao registieren'; $lang->install->successLabel = "

Sie haben ZenTao %s installiert.

"; $lang->install->successNoticeLabel = "

Sie haben ZenTao %s installiert. Bitte löschen Sie die install.php schnellstmöglich.

"; +$lang->install->congratulations = "Congratulations! ZenTao has been installed."; $lang->install->joinZentao = <<Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

EOT; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 2ea4690118..0793befee6 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -312,7 +312,7 @@ $lang->install->register = 'ZenTao Community Signup'; $lang->install->successLabel = "

You have installed ZenTao %s.

"; $lang->install->successNoticeLabel = "

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

"; -$lang->install->congratulations = "Congratulations, the installation of ZenTao has been successful!"; +$lang->install->congratulations = "Congratulations! ZenTao has been installed."; $lang->install->joinZentao = <<Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

EOT; diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 4e0dc999e3..dec0140739 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -312,6 +312,7 @@ $lang->install->register = "S'enregistrer sur la Communauté ZenTao"; $lang->install->successLabel = "

Vous avez installé ZenTao %s.

"; $lang->install->successNoticeLabel = "

Vous avez installé ZenTao %s. Supprimez install.php asap.

"; +$lang->install->congratulations = "Congratulations! ZenTao has been installed."; $lang->install->joinZentao = <<Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

EOT; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 0bfcc2899e..63df00499f 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -208,6 +208,7 @@ $lang->install->register = '禪道社區註冊'; $lang->install->successLabel = "

您已經成功安裝禪道管理系統%s。

"; $lang->install->successNoticeLabel = "

您已經成功安裝禪道管理系統%s，請及時刪除install.php。

"; +$lang->install->congratulations = "恭喜您，禪道安裝成功！"; $lang->install->joinZentao = <<友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(www.zentao.net)進行登記。

EOT;