diff --git a/module/common/lang/en.php b/module/common/lang/en.php index fea3b8a235..983fde72e6 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -204,14 +204,14 @@ $lang->dept->menu = $lang->company->menu; $lang->group->menu = $lang->company->menu; /* User menu. */ -$lang->user->menu->account = '%s' . $lang->arrow; -$lang->user->menu->todo = array('link' => 'Todo|user|todo|account=%s', 'subModule' => 'todo'); -$lang->user->menu->task = 'Task|user|task|account=%s'; -$lang->user->menu->bug = 'Bug|user|bug|account=%s'; -$lang->user->menu->dynamic = 'Dynamic|user|dynamic|type=today&account=%s'; -$lang->user->menu->project = 'Project|user|project|account=%s'; -$lang->user->menu->profile = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit'); -$lang->user->menu->browse = array('link' => 'Manage user|company|browse|', 'float' => 'right'); +$lang->user->menu->account = '%s' . $lang->arrow; +$lang->user->menu->todo = array('link' => 'Todo|user|todo|account=%s', 'subModule' => 'todo'); +$lang->user->menu->task = 'Task|user|task|account=%s'; +$lang->user->menu->bug = 'Bug|user|bug|account=%s'; +$lang->user->menu->dynamic = 'Dynamic|user|dynamic|type=today&account=%s'; +$lang->user->menu->projectList = 'Project|user|project|account=%s'; +$lang->user->menu->profile = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit'); +$lang->user->menu->browse = array('link' => 'Manage user|company|browse|', 'float' => 'right'); /* Admin menu. */ $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9553ae885f..f3b557b657 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -122,7 +122,7 @@ $lang->my->menu->task = '我的任务|my|task|'; $lang->my->menu->bug = '我的Bug|my|bug|'; $lang->my->menu->testtask = '我的测试|my|testtask|'; $lang->my->menu->story = '我的需求|my|story|'; -$lang->my->menu->project = '我的项目|my|project|'; +$lang->my->menu->myProject = '我的项目|my|project|'; $lang->my->menu->dynamic = '我的动态|my|dynamic|'; $lang->my->menu->profile = array('link' => '我的档案|my|profile|', 'alias' => 'editprofile'); $lang->todo->menu = $lang->my->menu; @@ -204,14 +204,14 @@ $lang->dept->menu = $lang->company->menu; $lang->group->menu = $lang->company->menu; /* 用户信息菜单设置。*/ -$lang->user->menu->account = '%s' . $lang->arrow; -$lang->user->menu->todo = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo'); -$lang->user->menu->task = '任务列表|user|task|account=%s'; -$lang->user->menu->bug = 'Bug列表|user|bug|account=%s'; -$lang->user->menu->dynamic = '用户动态|user|dynamic|type=today&account=%s'; -$lang->user->menu->project = '项目列表|user|project|account=%s'; -$lang->user->menu->profile = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit'); -$lang->user->menu->browse = array('link' => '用户管理|company|browse|', 'float' => 'right'); +$lang->user->menu->account = '%s' . $lang->arrow; +$lang->user->menu->todo = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo'); +$lang->user->menu->task = '任务列表|user|task|account=%s'; +$lang->user->menu->bug = 'Bug列表|user|bug|account=%s'; +$lang->user->menu->dynamic = '用户动态|user|dynamic|type=today&account=%s'; +$lang->user->menu->projectList = '项目列表|user|project|account=%s'; +$lang->user->menu->profile = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit'); +$lang->user->menu->browse = array('link' => '用户管理|company|browse|', 'float' => 'right'); /* 后台管理菜单设置。*/ $lang->admin->menu->extension = array('link' => '插件管理|extension|browse', 'subModule' => 'extension'); diff --git a/module/my/control.php b/module/my/control.php index 7e37ab190a..36d89bd48d 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -285,8 +285,8 @@ class my extends control { $this->app->loadLang('project'); - $this->view->header->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->project; - $this->view->position[] = $this->lang->my->project; + $this->view->header->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myProject; + $this->view->position[] = $this->lang->my->myProject; $this->view->tabID = 'project'; $this->view->projects = @array_reverse($this->user->getProjects($this->app->user->account)); diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 893950fd60..74646ee54a 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -9,7 +9,7 @@ $lang->my->bug = 'Bug'; $lang->my->testTask = 'Test task'; $lang->my->testCase = 'Test case'; $lang->my->story = 'Story'; -$lang->my->project = 'Project'; +$lang->my->myProject = 'Project'; $lang->my->team = 'Team'; $lang->my->profile = 'Profile'; $lang->my->dynamic = 'Dynamic'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 58845c47ad..41d24676ea 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -9,7 +9,7 @@ $lang->my->bug = '我的Bug'; $lang->my->testTask = '我的测试任务'; $lang->my->testCase = '我的测试用例'; $lang->my->story = '我的需求'; -$lang->my->project = '我的项目'; +$lang->my->myProject = '我的项目'; $lang->my->team = '我的团队'; $lang->my->profile = '我的档案'; $lang->my->dynamic = '我的动态'; diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index b594889768..1ee3ffc1ad 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -22,8 +22,8 @@ project->end;?> statusAB;?> team->role;?> - team->joinDate;?> - team->workingHour;?> + team->join;?> + team->hours;?> @@ -37,8 +37,8 @@ end;?> project->statusList[$project->status];?> role;?> - joinDate;?> - workingHour;?> + join;?> + hours;?> diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php index b594889768..1ee3ffc1ad 100644 --- a/module/user/view/project.html.php +++ b/module/user/view/project.html.php @@ -22,8 +22,8 @@ project->end;?> statusAB;?> team->role;?> - team->joinDate;?> - team->workingHour;?> + team->join;?> + team->hours;?> @@ -37,8 +37,8 @@ end;?> project->statusList[$project->status];?> role;?> - joinDate;?> - workingHour;?> + join;?> + hours;?> diff --git a/module/user/view/view.html.php b/module/user/view/view.html.php index a3f6be9da5..4c08f603ea 100644 --- a/module/user/view/view.html.php +++ b/module/user/view/view.html.php @@ -59,7 +59,7 @@ echo "
  • {$user->realname}
  • "; echo "
  • " . html::a($this->createLink('user', 'view', "account=$user->account&tabID=task"), $lang->my->task) . "
  • "; //echo "
  • " . html::a($this->createLink('user', 'view', "account=$user->account&tabID=todo"), $lang->my->todo) . "
  • "; - echo "
  • ". html::a($this->createLink('user', 'view', "account=$user->account&tabID=project"), $lang->my->project) . "
  • "; + echo "
  • ". html::a($this->createLink('user', 'view', "account=$user->account&tabID=project"), $lang->my->myProject) . "
  • "; //echo "
  • " . html::a($this->createLink('user', 'view', "account=$user->account&tabID=story"), $lang->my->story) . "
  • "; echo "
  • " . html::a($this->createLink('user', 'view', "account=$user->account&tabID=bug"), $lang->my->bug) . "
  • "; //echo "
  • " . html::a($this->createLink('user', 'view', "account=$user->account&tabID=team"), $lang->my->team) . "
  • ";