From 1c13a31e99f0d0e8a00bd867832eab79b6341e5e Mon Sep 17 00:00:00 2001 From: liugang Date: Sun, 28 Apr 2024 14:35:26 +0800 Subject: [PATCH] * Rename $lang->colon to $lang->hyphen. --- extension/lite/product/ext/control/browse.php | 2 +- .../lite/story/ext/ui/batchcreate.html.php | 2 +- .../lite/story/ext/view/batchedit.html.php | 2 +- .../lite/task/ext/view/batchcreate.html.php | 2 +- extension/lite/tree/ext/ui/browse.html.php | 2 +- .../lite/tree/ext/ui/browsetask.html.php | 2 +- .../lite/tree/ext/view/browsetask.html.php | 2 +- module/admin/control.php | 4 +- module/ai/control.php | 10 ++--- module/api/control.php | 4 +- module/block/zen.php | 2 +- module/bug/control.php | 6 +-- module/bug/ui/batchactivate.html.php | 2 +- module/bug/view/batchactivate.html.php | 2 +- module/bug/view/batchedit.html.php | 2 +- module/bug/view/view.html.php | 4 +- module/bug/zen.php | 6 +-- module/build/zen.php | 2 +- module/caselib/control.php | 14 +++--- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 2 +- module/common/lang/vi.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/common/lang/zh-tw.php | 2 +- module/company/control.php | 8 ++-- module/compile/control.php | 4 +- module/convert/control.php | 8 ++-- module/custom/control.php | 2 +- module/dept/control.php | 2 +- module/design/control.php | 16 +++---- module/doc/control.php | 6 +-- module/doc/ui/view.html.php | 2 +- module/doc/view/content.html.php | 2 +- module/doc/zen.php | 4 +- module/entry/control.php | 8 ++-- module/execution/control.php | 34 +++++++------- module/execution/model.php | 2 +- module/execution/zen.php | 6 +-- module/gitea/control.php | 8 ++-- module/gitfox/control.php | 4 +- module/gitlab/control.php | 44 +++++++++---------- module/gogs/control.php | 8 ++-- module/group/control.php | 14 +++--- module/group/zen.php | 4 +- module/jenkins/control.php | 2 +- module/job/control.php | 8 ++-- module/mail/control.php | 8 ++-- module/mr/control.php | 6 +-- module/my/control.php | 38 ++++++++-------- module/product/control.php | 16 +++---- module/product/zen.php | 2 +- module/productplan/control.php | 6 +-- .../view/batchchangestatus.html.php | 2 +- module/programplan/zen.php | 2 +- module/project/control.php | 22 +++++----- module/project/model.php | 2 +- module/project/zen.php | 2 +- module/projectrelease/control.php | 6 +-- module/release/control.php | 6 +-- module/repo/control.php | 16 +++---- module/repo/zen.php | 6 +-- module/sonarqube/control.php | 12 ++--- module/stage/control.php | 12 ++--- module/stakeholder/control.php | 8 ++-- module/story/control.php | 20 ++++----- module/story/ui/batchcreate.html.php | 2 +- module/story/view/batchclose.html.php | 2 +- module/story/view/batchedit.html.php | 2 +- module/story/zen.php | 4 +- module/task/control.php | 16 +++---- module/task/view/batchcreate.html.php | 2 +- module/task/view/batchedit.html.php | 4 +- module/task/view/view.html.php | 2 +- module/task/zen.php | 8 ++-- module/testcase/control.php | 14 +++--- module/testcase/view/batchedit.html.php | 2 +- module/testcase/view/view.html.php | 2 +- module/testcase/zen.php | 12 ++--- module/testreport/control.php | 2 +- module/testsuite/control.php | 6 +-- module/testtask/control.php | 22 +++++----- module/testtask/ui/batchrun.html.php | 2 +- module/testtask/view/batchrun.html.php | 2 +- module/testtask/zen.php | 6 +-- module/todo/view/batchedit.html.php | 2 +- module/todo/zen.php | 8 ++-- module/tree/ui/browse.html.php | 2 +- module/tree/ui/browsetask.html.php | 2 +- module/tree/view/browse.html.php | 6 +-- module/tree/view/browsetask.html.php | 2 +- module/upgrade/control.php | 2 +- module/user/control.php | 20 ++++----- module/webhook/control.php | 8 ++-- module/weekly/model.php | 2 +- 95 files changed, 319 insertions(+), 319 deletions(-) diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php index e753d49573..8f76b5b78b 100644 --- a/extension/lite/product/ext/control/browse.php +++ b/extension/lite/product/ext/control/browse.php @@ -96,7 +96,7 @@ class product extends control $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID]; /* Assign. */ - $this->view->title = $productName . $this->lang->colon . $this->lang->product->browse; + $this->view->title = $productName . $this->lang->hyphen . $this->lang->product->browse; $this->view->moduleID = $moduleID; $this->view->pager = $pager; $this->view->orderBy = $orderBy; diff --git a/extension/lite/story/ext/ui/batchcreate.html.php b/extension/lite/story/ext/ui/batchcreate.html.php index 7d4202fdd7..baeddbbf7d 100644 --- a/extension/lite/story/ext/ui/batchcreate.html.php +++ b/extension/lite/story/ext/ui/batchcreate.html.php @@ -51,7 +51,7 @@ formBatchPanel ( set::id('dataform'), set::ajax(array('beforeSubmit' => jsRaw('clickSubmit'))), - set::title($storyID ? $storyTitle . $lang->colon . $this->lang->story->subdivide : $this->lang->story->batchCreate), + set::title($storyID ? $storyTitle . $lang->hyphen . $this->lang->story->subdivide : $this->lang->story->batchCreate), set::uploadParams('module=story¶ms=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=$executionID&plan=&type=$type")), set::pasteField('title'), set::customFields(array('list' => array(), 'show' => $showFields, 'key' => 'batchCreateFields')), diff --git a/extension/lite/story/ext/view/batchedit.html.php b/extension/lite/story/ext/view/batchedit.html.php index ce7beafd71..61e238a408 100644 --- a/extension/lite/story/ext/view/batchedit.html.php +++ b/extension/lite/story/ext/view/batchedit.html.php @@ -18,7 +18,7 @@

- story->common . $lang->colon . $lang->story->batchEdit;?> + story->common . $lang->hyphen . $lang->story->batchEdit;?>

diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index 88b8029a41..e0e5b3b085 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -22,7 +22,7 @@

- lang->colon;?> + lang->hyphen;?> task->batchCreateChildren;?> task->batchCreate;?> diff --git a/extension/lite/tree/ext/ui/browse.html.php b/extension/lite/tree/ext/ui/browse.html.php index dd85098eee..7587378746 100644 --- a/extension/lite/tree/ext/ui/browse.html.php +++ b/extension/lite/tree/ext/ui/browse.html.php @@ -161,7 +161,7 @@ div div ( setClass('entity-label flex items-center gap-x-2 entity-title text-lg font-bold'), - $lang->tree->common . $lang->colon . $root->name + $lang->tree->common . $lang->hyphen . $root->name ) ); diff --git a/extension/lite/tree/ext/ui/browsetask.html.php b/extension/lite/tree/ext/ui/browsetask.html.php index ff7a32278a..8c4666a3a0 100644 --- a/extension/lite/tree/ext/ui/browsetask.html.php +++ b/extension/lite/tree/ext/ui/browsetask.html.php @@ -173,7 +173,7 @@ div div ( setClass('entity-label flex items-center gap-x-2 entity-title text-lg font-bold'), - $lang->tree->common . $lang->colon . $root->name + $lang->tree->common . $lang->hyphen . $root->name ) ); diff --git a/extension/lite/tree/ext/view/browsetask.html.php b/extension/lite/tree/ext/view/browsetask.html.php index 52564b1105..fa94a41f14 100644 --- a/extension/lite/tree/ext/view/browsetask.html.php +++ b/extension/lite/tree/ext/view/browsetask.html.php @@ -26,7 +26,7 @@ li.story-item > .tree-actions .tree-action[data-type=delete] {display: none;}
- tree->common . $lang->colon . $root->name;?> + tree->common . $lang->hyphen . $root->name;?>

