- status == 'draft' ? zget($users, $doc->addedBy) . " {$lang->colon} " . substr($doc->addedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->createAB : zget($users, $doc->releasedBy) . " {$lang->colon} " . substr($doc->releasedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->release;?>
+ status == 'draft' ? zget($users, $doc->addedBy) . " {$lang->hyphen} " . substr($doc->addedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->createAB : zget($users, $doc->releasedBy) . " {$lang->hyphen} " . substr($doc->releasedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->release;?>
collects;?>
views;?>
diff --git a/module/doc/zen.php b/module/doc/zen.php
index bec7dec4d1..cc7aa1f4d4 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -521,7 +521,7 @@ class docZen extends doc
$this->setObjectsForCreate($objectType, $lib, $unclosed, $objectID);
- $this->view->title = empty($lib) ? '' : zget($lib, 'name', '', $lib->name . $this->lang->colon) . $this->lang->doc->uploadDoc;
+ $this->view->title = empty($lib) ? '' : zget($lib, 'name', '', $lib->name . $this->lang->hyphen) . $this->lang->doc->uploadDoc;
$this->view->linkType = $objectType;
$this->view->objectType = $objectType;
$this->view->objectID = empty($lib) ? 0 : zget($lib, $lib->type, 0);
@@ -689,7 +689,7 @@ class docZen extends doc
*/
protected function assignVarsForView(int $docID, int $version, string $type, int $objectID, int $libID, object $doc, object $object, string $objectType, array $libs, array $objectDropdown): void
{
- $this->view->title = $this->lang->doc->common . $this->lang->colon . $doc->title;
+ $this->view->title = $this->lang->doc->common . $this->lang->hyphen . $doc->title;
$this->view->docID = $docID;
$this->view->type = $type;
$this->view->objectID = $objectID;
diff --git a/module/entry/control.php b/module/entry/control.php
index 79885bd7ea..ccbfc542f7 100644
--- a/module/entry/control.php
+++ b/module/entry/control.php
@@ -28,7 +28,7 @@ class entry extends control
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->entry->common . $this->lang->colon . $this->lang->entry->list;
+ $this->view->title = $this->lang->entry->common . $this->lang->hyphen . $this->lang->entry->list;
$this->view->entries = $this->entry->getList($orderBy, $pager);
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -62,7 +62,7 @@ class entry extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
- $this->view->title = $this->lang->entry->common . $this->lang->colon . $this->lang->entry->create;
+ $this->view->title = $this->lang->entry->common . $this->lang->hyphen . $this->lang->entry->create;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->display();
}
@@ -99,7 +99,7 @@ class entry extends control
}
$entry = $this->entry->getById($id);
- $this->view->title = $this->lang->entry->edit . $this->lang->colon . $entry->name;
+ $this->view->title = $this->lang->entry->edit . $this->lang->hyphen . $entry->name;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->entry = $entry;
$this->display();
@@ -139,7 +139,7 @@ class entry extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$entry = $this->entry->getByID($id);
- $this->view->title = $this->lang->entry->log . $this->lang->colon . $entry->name;
+ $this->view->title = $this->lang->entry->log . $this->lang->hyphen . $entry->name;
$this->view->logs = $this->entry->getLogs($id, $orderBy, $pager);
$this->view->entry = $entry;
$this->view->orderBy = $orderBy;
diff --git a/module/execution/control.php b/module/execution/control.php
index 80c408d80b..3f0f54b0a5 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -194,7 +194,7 @@ class execution extends control
if(!$execution->multiple) unset($this->config->execution->search['fields']['execution']);
$this->execution->buildTaskSearchForm($executionID, $this->executions, $queryID, $actionURL, $modules);
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->task;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->task;
$this->view->tasks = $tasks;
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
@@ -269,7 +269,7 @@ class execution extends control
list($groupTasks, $allCount) = $this->executionZen->filterGroupTasks($groupTasks, $groupBy, $filter, $allCount, $tasks);
/* Assign. */
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->task;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->task;
$this->view->members = $this->execution->getTeamMembers($executionID);
$this->view->tasks = $groupTasks;
$this->view->groupByList = $groupByList;
@@ -334,7 +334,7 @@ class execution extends control
$tasks2ImportedList = empty($tasks2ImportedList) ? $tasks2ImportedList : $tasks2ImportedList[$pageID - 1];
$tasks2ImportedList = $this->loadModel('task')->processTasks($tasks2ImportedList);
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->importTask;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->importTask;
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->executions = $executions;
@@ -399,7 +399,7 @@ class execution extends control
if($this->app->tab == 'project') $this->view->projectID = $execution->project;
/* Assign. */
- $this->view->title = $executions[$executionID] . $this->lang->colon . $this->lang->execution->importBug;
+ $this->view->title = $executions[$executionID] . $this->lang->hyphen . $this->lang->execution->importBug;
$this->view->pager = $pager;
$this->view->bugs = $bugs;
$this->view->browseType = $browseType;
@@ -701,7 +701,7 @@ class execution extends control
}
/* Set view data. */
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->build;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->build;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->builds = $this->executionZen->processBuildListData($builds, $executionID);
$this->view->product = $type == 'product' ? $param : '';
@@ -744,7 +744,7 @@ class execution extends control
$this->executionZen->assignTesttaskVars($tasks);
- $this->view->title = $this->executions[$executionID] . $this->lang->colon . $this->lang->testtask->common;
+ $this->view->title = $this->executions[$executionID] . $this->lang->hyphen . $this->lang->testtask->common;
$this->view->execution = $execution;
$this->view->project = $this->loadModel('project')->getByID($execution->project);
$this->view->executionID = $executionID;
@@ -798,7 +798,7 @@ class execution extends control
unset($this->lang->TRActions);
/* Shows the variables needed to burn page. */
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->burn;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->burn;
$this->view->tabID = 'burn';
$this->view->burnBy = $burnBy;
$this->view->executionID = $executionID;
@@ -962,7 +962,7 @@ class execution extends control
$teamMembers[] = $member;
}
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->team;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->team;
$this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->recTotal = count($this->view->teamMembers);
@@ -1184,7 +1184,7 @@ class execution extends control
unset($parentStageList[0]);
}
- $this->view->title = $this->lang->execution->edit . $this->lang->colon . $execution->name;
+ $this->view->title = $this->lang->execution->edit . $this->lang->hyphen . $execution->name;
$this->view->executions = $executions;
$this->view->execution = $execution;
$this->view->project = $project;
@@ -1385,7 +1385,7 @@ class execution extends control
return $this->sendSuccess($response);
}
- $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->start;
+ $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->execution->start;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID);
$this->display();
@@ -1425,7 +1425,7 @@ class execution extends control
return $this->sendSuccess($response);
}
- $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->putoff;
+ $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->execution->putoff;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID);
$this->display();
@@ -1472,7 +1472,7 @@ class execution extends control
return $this->sendSuccess($response);
}
- $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->suspend;
+ $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->execution->suspend;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID);
$this->display();
@@ -1524,7 +1524,7 @@ class execution extends control
$dateDiff = helper::diffDate($newBegin, $execution->begin);
$newEnd = date('Y-m-d', strtotime($execution->end) + $dateDiff * 24 * 3600);
- $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->activate;
+ $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->execution->activate;
$this->view->execution = $execution;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID);
@@ -1576,7 +1576,7 @@ class execution extends control
return $this->sendSuccess($response);
}
- $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->close;
+ $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->execution->close;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID);
$this->display();
@@ -2145,7 +2145,7 @@ class execution extends control
if($execution->type == 'kanban') $this->lang->execution->copyTeamTitle = str_replace($this->lang->execution->common, $this->lang->execution->kanban, $this->lang->execution->copyTeamTitle);
- $this->view->title = $this->lang->execution->manageMembers . $this->lang->colon . $execution->name;
+ $this->view->title = $this->lang->execution->manageMembers . $this->lang->hyphen . $execution->name;
$this->view->execution = $execution;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|devfirst', $appendUsers);
$this->view->roles = $this->user->getUserRoles(array_keys($this->view->users));
@@ -2310,7 +2310,7 @@ class execution extends control
$productPairs = array();
foreach($products as $id => $product) $productPairs[$id] = $product->name;
- $this->view->title = $object->name . $this->lang->colon . $this->lang->execution->linkStory;
+ $this->view->title = $object->name . $this->lang->hyphen . $this->lang->execution->linkStory;
$this->view->objectID = $originObjectID;
$this->view->param = $param;
$this->view->extra = $extra;
@@ -2458,7 +2458,7 @@ class execution extends control
$dateGroups = $this->action->buildDateGroup($actions, $direction);
if(empty($recTotal)) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->dynamic;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->dynamic;
$this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid');
$this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
$this->view->executionID = $executionID;
diff --git a/module/execution/model.php b/module/execution/model.php
index a4e1afd256..c8c14cacae 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5104,7 +5104,7 @@ class executionModel extends model
if($this->app->viewType == 'mhtml' and $executionID)
{
- $output = html::a(helper::createLink('execution', 'index'), $this->lang->executionCommon) . $this->lang->colon;
+ $output = html::a(helper::createLink('execution', 'index'), $this->lang->executionCommon) . $this->lang->hyphen;
$output .= "
{$currentExecutionName} ";
return $output;
}
diff --git a/module/execution/zen.php b/module/execution/zen.php
index 8e6cc4719b..28e4b0c317 100644
--- a/module/execution/zen.php
+++ b/module/execution/zen.php
@@ -56,7 +56,7 @@ class executionZen extends execution
$build = !empty($build) ? $this->loadModel('build')->getById((int)$build) : null;
/* Assign. */
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->bug;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->bug;
$this->view->project = $project;
$this->view->orderBy = $orderBy;
$this->view->type = $type;
@@ -171,7 +171,7 @@ class executionZen extends execution
}
}
- $this->view->title = $this->lang->execution->manageProducts . $this->lang->colon . $execution->name;
+ $this->view->title = $this->lang->execution->manageProducts . $this->lang->hyphen . $execution->name;
$this->view->execution = $execution;
$this->view->linkedProducts = $linkedProducts;
$this->view->unmodifiableProducts = $unmodifiableProducts;
@@ -263,7 +263,7 @@ class executionZen extends execution
$this->assignModuleForStory($type, $param, $storyType, $execution, $productID);
/* Assign. */
- $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->story;
+ $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->story;
$this->view->storyType = $storyType;
$this->view->param = $param;
$this->view->type = $this->session->executionStoryBrowseType;
diff --git a/module/gitea/control.php b/module/gitea/control.php
index db855f70a3..83d7ccda29 100644
--- a/module/gitea/control.php
+++ b/module/gitea/control.php
@@ -52,7 +52,7 @@ class gitea extends control
if(!$this->app->user->admin && !isset($myGiteas[$gitea->id])) $gitea->isBindUser = false;
}
- $this->view->title = $this->lang->gitea->common . $this->lang->colon . $this->lang->gitea->browse;
+ $this->view->title = $this->lang->gitea->common . $this->lang->hyphen . $this->lang->gitea->browse;
$this->view->giteaList = $giteaList;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -84,7 +84,7 @@ class gitea extends control
return $this->sendSuccess(array('locate' => $this->createLink('space', 'browse')));
}
- $this->view->title = $this->lang->gitea->common . $this->lang->colon . $this->lang->gitea->lblCreate;
+ $this->view->title = $this->lang->gitea->common . $this->lang->hyphen . $this->lang->gitea->lblCreate;
$this->display();
}
@@ -99,7 +99,7 @@ class gitea extends control
{
$gitea = $this->gitea->fetchByID($giteaID);
- $this->view->title = $this->lang->gitea->common . $this->lang->colon . $this->lang->gitea->view;
+ $this->view->title = $this->lang->gitea->common . $this->lang->hyphen . $this->lang->gitea->view;
$this->view->gitea = $gitea;
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->actions = $this->loadModel('action')->getList('gitea', $giteaID);
@@ -136,7 +136,7 @@ class gitea extends control
return $this->sendSuccess(array('load' => true, 'closeModal' => true));
}
- $this->view->title = $this->lang->gitea->common . $this->lang->colon . $this->lang->gitea->edit;
+ $this->view->title = $this->lang->gitea->common . $this->lang->hyphen . $this->lang->gitea->edit;
$this->view->gitea = $oldGitea;
$this->display();
}
diff --git a/module/gitfox/control.php b/module/gitfox/control.php
index c1c17bd39c..665aa5c6b7 100644
--- a/module/gitfox/control.php
+++ b/module/gitfox/control.php
@@ -34,7 +34,7 @@ class gitfox extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('space', 'browse')));
}
- $this->view->title = $this->lang->gitfox->common . $this->lang->colon . $this->lang->gitfox->lblCreate;
+ $this->view->title = $this->lang->gitfox->common . $this->lang->hyphen . $this->lang->gitfox->lblCreate;
$this->display();
}
@@ -68,7 +68,7 @@ class gitfox extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => 'loadCurrentPage()', 'closeModal' => true));
}
- $this->view->title = $this->lang->gitfox->common . $this->lang->colon . $this->lang->gitfox->edit;
+ $this->view->title = $this->lang->gitfox->common . $this->lang->hyphen . $this->lang->gitfox->edit;
$this->view->gitfox = $oldGitFox;
$this->display();
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 38c7470b6b..8e56e9b05c 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -56,7 +56,7 @@ class gitlab extends control
/* Admin user don't need bind. */
$gitlabList = $this->gitlab->getList($orderBy, $pager);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browse;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browse;
$this->view->gitlabList = $gitlabList;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -87,7 +87,7 @@ class gitlab extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('space', 'browse')));
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->lblCreate;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->lblCreate;
$this->display();
}
@@ -103,7 +103,7 @@ class gitlab extends control
{
$gitlab = $this->gitlab->getByID($gitlabID);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->view;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->view;
$this->view->gitlab = $gitlab;
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->actions = $this->loadModel('action')->getList('gitlab', $gitlabID);
@@ -140,7 +140,7 @@ class gitlab extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true));
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->edit;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->edit;
$this->view->gitlab = $oldGitLab;
$this->display();
@@ -327,7 +327,7 @@ class gitlab extends control
$adminGroupIDList = array();
foreach($adminGroups as $group) $adminGroupIDList[] = $group->id;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseGroup;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseGroup;
$this->view->gitlabID = $gitlabID;
$this->view->gitlab = $this->gitlab->getByID($gitlabID);
$this->view->gitlabGroupList = $groups;
@@ -360,7 +360,7 @@ class gitlab extends control
$gitlab = $this->gitlab->getByID($gitlabID);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->group->create;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->group->create;
$this->view->gitlab = $gitlab;
$this->view->gitlabID = $gitlabID;
$this->display();
@@ -397,7 +397,7 @@ class gitlab extends control
$gitlab = $this->gitlab->getByID($gitlabID);
$group = $this->gitlab->apiGetSingleGroup($gitlabID, $groupID);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->group->edit;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->group->edit;
$this->view->gitlab = $gitlab;
$this->view->group = $group;
$this->view->gitlabID = $gitlabID;
@@ -492,7 +492,7 @@ class gitlab extends control
$accessLevels = $this->lang->gitlab->accessLevels;
$currentMembers = $this->gitlab->apiGetGroupMembers($gitlabID, $groupID);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->group->manageMembers;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->group->manageMembers;
$this->view->currentMembers = $currentMembers;
$this->view->gitlabUsers = $gitlabUsers;
$this->view->gitlabID = $gitlabID;
@@ -528,7 +528,7 @@ class gitlab extends control
}
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseUser;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseUser;
$this->view->gitlabID = $gitlabID;
$this->view->gitlabUserList = $users;
$this->view->orderBy = $orderBy;
@@ -576,7 +576,7 @@ class gitlab extends control
}
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->user->create;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->user->create;
$this->view->userPairs = $userPairs;
$this->view->users = $userInfos;
$this->view->gitlabID = $gitlabID;
@@ -618,7 +618,7 @@ class gitlab extends control
if(!isset($bindedUsers[$user->account]) or $user->account == $zentaoBindAccount) $userPairs[$user->account] = $user->realname;
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->user->edit;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->user->edit;
$this->view->user = $gitlabUser;
$this->view->userPairs = $userPairs;
$this->view->zentaoBindAccount = $zentaoBindAccount;
@@ -705,7 +705,7 @@ class gitlab extends control
$this->view->gitlab = $gitlab;
$this->view->keyword = urldecode(urldecode($keyword));
$this->view->pager = $result['pager'];
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseProject;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseProject;
$this->view->gitlabID = $gitlabID;
$this->view->gitlabProjectList = $result['projects'];
$this->view->orderBy = $orderBy;
@@ -748,7 +748,7 @@ class gitlab extends control
if($namespace->kind == 'group') $namespaces[$namespace->id] = $namespace->path;
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->project->create;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->project->create;
$this->view->gitlab = $gitlab;
$this->view->user = $user;
$this->view->namespaces = $namespaces;
@@ -778,7 +778,7 @@ class gitlab extends control
$project = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->project->edit;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->project->edit;
$this->view->project = $project;
$this->view->gitlabID = $gitlabID;
$this->display();
@@ -857,7 +857,7 @@ class gitlab extends control
$this->view->gitlab = $this->gitlab->getByID($gitlabID);
$this->view->pager = $pager;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseBranch;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseBranch;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->gitlabBranchList = empty($branchList) ? $branchList: $branchList[$pageID - 1];
@@ -893,7 +893,7 @@ class gitlab extends control
$branchPairs = array();
foreach($branches as $branch) $branchPairs[$branch->name] = $branch->name;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->createBranch;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->createBranch;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->branchPairs = $branchPairs;
@@ -944,7 +944,7 @@ class gitlab extends control
$this->view->gitlab = $this->gitlab->getByID($gitlabID);
$this->view->pager = $pager;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseTag;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseTag;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->keyword = $keyword;
@@ -1044,7 +1044,7 @@ class gitlab extends control
$products = $this->loadModel("product")->getPairs();
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->importIssue;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->importIssue;
$this->view->importable = empty($gitlabIssues) ? false : true;
$this->view->products = $products;
$this->view->gitlabID = $gitlabID;
@@ -1167,7 +1167,7 @@ class gitlab extends control
}
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->manageProjectMembers;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->manageProjectMembers;
$this->view->userAccessData = $userAccessData;
$this->view->users = $users;
$this->view->repo = $repo;
@@ -1248,7 +1248,7 @@ class gitlab extends control
$branches[$branch->name] = $branch->name;
}
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->createTag;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->createTag;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->branches = $branches;
@@ -1318,7 +1318,7 @@ class gitlab extends control
$branchPairs = array();
foreach($allBranches as $branch) $branchPairs[$branch->name] = $branch->name;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseBranchPriv;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseBranchPriv;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->branchPairs = $branchPairs;
@@ -1359,7 +1359,7 @@ class gitlab extends control
$tagPairs = array();
foreach($allTags as $tag) $tagPairs[$tag->name] = $tag->name;
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseTagPriv;
+ $this->view->title = $this->lang->gitlab->common . $this->lang->hyphen . $this->lang->gitlab->browseTagPriv;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->hasAccessTags = $hasAccessTags;
diff --git a/module/gogs/control.php b/module/gogs/control.php
index 6c5e95c437..87fa00a092 100644
--- a/module/gogs/control.php
+++ b/module/gogs/control.php
@@ -51,7 +51,7 @@ class gogs extends control
if(!$this->app->user->admin && !isset($myGogses[$gogs->id])) $gogs->isBindUser = false;
}
- $this->view->title = $this->lang->gogs->common . $this->lang->colon . $this->lang->gogs->browse;
+ $this->view->title = $this->lang->gogs->common . $this->lang->hyphen . $this->lang->gogs->browse;
$this->view->gogsList = $gogsList;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -83,7 +83,7 @@ class gogs extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('space', 'browse')));
}
- $this->view->title = $this->lang->gogs->common . $this->lang->colon . $this->lang->gogs->lblCreate;
+ $this->view->title = $this->lang->gogs->common . $this->lang->hyphen . $this->lang->gogs->lblCreate;
$this->display();
}
@@ -98,7 +98,7 @@ class gogs extends control
{
$gogs = $this->gogs->fetchByID($gogsID);
- $this->view->title = $this->lang->gogs->common . $this->lang->colon . $this->lang->gogs->view;
+ $this->view->title = $this->lang->gogs->common . $this->lang->hyphen . $this->lang->gogs->view;
$this->view->gogs = $gogs;
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->actions = $this->loadModel('action')->getList('gogs', $gogsID);
@@ -134,7 +134,7 @@ class gogs extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true));
}
- $this->view->title = $this->lang->gogs->common . $this->lang->colon . $this->lang->gogs->edit;
+ $this->view->title = $this->lang->gogs->common . $this->lang->hyphen . $this->lang->gogs->edit;
$this->view->gogs = $oldGogs;
$this->display();
}
diff --git a/module/group/control.php b/module/group/control.php
index 231c09e215..aac35b7343 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -44,7 +44,7 @@ class group extends control
$group->users = implode(',', zget($groupUsers, $group->id, array()));
}
- $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->browse;
+ $this->view->title = $this->lang->company->orgView . $this->lang->hyphen . $this->lang->group->browse;
$this->view->groups = $groups;
$this->display();
@@ -69,7 +69,7 @@ class group extends control
return $this->sendSuccess(array('load' => true));
}
- $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create;
+ $this->view->title = $this->lang->company->orgView . $this->lang->hyphen . $this->lang->group->create;
$this->display();
}
@@ -92,7 +92,7 @@ class group extends control
return $this->sendSuccess(array('load' => true, 'closeModal' => true));
}
- $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit;
+ $this->view->title = $this->lang->company->orgView . $this->lang->hyphen . $this->lang->group->edit;
$this->view->group = $this->group->getByID($groupID);
$this->display();
}
@@ -116,7 +116,7 @@ class group extends control
return $this->sendSuccess(array('load' => true));
}
- $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->copy;
+ $this->view->title = $this->lang->company->orgView . $this->lang->hyphen . $this->lang->group->copy;
$this->view->group = $this->group->getById($groupID);
$this->display();
}
@@ -143,7 +143,7 @@ class group extends control
/* Get the group data by id. */
$group = $this->group->getByID($groupID);
- $this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageView;
+ $this->view->title = $this->lang->company->common . $this->lang->hyphen . $group->name . $this->lang->hyphen . $this->lang->group->manageView;
/* Get the list of data sets under administrator permission. */
if(!$this->app->user->admin)
@@ -233,7 +233,7 @@ class group extends control
$otherUsers = array_diff_assoc($allUsers, $groupUsers);
$outsideUsers = $this->loadModel('user')->getPairs('outside|noclosed|noletter|noempty');
- $this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
+ $this->view->title = $this->lang->company->common . $this->lang->hyphen . $group->name . $this->lang->hyphen . $this->lang->group->manageMember;
$this->view->group = $group;
$this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID);
$this->view->groupUsers = $groupUsers;
@@ -267,7 +267,7 @@ class group extends control
$group = $this->group->getById($groupID);
$groupUsers = $this->dao->select('t1.account, t2.realname')->from(TABLE_PROJECTADMIN)->alias('t1')->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')->fetchPairs();
- $this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
+ $this->view->title = $this->lang->company->common . $this->lang->hyphen . $group->name . $this->lang->hyphen . $this->lang->group->manageMember;
$this->view->allUsers = $groupUsers + $this->loadModel('dept')->getDeptUserPairs($deptID);
$this->view->groupID = $groupID;
$this->view->deptID = $deptID;
diff --git a/module/group/zen.php b/module/group/zen.php
index 122c622bf2..2a7cf37de1 100644
--- a/module/group/zen.php
+++ b/module/group/zen.php
@@ -168,7 +168,7 @@ class groupZen extends group
$allPrivList = array_keys($allPrivList);
$relatedPrivData = $this->group->getRelatedPrivs($allPrivList, $selectedPrivList);
- $this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->managePriv;
+ $this->view->title = $this->lang->company->common . $this->lang->hyphen . $group->name . $this->lang->hyphen . $this->lang->group->managePriv;
$this->view->allPrivList = $allPrivList;
$this->view->selectedPrivList = $selectedPrivList;
$this->view->relatedPrivData = $relatedPrivData;
@@ -225,7 +225,7 @@ class groupZen extends group
}
}
- $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->group->managePriv;
+ $this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->group->managePriv;
$this->view->groups = $this->group->getPairs();
$this->view->subsets = $subsets;
$this->view->packages = $packages;
diff --git a/module/jenkins/control.php b/module/jenkins/control.php
index 06a0a99e62..bfe69c1a79 100644
--- a/module/jenkins/control.php
+++ b/module/jenkins/control.php
@@ -81,7 +81,7 @@ class jenkins extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true));
}
- $this->view->title = $this->lang->jenkins->common . $this->lang->colon . $this->lang->jenkins->edit;
+ $this->view->title = $this->lang->jenkins->common . $this->lang->hyphen . $this->lang->jenkins->edit;
$this->view->jenkins = $jenkins;
$this->display();
}
diff --git a/module/job/control.php b/module/job/control.php
index bc188b37a1..e6324cbd8d 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -71,7 +71,7 @@ class job extends control
$jobList = $this->jobZen->getJobList($repoID, $orderBy, $pager);
- $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse;
+ $this->view->title = $this->lang->ci->job . $this->lang->hyphen . $this->lang->job->browse;
$this->view->repoID = $repoID;
$this->view->jobList = $jobList;
$this->view->orderBy = $orderBy;
@@ -112,7 +112,7 @@ class job extends control
$this->loadModel('ci');
$this->app->loadLang('action');
- $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->create;
+ $this->view->title = $this->lang->ci->job . $this->lang->hyphen . $this->lang->job->create;
$this->view->repoList = $this->loadModel('repo')->getList($this->projectID);
$this->view->products = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->projectID);
$this->view->jenkinsServerList = $this->loadModel('pipeline')->getPairs('jenkins');
@@ -170,7 +170,7 @@ class job extends control
$this->view->sonarqubeProjectPairs = $this->loadModel('sonarqube')->getProjectPairs($job->sonarqubeServer, $job->projectKey);
}
- $this->view->title = $this->lang->job->pipeline . $this->lang->colon . $this->lang->job->edit;
+ $this->view->title = $this->lang->job->pipeline . $this->lang->hyphen . $this->lang->job->edit;
$this->view->repoList = $this->loadModel('repo')->getList($this->projectID);
$this->view->job = $job;
$this->view->repo = $repo;
@@ -222,7 +222,7 @@ class job extends control
if($compile && $compile->testtask) $this->jobZen->getCompileData($compile);
- $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse;
+ $this->view->title = $this->lang->ci->job . $this->lang->hyphen . $this->lang->job->browse;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->job = $job;
$this->view->compile = $compile;
diff --git a/module/mail/control.php b/module/mail/control.php
index d4a15b99c4..8cbd90fe07 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -38,7 +38,7 @@ class mail extends control
{
if($this->config->mail->mta == 'smtp') $this->locate(inlink('edit'));
}
- $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->index;
+ $this->view->title = $this->lang->mail->common . $this->lang->hyphen . $this->lang->mail->index;
$this->display();
}
@@ -67,7 +67,7 @@ class mail extends control
return $this->sendSuccess($response);
}
- $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->detect;
+ $this->view->title = $this->lang->mail->common . $this->lang->hyphen . $this->lang->mail->detect;
$this->view->fromAddress = $this->session->mailConfig ? $this->session->mailConfig->fromAddress : '';
$this->display();
@@ -84,7 +84,7 @@ class mail extends control
$mailConfig = $this->mailZen->getConfigForEdit();
if(empty($mailConfig)) $this->locate(inlink('detect'));
- $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->edit;
+ $this->view->title = $this->lang->mail->common . $this->lang->hyphen . $this->lang->mail->edit;
$this->view->mailExist = $this->mail->mailExist();
$this->view->mailConfig = $mailConfig;
$this->view->openssl = extension_loaded('openssl');
@@ -151,7 +151,7 @@ class mail extends control
return $this->sendSuccess(array('load' => inLink('test'), 'message' => $this->lang->mail->noticeResend));
}
- $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->test;
+ $this->view->title = $this->lang->mail->common . $this->lang->hyphen . $this->lang->mail->test;
$this->view->users = $this->mailZen->getHasMailUserPairs();
$this->display();
}
diff --git a/module/mr/control.php b/module/mr/control.php
index fe42aed7b3..97cdf8d303 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -94,7 +94,7 @@ class mr extends control
$MR->linkButton = empty($product) ? false : true;
}
- $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse;
+ $this->view->title = $this->lang->mr->common . $this->lang->hyphen . $this->lang->mr->browse;
$this->view->MRList = $MRList;
$this->view->projects = $projects;
$this->view->pager = $pager;
@@ -157,7 +157,7 @@ class mr extends control
foreach(array('gitlab', 'gitea', 'gogs') as $service) $openIDList += $this->pipeline->getProviderPairsByAccount($service);
}
- $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse;
+ $this->view->title = $this->lang->mr->common . $this->lang->hyphen . $this->lang->mr->browse;
$this->view->MRList = $MRList;
$this->view->projects = $projects;
$this->view->pager = $pager;
@@ -559,7 +559,7 @@ class mr extends control
$tasks = $this->mr->getLinkList($MRID, $productID, 'task', $type == 'task' ? $orderBy : '', $taskPager);
$builds = $this->loadModel('build')->getBuildPairs($productID);
- $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->link;
+ $this->view->title = $this->lang->mr->common . $this->lang->hyphen . $this->lang->mr->link;
$this->view->MR = $MR;
$this->view->repoID = $MR->repoID;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
diff --git a/module/my/control.php b/module/my/control.php
index 620c73a30f..a1f2afd583 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -167,7 +167,7 @@ class my extends control
}
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->todo;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->todo;
$this->view->todos = $todos;
$this->view->date = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type));
$this->view->type = $type;
@@ -238,7 +238,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->story;
$this->view->stories = $stories;
$this->view->users = $this->user->getPairs('noletter');
$this->view->type = $type;
@@ -303,7 +303,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->story;
$this->view->stories = $stories;
$this->view->users = $this->user->getPairs('noletter');
$this->view->type = $type;
@@ -366,7 +366,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->task;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->task;
$this->view->tabID = 'task';
$this->view->tasks = $this->app->viewType == 'json' ? array_values($tasks) : $tasks;
$this->view->summary = $summary;
@@ -436,7 +436,7 @@ class my extends control
}
/* assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->bug;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->bug;
$this->view->bugs = $bugs;
$this->view->users = $this->user->getPairs('noletter');
$this->view->memberPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
@@ -494,7 +494,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myTestTask;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->myTestTask;
$this->view->tasks = $tasks;
$this->view->type = $type;
$this->view->waitCount = $count['wait'];
@@ -552,7 +552,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myTestCase;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->myTestCase;
$this->view->cases = $cases;
$this->view->users = $this->user->getPairs('noletter');
$this->view->tabID = 'test';
@@ -603,7 +603,7 @@ class my extends control
$this->loadModel('doc')->buildSearchForm(0, array(), $queryID, $actionURL, 'contribute');
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->doc;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->doc;
$this->view->docs = $docs;
$this->view->users = $this->user->getPairs('noletter');
$this->view->type = $type;
@@ -651,7 +651,7 @@ class my extends control
}
$PMList = $this->user->getListByAccounts($accounts, 'account');
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->project;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->project;
$this->view->users = $this->user->getPairs('noletter');
$this->view->projects = $projects;
$this->view->PMList = $PMList;
@@ -687,7 +687,7 @@ class my extends control
$executions = $this->user->getExecutions($this->app->user->account, $type, $orderBy, $pager);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->execution;
$this->view->tabID = 'project';
$this->view->executions = $executions;
$this->view->parentGroup = $this->loadModel('execution')->getChildIdGroup(array_keys($executions));
@@ -890,7 +890,7 @@ class my extends control
$this->view->activities = $this->pssp->getActivityPairs();
$this->view->outputs = $this->pssp->getOutputPairs();
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->auditplan;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->auditplan;
$this->view->browseType = $browseType;
$this->view->auditplans = $auditplans;
$this->view->users = $this->user->getPairs('noclosed|noletter');
@@ -935,7 +935,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->nc;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->nc;
$this->view->browseType = $browseType;
$this->view->ncs = $ncList;
$this->view->users = $this->user->getPairs('noclosed|noletter');
@@ -976,7 +976,7 @@ class my extends control
$this->myZen->showWorkCount($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myMeeting;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->myMeeting;
$this->view->browseType = $browseType;
$this->view->meetings = $this->meeting->getListByUser($browseType, $orderBy, $queryID, $pager);
$this->view->orderBy = $orderBy;
@@ -1158,7 +1158,7 @@ class my extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('my', 'profile')));
}
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->editProfile;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->editProfile;
$this->view->user = $this->user->getById($this->app->user->account);
$this->view->rand = updateSessionRandom();
$this->display();
@@ -1198,7 +1198,7 @@ class my extends control
}
$this->view->isonlybody = $isonlybody;
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->changePassword;
$this->view->user = $this->user->getById($this->app->user->account);
$this->view->rand = updateSessionRandom();
$this->display();
@@ -1251,7 +1251,7 @@ class my extends control
$userParams = empty($this->config->user->showDeleted) ? 'noletter|noempty|noclosed|noclosed|nodeleted' : 'noletter|noempty|noclosed|noclosed';
$users = $this->user->getPairs($userParams, $mode == 'new' ? '' : $userList, $this->config->maxCount);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $label;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $label;
$this->view->lists = $this->user->getContactLists($this->app->user->account, 'list');
$this->view->users = $users;
$this->view->mode = $mode;
@@ -1304,7 +1304,7 @@ class my extends control
$user = $this->user->getById($this->app->user->account);
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->profile;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->profile;
$this->view->user = $user;
$this->view->groups = $this->loadModel('group')->getByAccount($this->app->user->account);
$this->view->deptPath = $this->dept->getParents($user->dept);
@@ -1331,7 +1331,7 @@ class my extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
}
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->preference;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->preference;
$this->view->showTip = $showTip;
$this->view->URSRList = $this->loadModel('custom')->getURSRPairs();
@@ -1399,7 +1399,7 @@ class my extends control
if(empty($recTotal)) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
/* Assign. */
- $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->dynamic;
+ $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->dynamic;
$this->view->type = $type;
$this->view->orderBy = $orderBy;
$this->view->dateGroups = $dateGroups;
diff --git a/module/product/control.php b/module/product/control.php
index b57b2bd9b2..77667affc7 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -92,7 +92,7 @@ class product extends control
$projects = $this->loadModel('project')->getPairsByProgram($product->program, 'all', false, 'order_asc', '', '', 'product');
foreach($projectStats as $project) unset($projects[$project->id]);
- $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->product->project;
+ $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->product->project;
$this->view->projectStats = $this->productZen->processProjectListData($projectStats);
$this->view->PMList = $this->loadModel('user')->getListByAccounts(helper::arrayColumn($projectStats, 'PM'), 'account');
$this->view->product = $product;
@@ -240,7 +240,7 @@ class product extends control
$product = $this->product->getByID($productID);
- $this->view->title = $this->lang->product->edit . $this->lang->colon . $product->name;
+ $this->view->title = $this->lang->product->edit . $this->lang->hyphen . $product->name;
$this->view->product = $product;
$this->view->fields = $this->productZen->getFormFields4Edit($product);
@@ -313,7 +313,7 @@ class product extends control
$product = $this->product->getByID($productID);
- $this->view->title = $product->name . $this->lang->colon .$this->lang->close;
+ $this->view->title = $product->name . $this->lang->hyphen .$this->lang->close;
$this->view->product = $product;
$this->view->actions = $this->loadModel('action')->getList('product', $productID);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
@@ -346,7 +346,7 @@ class product extends control
$product = $this->product->getByID($productID);
- $this->view->title = $product->name . $this->lang->colon .$this->lang->close;
+ $this->view->title = $product->name . $this->lang->hyphen .$this->lang->close;
$this->view->product = $product;
$this->view->actions = $this->loadModel('action')->getList('product', $productID);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
@@ -380,7 +380,7 @@ class product extends control
/* Execute hooks. */
$this->executeHooks($productID);
- $this->view->title = $product->name . $this->lang->colon . $this->lang->product->view;
+ $this->view->title = $product->name . $this->lang->hyphen . $this->lang->product->view;
$this->view->product = $product;
$this->view->actions = $this->loadModel('action')->getList('product', $productID);
$this->view->dynamics = $this->action->getDynamic('all', 'all', 'date_desc', 50, $productID);
@@ -439,7 +439,7 @@ class product extends control
$branches = $product->type == 'normal' ? array(0 => '') : $this->loadModel('branch')->getPairs($productID);
/* Assign view data. */
- $this->view->title = $product->name . $this->lang->colon . $this->lang->product->roadmap;
+ $this->view->title = $product->name . $this->lang->hyphen . $this->lang->product->roadmap;
$this->view->product = $product;
$this->view->roadmaps = $roadmaps;
$this->view->branches = $branches;
@@ -484,7 +484,7 @@ class product extends control
if(empty($recTotal)) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
/* Assign. */
- $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->product->dynamic;
+ $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->product->dynamic;
$this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|noclosed|useid');
$this->view->accountPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
$this->view->productID = $productID;
@@ -520,7 +520,7 @@ class product extends control
$product = $this->product->getStatByID($productID);
if(!$product) return $this->locate('product', 'all');
- $this->view->title = $product->name . $this->lang->colon . $this->lang->product->view;
+ $this->view->title = $product->name . $this->lang->hyphen . $this->lang->product->view;
echo $this->fetch('block', 'dashboard', 'dashboard=singleproduct');
}
diff --git a/module/product/zen.php b/module/product/zen.php
index 7e2e7de600..7f5d1a9e29 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -1381,7 +1381,7 @@ class productZen extends product
$showModule = empty($this->config->product->browse->showModule) ? 0 : $this->config->product->browse->showModule;
if($isProjectStory) $showModule = empty($this->config->projectstory->story->showModule) ? 0 : $this->config->projectstory->story->showModule;
- $this->view->title = $productName . $this->lang->colon . ($storyType === 'story' ? $this->lang->product->browse : $this->lang->product->requirement);
+ $this->view->title = $productName . $this->lang->hyphen . ($storyType === 'story' ? $this->lang->product->browse : $this->lang->product->requirement);
$this->view->productID = $productID;
$this->view->product = $product;
$this->view->projectID = $projectID;
diff --git a/module/productplan/control.php b/module/productplan/control.php
index c87d8b756e..b8209bdd4f 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -106,7 +106,7 @@ class productplan extends control
$this->view->begin = $lastPlan ? $begin : date('Y-m-d');
if($parent) $this->view->parentPlan = $this->productplan->getByID($parent);
- $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->productplan->create;
+ $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->productplan->create;
$this->view->product = $product;
$this->view->lastPlan = $lastPlan;
$this->view->branch = $branchID;
@@ -169,7 +169,7 @@ class productplan extends control
}
$this->view->branchTagOption = $branchPairs;
}
- $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->productplan->edit;
+ $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->productplan->edit;
$this->view->productID = $plan->product;
$this->view->oldBranch = $oldBranch;
$this->view->plan = $plan;
@@ -321,7 +321,7 @@ class productplan extends control
$plans = $this->productplan->getList($productID, (string)$branch, $browseType, $pager, $sort, "", $queryID);
$plans = $this->productplanZen->buildDataForBrowse($plans, $this->view->branchOption);
- $this->view->title = $productName . $this->lang->colon . $this->lang->productplan->browse;
+ $this->view->title = $productName . $this->lang->hyphen . $this->lang->productplan->browse;
$this->view->productID = $productID;
$this->view->branchID = $branchID;
$this->view->browseType = $browseType;
diff --git a/module/productplan/view/batchchangestatus.html.php b/module/productplan/view/batchchangestatus.html.php
index fb174e95b7..52993a3f0f 100755
--- a/module/productplan/view/batchchangestatus.html.php
+++ b/module/productplan/view/batchchangestatus.html.php
@@ -13,7 +13,7 @@
-
productplan->common . $lang->colon . $lang->productplan->batchClose;?>
+ productplan->common . $lang->hyphen . $lang->productplan->batchClose;?>