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

* fix sprintf with %branch%.

Browse Source
This commit is contained in:
wangyidong
2016-03-23 13:45:08 +08:00
parent e7a1c9e217
commit f3e552f275
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/control.php
+1 -1
View File
@@ -93,7 +93,7 @@ class branch extends control
{
$this->app->loadLang('product');
$productType = $this->branch->getProductType($branchID);
die(js::confirm(str_replace('%branch%', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
}
$this->branch->delete(TABLE_BRANCH, $branchID);
module/branch/lang/en.php
+1 -1
View File
@@ -6,4 +6,4 @@ $lang->branch->delete = 'Branch delete';
$lang->branch->manageTitle = '%s Manage';
$lang->branch->all = 'All ';
$lang->branch->confirmDelete = '%branch% deletion, will affect the %branch% of the demand, module, plan, release, Bug, testcase and so on, please consider carefully. Are you sure delete the %branch%?';
$lang->branch->confirmDelete = '@branch@ deletion, will affect the @branch@ of the demand, module, plan, release, Bug, testcase and so on, please consider carefully. Are you sure delete the @branch@?';
module/branch/lang/zh-cn.php
+1 -1
View File
@@ -6,4 +6,4 @@ $lang->branch->delete = '分支删除';
$lang->branch->manageTitle = '%s管理';
$lang->branch->all = '所有';
$lang->branch->confirmDelete = '%branch%删除，会影响关联该%branch%的需求、模块、计划、发布、Bug、用例等等，请慎重考虑。是否删除该%branch%';
$lang->branch->confirmDelete = '@branch@删除，会影响关联该@branch@的需求、模块、计划、发布、Bug、用例等等，请慎重考虑。是否删除该@branch@';
module/common/lang/en.php
+1 -1
View File
@@ -174,7 +174,7 @@ $lang->product->menu->plan = array('link' => 'Plan|productplan|browse|product
$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->menu->doc = array('link' => 'Doc|product|doc|productID=%s', 'subModule' => 'doc');
$lang->product->menu->branch = '%branch%|branch|manage|productID=%s';
$lang->product->menu->branch = '@branch@|branch|manage|productID=%s';
$lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story';
$lang->product->menu->view = array('link' => 'Info|product|view|productID=%s', 'alias' => 'edit');
$lang->product->menu->project = "{$lang->projectCommon}s|product|project|status=all&productID=%s";
module/common/lang/zh-cn.php
+1 -1
View File
@@ -174,7 +174,7 @@ $lang->product->menu->plan = array('link' => '计划|productplan|browse|produ
$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s';
$lang->product->menu->doc = array('link' => '文档|product|doc|productID=%s', 'subModule' => 'doc');
$lang->product->menu->branch = '%branch%|branch|manage|productID=%s';
$lang->product->menu->branch = '@branch@|branch|manage|productID=%s';
$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story';
$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
module/product/model.php
+1 -1
View File
@@ -70,7 +70,7 @@ class productModel extends model
if($currentProduct->type != 'normal')
{
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
$this->lang->product->menu->branch = str_replace('%branch%', $this->lang->product->branchName[$currentProduct->type], $this->lang->product->menu->branch);
$this->lang->product->menu->branch = str_replace('@branch@', $this->lang->product->branchName[$currentProduct->type], $this->lang->product->menu->branch);
$branches = $this->loadModel('branch')->getPairs($productID);
$branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
$output .= '</li><li>';