diff --git a/module/admin/control.php b/module/admin/control.php index 8ddd3beaf6..c17cd40151 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -188,7 +188,7 @@ class admin extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true)); } - $this->view->title = $this->lang->admin->safe->common . $this->lang->colon . $this->lang->admin->safe->set; + $this->view->title = $this->lang->admin->safe->common . $this->lang->hyphen . $this->lang->admin->safe->set; $this->view->gdInfo = function_exists('gd_info') ? gd_info() : array(); $this->display(); } @@ -202,7 +202,7 @@ class admin extends control */ public function checkWeak() { - $this->view->title = $this->lang->admin->safe->common . $this->lang->colon . $this->lang->admin->safe->checkWeak; + $this->view->title = $this->lang->admin->safe->common . $this->lang->hyphen . $this->lang->admin->safe->checkWeak; $this->view->weakUsers = $this->loadModel('user')->getWeakUsers(); $this->display(); } diff --git a/module/ai/control.php b/module/ai/control.php index d5720443fb..6c45b7fe85 100644 --- a/module/ai/control.php +++ b/module/ai/control.php @@ -581,7 +581,7 @@ class ai extends control $this->view->prompt = $prompt; $this->view->promptID = $promptID; $this->view->lastActiveStep = $this->ai->getLastActiveStep($prompt); - $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->colon} " . $this->lang->ai->prompts->assignRole . " {$this->lang->colon} " . $this->lang->ai->prompts->common; + $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->hyphen} " . $this->lang->ai->prompts->assignRole . " {$this->lang->hyphen} " . $this->lang->ai->prompts->common; $this->view->roleTemplates = $this->ai->getRoleTemplates(); $this->display(); } @@ -620,7 +620,7 @@ class ai extends control $this->view->prompt = $prompt; $this->view->promptID = $promptID; $this->view->lastActiveStep = $this->ai->getLastActiveStep($prompt); - $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->colon} " . $this->lang->ai->prompts->selectDataSource . " {$this->lang->colon} " . $this->lang->ai->prompts->common; + $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->hyphen} " . $this->lang->ai->prompts->selectDataSource . " {$this->lang->hyphen} " . $this->lang->ai->prompts->common; $this->display(); } @@ -656,7 +656,7 @@ class ai extends control $this->view->prompt = $prompt; $this->view->promptID = $promptID; $this->view->lastActiveStep = $this->ai->getLastActiveStep($prompt); - $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->colon} " . $this->lang->ai->prompts->setPurpose . " {$this->lang->colon} " . $this->lang->ai->prompts->common; + $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->hyphen} " . $this->lang->ai->prompts->setPurpose . " {$this->lang->hyphen} " . $this->lang->ai->prompts->common; $this->display(); } @@ -697,7 +697,7 @@ class ai extends control $this->view->prompt = $prompt; $this->view->promptID = $promptID; $this->view->lastActiveStep = $this->ai->getLastActiveStep($prompt); - $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->colon} " . $this->lang->ai->prompts->setTargetForm . " {$this->lang->colon} " . $this->lang->ai->prompts->common; + $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->hyphen} " . $this->lang->ai->prompts->setTargetForm . " {$this->lang->hyphen} " . $this->lang->ai->prompts->common; $this->display(); } @@ -735,7 +735,7 @@ class ai extends control $this->view->prompt = $prompt; $this->view->promptID = $promptID; $this->view->lastActiveStep = $this->ai->getLastActiveStep($prompt); - $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->colon} " . $this->lang->ai->prompts->finalize . " {$this->lang->colon} " . $this->lang->ai->prompts->common; + $this->view->title = "{$this->lang->ai->prompts->common}#{$prompt->id} $prompt->name {$this->lang->hyphen} " . $this->lang->ai->prompts->finalize . " {$this->lang->hyphen} " . $this->lang->ai->prompts->common; $this->display(); } diff --git a/module/api/control.php b/module/api/control.php index 2b0597e647..6c66390220 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -489,7 +489,7 @@ class api extends control $this->setMenu($libID, $space); $lib = $this->doc->getLibByID($libID); - $libName = isset($lib->name) ? $lib->name . $this->lang->colon : ''; + $libName = isset($lib->name) ? $lib->name . $this->lang->hyphen : ''; $this->view->title = $libName . $this->lang->api->create; $this->view->allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed'); @@ -526,7 +526,7 @@ class api extends control $this->setMenu($api->lib); $this->getTypeOptions($api->lib); - $this->view->title = $api->title . $this->lang->colon . $this->lang->api->edit; + $this->view->title = $api->title . $this->lang->hyphen . $this->lang->api->edit; $this->view->api = $api; $this->view->allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed');; $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($api->lib, 'api', $startModuleID = 0); diff --git a/module/block/zen.php b/module/block/zen.php index 5203c0a327..8b8f04cafa 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -712,7 +712,7 @@ class blockZen extends block $branches = $product->type == 'normal' ? array(0 => '') : $this->loadModel('branch')->getPairs($productID, 'active'); /* 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; diff --git a/module/bug/control.php b/module/bug/control.php index d79fb6d6ad..970ed46529 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -686,7 +686,7 @@ class bug extends control $this->qa->setMenu($productID, $branchID); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common . $this->lang->colon . $this->lang->bug->reportChart; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->bug->common . $this->lang->hyphen . $this->lang->bug->reportChart; $this->view->productID = $productID; $this->view->browseType = $browseType; $this->view->branchID = $branchID; @@ -801,7 +801,7 @@ class bug extends control /* Show the variables associated with the batch creation bugs. */ $this->bugZen->assignBatchCreateVars($executionID, $product, $branch, $output, $bugImagesFile); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->batchCreate; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->bug->batchCreate; $this->view->moduleID = $moduleID; $this->view->product = $product; $this->display(); @@ -1288,7 +1288,7 @@ class bug extends control /* 展示关联的变量。 */ /* Show the variables associated. */ $bugIdList = array_unique($this->post->bugIdList); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->batchActivate; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->bug->batchActivate; $this->view->bugs = $this->bug->getByIdList($bugIdList); $this->view->users = $this->user->getPairs('noclosed'); $this->view->builds = $this->loadModel('build')->getBuildPairs(array($productID), $branch, 'noempty,noreleased'); diff --git a/module/bug/ui/batchactivate.html.php b/module/bug/ui/batchactivate.html.php index c7007a4f33..d7977e555f 100644 --- a/module/bug/ui/batchactivate.html.php +++ b/module/bug/ui/batchactivate.html.php @@ -27,7 +27,7 @@ foreach($bugs as $bug) formBatchPanel ( - set::title($lang->bug->common . $lang->colon . $lang->bug->batchActivate), + set::title($lang->bug->common . $lang->hyphen . $lang->bug->batchActivate), set::mode('edit'), set::items($items), set::data(array_values($bugs)) diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php index 183149908c..3ed469881e 100644 --- a/module/bug/view/batchactivate.html.php +++ b/module/bug/view/batchactivate.html.php @@ -23,7 +23,7 @@ if($this->config->edition != 'open')
-

bug->common . $lang->colon . $lang->bug->batchActivate;?>

+

bug->common . $lang->hyphen . $lang->bug->batchActivate;?>

diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 64af2943fc..813a599d1b 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -17,7 +17,7 @@ bug->edit->requiredFields);?>
-

bug->common . $lang->colon . $lang->bug->batchEdit;?>

+

bug->common . $lang->hyphen . $lang->bug->batchEdit;?>

