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

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

Browse Source
This commit is contained in:
chenfeiCF
2018-07-13 13:33:02 +08:00
parent bea1e4d4ed 1772018ead
commit 37cbffb5e7
17 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+5 -5
View File
@@ -46,11 +46,11 @@ $lang->action->history->diff = 'Diff';
$lang->action->dynamic = new stdclass();
$lang->action->dynamic->today = 'Today';
$lang->action->dynamic->yesterday = 'Yesterday';
$lang->action->dynamic->twoDaysAgo = '2DaysAgo';
$lang->action->dynamic->thisWeek = 'ThisWeek';
$lang->action->dynamic->lastWeek = 'LastWeek';
$lang->action->dynamic->thisMonth = 'ThisMonth';
$lang->action->dynamic->lastMonth = 'LastMonth';
$lang->action->dynamic->twoDaysAgo = '2 Days Ago';
$lang->action->dynamic->thisWeek = 'This Week';
$lang->action->dynamic->lastWeek = 'Last Week';
$lang->action->dynamic->thisMonth = 'This Month';
$lang->action->dynamic->lastMonth = 'Last Month';
$lang->action->dynamic->all = 'All';
$lang->action->dynamic->hidden = 'Hidden';
$lang->action->dynamic->search = 'Search';
module/block/view/todoblock.html.php
+1 -1
View File
@@ -174,7 +174,7 @@
{
$("input[name='name']").addClass('has-error');
$('#nameLabel').remove();
$("input[name='name']").after('<div id="nameLabel" class="text-danger help-text"><?php echo $lang->todo->noName ?></div>');
$("input[name='name']").after('<div id="nameLabel" class="text-danger help-text"><?php echo sprintf($lang->error->notempty, $lang->todo->name) ?></div>');
setTimeout('clearError()', 2000)
return false;
}
module/bug/lang/en.php
+4 -4
View File
@@ -103,10 +103,10 @@ $lang->bug->copy = 'Copy';
$lang->bug->search = 'Search';
/* 查询条件列表。*/
$lang->bug->assignToMe = 'AssignedToMe';
$lang->bug->openedByMe = 'CreatedByMe';
$lang->bug->resolvedByMe = 'ResolvedByMe';
$lang->bug->closedByMe = 'ClosedByMe';
$lang->bug->assignToMe = 'Assigned To Me';
$lang->bug->openedByMe = 'Created By Me';
$lang->bug->resolvedByMe = 'Resolved By Me';
$lang->bug->closedByMe = 'Closed By Me';
$lang->bug->assignToNull = 'Unassigned';
$lang->bug->unResolved = 'Unresolved';
$lang->bug->toClosed = 'Unclosed';
module/install/js/common.js
View File
module/my/lang/en.php
+8 -8
View File
@@ -26,16 +26,16 @@ $lang->my->noTodo = 'No todos. ';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'Assigned To Me';
$lang->my->taskMenu->openedByMe = 'CreatedByMe';
$lang->my->taskMenu->finishedByMe = 'FinishedByMe';
$lang->my->taskMenu->closedByMe = 'ClosedByMe';
$lang->my->taskMenu->canceledByMe = 'CancelledByMe';
$lang->my->taskMenu->openedByMe = 'Created By Me';
$lang->my->taskMenu->finishedByMe = 'Finished By Me';
$lang->my->taskMenu->closedByMe = 'Closed By Me';
$lang->my->taskMenu->canceledByMe = 'Cancelled By Me';
$lang->my->storyMenu = new stdclass();
$lang->my->storyMenu->assignedToMe = 'AssignedToMe';
$lang->my->storyMenu->openedByMe = 'CreatedByMe';
$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
$lang->my->storyMenu->closedByMe = 'ClosedByMe';
$lang->my->storyMenu->assignedToMe = 'Assigned To Me';
$lang->my->storyMenu->openedByMe = 'Created By Me';
$lang->my->storyMenu->reviewedByMe = 'Reviewed By Me';
$lang->my->storyMenu->closedByMe = 'Closed By Me';
$lang->my->home = new stdclass();
$lang->my->home->latest = 'Dynamic';
module/product/lang/en.php
+4 -4
View File
@@ -79,10 +79,10 @@ $lang->product->iterationInfo = '%s Iterations';
$lang->product->iterationView = 'Details';
$lang->product->searchStory = 'Search';
$lang->product->assignedToMe = 'AssignedToMe';
$lang->product->openedByMe = 'CreatedByMe';
$lang->product->reviewedByMe = 'ReviewedByMe';
$lang->product->closedByMe = 'ClosedByMe';
$lang->product->assignedToMe = 'Assigned To Me';
$lang->product->openedByMe = 'Created By Me';
$lang->product->reviewedByMe = 'Reviewed By Me';
$lang->product->closedByMe = 'Closed By Me';
$lang->product->draftStory = 'Draft';
$lang->product->activeStory = 'Activated';
$lang->product->changedStory = 'Changed';
module/project/control.php
+1 -1
View File
@@ -2325,7 +2325,7 @@ class project extends control
$planStories = array_keys($planStory);
$this->project->linkStory($projectID, $planStories, $planProducts);
}
if($count != 0) die(js::confirm(sprintf($this->lang->project->haveDraft, $count), $this->createLink('project', 'story', "projectID=$projectID")));
if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate($this->createLink('project', 'story', "projectID=$projectID"));
die(js::locate(helper::createLink('project', 'story', 'projectID=' . $projectID), 'parent'));
}
module/project/model.php
+1 -1
View File
@@ -1614,7 +1614,7 @@ class projectModel extends model
}
}
$this->linkStory($projectID, $planStories, $planProducts);
if($count != 0) die(js::confirm(sprintf($this->lang->project->haveDraft, $count), helper::createLink('project', 'create', "projectID=$projectID")));
if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate(helper::createLink('project', 'create', "projectID=$projectID"));
}
/**
module/task/view/create.html.php
+1 -1
View File
@@ -187,7 +187,7 @@
<td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
<td>
<div class='input-group'>
<?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>
<?php echo html::input("teamEstimate[]", '', "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->estimateAB}'") ?>
<span class='input-group-addon'><?php echo $lang->task->hour;?></span>
</div>
</td>
module/task/view/edit.html.php
+6 -6
View File
@@ -228,11 +228,11 @@
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>
<?php echo html::input("teamEstimate[]", $member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamEstimate[]", $member->estimate, "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
<?php echo html::input("teamConsumed[]", $member->consumed, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamConsumed[]", $member->consumed, "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
<?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
</div>
</td>
<td class='w-130px sort-handler'>
@@ -247,11 +247,11 @@
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>
<?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamEstimate[]", '', "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
<?php echo html::input("teamConsumed[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamConsumed[]", '', "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
<?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamLeft[]", '', "class='form-control text-center' autocomplete='off' placeholder='{$lang->task->hour}'")?>
</div>
</td>
<td class='w-130px sort-handler'>
module/testcase/lang/en.php
+3 -3
View File
@@ -112,11 +112,11 @@ $lang->testcase->deleteStep = 'Delete';
$lang->testcase->insertBefore = 'Inserted Before';
$lang->testcase->insertAfter = 'Inserted After';
$lang->testcase->assignToMe = 'AssignedToMe';
$lang->testcase->openedByMe = 'CreatedByMe';
$lang->testcase->assignToMe = 'Assigned To Me';
$lang->testcase->openedByMe = 'Created By Me';
$lang->testcase->allCases = 'All';
$lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'StoryChanged';
$lang->testcase->needConfirm = 'Story Changed';
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Wait';
module/todo/lang/en.php
-1
View File
@@ -30,7 +30,6 @@ $lang->todo->import = "Import";
$lang->todo->legendBasic = "Basic Info";
$lang->todo->cycle = "Recurrence";
$lang->todo->cycleConfig = "Set Recurrence";
$lang->todo->noName = "The Name should not be empty.";
$lang->todo->reasonList['story'] = "Transfer Story";
$lang->todo->reasonList['task'] = "Transfer Task";
module/todo/lang/zh-cn.php
-1
View File
@@ -30,7 +30,6 @@ $lang->todo->import = "导入";
$lang->todo->legendBasic = "基本信息";
$lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期设置";
$lang->todo->noName = "『待办名称』不能为空。";
$lang->todo->reasonList['story'] = "转需求";
$lang->todo->reasonList['task'] = "转任务";
module/todo/view/batchcreate.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div id="mainContent">
<div class="main-header">
<h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>
<div class="input-group pull-left" style='width:255px;'>
<div class="input-group pull-left">
<span class="input-group-addon"><?php echo $lang->todo->date;?></span>
<input type="text" name="date" value="<?php echo $date;?>" class="form-control form-date" autocomplete="off" />
<span class="input-group-addon">
module/upgrade/js/common.js
View File
module/user/lang/en.php
+1 -1
View File
@@ -100,7 +100,7 @@ $lang->user->weakPassword = "Your password does not meet the complexity requirem
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
$lang->user->roleList['qa'] = 'Tester';
$lang->user->roleList['qa'] = 'QA';
$lang->user->roleList['pm'] = 'Scrum Master';
$lang->user->roleList['po'] = 'Product Owner';
$lang->user->roleList['td'] = 'Technical Manager';