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

Merge branch 'sprint/pailei2_zhouxudong_19120' into 'pailei2'

Browse Source 
* Fix bug #19120.

See merge request easycorp/zentaopms!2148
This commit is contained in:
李玉春
2022-03-08 09:20:03 +00:00
parent 3b79f9ce1c 027fbc1472
commit 5d4e08fae7
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+2 -2
View File
@@ -156,7 +156,7 @@ class kanban extends control
{
if($confirm == 'no')
{
return print(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteSpace', "spaceID=$spaceID&confirm=yes")));
return print(js::confirm($this->lang->kanban->confirmDeleteSpace, $this->createLink('kanban', 'deleteSpace', "spaceID=$spaceID&confirm=yes")));
}
else
{
@@ -324,7 +324,7 @@ class kanban extends control
{
if($confirm == 'no')
{
return print(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'delete', "kanbanID=$kanbanID&confirm=yes")));
return print(js::confirm($this->lang->kanban->confirmDeleteKanban, $this->createLink('kanban', 'delete', "kanbanID=$kanbanID&confirm=yes")));
}
else
{
module/kanban/lang/en.php
+4 -3
View File
@@ -101,9 +101,10 @@ $lang->kanban->cardCount = 'Card Count';
$lang->kanban->createColumnOnLeft = 'Create Column On Left';
$lang->kanban->createColumnOnRight = 'Create Column On Right';
$lang->kanban->accessDenied = "You have no access to the kanban.";
$lang->kanban->confirmDelete = 'Do you want to delete this?';
$lang->kanban->cardCountTip = 'Please enter the number of cards';
$lang->kanban->accessDenied = "You have no access to the kanban.";
$lang->kanban->confirmDeleteSpace = 'Do you want to delete this Space?';
$lang->kanban->confirmDeleteKanban = 'Do you want to delete this Kanban?';
$lang->kanban->cardCountTip = 'Please enter the number of cards';
$lang->kanban->selectedKanban = 'Please select Kanban';
$lang->kanban->selectedProduct = 'Please select Product';
module/kanban/lang/zh-cn.php
+4 -3
View File
@@ -101,9 +101,10 @@ $lang->kanban->cardCount = '卡片数量';
$lang->kanban->createColumnOnLeft = '在左侧添加看板列';
$lang->kanban->createColumnOnRight = '在右侧添加看板列';
$lang->kanban->accessDenied = '您无权访问该看板';
$lang->kanban->confirmDelete = '您确认删除吗？';
$lang->kanban->cardCountTip = '请输入卡片数量';
$lang->kanban->accessDenied = '您无权访问该看板';
$lang->kanban->confirmDeleteSpace = '您确认要删除该空间吗？';
$lang->kanban->confirmDeleteKanban = '您确认要删除该看板吗？';
$lang->kanban->cardCountTip = '请输入卡片数量';
$lang->kanban->selectedKanban = '请选择看板';
$lang->kanban->selectedProduct = '请选择产品';
module/kanban/lang/zh-tw.php
+3 -2
View File
@@ -77,8 +77,9 @@ $lang->kanban->teamSumCount = '共%s人';
$lang->kanban->createColumnOnLeft = '在左側添加看板列';
$lang->kanban->createColumnOnRight = '在右側添加看板列';
$lang->kanban->accessDenied = '您無權訪問該看板';
$lang->kanban->confirmDelete = '您確認刪除嗎？';
$lang->kanban->accessDenied = '您無權訪問該看板';
$lang->kanban->confirmDeleteSpace = '您確認要删除該空間嗎？';
$lang->kanban->confirmDeleteKanban = '您確認要删除該看板嗎？';
$lang->kanban->aclGroup['open'] = '公開';
$lang->kanban->aclGroup['private'] = '私有';