createLink('custom', 'ajaxSaveCustomFields', 'module=bug§ion=custom&key=batchEditFields')?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 5a9215a966..03fe8984b5 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -34,7 +34,7 @@ bug->deleted;?> case):?> - case&version=$bug->caseVersion", '', true), " {$lang->bug->fromCase}$lang->colon$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?> + case&version=$bug->caseVersion", '', true), " {$lang->bug->fromCase}$lang->hyphen$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?>
@@ -159,7 +159,7 @@
- + '> diff --git a/module/bug/zen.php b/module/bug/zen.php index be481be098..b72545ebe2 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -773,7 +773,7 @@ class bugZen extends bug $showModule = !empty($this->config->bug->browse->showModule) ? $this->config->bug->browse->showModule : ''; /* Set view. */ - $this->view->title = $product->name . $this->lang->colon . $this->lang->bug->common; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->bug->common; $this->view->product = $product; $this->view->branch = $branch; $this->view->browseType = $browseType; @@ -1063,7 +1063,7 @@ class bugZen extends bug $bug = $this->gettasksForCreate($bug); if(in_array($this->config->edition, array('max', 'ipd'))) $this->view->injectionList = $this->view->identifyList = $this->loadModel('review')->getPairs($bug->projectID, $bug->productID, true); - $this->view->title = isset($this->products[$bug->productID]) ? $this->products[$bug->productID] . $this->lang->colon . $this->lang->bug->create : $this->lang->bug->create; + $this->view->title = isset($this->products[$bug->productID]) ? $this->products[$bug->productID] . $this->lang->hyphen . $this->lang->bug->create : $this->lang->bug->create; $this->view->productMembers = $this->getProductMembersForCreate($bug); $this->view->gobackLink = $from == 'global' ? $this->createLink('bug', 'browse', "productID=$bug->productID") : ''; $this->view->productName = isset($this->products[$bug->productID]) ? $this->products[$bug->productID] : ''; @@ -1547,7 +1547,7 @@ class bugZen extends bug /* Get custom Fields. */ foreach(explode(',', $this->config->bug->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->bug->$field; - $this->view->title = ($productID ? (zget($products, $productID, '', $products[$productID]->name . $this->lang->colon) . "BUG") : '') . $this->lang->bug->batchEdit; + $this->view->title = ($productID ? (zget($products, $productID, '', $products[$productID]->name . $this->lang->hyphen) . "BUG") : '') . $this->lang->bug->batchEdit; $this->view->customFields = $customFields; /* Judge whether the editedBugs is too large and set session. */ diff --git a/module/build/zen.php b/module/build/zen.php index c7d31e27ef..220a673139 100644 --- a/module/build/zen.php +++ b/module/build/zen.php @@ -116,7 +116,7 @@ class buildZen extends build $products = array(); foreach($productGroups as $product) $products[$product->id] = $product->name; - $this->view->title = $build->name . $this->lang->colon . $this->lang->build->edit; + $this->view->title = $build->name . $this->lang->hyphen . $this->lang->build->edit; $this->view->products = $products; $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; $this->view->users = $this->loadModel('user')->getPairs('noletter', $build->builder); diff --git a/module/caselib/control.php b/module/caselib/control.php index 3bb8158baf..33a8f00b4f 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -57,7 +57,7 @@ class caselib extends control $libID = $this->caselibZen->saveLibState(0, $libraries); $this->caselib->setLibMenu($libraries, $libID); - $this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->caselib->create; + $this->view->title = $this->lang->caselib->common . $this->lang->hyphen . $this->lang->caselib->create; $this->display(); } @@ -91,7 +91,7 @@ class caselib extends control $libID = $this->caselibZen->saveLibState($libID, $libraries); $this->caselib->setLibMenu($libraries, $libID); - $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->caselib->edit; + $this->view->title = $libraries[$libID] . $this->lang->hyphen . $this->lang->caselib->edit; $this->view->lib = $this->caselib->getByID($libID); $this->display(); } @@ -164,7 +164,7 @@ class caselib extends control $this->loadModel('testcase'); - $this->view->title = $this->lang->caselib->common . $this->lang->colon . $libraries[$libID]; + $this->view->title = $this->lang->caselib->common . $this->lang->hyphen . $libraries[$libID]; $this->view->libID = $libID; $this->view->libName = $libraries[$libID]; $this->view->cases = $cases; @@ -234,7 +234,7 @@ class caselib extends control /* Show the variables associated. */ $this->app->loadLang('testcase'); - $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->create; + $this->view->title = $libraries[$libID] . $this->lang->hyphen . $this->lang->testcase->create; $this->view->showFields = $this->config->caselib->custom->createFields; $this->view->customFields = $customFields; $this->view->libraries = $libraries; @@ -274,7 +274,7 @@ class caselib extends control /* Set lib menu. */ $this->caselib->setLibMenu($libraries, $libID); - $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->batchCreate; + $this->view->title = $libraries[$libID] . $this->lang->hyphen . $this->lang->testcase->batchCreate; $this->view->libID = $libID; $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'caselib', 0); $this->view->currentModuleID = $moduleID; @@ -299,7 +299,7 @@ class caselib extends control $this->caselib->setLibMenu($libraries, $libID); $this->app->loadLang('testcase'); - $this->view->title = $lib->name . $this->lang->colon . $this->lang->caselib->view; + $this->view->title = $lib->name . $this->lang->hyphen . $this->lang->caselib->view; $this->view->lib = $lib; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->actions = $this->loadModel('action')->getList('caselib', $libID); @@ -449,7 +449,7 @@ class caselib extends control $caseData = array_slice($caseData, ($pageID - 1) * $maxImport, $maxImport, true); } - $this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->testcase->showImport; + $this->view->title = $this->lang->caselib->common . $this->lang->hyphen . $this->lang->testcase->showImport; $this->view->cases = $this->dao->select('id,module,stage,status,pri,type')->from(TABLE_CASE)->where('lib')->eq($libID)->andWhere('deleted')->eq(0)->andWhere('product')->eq(0)->fetchAll('id'); $this->view->modules = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0); $this->view->caseData = $caseData; diff --git a/module/common/lang/de.php b/module/common/lang/de.php index b7aa004ee4..250b19f3f7 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -15,7 +15,7 @@ include (dirname(__FILE__) . '/common.php'); global $config; $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = ','; $lang->dot = '.'; $lang->at = ' am '; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 8137a9e9fd..4a024ba37b 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -15,7 +15,7 @@ include (dirname(__FILE__) . '/common.php'); global $config; $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = ','; $lang->dot = '.'; $lang->at = ' on '; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 58ee284ef1..b920772745 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -15,7 +15,7 @@ include (dirname(__FILE__) . '/common.php'); global $config; $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = ','; $lang->dot = '.'; $lang->at = ' à '; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 4ba0beddc7..2ec1289ef9 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -10,7 +10,7 @@ * @link https://www.zentao.net */ $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = ','; $lang->dot = '.'; $lang->at = ' on '; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 84efd8162b..5c10c9a3a7 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -15,7 +15,7 @@ include(dirname(__FILE__) . '/common.php'); global $config; $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = '，'; $lang->dot = '。'; $lang->at = ' 于 '; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 344c602125..5d15646f3c 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -15,7 +15,7 @@ include(dirname(__FILE__) . '/common.php'); global $config; $lang->arrow = '  '; -$lang->colon = '-'; +$lang->hyphen = '-'; $lang->comma = '，'; $lang->dot = '。'; $lang->at = ' 于 '; diff --git a/module/company/control.php b/module/company/control.php index 8ba9cba24a..59e18ac44d 100755 --- a/module/company/control.php +++ b/module/company/control.php @@ -73,7 +73,7 @@ class company extends control $users = $this->company->getUsers($browseType, $type, $queryID, $deptID, $sort, $pager); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'user'); - $this->view->title = $this->lang->company->index . $this->lang->colon . $this->lang->dept->common; + $this->view->title = $this->lang->company->index . $this->lang->hyphen . $this->lang->dept->common; $this->view->users = array_map(function($user){unset($user->password);return $user;}, $users); $this->view->deptTree = $this->dept->getTreeMenu(0, array('deptModel', 'createMemberLink')); $this->view->orderBy = $orderBy; @@ -110,7 +110,7 @@ class company extends control return $this->sendSuccess(array('load' => true)); } - $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->edit; + $this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->company->edit; $this->view->company = $this->company->getByID($this->app->company->id); $this->display(); } @@ -124,7 +124,7 @@ class company extends control */ public function view() { - $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->view; + $this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->company->view; $this->view->company = $this->company->getByID($this->app->company->id); $this->display(); } @@ -179,7 +179,7 @@ class company extends control if(empty($recTotal)) $recTotal = !(empty($date) && $browseType == 'all') ? array_sum(array_map('count', $dateGroups)) : $this->action->getDynamicCount(); /* Assign.*/ - $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->dynamic; + $this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->company->dynamic; $this->view->recTotal = $recTotal; $this->view->browseType = $browseType; $this->view->account = $account; diff --git a/module/compile/control.php b/module/compile/control.php index cc5f9b7e72..8e64c45383 100644 --- a/module/compile/control.php +++ b/module/compile/control.php @@ -69,7 +69,7 @@ class compile extends control foreach($buildList as $build) $build->triggerType = $this->loadModel('job')->getTriggerConfig($build); - $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->browse; + $this->view->title = $this->lang->ci->job . $this->lang->hyphen . $this->lang->compile->browse; $this->view->repoID = $repoID; $this->view->jobID = $jobID; $this->view->buildList = $buildList; @@ -103,7 +103,7 @@ class compile extends control $this->view->logs = $logs; $this->view->build = $build; $this->view->job = $job; - $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->logs; + $this->view->title = $this->lang->ci->job . $this->lang->hyphen . $this->lang->compile->logs; $this->display(); } diff --git a/module/convert/control.php b/module/convert/control.php index abb8486a16..20ec5384bf 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -35,7 +35,7 @@ class convert extends control */ public function selectSource() { - $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->start; + $this->view->title = $this->lang->convert->common . $this->lang->hyphen . $this->lang->convert->start; $this->display(); } @@ -54,7 +54,7 @@ class convert extends control list($sourceName, $version) = explode('_', $this->post->source); $setFunc = "set$sourceName"; - $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->setting; + $this->view->title = $this->lang->convert->common . $this->lang->hyphen . $this->lang->convert->setting; $this->view->source = $sourceName; $this->view->version = $version; $this->view->setting = $this->fetch('convert', $setFunc, "version=$version"); @@ -106,7 +106,7 @@ class convert extends control public function checkConfig() { $checkFunc = 'check' . $this->post->source; - $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->checkConfig; + $this->view->title = $this->lang->convert->common . $this->lang->hyphen . $this->lang->convert->checkConfig; $this->view->source = $this->post->source; $this->view->checkResult = $this->fetch('convert', $checkFunc, "version={$this->post->version}"); $this->display(); @@ -192,7 +192,7 @@ class convert extends control public function execute() { $convertFunc = 'convert' . $this->post->source; - $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->execute; + $this->view->title = $this->lang->convert->common . $this->lang->hyphen . $this->lang->convert->execute; $this->view->source = $this->post->source; $this->view->version = $this->post->version; $this->view->executeResult = $this->fetch('convert', $convertFunc, "version={$this->post->version}"); diff --git a/module/custom/control.php b/module/custom/control.php index d883569d93..11d49345f8 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -58,7 +58,7 @@ class custom extends control return $this->sendSuccess(array('load' => $this->createLink('custom', 'set', "module=$module&field=$field&lang=" . ($lang == 'all' ? $lang : '')))); } - $this->view->title = $this->lang->custom->common . $this->lang->colon . $this->lang->$module->common; + $this->view->title = $this->lang->custom->common . $this->lang->hyphen . $this->lang->$module->common; $this->view->field = $field; $this->view->lang2Set = str_replace('_', '-', $lang); $this->view->module = $module; diff --git a/module/dept/control.php b/module/dept/control.php index bbdb816293..6e161abca6 100644 --- a/module/dept/control.php +++ b/module/dept/control.php @@ -21,7 +21,7 @@ class dept extends control */ public function browse(int $deptID = 0) { - $this->view->title = $this->lang->dept->manage . $this->lang->colon . $this->app->company->name; + $this->view->title = $this->lang->dept->manage . $this->lang->hyphen . $this->app->company->name; $this->view->deptID = $deptID; $this->view->sons = $this->dept->getSons($deptID); $this->view->tree = $this->dept->getDataStructure(); diff --git a/module/design/control.php b/module/design/control.php index f5e1dd04d8..62e6f15590 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -107,7 +107,7 @@ class design extends control if(isset($project->hasProduct) && $project->hasProduct) $this->config->design->dtable->fieldList['product']['map'] = $this->view->products; if(!helper::hasFeature('devops')) $this->config->design->dtable->fieldList['actions']['menu'] = array('edit', 'delete'); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->browse; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->browse; $this->view->designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager); $this->view->projectID = $projectID; $this->view->productID = $productID; @@ -151,7 +151,7 @@ class design extends control $products = $this->product->getProductPairsByProject($projectID); $productIdList = $productID ? $productID : array_keys($products); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->create; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->create; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, 'active', 'id_desc', 0, 'full', 'story', false); $this->view->productID = $productID; @@ -190,7 +190,7 @@ class design extends control $project = $this->loadModel('project')->getByID($projectID); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->batchCreate; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList); $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->type = $type; @@ -220,7 +220,7 @@ class design extends control $productIdList = $design->product ? $design->product : array_keys($products); $project = $this->loadModel('project')->getByID($design->project); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->view; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->view; $this->view->design = $design; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList); $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -266,7 +266,7 @@ class design extends control $productIdList = $design->product ? $design->product : array_keys($products); $project = $this->loadModel('project')->getByID($design->project); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->edit; $this->view->design = $design; $this->view->project = $project; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList); @@ -331,7 +331,7 @@ class design extends control $this->config->design->linkcommit->dtable->fieldList['revision']['link'] = sprintf($this->config->design->linkcommit->dtable->fieldList['revision']['link'], $repoID, $design->project); if(empty($repo->SCM) || $repo->SCM != 'Git') unset($this->config->design->linkcommit->dtable->fieldList['commit']); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->linkCommit; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->linkCommit; $this->view->repos = $repos; $this->view->repoID = $repoID; $this->view->repo = $repo; @@ -385,7 +385,7 @@ class design extends control $this->config->design->viewcommit->dtable->fieldList['actions']['list']['unlinkCommit']['url'] = sprintf($this->config->design->viewcommit->actionList['unlinkCommit']['url'], $designID); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->submission; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->submission; $this->view->design = $design; $this->view->pager = $pager; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -499,7 +499,7 @@ class design extends control $design = $this->design->getByID($designID); - $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->assignedTo; + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->assignedTo; $this->view->design = $design; $this->view->users = $this->loadModel('project')->getTeamMemberPairs($design->project); $this->display(); diff --git a/module/doc/control.php b/module/doc/control.php index 8f16b64988..aacb1a22ac 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -355,7 +355,7 @@ class doc extends control $this->docZen->setObjectsForCreate($lib->type, $lib, $unclosed, zget($lib, $lib->type, 0)); - $this->view->title = zget($lib, 'name', '', $lib->name . $this->lang->colon) . $this->lang->doc->create; + $this->view->title = zget($lib, 'name', '', $lib->name . $this->lang->hyphen) . $this->lang->doc->create; $this->view->objectType = $objectType; $this->view->objectID = zget($lib, $lib->type, 0); $this->view->libID = $libID; @@ -409,7 +409,7 @@ class doc extends control $this->docZen->setObjectsForEdit($lib->type, $objectID); - $this->view->title = $lib->name . $this->lang->colon . $this->lang->doc->edit; + $this->view->title = $lib->name . $this->lang->hyphen . $this->lang->doc->edit; $this->view->doc = $doc; $this->view->moduleOptionMenu = $this->doc->getLibsOptionMenu($libs); $this->view->type = $lib->type; @@ -752,7 +752,7 @@ class doc extends control $executionID = $type == 'project' && $lib->type == 'execution' ? $lib->execution : 0; - $this->view->title = $type == 'custom' ? $this->lang->doc->tableContents : $object->name . $this->lang->colon . $this->lang->doc->tableContents; + $this->view->title = $type == 'custom' ? $this->lang->doc->tableContents : $object->name . $this->lang->hyphen . $this->lang->doc->tableContents; $this->view->type = $type; $this->view->objectType = $type; $this->view->spaceType = $type; diff --git a/module/doc/ui/view.html.php b/module/doc/ui/view.html.php index 1e485bb81c..e671a9d43e 100644 --- a/module/doc/ui/view.html.php +++ b/module/doc/ui/view.html.php @@ -72,7 +72,7 @@ if($config->vision == 'rnd' and ($config->edition == 'max' or $config->edition = ) : null; } -$createInfo = $doc->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; +$createInfo = $doc->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; $keywordsLabel = array(); if($doc->keywords) diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 04d99dd745..325e1a6078 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -117,7 +117,7 @@
type) echo 'style="max-height: 60px"';?>>
- 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;?>

