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

* Finish task #5877.

Browse Source
This commit is contained in:
Yagami
2019-06-27 09:59:51 +08:00
parent 8ada663477
commit 80683b35d3
7 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/lang/en.php
+10 -10
View File
@@ -94,17 +94,17 @@ $lang->user->todo = 'Todo';
$lang->user->story = 'Stories';
$lang->user->dynamic = 'Dynamics';
$lang->user->openedBy = 'CreatedBy';
$lang->user->assignedTo = 'AssignedTo';
$lang->user->finishedBy = 'FinishedBy';
$lang->user->resolvedBy = 'SolvedBy';
$lang->user->closedBy = 'ClosedBy';
$lang->user->reviewedBy = 'ReviewedBy';
$lang->user->canceledBy = 'CancelledBy';
$lang->user->openedBy = 'CreatedBy %s';
$lang->user->assignedTo = 'AssignedTo %s';
$lang->user->finishedBy = 'FinishedBy %s';
$lang->user->resolvedBy = 'SolvedBy %s';
$lang->user->closedBy = 'ClosedBy %s';
$lang->user->reviewedBy = 'ReviewedBy %s';
$lang->user->canceledBy = 'CancelledBy %s';
$lang->user->testTask2Him = 'BuildBy';
$lang->user->case2Him = 'CaseAssignedTo';
$lang->user->caseByHim = 'CaseCreatedBy';
$lang->user->testTask2Him = 'BuildBy %s';
$lang->user->case2Him = 'CaseAssignedTo %s';
$lang->user->caseByHim = 'CaseCreatedBy %s';
$lang->user->errorDeny = "Sorry, your access to <b>%s</b> of <b>%s</b> is denied. Please contact your Admin to get privileges. Click Back to return.";
$lang->user->loginFailed = "Login failed. Please check your account and password.";
module/user/lang/zh-cn.php
+13 -10
View File
@@ -94,17 +94,17 @@ $lang->user->todo = '待办';
$lang->user->story = '需求';
$lang->user->dynamic = '动态';
$lang->user->openedBy = '由他创建';
$lang->user->assignedTo = '指派给他';
$lang->user->finishedBy = '由他完成';
$lang->user->resolvedBy = '由他解决';
$lang->user->closedBy = '由他关闭';
$lang->user->reviewedBy = '由他评审';
$lang->user->canceledBy = '由他取消';
$lang->user->openedBy = '由%s创建';
$lang->user->assignedTo = '指派给%s';
$lang->user->finishedBy = '由%s完成';
$lang->user->resolvedBy = '由%s解决';
$lang->user->closedBy = '由%s关闭';
$lang->user->reviewedBy = '由%s评审';
$lang->user->canceledBy = '由%s取消';
$lang->user->testTask2Him = '负责版本';
$lang->user->case2Him = '给他的用例';
$lang->user->caseByHim = '他建的用例';
$lang->user->testTask2Him = '%s负责版本';
$lang->user->case2Him = '给%s的用例';
$lang->user->caseByHim = '%s建的用例';
$lang->user->errorDeny = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。点击后退返回上页。";
$lang->user->loginFailed = "登录失败，请检查您的用户名或密码是否填写正确。";
@@ -126,6 +126,9 @@ $lang->user->roleList['others'] = '其他';
$lang->user->genderList['m'] = '男';
$lang->user->genderList['f'] = '女';
$lang->user->thirdPerson['m'] = '他';
$lang->user->thirdPerson['f'] = '她';
$lang->user->passwordStrengthList[0] = "<span style='color:red'>弱</span>";
$lang->user->passwordStrengthList[1] = "<span style='color:#000'>中</span>";
$lang->user->passwordStrengthList[2] = "<span style='color:green'>强</span>";
module/user/view/bug.html.php
+5 -5
View File
@@ -17,18 +17,18 @@
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
$that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=openedBy"), $lang->user->openedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'resolvedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=resolvedBy"), $lang->user->resolvedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=resolvedBy"), sprintf($lang->user->resolvedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=closedBy"), $lang->user->closedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
?>
</ul>
</nav>
module/user/view/story.html.php
+5 -5
View File
@@ -17,18 +17,18 @@
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
$that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=assignedTo"), $lang->user->assignedTo . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=openedBy"), $lang->user->openedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'reviewedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=reviewedBy"), $lang->user->reviewedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=reviewedBy"), sprintf($lang->user->reviewedBy ,$that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=closedBy"), $lang->user->closedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=closedBy"), sprintf($lang->user->closedBy ,$that)) . "</li>";
?>
</ul>
</nav>
module/user/view/task.html.php
+6 -6
View File
@@ -17,21 +17,21 @@
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
$that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=openedBy"), $lang->user->openedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'finishedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=finishedBy"), sprintf($lang->user->finishedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=closedBy"), $lang->user->closedBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
$active = $type == 'canceledBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy . $that) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=canceledBy"), sprintf($lang->user->canceledBy, $that)) . "</li>";
?>
</ul>
</nav>
module/user/view/testcase.html.php
+4 -4
View File
@@ -16,13 +16,13 @@
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
$that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
echo "<li id='testtaskTab'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him . $that) . "</li>";
$that = zget($lang->user->thirdPerson, $user->gender);
echo "<li id='testtaskTab'>" . html::a($this->createLink('user', 'testtask', "account=$account"), sprintf($lang->user->testTask2Him, $that)) . "</li>";
$active = $type == 'case2Him' ? 'active' : '';
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him . $that) . "</li>";
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), sprintf($lang->user->case2Him, $that)) . "</li>";
$active = $type == 'caseByHim' ? 'active' : '';
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim . $that) . "</li>";
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), sprintf($lang->user->caseByHim, $that)) . "</li>";
?>
</ul>
</nav>
module/user/view/testtask.html.php
+4 -4
View File
@@ -16,10 +16,10 @@
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
$that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
echo "<li class='active'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him . $that) . "</li>";
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him . $that) . "</li>";
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim . $that) . "</li>";
$that = zget($lang->user->thirdPerson, $user->gender);
echo "<li class='active'>" . html::a($this->createLink('user', 'testtask', "account=$account"), sprintf($lang->user->testTask2Him, $that)) . "</li>";
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), sprintf($lang->user->case2Him, $that)) . "</li>";
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), sprintf($lang->user->caseByHim, $that)) . "</li>";
?>
</ul>
</nav>