From d246bca164c143b3355beb0fa5b75d962b45c7bf Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 16 Jun 2022 13:49:47 +0800
Subject: [PATCH] * Fix bug#23655.

---
 module/kanban/control.php    |  1 +
 module/kanban/lang/en.php    | 15 ++++++++-------
 module/kanban/lang/zh-cn.php | 15 ++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 6302d2919f..0d921abfbd 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -615,6 +615,7 @@ class kanban extends control
         }
 
         $kanban = $from == 'execution' ? $this->loadModel('execution')->getByID($kanbanID) : $this->kanban->getByID($kanbanID);
+        if($from == 'execution') $this->lang->kanbanlane->heightTypeList['auto'] = $this->lang->kanbanlane->heightByCard;
 
         $this->view->heightType   = $kanban->displayCards > 2 ? 'custom' : 'auto';
         $this->view->displayCards = $kanban->displayCards ? $kanban->displayCards : '';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 331c09cda7..4e5a92b40f 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -308,13 +308,14 @@ $lang->kanbancolumn->confirmDeleteChild = 'Are you sure to delete this column? A
 $lang->kanbancolumn->confirmRestore     = 'Are you sure you want to restore this Kanban column? After restoring the Kanban column, the Kanban column and all tasks in the Kanban column will be restored to the previous position at the same time.';
 
 $lang->kanbanlane = new stdclass();
-$lang->kanbanlane->name      = $lang->kanban->laneName;
-$lang->kanbanlane->common    = 'Lane';
-$lang->kanbanlane->default   = 'Default Lane';
-$lang->kanbanlane->column    = 'Lane Kanban Column';
-$lang->kanbanlane->otherlane = 'Select Existed Lane';
-$lang->kanbanlane->color     = 'Lane Color';
-$lang->kanbanlane->WIPType   = 'Lane WIP Type';
+$lang->kanbanlane->name         = $lang->kanban->laneName;
+$lang->kanbanlane->common       = 'Lane';
+$lang->kanbanlane->default      = 'Default Lane';
+$lang->kanbanlane->column       = 'Lane Kanban Column';
+$lang->kanbanlane->otherlane    = 'Select Existed Lane';
+$lang->kanbanlane->color        = 'Lane Color';
+$lang->kanbanlane->WIPType      = 'Lane WIP Type';
+$lang->kanbanlane->heightByCard = 'Adaptive (Adaptive to card height)';
 
 $lang->kanbanlane->confirmDelete    = 'Are you sure to delete this lane? After deleting the lane, all data (columns and cards) in the lane will also be deleted.';
 $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After deleting the lane, all %s in the lane will be hidden.';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 870a18253f..42e5bf807e 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -308,13 +308,14 @@ $lang->kanbancolumn->confirmDeleteChild = '您确认删除该列吗？删除列
 $lang->kanbancolumn->confirmRestore     = '您确定要还原该看板列吗？还原后，该看板列将回到之前的位置。';
 
 $lang->kanbanlane = new stdclass();
-$lang->kanbanlane->name      = $lang->kanban->laneName;
-$lang->kanbanlane->common    = '泳道';
-$lang->kanbanlane->default   = '默认泳道';
-$lang->kanbanlane->column    = '泳道看板列';
-$lang->kanbanlane->otherlane = '选择共享看板列的泳道';
-$lang->kanbanlane->color     = '泳道颜色';
-$lang->kanbanlane->WIPType   = '泳道在制品类型';
+$lang->kanbanlane->name         = $lang->kanban->laneName;
+$lang->kanbanlane->common       = '泳道';
+$lang->kanbanlane->default      = '默认泳道';
+$lang->kanbanlane->column       = '泳道看板列';
+$lang->kanbanlane->otherlane    = '选择共享看板列的泳道';
+$lang->kanbanlane->color        = '泳道颜色';
+$lang->kanbanlane->WIPType      = '泳道在制品类型';
+$lang->kanbanlane->heightByCard = '自适应（根据卡片高度自适应）';
 
 $lang->kanbanlane->confirmDelete    = '您确认删除该泳道吗？删除泳道后，该泳道中所有数据（列、卡片）也会被删除。';
 $lang->kanbanlane->confirmDeleteTip = '您确认删除该泳道吗？删除泳道后，该泳道中所有的%s将被隐藏。';