">
bug->fromCase;?>case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion", '', true), " {$lang->bug->fromCase}$lang->colon$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?>case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion", '', true), " {$lang->bug->fromCase}$lang->hyphen$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?>
bug->plan;?>
diff --git a/module/programplan/zen.php b/module/programplan/zen.php index 87cb3443e5..621b0741c3 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -119,7 +119,7 @@ class programplanZen extends programplan $this->config->programplan->form->create['attribute']['options'] = $this->lang->stage->ipdTypeList; } - $this->view->title = $this->lang->programplan->create . $this->lang->colon . $viewData->project->name; + $this->view->title = $this->lang->programplan->create . $this->lang->hyphen . $viewData->project->name; $this->view->productList = $viewData->productList; $this->view->project = $viewData->project; $this->view->productID = $viewData->productID ?: key($viewData->productList); diff --git a/module/project/control.php b/module/project/control.php index 72cd8b3807..1f5cf33813 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -282,7 +282,7 @@ class project extends control $this->app->loadClass('pager', true); $pager = new pager($recTotal, $recPerPage, $pageID); - $this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index; + $this->view->title = $this->lang->project->common . $this->lang->hyphen . $this->lang->project->index; $this->view->pager = $pager; $this->view->project = $project; $this->view->browseType = $browseType; @@ -711,7 +711,7 @@ class project extends control /* The header and position. */ $project = $this->project->getByID($projectID); - $this->view->title = $project->name . $this->lang->colon . $this->lang->project->dynamic; + $this->view->title = $project->name . $this->lang->hyphen . $this->lang->project->dynamic; $this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project'); $this->view->accountPairs = $this->user->getPairs('noletter|nodeleted'); @@ -929,7 +929,7 @@ class project extends control $this->projectZen->assignTesttaskVars($tasks); - $this->view->title = $project->name . $this->lang->colon . $this->lang->project->common; + $this->view->title = $project->name . $this->lang->hyphen . $this->lang->project->common; $this->view->project = $project; $this->view->pager = $pager; $this->view->orderBy = $orderBy; @@ -980,7 +980,7 @@ class project extends control } /* Set view data. */ - $this->view->title = $project->name . $this->lang->colon . $this->lang->execution->build; + $this->view->title = $project->name . $this->lang->hyphen . $this->lang->execution->build; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->builds = $this->projectZen->processBuildListData($builds, $projectID); $this->view->productID = $type == 'product' ? $param : 'all'; @@ -1040,7 +1040,7 @@ class project extends control } } - $this->view->title = $group->name . $this->lang->colon . $this->lang->group->managePriv; + $this->view->title = $group->name . $this->lang->hyphen . $this->lang->group->managePriv; $this->view->group = $group; $this->view->groupPrivs = $getPrivs; $this->view->groupID = $groupID; @@ -1064,7 +1064,7 @@ class project extends control $project = $this->project->getByID($projectID); $deptID = $this->app->user->admin ? 0 : $this->app->user->dept; - $this->view->title = $project->name . $this->lang->colon . $this->lang->project->team; + $this->view->title = $project->name . $this->lang->hyphen . $this->lang->project->team; $this->view->projectID = $projectID; $this->view->teamMembers = $this->project->getTeamMembers($projectID); $this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id'); @@ -1142,7 +1142,7 @@ class project extends control $currentMembers = $this->project->getTeamMembers($projectID); $members2Import = $this->project->getMembers2Import($copyProjectID, array_keys($currentMembers)); - $this->view->title = $this->lang->project->manageMembers . $this->lang->colon . $project->name; + $this->view->title = $this->lang->project->manageMembers . $this->lang->hyphen . $project->name; $this->view->project = $project; $this->view->users = $users; $this->view->roles = $roles; @@ -1196,7 +1196,7 @@ class project extends control } } - $this->view->title = $group->name . $this->lang->colon . $this->lang->group->manageMember; + $this->view->title = $group->name . $this->lang->hyphen . $this->lang->group->manageMember; $this->view->group = $group; $this->view->deptTree = $this->loadModel('dept')->getTreeMenu(0, array('deptModel', 'createGroupManageMemberLink'), (int)$groupID); $this->view->groupUsers = $groupUsers; @@ -1229,7 +1229,7 @@ class project 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 = $group; $this->display('group', 'copy'); } @@ -1257,7 +1257,7 @@ class project extends control return $this->sendSuccess(array('load' => 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('group', 'edit'); } @@ -1538,7 +1538,7 @@ class project extends control $this->projectZen->extractUnModifyForm($projectID, $project); /* Organizing render pages requires data. */ - $this->view->title = $this->lang->project->manageProducts . $this->lang->colon . $project->name; + $this->view->title = $this->lang->project->manageProducts . $this->lang->hyphen . $project->name; $this->view->project = $project; $this->view->executions = $executions; $this->view->branches = $this->project->getBranchesByProject($projectID); diff --git a/module/project/model.php b/module/project/model.php index a17f6f2947..85cae37e2a 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -2531,7 +2531,7 @@ class projectModel extends model if($this->app->viewType == 'mhtml' && $projectID) { - $output = $this->lang->project->common . $this->lang->colon; + $output = $this->lang->project->common . $this->lang->hyphen; $output .= "{$currentProjectName} "; return $output; } diff --git a/module/project/zen.php b/module/project/zen.php index 10c2f7d205..c0c589a353 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -799,7 +799,7 @@ class projectZen extends project $storyList = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array(); $taskList = $taskIdList ? $this->loadModel('task')->getByIdList($taskIdList) : array(); - $this->view->title = $project->name . $this->lang->colon . $this->lang->bug->common; + $this->view->title = $project->name . $this->lang->hyphen . $this->lang->bug->common; $this->view->bugs = $bugs; $this->view->build = $this->loadModel('build')->getById($build); $this->view->buildID = $this->view->build ? $this->view->build->id : 0; diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index a4c47275b4..180d01acdd 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -78,7 +78,7 @@ class projectrelease extends control $project = $this->project->getByID($projectID); $execution = $this->loadModel('execution')->getByID($executionID); - $this->view->title = (isset($project->name) ? $project->name : $execution->name) . $this->lang->colon . $this->lang->release->browse; + $this->view->title = (isset($project->name) ? $project->name : $execution->name) . $this->lang->hyphen . $this->lang->release->browse; $this->view->products = $this->product->getProductPairsByProject($projectID); $this->view->pageSummary = $this->release->getPageSummary($releases, $type); $this->view->projectID = $projectID; @@ -146,7 +146,7 @@ class projectrelease extends control $releasedBuilds = $this->projectrelease->getReleasedBuilds($projectID); foreach($releasedBuilds as $build) unset($builds[$build]); - $this->view->title = $this->view->project->name . $this->lang->colon . $this->lang->release->create; + $this->view->title = $this->view->project->name . $this->lang->hyphen . $this->lang->release->create; $this->view->projectID = $projectID; $this->view->builds = $builds; $this->view->lastRelease = $this->projectrelease->getLast($projectID); @@ -202,7 +202,7 @@ class projectrelease extends control if(!isset($bindBuilds[$releasedBuild])) unset($builds[$releasedBuild]); } - $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit; + $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->release->edit; $this->view->release = $release; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); diff --git a/module/release/control.php b/module/release/control.php index 7ac726e29d..1d15676e8d 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -76,7 +76,7 @@ class release extends control $releaseQuery = $type == 'bySearch' ? $this->releaseZen->getSearchQuery($queryID) : ''; $releases = $this->release->getList($productID, $branch, $type, $sort, $releaseQuery, $pager); - $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->browse; + $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->release->browse; $this->view->releases = $this->releaseZen->processReleaseListData($releases); $this->view->pageSummary = $this->release->getPageSummary($releases, $type); $this->view->type = $type; @@ -127,7 +127,7 @@ class release extends control $this->commonAction($productID, $branch); - $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->create; + $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->release->create; $this->view->productID = $productID; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -176,7 +176,7 @@ class release extends control if(strpos(',' . trim($release->build, ',') . ',', ",{$releasedBuild},") === false) unset($builds[$releasedBuild]); } - $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit; + $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->release->edit; $this->view->release = $release; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); diff --git a/module/repo/control.php b/module/repo/control.php index 61fd3cb76d..6304cc5448 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -117,7 +117,7 @@ class repo extends control $this->repoZen->buildRepoSearchForm($products, $projects, $objectID, $orderBy, $recPerPage, $pageID, $param); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->browse; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->browse; $this->view->serverPairs = $this->loadModel('pipeline')->getPairs('gitfox,gitlab'); $this->view->type = $type; $this->view->orderBy = $orderBy; @@ -374,7 +374,7 @@ class repo extends control if(in_array($repo->SCM, $this->config->repo->gitTypeList)) $dropMenus = $this->repoZen->getBranchAndTagItems($repo, $this->cookie->repoBranch); if($this->app->tab == 'execution') $this->view->executionID = $objectID; - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->view; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->view; $this->view->dropMenus = $dropMenus; $this->view->type = 'view'; $this->view->branchID = $this->cookie->repoBranch; @@ -728,7 +728,7 @@ class repo extends control $this->view->newRevision = $newRevision; $this->view->oldRevision = $oldRevision; $this->view->isBranchOrTag = $isBranchOrTag; - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->diff; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->diff; $this->display(); } @@ -798,7 +798,7 @@ class repo extends control $this->app->loadLang('story'); if(is_string($this->config->repo->rules)) $this->config->repo->rules = json_decode($this->config->repo->rules, true); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->setRules; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->setRules; $this->display(); } @@ -820,7 +820,7 @@ class repo extends control if($branch) $branch = base64_decode(helper::safe64Decode($branch)); $latestInDB = $this->repo->getLatestCommit($repoID); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->showSyncCommit; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->showSyncCommit; $this->view->version = $latestInDB ? (int)$latestInDB->commit : 1; $this->view->repoID = $repoID; $this->view->repo = $this->repo->getByID($repoID); @@ -1029,7 +1029,7 @@ class repo extends control $repoList = $server ? $this->repoZen->getNotExistRepos($server) : array(); $products = $this->loadModel('product')->getPairs('', 0, '', 'all'); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->importAction; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->importAction; $this->view->servers = $serverList; $this->view->products = $products; $this->view->projects = $this->product->getProjectPairsByProductIDList(array_keys($products)); @@ -1071,7 +1071,7 @@ class repo extends control $this->scm->setEngine($repo); $info = $this->scm->info($entry, $nRevision); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->diff; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->diff; $this->view->type = 'diff'; $this->view->encoding = str_replace('-', '_', $encoding); $this->view->repoID = $repoID; @@ -1136,7 +1136,7 @@ class repo extends control $content = helper::convertEncoding($content, $encoding); } - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->view; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->view; $this->view->type = 'view'; $this->view->showBug = $showBug; $this->view->repoID = $repoID; diff --git a/module/repo/zen.php b/module/repo/zen.php index 825b0a06c7..9f8dad7a66 100644 --- a/module/repo/zen.php +++ b/module/repo/zen.php @@ -378,7 +378,7 @@ class repoZen extends repo } $projects = $this->product->getProjectPairsByProductIDList(array_keys($products)); - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->create; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed'); $this->view->products = $products; @@ -425,7 +425,7 @@ class repoZen extends repo $repoGroups = $this->repo->getGroups($serverID); } - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->create; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed'); $this->view->products = $products; @@ -474,7 +474,7 @@ class repoZen extends repo $linkedProductPairs = array_combine(array_keys($linkedProducts), helper::arrayColumn($linkedProducts, 'name')); $products = $products + $linkedProductPairs; - $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->edit; + $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->edit; $this->view->repo = $repo; $this->view->repoID = $repoID; $this->view->objectID = $objectID; diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index 91ed11686b..799938d50d 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -54,7 +54,7 @@ class sonarqube extends control $sonarqubeList = $this->loadModel('pipeline')->getList('sonarqube', $orderBy, $pager); - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->browse; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->browse; $this->view->sonarqubeList = $sonarqubeList; $this->view->orderBy = $orderBy; $this->view->pager = $pager; @@ -148,7 +148,7 @@ class sonarqube extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('space', 'browse'))); } - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->createServer; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->createServer; $this->display(); } @@ -215,7 +215,7 @@ class sonarqube extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true)); } - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->editServer; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->editServer; $this->view->sonarqube = $oldSonarQube; $this->display(); @@ -306,7 +306,7 @@ class sonarqube extends control $this->view->sonarqube = $sonarqube; $this->view->keyword = urldecode(urldecode($keyword)); - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->browseProject; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->browseProject; $this->view->sonarqubeID = $sonarqubeID; $this->view->sonarqubeProjectList = (empty($sonarqubeProjectList) or empty($sonarqubeProjectList[$pageID - 1])) ? array() : $sonarqubeProjectList[$pageID - 1]; $this->view->projectJobPairs = $projectJobPairs; @@ -334,7 +334,7 @@ class sonarqube extends control return $this->sendSuccess(array('load' => inlink('browseProject', "sonarqubeID=$sonarqubeID"), 'closeModal' => true)); } - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->createProject; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->createProject; $this->view->sonarqubeID = $sonarqubeID; $this->display(); } @@ -411,7 +411,7 @@ class sonarqube extends control $this->view->projectKey = $projectKey; $this->view->search = $search; $this->view->keyword = $keyword; - $this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->browseIssue; + $this->view->title = $this->lang->sonarqube->common . $this->lang->hyphen . $this->lang->sonarqube->browseIssue; $this->view->sonarqubeID = $sonarqubeID; $this->view->sonarqube = $this->loadModel('pipeline')->getByID($sonarqubeID); $this->view->sonarqubeIssueList = (empty($sonarqubeIssueList) or empty($sonarqubeIssueList[$pageID - 1])) ? array() : $sonarqubeIssueList[$pageID - 1]; diff --git a/module/stage/control.php b/module/stage/control.php index e418bb476a..fe91a07cec 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -27,7 +27,7 @@ class stage extends control $this->stage->setMenu($type); - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->browse; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->browse; $this->view->stages = $this->stage->getStages($orderBy, 0, $type); $this->view->orderBy = $orderBy; $this->view->type = $type; @@ -53,7 +53,7 @@ class stage extends control $this->view->stages = $this->stage->getStages($orderBy, 0, $type); $this->view->orderBy = $orderBy; $this->view->type = $type; - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->browse; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->browse; $this->display('stage', 'browse'); } @@ -78,7 +78,7 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->create; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->create; $this->display(); } @@ -103,7 +103,7 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => inlink($type == 'waterfall' ? 'browse' : 'plusBrowse', "orderBy=id_asc&type=$type"))); } - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->batchCreate; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->batchCreate; $this->display(); } @@ -132,7 +132,7 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->edit; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->edit; $this->view->stage = $stage; $this->display(); @@ -190,7 +190,7 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true)); } - $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->setType; + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->setType; $this->view->currentLang = $currentLang; $this->view->lang2Set = !empty($lang2Set) ? $lang2Set : $lang; $this->view->fieldList = $fieldList; diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index 3cf6e19745..f615c52cf5 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -317,7 +317,7 @@ class stakeholder extends control if($stakeholder->objectType == 'project') $this->view->projectID = $stakeholder->objectID; - $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->view; + $this->view->title = $this->lang->stakeholder->common . $this->lang->hyphen . $this->lang->stakeholder->view; $this->view->user = $stakeholder; $this->view->users = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project', 'nodeleted'); $this->view->expects = $this->stakeholder->getExpectByUser($stakeholderID); @@ -347,7 +347,7 @@ class stakeholder extends control $this->commonAction($stakeholderID, 'stakeholder'); - $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; + $this->view->title = $this->lang->stakeholder->common . $this->lang->hyphen . $this->lang->stakeholder->communicate; $this->view->user = $this->stakeholder->getByID($stakeholderID); $this->view->users = $this->loadModel('user')->getTeamMemberPairs($this->view->user->objectID, 'project', 'nodeleted'); @@ -381,7 +381,7 @@ class stakeholder extends control return $this->send(array('result' => 'success', 'closeModal' => true)); } - $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; + $this->view->title = $this->lang->stakeholder->common . $this->lang->hyphen . $this->lang->stakeholder->communicate; $this->view->user = $this->stakeholder->getByID($stakeholderID); $this->display(); @@ -413,7 +413,7 @@ class stakeholder extends control $this->app->loadLang('issue'); $stakeholder = $this->stakeholder->getByID($stakeholderID); - $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; + $this->view->title = $this->lang->stakeholder->common . $this->lang->hyphen . $this->lang->stakeholder->communicate; $this->view->stakeholder = $stakeholder; $this->view->projectID = $stakeholder->objectID; $this->view->issueList = $this->stakeholder->getStakeholderIssue($stakeholder->user); diff --git a/module/story/control.php b/module/story/control.php index c1c5005591..eac7e7666d 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -106,7 +106,7 @@ class story extends control $fields = $this->storyZen->setModuleField($fields, $moduleID); $fields = $this->storyZen->removeFormFieldsForCreate($fields, $storyType); - $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->story->create; + $this->view->title = $this->view->product->name . $this->lang->hyphen . $this->lang->story->create; $this->view->fields = $fields; $this->view->blockID = $this->storyZen->getAssignMeBlockID(); $this->view->type = $storyType; @@ -190,7 +190,7 @@ class story extends control if(!$this->story->checkCanSubdivide($story, !empty($product->shadow))) return $this->send(array('result' => 'fail', 'message' => $this->lang->story->errorNotSubdivide, 'load' => array('alert' => $this->lang->story->errorNotSubdivide))); } - $this->view->title = $product->name . $this->lang->colon . ($storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate); + $this->view->title = $product->name . $this->lang->hyphen . ($storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate); $this->view->customFields = $customFields; $this->view->showFields = $showFields; $this->view->product = $product; @@ -308,7 +308,7 @@ class story extends control $fields = $this->storyZen->getFormFieldsForEdit($storyID); $fields = $this->storyZen->hiddenFormFieldsForEdit($fields); - $this->view->title = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title; + $this->view->title = $this->lang->story->edit . "STORY" . $this->lang->hyphen . $this->view->story->title; $this->view->story = $story; $this->view->twins = empty($story->twins) ? array() : $this->story->getByList($story->twins); $this->view->fields = $fields; @@ -422,7 +422,7 @@ class story extends control $this->story->getAffectedScope($story); /* Assign. */ - $this->view->title = $this->lang->story->change . "STORY" . $this->lang->colon . $story->title; + $this->view->title = $this->lang->story->change . "STORY" . $this->lang->hyphen . $story->title; $this->view->users = $this->user->getPairs('pofirst|nodeleted|noclosed', $story->assignedTo); $this->view->fields = $this->storyZen->getFormFieldsForChange($storyID); $this->view->lastReviewer = $this->story->getLastReviewer($story->id); @@ -474,7 +474,7 @@ class story extends control $this->commonAction($storyID); /* Assign. */ - $this->view->title = $this->lang->story->activate . "STORY" . $this->lang->colon . $this->view->story->title; + $this->view->title = $this->lang->story->activate . "STORY" . $this->lang->hyphen . $this->view->story->title; $this->view->users = $this->user->getPairs('pofirst|nodeleted|noclosed', $this->view->story->closedBy); $this->display(); } @@ -642,7 +642,7 @@ class story extends control $reviewers = $this->story->getReviewerPairs($storyID, $story->version); $this->story->getAffectedScope($story); - $this->view->title = $this->lang->story->review . "STORY" . $this->lang->colon . $story->title; + $this->view->title = $this->lang->story->review . "STORY" . $this->lang->hyphen . $story->title; $this->view->fields = $this->storyZen->getFormFieldsForReview($storyID); $this->view->reviewers = $reviewers; $this->view->isLastOne = count(array_diff(array_keys($reviewers), explode(',', $story->reviewedBy))) <= 1; @@ -859,7 +859,7 @@ class story extends control $productStories = $this->story->getProductStoryPairs($story->product, $branch, 0, 'all', 'id_desc', 0, '', $storyType); if(isset($productStories[$storyID])) unset($productStories[$storyID]); - $this->view->title = $this->lang->story->close . "STORY" . $this->lang->colon . $story->title; + $this->view->title = $this->lang->story->close . "STORY" . $this->lang->hyphen . $story->title; $this->view->product = $product; $this->view->story = $story; $this->view->productStories = $productStories; @@ -1172,7 +1172,7 @@ class story extends control $product = $this->product->getByID($story->product); $users = $this->config->vision == 'lite' ? $this->user->getTeamMemberPairs($this->session->project) : $this->user->getPairs('nodeleted|noclosed|pofirst|noletter'); - $this->view->title = zget($product, 'name', $story->title) . $this->lang->colon . $this->lang->story->assign; + $this->view->title = zget($product, 'name', $story->title) . $this->lang->hyphen . $this->lang->story->assign; $this->view->story = $story; $this->view->actions = $this->action->getList('story', $storyID); $this->view->users = $users; @@ -1350,7 +1350,7 @@ class story extends control $stories2Link = $this->story->getStories2Link($storyID, $type, $browseType, $queryID, $story->type); /* Assign. */ - $this->view->title = $this->lang->story->linkStory . "STORY" . $this->lang->colon .$this->lang->story->linkStory; + $this->view->title = $this->lang->story->linkStory . "STORY" . $this->lang->hyphen .$this->lang->story->linkStory; $this->view->type = $type; $this->view->stories2Link = $stories2Link; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -1728,7 +1728,7 @@ class story extends control unset($this->lang->story->report->charts['storiesPerStage']); } - $this->view->title = $product->name . $this->lang->colon . $this->lang->story->reportChart; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->story->reportChart; $this->view->productID = $productID; $this->view->branchID = $branchID; $this->view->browseType = $browseType; diff --git a/module/story/ui/batchcreate.html.php b/module/story/ui/batchcreate.html.php index cedfa7e81c..af588046d0 100644 --- a/module/story/ui/batchcreate.html.php +++ b/module/story/ui/batchcreate.html.php @@ -70,7 +70,7 @@ formBatchPanel on::change('[data-name="branch"]', 'setModuleAndPlanByBranch'), $stories ? set::data($stories) : null, set::ajax(array('beforeSubmit' => jsRaw('clickSubmit'))), - set::title($storyID ? $storyTitle . $lang->colon . $this->lang->story->subdivide : $this->lang->story->batchCreate), + set::title($storyID ? $storyTitle . $lang->hyphen . $this->lang->story->subdivide : $this->lang->story->batchCreate), set::uploadParams('module=story¶ms=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=$executionID&plan={$planID}&type=$type")), set::pasteField('title'), set::customFields(array('list' => $customFields, 'show' => explode(',', $showFields), 'key' => 'batchCreateFields')), diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 18bb77ab36..fc7adede7c 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -15,7 +15,7 @@ tab);?>
-

