From 6d935373bb6739447f208a4fe1e9ccaabb5f7509 Mon Sep 17 00:00:00 2001
From: zhangjialiang
Date: Mon, 23 Jun 2025 18:12:58 +0800
Subject: [PATCH 01/11] * 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;
From edc2b4e969b58d722b6422d4ed089197aaae8f9c Mon Sep 17 00:00:00 2001
From: zhangjialiang
Date: Mon, 23 Jun 2025 18:12:58 +0800
Subject: [PATCH 02/11] * 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;
From 76e6b08a85b5c54e40ab9cd465ae60a01f04200d Mon Sep 17 00:00:00 2001
From: zhangjialiang
Date: Mon, 23 Jun 2025 18:20:05 +0800
Subject: [PATCH 03/11] * Fix revise the English translation.
---
module/admin/lang/de.php | 2 +-
module/admin/lang/en.php | 2 +-
module/admin/lang/fr.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 25469f4cfa..b984ef57d2 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -263,6 +263,6 @@ $lang->admin->register->uxPlan->agree = 'Agreed';
$lang->admin->register->uxPlan->cancel = 'Canceled';
$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Unbound';
+$lang->admin->register->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index cfb4380df1..34c4691cb0 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -263,6 +263,6 @@ $lang->admin->register->uxPlan->agree = 'Agreed';
$lang->admin->register->uxPlan->cancel = 'Canceled';
$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Unbound';
+$lang->admin->register->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index e0801aacf6..9b68dc9508 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -263,6 +263,6 @@ $lang->admin->register->uxPlan->agree = 'Agreed';
$lang->admin->register->uxPlan->cancel = 'Canceled';
$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Unbound';
+$lang->admin->register->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
From 528f14cc1f0d5543b6b1ffc1880095097b397b63 Mon Sep 17 00:00:00 2001
From: xieqiyu
Date: Mon, 23 Jun 2025 07:50:01 +0000
Subject: [PATCH 04/11] * [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 f93dd77df886e3de883301550587aa12635c1cda Mon Sep 17 00:00:00 2001
From: liumengyi
Date: Mon, 23 Jun 2025 15:49:36 +0800
Subject: [PATCH 05/11] * [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 a4165e1b909a5e4d4d5ba5f4608dfb2624643b83 Mon Sep 17 00:00:00 2001
From: liumengyi
Date: Mon, 23 Jun 2025 15:47:01 +0800
Subject: [PATCH 06/11] * [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 305aae7540033f1e8b2ebc448fdae24e51fd822b Mon Sep 17 00:00:00 2001
From: daitingting
Date: Mon, 23 Jun 2025 16:33:30 +0800
Subject: [PATCH 07/11] * [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 01cbb7a2155a864ed82c90685d8ffd5fd808c702 Mon Sep 17 00:00:00 2001
From: wangyidong
Date: Mon, 23 Jun 2025 17:31:38 +0800
Subject: [PATCH 08/11] * [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 9141ad90bb28a88508d549d4210b9bae4d7135a6 Mon Sep 17 00:00:00 2001
From: zhangjialiang
Date: Tue, 24 Jun 2025 08:40:28 +0800
Subject: [PATCH 09/11] * Restore adjust admin register to community.
---
module/admin/control.php | 12 ++---
module/admin/lang/de.php | 74 ++++++++++++++---------------
module/admin/lang/en.php | 74 ++++++++++++++---------------
module/admin/lang/fr.php | 76 +++++++++++++++---------------
module/admin/lang/zh-cn.php | 74 ++++++++++++++---------------
module/admin/ui/planmodal.html.php | 2 +-
module/admin/ui/register.html.php | 67 +++++++++++++-------------
7 files changed, 190 insertions(+), 189 deletions(-)
diff --git a/module/admin/control.php b/module/admin/control.php
index 69690b4f8a..4af83e8c47 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -523,8 +523,8 @@ class admin extends control
{
if(!empty($_POST))
{
- if(!$this->post->mobile) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->register->loginFailedMobile));
- if(!$this->post->code) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->register->loginFailedCode));
+ if(!$this->post->mobile) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->community->loginFailedMobile));
+ if(!$this->post->code) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->community->loginFailedCode));
$apiRoot = $this->config->admin->register->apiRoot;
$sessionVar = $this->config->sessionVar;
@@ -554,11 +554,11 @@ class admin extends control
return $this->send(array('result' => 'success', 'load' => inlink('register')));
}
- return $this->send(array('result' => 'fail', 'message' => isset($response['message']) ? $response['message'] : $this->lang->admin->register->loginFailed));
+ return $this->send(array('result' => 'fail', 'message' => isset($response['message']) ? $response['message'] : $this->lang->admin->community->loginFailed));
}
}
- $this->view->title = $this->lang->admin->register->registerTitle;
+ $this->view->title = $this->lang->admin->community->registerTitle;
$this->display();
}
@@ -577,7 +577,7 @@ class admin extends control
$this->config->admin->register->bindCommunity = 'false';
$this->config->admin->register->bindCommunityMobile = '';
$this->config->admin->register->agreeUX = 'false';
- return $this->send(array('result' => 'success', 'message' => $this->lang->admin->register->unBind->success, 'load' => inlink('register')));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->admin->community->unBind->success, 'load' => inlink('register')));
}
/**
@@ -592,7 +592,7 @@ class admin extends control
$agreeUX = $this->post->agreeUX;
$this->loadModel('setting')->setItem('system.admin.register.agreeUX', $agreeUX);
$this->config->admin->register->agreeUX = $agreeUX;
- $message = $agreeUX == 'true' ? $this->lang->admin->register->uxPlan->agree : $this->lang->admin->register->uxPlan->cancel;
+ $message = $agreeUX == 'true' ? $this->lang->admin->community->uxPlan->agree : $this->lang->admin->community->uxPlan->cancel;
return $this->send(array('result' => 'success', 'message' => $message));
}
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index b984ef57d2..a5f6d648be 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -225,44 +225,44 @@ $lang->admin->ai->prompt = 'AI Prompts';
$lang->admin->ai->assistant = 'AI Assistant';
$lang->admin->register = new stdclass();
-$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 = '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 = '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 = '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 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 = 'Disconnect';
+$lang->admin->community->registerTitle = 'Join Us';
+$lang->admin->community->skip = 'Skip';
+$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program';
+$lang->admin->community->loginFailed = 'Login failed';
+$lang->admin->community->loginFailedMobile = 'Please provide your phone number';
+$lang->admin->community->loginFailedCode = 'Please fill in the verification code';
+$lang->admin->community->officialWebsite = 'ZenTao Official website ';
+$lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program ';
+$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.';
+$lang->admin->community->mobile = 'phone number';
+$lang->admin->community->smsCode = 'Verification code';
+$lang->admin->community->sendCode = 'Get code';
+$lang->admin->community->join = 'join the';
+$lang->admin->community->joinDesc = 'and help us understand the usage of the product';
+$lang->admin->community->captchaTip = 'verification code';
+$lang->admin->community->sure = 'Confirm';
+$lang->admin->community->unBindText = 'Disconnect';
+$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:';
+$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:";
+$lang->admin->community->advantage1 = 'PM resources';
+$lang->admin->community->advantage2 = 'Technical support';
+$lang->admin->community->advantage3 = 'Demos';
+$lang->admin->community->advantage4 = 'User manual';
+$lang->admin->community->goCommunity = 'Visit Community';
+$lang->admin->community->enterMobile = 'Please enter your phone number';
+$lang->admin->community->enterCode = 'Please enter the verification code';
+$lang->admin->community->goBack = 'back';
+$lang->admin->community->reSend = 'resend';
+$lang->admin->community->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?';
+$lang->admin->community->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software';
+$lang->admin->community->cancelButton = 'Cancel';
+$lang->admin->community->unbindButton = 'Disconnect';
-$lang->admin->register->uxPlan = new stdclass();
-$lang->admin->register->uxPlan->agree = 'Agreed';
-$lang->admin->register->uxPlan->cancel = 'Canceled';
+$lang->admin->community->uxPlan = new stdclass();
+$lang->admin->community->uxPlan->agree = 'Agreed';
+$lang->admin->community->uxPlan->cancel = 'Canceled';
-$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Disconnect';
+$lang->admin->community->unBind = new stdclass();
+$lang->admin->community->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 34c4691cb0..a0af1808d6 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -225,44 +225,44 @@ $lang->admin->ai->prompt = 'AI Prompts';
$lang->admin->ai->assistant = 'AI Assistant';
$lang->admin->register = new stdclass();
-$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 = '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 = '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 = '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 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 = 'Disconnect';
+$lang->admin->community->registerTitle = 'Join Us';
+$lang->admin->community->skip = 'Skip';
+$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program';
+$lang->admin->community->loginFailed = 'Login failed';
+$lang->admin->community->loginFailedMobile = 'Please provide your phone number';
+$lang->admin->community->loginFailedCode = 'Please fill in the verification code';
+$lang->admin->community->officialWebsite = 'ZenTao Official website ';
+$lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program ';
+$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.';
+$lang->admin->community->mobile = 'phone number';
+$lang->admin->community->smsCode = 'Verification code';
+$lang->admin->community->sendCode = 'Get code';
+$lang->admin->community->join = 'join the';
+$lang->admin->community->joinDesc = 'and help us understand the usage of the product';
+$lang->admin->community->captchaTip = 'verification code';
+$lang->admin->community->sure = 'Confirm';
+$lang->admin->community->unBindText = 'Disconnect';
+$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:';
+$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:";
+$lang->admin->community->advantage1 = 'PM resources';
+$lang->admin->community->advantage2 = 'Technical support';
+$lang->admin->community->advantage3 = 'Demos';
+$lang->admin->community->advantage4 = 'User manual';
+$lang->admin->community->goCommunity = 'Visit Community';
+$lang->admin->community->enterMobile = 'Please enter your phone number';
+$lang->admin->community->enterCode = 'Please enter the verification code';
+$lang->admin->community->goBack = 'back';
+$lang->admin->community->reSend = 'resend';
+$lang->admin->community->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?';
+$lang->admin->community->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software';
+$lang->admin->community->cancelButton = 'Cancel';
+$lang->admin->community->unbindButton = 'Disconnect';
-$lang->admin->register->uxPlan = new stdclass();
-$lang->admin->register->uxPlan->agree = 'Agreed';
-$lang->admin->register->uxPlan->cancel = 'Canceled';
+$lang->admin->community->uxPlan = new stdclass();
+$lang->admin->community->uxPlan->agree = 'Agreed';
+$lang->admin->community->uxPlan->cancel = 'Canceled';
-$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Disconnect';
+$lang->admin->community->unBind = new stdclass();
+$lang->admin->community->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 9b68dc9508..1196c2e4af 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -224,45 +224,45 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs';
$lang->admin->ai->prompt = 'AI Prompts';
$lang->admin->ai->assistant = 'AI Assistant';
-$lang->admin->register = new stdclass();
-$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 = '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 = '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 = '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 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 = 'Disconnect';
+$lang->admin->community = new stdclass();
+$lang->admin->community->registerTitle = 'Join Us';
+$lang->admin->community->skip = 'Skip';
+$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program';
+$lang->admin->community->loginFailed = 'Login failed';
+$lang->admin->community->loginFailedMobile = 'Please provide your phone number';
+$lang->admin->community->loginFailedCode = 'Please fill in the verification code';
+$lang->admin->community->officialWebsite = 'ZenTao Official website ';
+$lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program ';
+$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.';
+$lang->admin->community->mobile = 'phone number';
+$lang->admin->community->smsCode = 'Verification code';
+$lang->admin->community->sendCode = 'Get code';
+$lang->admin->community->join = 'join the';
+$lang->admin->community->joinDesc = 'and help us understand the usage of the product';
+$lang->admin->community->captchaTip = 'verification code';
+$lang->admin->community->sure = 'Confirm';
+$lang->admin->community->unBindText = 'Disconnect';
+$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:';
+$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:";
+$lang->admin->community->advantage1 = 'PM resources';
+$lang->admin->community->advantage2 = 'Technical support';
+$lang->admin->community->advantage3 = 'Demos';
+$lang->admin->community->advantage4 = 'User manual';
+$lang->admin->community->goCommunity = 'Visit Community';
+$lang->admin->community->enterMobile = 'Please enter your phone number';
+$lang->admin->community->enterCode = 'Please enter the verification code';
+$lang->admin->community->goBack = 'back';
+$lang->admin->community->reSend = 'resend';
+$lang->admin->community->unbindTitle = 'Are you sure you want to disconnect from the ZenTao website?';
+$lang->admin->community->unbindContent = 'After unbinding, it will not be possible to directly redirect to the official website of Zen Buddhism through ZenTao Buddhism software';
+$lang->admin->community->cancelButton = 'Cancel';
+$lang->admin->community->unbindButton = 'Disconnect';
-$lang->admin->register->uxPlan = new stdclass();
-$lang->admin->register->uxPlan->agree = 'Agreed';
-$lang->admin->register->uxPlan->cancel = 'Canceled';
+$lang->admin->community->uxPlan = new stdclass();
+$lang->admin->community->uxPlan->agree = 'Agreed';
+$lang->admin->community->uxPlan->cancel = 'Canceled';
-$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = 'Disconnect';
+$lang->admin->community->unBind = new stdclass();
+$lang->admin->community->unBind->success = 'Disconnect';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index bb868340c6..b41c45943c 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -225,44 +225,44 @@ $lang->admin->ai->prompt = 'AI 提词';
$lang->admin->ai->assistant = 'AI 助手';
$lang->admin->register = new stdclass();
-$lang->admin->register->registerTitle = '加入禅道社区';
-$lang->admin->register->skip = '跳过';
-$lang->admin->register->uxPlanTitle = '禅道用户体验改进计划';
-$lang->admin->register->loginFailed = '登录失败';
-$lang->admin->register->loginFailedMobile = '请填写手机号';
-$lang->admin->register->loginFailedCode = '请填写验证码';
-$lang->admin->register->officialWebsite = '禅道官网 ';
-$lang->admin->register->uxPlanWithBookTitle = '《禅道用户体验改进计划》';
-$lang->admin->register->uxPlanStatusTitle = '帮助我们了解产品使用情况,您可在后台关闭此功能。';
-$lang->admin->register->mobile = '手机号';
-$lang->admin->register->smsCode = '验证码';
-$lang->admin->register->sendCode = '获取验证码';
-$lang->admin->register->join = '加入';
-$lang->admin->register->joinDesc = '帮助我们了解产品使用情况。';
-$lang->admin->register->captchaTip = '请输入图形验证码';
-$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';
-$lang->admin->register->advantage4 = '禅道软件手册';
-$lang->admin->register->goCommunity = '前往社区';
-$lang->admin->register->enterMobile = '请输入手机号';
-$lang->admin->register->enterCode = '请输入验证码';
-$lang->admin->register->goBack = '返回';
-$lang->admin->register->reSend = '重新发送';
-$lang->admin->register->unbindTitle = '确认与禅道解绑吗';
-$lang->admin->register->unbindContent = '解绑后将无法通过禅道软件直接跳转禅道官网';
-$lang->admin->register->cancelButton = '取消';
-$lang->admin->register->unbindButton = '解绑';
+$lang->admin->community->registerTitle = '加入禅道社区';
+$lang->admin->community->skip = '跳过';
+$lang->admin->community->uxPlanTitle = '禅道用户体验改进计划';
+$lang->admin->community->loginFailed = '登录失败';
+$lang->admin->community->loginFailedMobile = '请填写手机号';
+$lang->admin->community->loginFailedCode = '请填写验证码';
+$lang->admin->community->officialWebsite = '禅道官网 ';
+$lang->admin->community->uxPlanWithBookTitle = '《禅道用户体验改进计划》';
+$lang->admin->community->uxPlanStatusTitle = '帮助我们了解产品使用情况,您可在后台关闭此功能。';
+$lang->admin->community->mobile = '手机号';
+$lang->admin->community->smsCode = '验证码';
+$lang->admin->community->sendCode = '获取验证码';
+$lang->admin->community->join = '加入';
+$lang->admin->community->joinDesc = '帮助我们了解产品使用情况。';
+$lang->admin->community->captchaTip = '请输入图形验证码';
+$lang->admin->community->sure = ' 确定';
+$lang->admin->community->unBindText = '解绑';
+$lang->admin->community->welcome = '欢迎您加入禅道社区。在这里,您可以获得:';
+$lang->admin->community->welcomeForBound = '您已加入禅道社区。在这里,您可以获得:';
+$lang->admin->community->advantage1 = '项目管理大礼包';
+$lang->admin->community->advantage2 = '技术支持服务';
+$lang->admin->community->advantage3 = '体验各版本Demo';
+$lang->admin->community->advantage4 = '禅道软件手册';
+$lang->admin->community->goCommunity = '前往社区';
+$lang->admin->community->enterMobile = '请输入手机号';
+$lang->admin->community->enterCode = '请输入验证码';
+$lang->admin->community->goBack = '返回';
+$lang->admin->community->reSend = '重新发送';
+$lang->admin->community->unbindTitle = '确认与禅道解绑吗';
+$lang->admin->community->unbindContent = '解绑后将无法通过禅道软件直接跳转禅道官网';
+$lang->admin->community->cancelButton = '取消';
+$lang->admin->community->unbindButton = '解绑';
-$lang->admin->register->uxPlan = new stdclass();
-$lang->admin->register->uxPlan->agree = '已同意';
-$lang->admin->register->uxPlan->cancel = '已取消';
+$lang->admin->community->uxPlan = new stdclass();
+$lang->admin->community->uxPlan->agree = '已同意';
+$lang->admin->community->uxPlan->cancel = '已取消';
-$lang->admin->register->unBind = new stdclass();
-$lang->admin->register->unBind->success = '已解绑';
+$lang->admin->community->unBind = new stdclass();
+$lang->admin->community->unBind->success = '已解绑';
include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/ui/planmodal.html.php b/module/admin/ui/planmodal.html.php
index 2db55721d6..ffe002313b 100644
--- a/module/admin/ui/planmodal.html.php
+++ b/module/admin/ui/planmodal.html.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace zin;
-modalHeader(set::title($this->lang->admin->register->uxPlanTitle));
+modalHeader(set::title($this->lang->admin->community->uxPlanTitle));
$uxPlan = '';
$uxPlanFile = $this->app->getAppRoot() . 'www/uxplan.html';
diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php
index bc800e862e..56fbc14de9 100644
--- a/module/admin/ui/register.html.php
+++ b/module/admin/ui/register.html.php
@@ -10,7 +10,7 @@ declare(strict_types=1);
*/
namespace zin;
-jsVar('reSendText', $lang->admin->register->reSend);
+jsVar('reSendText', $lang->admin->community->reSend);
$checked = $agreeUX == 'true' ? 'checked' : '';
if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false)
@@ -22,13 +22,14 @@ else
$backBtn = div
(
setClass('page-title'),
- a(
+ a
+ (
icon(setClass('icon icon-back')),
setClass('btn capitalize primary'),
set::href(helper::createLink('admin')),
- $lang->admin->register->goBack
+ $lang->admin->community->goBack
),
- span($lang->admin->register->registerTitle),
+ span($lang->admin->community->registerTitle),
);
}
@@ -39,7 +40,7 @@ if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false)
a
(
setClass('btn capitalize skip-btn'),
- $lang->admin->register->skip,
+ $lang->admin->community->skip,
set::href(createLink('user', 'login')),
)
);
@@ -49,16 +50,16 @@ else
$skip = '';
}
-$welcomeText = $bindCommunity ? $lang->admin->register->welcomeForBound : $lang->admin->register->welcome;
+$welcomeText = $bindCommunity ? $lang->admin->community->welcomeForBound : $lang->admin->community->welcome;
$header[] = div
(
setClass('max-w-7xl h-32 form-title'),
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),
- div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->register->advantage4),
+ div(setClass('sub-title'), icon(setClass('icon icon-diamond')), $lang->admin->community->advantage1),
+ div(setClass('sub-title'), icon(setClass('icon icon-team')), $lang->admin->community->advantage2),
+ div(setClass('sub-title'), icon(setClass('icon icon-statistic')), $lang->admin->community->advantage3),
+ div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->community->advantage4),
);
if($bindCommunity)
@@ -86,8 +87,9 @@ if($bindCommunity)
(
setClass('z-bind-info-image'),
img(set::src('static/images/register-logo.png')),
- div(
- div(setClass('z-bind-info-website'), html(nl2br($lang->admin->register->officialWebsite))),
+ div
+ (
+ div(setClass('z-bind-info-website'), html(nl2br($lang->admin->community->officialWebsite))),
div(setClass('z-bind-info-mobile'), $bindCommunityMobile)
),
button
@@ -99,7 +101,7 @@ if($bindCommunity)
setData(array('position' => 'center', 'toggle' => 'modal', 'target' => '#positionModal')),
setClass('btn btn-primary z-unbind-btn'),
setID('unBind'),
- $lang->admin->register->unBindText,
+ $lang->admin->community->unBindText,
),
div
(
@@ -114,8 +116,8 @@ if($bindCommunity)
div
(
setClass('modal-body'),
- p(setClass('unbind-modal-title'), $lang->admin->register->unbindTitle),
- p(setClass('unbind-modal-content'), $lang->admin->register->unbindContent)
+ p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle),
+ p(setClass('unbind-modal-content'), $lang->admin->community->unbindContent)
),
div
(
@@ -125,13 +127,13 @@ if($bindCommunity)
setClass('btn'),
set::type('button'),
setData(array('dismiss' => 'modal')),
- $lang->admin->register->cancelButton
+ $lang->admin->community->cancelButton
),
button
(
setClass('btn primary'),
set::type('button'),
- $lang->admin->register->unbindButton,
+ $lang->admin->community->unbindButton,
on::click()->call('unBind')
)
)
@@ -149,16 +151,16 @@ if($bindCommunity)
div
(
setClass('z-plan-info-box-text'),
- span($lang->admin->register->join),
+ span($lang->admin->community->join),
a
(
setID('experience-plan-show'),
set('data-size', 'lg'),
- $lang->admin->register->uxPlanWithBookTitle,
+ $lang->admin->community->uxPlanWithBookTitle,
set::href(createLink('admin', 'planModal')),
set('data-toggle', 'modal')
),
- span($lang->admin->register->joinDesc)
+ span($lang->admin->community->joinDesc)
),
div
(
@@ -179,7 +181,7 @@ if($bindCommunity)
button
(
setClass('btn capitalize primary'),
- $lang->admin->register->goCommunity,
+ $lang->admin->community->goCommunity,
on::click()->call('goCommunity', $config->admin->register->community),
)
)
@@ -208,9 +210,9 @@ else
set::formID('joinForm'),
setClass('bg-canvas m-auto mw-auto'),
set::headingClass('w-96 m-auto'),
- set::submitBtnText($lang->admin->register->registerTitle),
+ set::submitBtnText($lang->admin->community->registerTitle),
set::cancelBtnText(),
- div(setClass('label-text'), $lang->admin->register->mobile),
+ div(setClass('label-text'), $lang->admin->community->mobile),
formRow
(
setClass('m-auto no-label-mobile'),
@@ -222,7 +224,7 @@ else
setClass('no-label-input'),
set::name('mobile'),
setID('mobile-captcha'),
- set::placeholder($lang->admin->register->enterMobile)
+ set::placeholder($lang->admin->community->enterMobile)
)
)
),
@@ -232,7 +234,7 @@ else
(
setID('captchaImageLabel'),
setClass('label-text'),
- $lang->admin->register->smsCode,
+ $lang->admin->community->smsCode,
),
formRow
(
@@ -244,7 +246,7 @@ else
(
setClass('no-label-input'),
set::name('code'),
- set::placeholder($lang->admin->register->enterCode)
+ set::placeholder($lang->admin->community->enterCode)
)
),
a
@@ -252,7 +254,7 @@ else
setID('captcha-btn'),
setClass('captcha-btn-class'),
set('href', 'javascript:;'),
- $lang->admin->register->sendCode,
+ $lang->admin->community->sendCode,
on::click()->call('showCaptcha'),
)
),
@@ -269,16 +271,16 @@ else
span
(
setClass('form-agree-ux-text'),
- $lang->admin->register->join,
+ $lang->admin->community->join,
a
(
setID('experience-plan-show'),
set('data-size', 'lg'),
- $lang->admin->register->uxPlanWithBookTitle,
+ $lang->admin->community->uxPlanWithBookTitle,
set::href(createLink('admin', 'planModal')),
set('data-toggle', 'modal')
),
- $lang->admin->register->uxPlanStatusTitle
+ $lang->admin->community->uxPlanStatusTitle
)
)
)
@@ -310,17 +312,16 @@ else
input
(
set::name('captchaImage'),
- set::placeholder($lang->admin->register->captchaTip)
+ set::placeholder($lang->admin->community->captchaTip)
),
div
(
setID('checkMobileSenderID'),
setClass('px-4'),
set::type('primary'),
- html(nl2br($lang->admin->register->sure)),
+ html(nl2br($lang->admin->community->sure)),
on::click()->call('checkMobileSender', '#checkMobileSenderID'),
)
-
)
)
)
From 339c7a4b87535b6cb0a5b21878339e60526c620c Mon Sep 17 00:00:00 2001
From: xieqiyu
Date: Mon, 23 Jun 2025 09:44:00 +0000
Subject: [PATCH 10/11] * [bug#63436] Return error when module is empty in
edit doc template.
---
module/doc/config/form.php | 1 +
module/doc/control.php | 1 +
2 files changed, 2 insertions(+)
diff --git a/module/doc/config/form.php b/module/doc/config/form.php
index 95d0095430..59d86f2fd2 100644
--- a/module/doc/config/form.php
+++ b/module/doc/config/form.php
@@ -90,6 +90,7 @@ $config->doc->form->edit['editedDate'] = array('type' => 'datetime', 'required'
$config->doc->form->edittemplate = $config->doc->form->edit;
$config->doc->form->edittemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->doc->form->edittemplate['module'] = array('type' => 'int', 'required' => true, 'default' => 0);
$config->doc->form->movelib['space'] = array('type' => 'string', 'required' => true, 'default' => '');
$config->doc->form->movelib['acl'] = array('type' => 'string', 'required' => true, 'default' => '');
diff --git a/module/doc/control.php b/module/doc/control.php
index fc1d1f63ec..5ee738a397 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -726,6 +726,7 @@ class doc extends control
$doc = $this->doc->getByID($docID);
if(!empty($_POST))
{
+ $this->lang->doc->module = $this->lang->docTemplate->module;
$changes = $files = array();
$docData = form::data()
->setDefault('editedBy', $this->app->user->account)
From 4a8eae592c7f16c9ea7ee71285603505e651c330 Mon Sep 17 00:00:00 2001
From: zhangjialiang
Date: Tue, 24 Jun 2025 08:47:35 +0800
Subject: [PATCH 11/11] * Restore adjust admin register to community.
---
module/admin/lang/de.php | 2 +-
module/admin/lang/en.php | 2 +-
module/admin/lang/zh-cn.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index a5f6d648be..718de6cc2b 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs';
$lang->admin->ai->prompt = 'AI Prompts';
$lang->admin->ai->assistant = 'AI Assistant';
-$lang->admin->register = new stdclass();
+$lang->admin->community = new stdclass();
$lang->admin->community->registerTitle = 'Join Us';
$lang->admin->community->skip = 'Skip';
$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index a0af1808d6..5b3760db87 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs';
$lang->admin->ai->prompt = 'AI Prompts';
$lang->admin->ai->assistant = 'AI Assistant';
-$lang->admin->register = new stdclass();
+$lang->admin->community = new stdclass();
$lang->admin->community->registerTitle = 'Join Us';
$lang->admin->community->skip = 'Skip';
$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index b41c45943c..c71443b177 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI 小程序';
$lang->admin->ai->prompt = 'AI 提词';
$lang->admin->ai->assistant = 'AI 助手';
-$lang->admin->register = new stdclass();
+$lang->admin->community = new stdclass();
$lang->admin->community->registerTitle = '加入禅道社区';
$lang->admin->community->skip = '跳过';
$lang->admin->community->uxPlanTitle = '禅道用户体验改进计划';