SRCommon : $lang->URCommon) . $lang->colon . $lang->story->batchClose;?>

+

SRCommon : $lang->URCommon) . $lang->hyphen . $lang->story->batchClose;?>

diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index cf9a0ab0c7..4ba1a84462 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -19,7 +19,7 @@

- story->common . $lang->colon . $lang->story->batchEdit;?> + story->common . $lang->hyphen . $lang->story->batchEdit;?>

createLink('custom', 'ajaxSaveCustomFields', 'module=story§ion=custom&key=batchEditFields')?> diff --git a/module/story/zen.php b/module/story/zen.php index 7ed163e463..9caab79109 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -229,7 +229,7 @@ class storyZen extends story { $this->product->setMenu($productID); $product = $this->product->getByID($productID); - $this->view->title = $product->name . $this->lang->colon . $this->lang->story->batchClose; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->story->batchClose; } /* The stories of a execution. */ elseif($this->app->tab == 'execution' && $executionID) @@ -238,7 +238,7 @@ class storyZen extends story $this->lang->story->menuOrder = $this->lang->execution->menuOrder; $this->execution->setMenu($executionID); $execution = $this->execution->getByID($executionID); - $this->view->title = $execution->name . $this->lang->colon . $this->lang->story->batchClose; + $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->story->batchClose; $this->view->executionID = $executionID; } elseif($this->app->tab == 'project') diff --git a/module/task/control.php b/module/task/control.php index 9b1888cf3f..50a0933341 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -464,7 +464,7 @@ class task extends control /* Shows the variables needed to start the task page. */ $assignedTo = empty($task->assignedTo) ? $this->app->user->account : $task->assignedTo; - $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->start; + $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->start; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->members = $this->user->getTeamMemberPairs($task->execution, 'execution', 'nodeleted'); $this->view->assignedTo = !empty($task->team) ? $this->task->getAssignedTo4Multi($task->team, $task) : $assignedTo; @@ -622,7 +622,7 @@ class task extends control $task->myConsumed = zget($currentTeam, 'consumed', 0); } - $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish; + $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->finish; $this->view->members = $members; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->canRecordEffort = $this->task->canOperateEffort($task); @@ -673,7 +673,7 @@ class task extends control } /* Show the variables associated. */ - $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->pause; + $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->pause; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); } @@ -720,7 +720,7 @@ class task extends control return $this->send($response); } - $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->restart; + $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->restart; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->members = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted'); $this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo; @@ -763,7 +763,7 @@ class task extends control return $this->send($response); } - $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish; + $this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->finish; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); } @@ -878,7 +878,7 @@ class task extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('task', 'view', "taskID=$taskID"))); } - $this->view->title = $this->view->execution->name . $this->lang->colon . $this->lang->task->cancel; + $this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->cancel; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); @@ -940,7 +940,7 @@ class task extends control $this->view->teamMembers = $teamMembers; } - $this->view->title = $this->view->execution->name . $this->lang->colon . $this->lang->task->activate; + $this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->activate; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->isMultiple = !empty($this->view->task->team); $this->display(); @@ -1064,7 +1064,7 @@ class task extends control $this->execution->setMenu($executionID); if($this->app->tab == 'project') $this->view->projectID = $execution->project; - $this->view->title = $execution->name . $this->lang->colon . $this->lang->task->report->common; + $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->task->report->common; $this->view->executionID = $executionID; $this->view->browseType = $browseType; $this->view->chartType = $chartType; diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 2d17ef9cc5..f72a4d4208 100755 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -39,7 +39,7 @@ $colspan = count($visibleFields) + 3;

- lang->colon;?> + lang->hyphen;?> task->batchCreateChildren;?> task->batchCreate;?> diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index fe8b2c33a1..10f231ef6f 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -21,9 +21,9 @@ js::set('requiredFields', $config->task->edit->requiredFields);

- task->common . $lang->colon . $lang->task->batchEdit;?> + task->common . $lang->hyphen . $lang->task->batchEdit;?> multiple):?> - task->execution . $lang->colon . ' ' . $executionName;?> + task->execution . $lang->hyphen . ' ' . $executionName;?>

diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 962a62aa81..53db8ee0ee 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -32,7 +32,7 @@ task->deleted;?> fromBug != 0):?> - fromBug", '', true), " {$lang->task->fromBug}$lang->colon$task->fromBug", '', "class='iframe' data-width='80%'");?> + fromBug", '', true), " {$lang->task->fromBug}$lang->hyphen$task->fromBug", '', "class='iframe' data-width='80%'");?>
diff --git a/module/task/zen.php b/module/task/zen.php index 02170ddc68..a4996796a0 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -59,7 +59,7 @@ class taskZen extends task $executionTypeLang = zget($this->lang->execution->typeList, $execution->type, ''); $this->lang->task->noticeLinkStory = sprintf($this->lang->task->noticeLinkStory, $executionTypeLang); - $this->view->title = $execution->name . $this->lang->colon . $this->lang->task->create; + $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->task->create; $this->view->customFields = $customFields; $this->view->modulePairs = $modulePairs; $this->view->showFields = $this->config->task->custom->createFields; @@ -185,7 +185,7 @@ class taskZen extends task $this->execution->setMenu($executionID); $execution = $this->execution->getById($executionID); - $this->view->title = $execution->name . $this->lang->colon . $this->lang->task->batchEdit; + $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->task->batchEdit; $this->view->execution = $execution; $this->view->modules = $this->tree->getTaskOptionMenu($executionID, 0, !empty($this->config->task->allModule) ? 'allModule' : ''); } @@ -279,7 +279,7 @@ class taskZen extends task $taskMembers = $this->view->members; } - $this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name; + $this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->hyphen . $this->view->task->name; $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active'); $this->view->tasks = $tasks; $this->view->taskMembers = $taskMembers; @@ -314,7 +314,7 @@ class taskZen extends task if(!isset($members[$task->assignedTo])) $members[$task->assignedTo] = $task->assignedTo; if(isset($members['closed']) || $task->status == 'closed') $members['closed'] = 'Closed'; - $this->view->title = $this->view->execution->name . $this->lang->colon . $this->lang->task->assign; + $this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->assign; $this->view->task = $task; $this->view->members = $members; $this->view->users = $this->loadModel('user')->getPairs(); diff --git a/module/testcase/control.php b/module/testcase/control.php index e73f5b34da..08b93a65f4 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -142,7 +142,7 @@ class testcase extends control /* 展示变量. */ /* Show the variables. */ - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->common; $this->view->projectID = $projectID; $this->view->productID = $productID; $this->view->users = $this->user->getPairs('noletter'); @@ -277,7 +277,7 @@ class testcase extends control $extras = str_replace(array(',', ' '), array('&', ''), $extras); parse_str($extras, $output); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->create; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->create; $this->view->productID = $productID; $this->view->users = $this->user->getPairs('noletter|noclosed|nodeleted'); $this->view->gobackLink = isset($output['from']) && $output['from'] == 'global' ? $this->createLink('testcase', 'browse', "productID=$productID") : ''; @@ -332,7 +332,7 @@ class testcase extends control /* 展示变量. */ /* Show the variables. */ - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->batchCreate; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->batchCreate; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, $branch === 'all' ? '0' : $branch); @@ -382,7 +382,7 @@ class testcase extends control /* 展示变量. */ /* Show the variables. */ - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->createBug; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->createBug; $this->view->caseID = $caseID; $this->view->version = $version; $this->view->runID = $runID; @@ -768,7 +768,7 @@ class testcase extends control $cases2Link = array_chunk($cases2Link, $pager->recPerPage); /* Assign. */ - $this->view->title = $case->title . $this->lang->colon . $this->lang->testcase->linkCases; + $this->view->title = $case->title . $this->lang->hyphen . $this->lang->testcase->linkCases; $this->view->case = $case; $this->view->cases2Link = empty($cases2Link) ? $cases2Link : $cases2Link[$pageID - 1]; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -1170,7 +1170,7 @@ class testcase extends control /* Show the variables. */ $this->testcaseZen->assignForImportFromLib($productID, $branch, $libID, $orderBy, $queryID, $libraries, $projectID); - $this->view->title = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->importFromLib; + $this->view->title = $this->lang->testcase->common . $this->lang->hyphen . $this->lang->testcase->importFromLib; $this->view->libraries = $libraries; $this->view->cases = $this->testcase->getCanImportCases($productID, $libID, $branch, $orderBy, $pager, $browseType, $queryID); $this->view->libModules = $this->tree->getOptionMenu($libID, 'caselib'); @@ -1226,7 +1226,7 @@ class testcase extends control $this->testcaseZen->assignShowImportVars($productID, $branch, $data['caseData'], isset($stepVars) ? $stepVars : 0, $pagerID, $maxImport); - $this->view->title = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->showImport; + $this->view->title = $this->lang->testcase->common . $this->lang->hyphen . $this->lang->testcase->showImport; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch); $this->view->cases = $this->testcase->getByProduct($productID); $this->view->stepData = array_values($data['stepData']); diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 381fae26d6..ee2ce80de4 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -20,7 +20,7 @@
-

testcase->common . $lang->colon . $lang->testcase->batchEdit;?>

+

testcase->common . $lang->hyphen . $lang->testcase->batchEdit;?>

createLink('custom', 'ajaxSaveCustomFields', 'module=testcase§ion=custom&key=batchEditFields')?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 72d28ed40c..2e4c0409fd 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -25,7 +25,7 @@ id;?> title;?> fromCaseID):?> - fromCaseID"), html::icon($lang->icons['testcase']) . " {$lang->testcase->fromCase}$lang->colon$case->fromCaseID");?> + fromCaseID"), html::icon($lang->icons['testcase']) . " {$lang->testcase->fromCase}$lang->hyphen$case->fromCaseID");?> deleted):?> diff --git a/module/testcase/zen.php b/module/testcase/zen.php index e5c02a0065..041043b820 100755 --- a/module/testcase/zen.php +++ b/module/testcase/zen.php @@ -307,7 +307,7 @@ class testcaseZen extends testcase /* Set menu. */ $this->setMenu((int)$this->session->project, (int)$this->session->execution, $productID, $branch); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->newScene; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->newScene; $this->view->modules = $this->tree->getOptionMenu($productID, 'case', 0, ($branch === 'all' || !isset($branches[$branch])) ? 'all' : (string)$branch); $this->view->scenes = $this->testcase->getSceneMenu($productID, $moduleID, ($branch === 'all' || !isset($branches[$branch])) ? 'all' : (string)$branch); $this->view->moduleID = $moduleID ? (int)$moduleID : (int)$this->cookie->lastCaseModule; @@ -355,7 +355,7 @@ class testcaseZen extends testcase $scenes = $this->testcase->getSceneMenu($productID, $moduleID, $branchID, 0, $oldScene->id); if(!isset($scenes[$parentID])) $scenes += $this->testcase->getScenesName((array)$parentID); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->editScene; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->editScene; $this->view->products = $this->products; $this->view->product = $product; $this->view->branches = $branches; @@ -578,7 +578,7 @@ class testcaseZen extends testcase $showModule = !empty($this->config->testcase->browse->showModule) ? $this->config->testcase->browse->showModule : ''; $tree = $moduleID ? $this->tree->getByID($moduleID) : ''; - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->common; $this->view->projectID = $projectID; $this->view->projectType = !empty($projectID) ? $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model') : ''; $this->view->browseType = $browseType; @@ -835,7 +835,7 @@ class testcaseZen extends testcase $product = $this->product->getByID($case->product); if(!isset($this->products[$case->product])) $this->products[$case->product] = $product->name; - $this->view->title = $this->products[$case->product] . $this->lang->colon . $this->lang->testcase->edit; + $this->view->title = $this->products[$case->product] . $this->lang->hyphen . $this->lang->testcase->edit; $this->view->isLibCase = false; $this->view->product = $product; $this->view->products = $this->products; @@ -1063,7 +1063,7 @@ class testcaseZen extends testcase /* Set caselib menu. */ $this->caselib->setLibMenu($libraries, $libID); - $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->batchEdit; + $this->view->title = $libraries[$libID] . $this->lang->hyphen . $this->lang->testcase->batchEdit; } /* 指派测试用例。 */ /* Assign test cases. */ @@ -1074,7 +1074,7 @@ class testcaseZen extends testcase $this->setMenu((int)$this->session->project, (int)$this->session->execution, $productID, $branch); - $this->view->title = $product->name . $this->lang->colon . $this->lang->testcase->batchEdit; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->testcase->batchEdit; } /* 指派地盘标签下的用例。 */ /* Assign cases of my tab. */ diff --git a/module/testreport/control.php b/module/testreport/control.php index 0c3c411bea..c31c038ce4 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -115,7 +115,7 @@ class testreport extends control foreach(explode(',', $report->tasks) as $taskID) $tasks[$taskID] = $taskID; } - $this->view->title = ($extra ? $task->name : $object->name) . $this->lang->colon . $this->lang->testreport->common; + $this->view->title = ($extra ? $task->name : $object->name) . $this->lang->hyphen . $this->lang->testreport->common; $this->view->reports = $reports; $this->view->orderBy = $orderBy; $this->view->objectID = $objectID; diff --git a/module/testsuite/control.php b/module/testsuite/control.php index fc2e3232dd..ee137c8f23 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -155,7 +155,7 @@ class testsuite extends control $productID = $this->product->checkAccess($productID, $this->products); $this->loadModel('qa')->setMenu($productID); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->create; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testsuite->create; $this->view->productID = $productID; $this->display(); } @@ -250,7 +250,7 @@ class testsuite extends control $productID = $this->product->checkAccess($suite->product, $this->products); $this->loadModel('qa')->setMenu($productID); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->edit; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testsuite->edit; $this->view->suite = $suite; $this->view->productID = $productID; $this->display(); @@ -339,7 +339,7 @@ class testsuite extends control if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']); $this->loadModel('search')->setSearchParams($this->config->testcase->search); - $this->view->title = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase; + $this->view->title = $suite->name . $this->lang->hyphen . $this->lang->testsuite->linkCase; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->cases = $this->testsuite->getUnlinkedCases($suite, $browseType, $param, $pager); $this->view->suiteID = $suiteID; diff --git a/module/testtask/control.php b/module/testtask/control.php index 8ae93ab0ed..6674fe1724 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -124,7 +124,7 @@ class testtask extends control $this->testtaskZen->prepareSummaryForBrowse($testtasks); - $this->view->title = $product->name . $this->lang->colon . $this->lang->testtask->common; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->testtask->common; $this->view->users = $users; $this->view->tasks = $testtasks; $this->view->product = $product; @@ -175,7 +175,7 @@ class testtask extends control $pager = pager::init($recTotal, $recPerPage, $pageID); $sort = common::appendOrder($orderBy); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->common; $this->view->tasks = $this->testtask->getProductUnitTasks($productID, $browseType, $sort, $pager); $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->product = $this->product->getByID($productID); @@ -337,7 +337,7 @@ class testtask extends control $runs = $this->loadModel('testcase')->appendData($runs, 'testrun'); $runs = $this->testtaskZen->processRowspanForUnitCases($runs); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testcase->common; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->runs = $runs; $this->view->productID = $productID; @@ -460,7 +460,7 @@ class testtask extends control $this->products[$productID] = $product->name; } - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common . $this->lang->colon . $this->lang->testtask->reportChart; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->common . $this->lang->hyphen . $this->lang->testtask->reportChart; $this->view->productID = $productID; $this->view->taskID = $taskID; $this->view->browseType = $browseType; @@ -518,7 +518,7 @@ class testtask extends control /* Process the rowspan property of cases for use by front-end component groupings. */ $cases = $this->testtaskZen->processRowspanForGroupCase($cases, $task->build); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->cases; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->canBeChanged = common::canBeChanged('testtask', $task); $this->view->productID = $productID; @@ -608,7 +608,7 @@ class testtask extends control /* Set menu. */ $this->loadModel('qa')->setMenu($productID, $testtask->branch); - $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->start; + $this->view->title = $testtask->name . $this->lang->hyphen . $this->lang->testtask->start; $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->testtask = $testtask; @@ -644,7 +644,7 @@ class testtask extends control /* Set menu. */ $this->loadModel('qa')->setMenu($productID, $testtask->branch); - $this->view->title = $testtask->name . $this->lang->colon . $this->lang->close; + $this->view->title = $testtask->name . $this->lang->hyphen . $this->lang->close; $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|qdfirst'); $this->view->testtask = $testtask; @@ -680,7 +680,7 @@ class testtask extends control /* Set menu. */ $this->loadModel('qa')->setMenu($productID, $testtask->branch); - $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->block; + $this->view->title = $testtask->name . $this->lang->hyphen . $this->lang->testtask->block; $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->testtask = $testtask; @@ -716,7 +716,7 @@ class testtask extends control /* Set menu. */ $this->loadModel('qa')->setMenu($productID, $testtask->branch); - $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->activate; + $this->view->title = $testtask->name . $this->lang->hyphen . $this->lang->testtask->activate; $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->testtask = $testtask; @@ -797,7 +797,7 @@ class testtask extends control $pager = pager::init($recTotal, $recPerPage, $pageID); $cases = $this->testtask->getLinkableCases($productID, $task, $type, $param, $pager); - $this->view->title = $task->name . $this->lang->colon . $this->lang->testtask->linkCase; + $this->view->title = $task->name . $this->lang->hyphen . $this->lang->testtask->linkCase; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->suites = $this->loadModel('testsuite')->getSuites($task->product); $this->view->relatedTasks = $this->testtask->getRelatedTestTasks($productID, $taskID); @@ -1037,7 +1037,7 @@ class testtask extends control $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, '', 0, '', array('review', 'design', 'request')); $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk', 0, 'execution', '', false); - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->importUnitResult; $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed'); $this->view->executions = $executions; $this->view->builds = $builds; diff --git a/module/testtask/ui/batchrun.html.php b/module/testtask/ui/batchrun.html.php index eeb09d986d..af39fb4328 100644 --- a/module/testtask/ui/batchrun.html.php +++ b/module/testtask/ui/batchrun.html.php @@ -152,7 +152,7 @@ foreach($cases as $caseID => $case) } formPanel ( - set::title(($from == 'testtask' ? $lang->testtask->common . $lang->colon : '') . $lang->testtask->batchRun), + set::title(($from == 'testtask' ? $lang->testtask->common . $lang->hyphen : '') . $lang->testtask->batchRun), set::width('auto'), on::click('[name^=results]', 'toggleAction'), diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index 497840abee..0e0aa805a7 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -15,7 +15,7 @@ app->loadLang('testcase'); unset($this->lang->testcase->resultList['n/a']); ?>
-

testtask->common . $lang->colon) : ''). $lang->testtask->batchRun;?>

+

testtask->common . $lang->hyphen) : ''). $lang->testtask->batchRun;?>

diff --git a/module/testtask/zen.php b/module/testtask/zen.php index 58f98ced1f..28bfe2a2a0 100644 --- a/module/testtask/zen.php +++ b/module/testtask/zen.php @@ -317,7 +317,7 @@ class testtaskZen extends testtask $this->setDropMenu($product->id, $testtask); $showModule = $this->loadModel('setting')->getItem("owner={$this->app->user->account}&module=testtask§ion=cases&key=showModule"); - $this->view->title = $product->name . $this->lang->colon . $this->lang->testtask->cases; + $this->view->title = $product->name . $this->lang->hyphen . $this->lang->testtask->cases; $this->view->runs = $this->loadModel('testcase')->appendData($runs, 'run'); $this->view->users = $this->loadModel('user')->getPairs('noclosed|qafirst|noletter'); $this->view->moduleTree = $this->loadModel('tree')->getTreeMenu($product->id, 'case', 0, array('treeModel', 'createTestTaskLink'), (string)$testtask->id, $testtask->branch ? $testtask->branch : '0'); @@ -380,7 +380,7 @@ class testtaskZen extends testtask $this->products[$productID] = $product->name; } - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->create; $this->view->product = $this->loadModel('product')->getByID($productID); $this->view->executions = $productID ? $this->product->getExecutionPairsByProduct($productID, '', $projectID, 'stagefilter') : array(); $this->view->builds = $productID ? $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk,withexecution', $objectID, $objectType, '', false) : array(); @@ -424,7 +424,7 @@ class testtaskZen extends testtask $this->products[$productID] = $product->name; } - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit; + $this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->edit; $this->view->task = $task; $this->view->project = $this->project->getByID($projectID); $this->view->productID = $productID; diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php index 26b2c3eae0..73708a5eba 100644 --- a/module/todo/view/batchedit.html.php +++ b/module/todo/view/batchedit.html.php @@ -18,7 +18,7 @@ todo->getUserObjectsMethod)?>
-

todo->common . $lang->colon . $lang->todo->batchEdit;?>

+

todo->common . $lang->hyphen . $lang->todo->batchEdit;?>

createLink('custom', 'ajaxSaveCustomFields', 'module=todo§ion=custom&key=batchEditFields')?>
diff --git a/module/todo/zen.php b/module/todo/zen.php index 836df1be18..2e5b5d88bf 100755 --- a/module/todo/zen.php +++ b/module/todo/zen.php @@ -20,7 +20,7 @@ class todoZen extends todo */ protected function buildCreateView(string $date) { - $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->create; + $this->view->title = $this->lang->todo->common . $this->lang->hyphen . $this->lang->todo->create; $this->view->date = date('Y-m-d', strtotime($date)); $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); @@ -46,7 +46,7 @@ class todoZen extends todo $this->view->customFields = $customFields; $this->view->showFields = $this->config->todo->custom->batchCreateFields; - $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->batchCreate; + $this->view->title = $this->lang->todo->common . $this->lang->hyphen . $this->lang->todo->batchCreate; $this->view->date = (int)$date == 0 ? $date : date('Y-m-d', strtotime($date)); $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); @@ -66,7 +66,7 @@ class todoZen extends todo protected function buildEditView(object $todo): void { $todo->date = date("Y-m-d", strtotime($todo->date)); - $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->edit; + $this->view->title = $this->lang->todo->common . $this->lang->hyphen . $this->lang->todo->edit; $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->todo = $todo; $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noempty'); @@ -464,7 +464,7 @@ class todoZen extends todo $this->view->showFields = $this->config->todo->custom->batchEditFields; $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); - $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->batchEdit; + $this->view->title = $this->lang->todo->common . $this->lang->hyphen . $this->lang->todo->batchEdit; $this->display(); } diff --git a/module/tree/ui/browse.html.php b/module/tree/ui/browse.html.php index 9f1eacd69f..15feb2316e 100644 --- a/module/tree/ui/browse.html.php +++ b/module/tree/ui/browse.html.php @@ -189,7 +189,7 @@ div div ( setClass('entity-label flex items-center gap-x-2 text-lg font-bold'), - $viewType == 'host' ? $root->name : $lang->tree->common . $lang->colon . $root->name + $viewType == 'host' ? $root->name : $lang->tree->common . $lang->hyphen . $root->name ) ); diff --git a/module/tree/ui/browsetask.html.php b/module/tree/ui/browsetask.html.php index 6a5ae2bd70..94ffb04f1e 100644 --- a/module/tree/ui/browsetask.html.php +++ b/module/tree/ui/browsetask.html.php @@ -165,7 +165,7 @@ div div ( setClass('entity-label flex items-center gap-x-2 text-lg font-bold'), - $lang->tree->common . $lang->colon . $root->name + $lang->tree->common . $lang->hyphen . $root->name ) ); diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index e43bdeb7fd..016110a1b1 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -65,11 +65,11 @@ if($viewType == 'doc' or $viewType == 'api') doc->manageType . $lang->colon . $root->name; + echo $lang->doc->manageType . $lang->hyphen . $root->name; } elseif($viewType == 'api') { - echo $lang->api->manageType . $lang->colon . $root->name; + echo $lang->api->manageType . $lang->hyphen . $root->name; } elseif($viewType == 'line') { @@ -85,7 +85,7 @@ if($viewType == 'doc' or $viewType == 'api') } else { - echo $lang->tree->common . $lang->colon . $root->name; + echo $lang->tree->common . $lang->hyphen . $root->name; } ?> diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index 126aa8c1dc..793d06ad4b 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -25,7 +25,7 @@ li.story-item > .tree-actions .tree-action[data-type=delete] {display: none;}
- tree->common . $lang->colon . $root->name;?> + tree->common . $lang->hyphen . $root->name;?>
diff --git a/module/upgrade/control.php b/module/upgrade/control.php index b9fb571560..17664cfbde 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -95,7 +95,7 @@ class upgrade extends control if($_POST) $this->locate(inlink('confirm', "fromVersion={$this->post->fromVersion}")); - $this->view->title = $this->lang->upgrade->common . $this->lang->colon . $this->lang->upgrade->selectVersion; + $this->view->title = $this->lang->upgrade->common . $this->lang->hyphen . $this->lang->upgrade->selectVersion; $this->view->version = $version; $this->display(); } diff --git a/module/user/control.php b/module/user/control.php index 374c772d8f..03ad0f417b 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -71,7 +71,7 @@ class user extends control $users = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id'); if(!isset($users[$userID])) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->user->error->noAccess, 'locate' => array('back' => true)))); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->todo; $this->view->deptUsers = $users; $this->view->todos = $todos; $this->view->user = $user; @@ -120,7 +120,7 @@ class user extends control if($storyType == 'requirement') $this->lang->story->title = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title); /* Assign. */ - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->story; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->story; $this->view->stories = $this->story->getUserStories($user->account, $type, $sort, $pager, $storyType, false, 'all'); $this->view->users = $this->user->getPairs('noletter'); $this->view->deptUsers = $users; @@ -165,7 +165,7 @@ class user extends control if(strpos($sort, 'Label') !== false) $sort = str_replace('Label', '', $sort); /* Assign. */ - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->task; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->task; $this->view->tasks = $this->loadModel('task')->getUserTasks($user->account, $type, 0, $pager, $sort); $this->view->deptUsers = $users; $this->view->user = $user; @@ -205,7 +205,7 @@ class user extends control /* Load the lang of bug module. */ $this->app->loadLang('bug'); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->bug; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->bug; $this->view->bugs = $this->loadModel('bug')->getUserBugs($user->account, $type, $orderBy, 0, $pager); $this->view->users = $this->user->getPairs('noletter'); $this->view->deptUsers = $users; @@ -249,7 +249,7 @@ class user extends control /* Append id for second sort. */ $sort = common::appendOrder($orderBy); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testTask; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->testTask; $this->view->tasks = $this->loadModel('testtask')->getByUser($user->account, $pager, $sort); $this->view->deptUsers = $users; $this->view->user = $user; @@ -306,7 +306,7 @@ class user extends control $cases = $this->loadModel('story')->checkNeedConfirm($cases); /* Assign. */ - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testCase; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->testCase; $this->view->users = $this->user->getPairs('noletter'); $this->view->cases = $cases; $this->view->deptUsers = $users; @@ -343,7 +343,7 @@ class user extends control $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->execution; $this->view->executions = $this->user->getExecutions($user->account, 'all', $orderBy, $pager); $this->view->deptUsers = $users; $this->view->user = $user; @@ -379,7 +379,7 @@ class user extends control $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->issue; $this->view->issues = $this->loadModel('issue')->getUserIssues($type, 0, $user->account, $orderBy, $pager); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->deptUsers = $users; @@ -419,7 +419,7 @@ class user extends control $pager = pager::init($recTotal, $recPerPage, $pageID); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->risk; $this->view->risks = $this->loadModel('risk')->getUserRisks($type, $user->account, $orderBy, $pager); $this->view->deptUsers = $users; $this->view->user = $user; @@ -960,7 +960,7 @@ class user extends control /* Assign. */ - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->dynamic; + $this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->dynamic; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->dateGroups = $dateGroups; $this->view->deptUsers = $users; diff --git a/module/webhook/control.php b/module/webhook/control.php index 05412d2162..b78e32503b 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -45,7 +45,7 @@ class webhook extends control /* Unset selectedDepts cookie. */ helper::setcookie('selectedDepts', '', 0, $this->config->webRoot, '', $this->config->cookieSecure, true); - $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->list; + $this->view->title = $this->lang->webhook->api . $this->lang->hyphen . $this->lang->webhook->list; $this->view->webhooks = $this->webhook->getList($orderBy, $pager); $this->view->orderBy = $orderBy; $this->view->pager = $pager; @@ -71,7 +71,7 @@ class webhook extends control } $this->app->loadLang('action'); - $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->create; + $this->view->title = $this->lang->webhook->api . $this->lang->hyphen . $this->lang->webhook->create; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->executions = $this->loadModel('execution')->getPairs(); $this->display(); @@ -98,7 +98,7 @@ class webhook extends control $webhook = $this->webhook->getByID($id); $this->app->loadLang('action'); - $this->view->title = $this->lang->webhook->edit . $this->lang->colon . $webhook->name; + $this->view->title = $this->lang->webhook->edit . $this->lang->hyphen . $webhook->name; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->executions = $this->loadModel('execution')->getPairs(); $this->view->webhook = $webhook; @@ -141,7 +141,7 @@ class webhook extends control $pager = new pager($recTotal, $recPerPage, $pageID); $webhook = $this->webhook->getByID($id); - $this->view->title = $this->lang->webhook->log . $this->lang->colon . $webhook->name; + $this->view->title = $this->lang->webhook->log . $this->lang->hyphen . $webhook->name; $this->view->logs = $this->webhook->getLogList($id, $orderBy, $pager); $this->view->webhook = $webhook; $this->view->orderBy = $orderBy; diff --git a/module/weekly/model.php b/module/weekly/model.php index 25bf0d0b25..2205d2d2b1 100755 --- a/module/weekly/model.php +++ b/module/weekly/model.php @@ -48,7 +48,7 @@ class weeklyModel extends model $current = zget($weeks, $date, current($weeks)); $selectHtml = "
"; - $selectHtml .= html::a('###', $this->lang->weekly->common . $this->lang->colon . $project->name, '', "class='btn'"); + $selectHtml .= html::a('###', $this->lang->weekly->common . $this->lang->hyphen . $project->name, '', "class='btn'"); $selectHtml .= '
'; $selectHtml .= "
";