From 8c1c84b4302e4cb1f1ff42734e4b87eaee2d74bc Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Aug 2022 11:24:36 +0800 Subject: [PATCH 1/5] * Fix bug #25968. --- module/testtask/css/create.css | 2 ++ module/testtask/css/edit.css | 2 ++ 2 files changed, 4 insertions(+) diff --git a/module/testtask/css/create.css b/module/testtask/css/create.css index 33976882a6..ac95ac79ff 100644 --- a/module/testtask/css/create.css +++ b/module/testtask/css/create.css @@ -1,3 +1,5 @@ #mailtoGroup .chosen-container-single a {border-left-width: 0px;} #ownerAndPriBox .picker .picker-selections .picker-selection {width: 158px;} .table tbody>tr>td {width: 400px;} +[lang^='en'] .table tbody>tr>td, [lang^='de'].table tbody>tr>td {width: 460px;} +[lang^='fr'] .table tbody>tr>td {width: 480px;} diff --git a/module/testtask/css/edit.css b/module/testtask/css/edit.css index 33976882a6..ac95ac79ff 100644 --- a/module/testtask/css/edit.css +++ b/module/testtask/css/edit.css @@ -1,3 +1,5 @@ #mailtoGroup .chosen-container-single a {border-left-width: 0px;} #ownerAndPriBox .picker .picker-selections .picker-selection {width: 158px;} .table tbody>tr>td {width: 400px;} +[lang^='en'] .table tbody>tr>td, [lang^='de'].table tbody>tr>td {width: 460px;} +[lang^='fr'] .table tbody>tr>td {width: 480px;} From 56c6349d0d9d980a549492f7a9f0cb10fafbdba2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Aug 2022 13:03:11 +0800 Subject: [PATCH 2/5] * Fix bug #25967. --- module/kanban/lang/de.php | 14 +++++++------- module/kanban/lang/en.php | 14 +++++++------- module/kanban/lang/fr.php | 14 +++++++------- module/kanban/lang/zh-cn.php | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index ba65456908..631d83cdbb 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote = 'The sum of products in the child colu $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.'; $lang->kanban->error->childLimitEmpty = 'Please set the WIP quantity of the sub column before operation.'; -$lang->kanban->orderList['id_asc'] = 'Story ID Ascending'; -$lang->kanban->orderList['id_desc'] = 'Story ID Descending'; -$lang->kanban->orderList['pri_asc'] = 'Story Priority Ascending'; -$lang->kanban->orderList['pri_desc'] = 'Story Priority Descending'; -$lang->kanban->orderList['stage_asc'] = 'Story Stage Ascending'; -$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending'; -$lang->kanban->orderList['assignedTo'] = 'Assigned To'; +$lang->kanban->orderList['id_asc'] = 'Story ID Ascending'; +$lang->kanban->orderList['id_desc'] = 'Story ID Descending'; +$lang->kanban->orderList['pri_asc'] = 'Story Priority Ascending'; +$lang->kanban->orderList['pri_desc'] = 'Story Priority Descending'; +$lang->kanban->orderList['stage_asc'] = 'Story Stage Ascending'; +$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending'; +$lang->kanban->orderList['assignedTo_desc'] = 'Assigned To'; $lang->kanban->importList = array(); $lang->kanban->importList['off'] = 'Import is not enabled'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 67d89c12ee..4f06a1084e 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote = 'The sum of products in the child colu $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.'; $lang->kanban->error->childLimitEmpty = 'Please set the WIP quantity of the sub column before operation.'; -$lang->kanban->orderList['id_asc'] = 'Story ID Ascending'; -$lang->kanban->orderList['id_desc'] = 'Story ID Descending'; -$lang->kanban->orderList['pri_asc'] = 'Story Priority Ascending'; -$lang->kanban->orderList['pri_desc'] = 'Story Priority Descending'; -$lang->kanban->orderList['stage_asc'] = 'Story Stage Ascending'; -$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending'; -$lang->kanban->orderList['assignedTo'] = 'Assigned To'; +$lang->kanban->orderList['id_asc'] = 'Story ID Ascending'; +$lang->kanban->orderList['id_desc'] = 'Story ID Descending'; +$lang->kanban->orderList['pri_asc'] = 'Story Priority Ascending'; +$lang->kanban->orderList['pri_desc'] = 'Story Priority Descending'; +$lang->kanban->orderList['stage_asc'] = 'Story Stage Ascending'; +$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending'; +$lang->kanban->orderList['assignedTo_desc'] = 'Assigned To'; $lang->kanban->importList = array(); $lang->kanban->importList['off'] = 'Import is not enabled'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index c05115c7ea..9b852ab9a9 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote = 'The sum of products in the child colu $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.'; $lang->kanban->error->childLimitEmpty = 'Please set the WIP quantity of the sub column before operation.'; -$lang->kanban->orderList['id_asc'] = 'Story ID Ascendante'; -$lang->kanban->orderList['id_desc'] = 'Story ID Descendante'; -$lang->kanban->orderList['pri_asc'] = 'Story Priorité Ascendante'; -$lang->kanban->orderList['pri_desc'] = 'Story Priorité Descendante'; -$lang->kanban->orderList['stage_asc'] = 'Story Phase Ascendante'; -$lang->kanban->orderList['stage_desc'] = 'Story Phase Descendante'; -$lang->kanban->orderList['assignedTo'] = 'Assigné à'; +$lang->kanban->orderList['id_asc'] = 'Story ID Ascendante'; +$lang->kanban->orderList['id_desc'] = 'Story ID Descendante'; +$lang->kanban->orderList['pri_asc'] = 'Story Priorité Ascendante'; +$lang->kanban->orderList['pri_desc'] = 'Story Priorité Descendante'; +$lang->kanban->orderList['stage_asc'] = 'Story Phase Ascendante'; +$lang->kanban->orderList['stage_desc'] = 'Story Phase Descendante'; +$lang->kanban->orderList['assignedTo_desc'] = 'Assigné à'; $lang->kanban->importList = array(); $lang->kanban->importList['off'] = 'Import is not enabled'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 43630355bd..1193c97d54 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote = '子列在制品数量之和不能大 $lang->kanban->error->importObjNotEmpty = '请至少选择一个导入对象'; $lang->kanban->error->childLimitEmpty = '请先设置子列的在制品数量后再操作'; -$lang->kanban->orderList['id_asc'] = '需求ID正序'; -$lang->kanban->orderList['id_desc'] = '需求ID倒序'; -$lang->kanban->orderList['pri_asc'] = '需求优先级正序'; -$lang->kanban->orderList['pri_desc'] = '需求优先级倒序'; -$lang->kanban->orderList['stage_asc'] = '需求阶段正序'; -$lang->kanban->orderList['stage_desc'] = '需求阶段倒序'; -$lang->kanban->orderList['assignedTo'] = '指派给'; +$lang->kanban->orderList['id_asc'] = '需求ID正序'; +$lang->kanban->orderList['id_desc'] = '需求ID倒序'; +$lang->kanban->orderList['pri_asc'] = '需求优先级正序'; +$lang->kanban->orderList['pri_desc'] = '需求优先级倒序'; +$lang->kanban->orderList['stage_asc'] = '需求阶段正序'; +$lang->kanban->orderList['stage_desc'] = '需求阶段倒序'; +$lang->kanban->orderList['assignedTo_desc'] = '指派给'; $lang->kanban->importList = array(); $lang->kanban->importList['off'] = '不启用导入功能'; From 66990b3fc9d8dfeb91e4fd11588357487a646c1b Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Aug 2022 13:14:45 +0800 Subject: [PATCH 3/5] * Fix bug #25965. --- module/action/lang/de.php | 8 ++++---- module/action/lang/en.php | 8 ++++---- module/action/lang/fr.php | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/module/action/lang/de.php b/module/action/lang/de.php index dd04ece590..e979911ba9 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase = '$date, $actor hat ein $lang->action->desc->unlinkrelatedcase = '$date, $actor hate eine Fallverknüpfung aufgelöst $extra.' . "\n"; /* Used to describe the history of operations link story and bug to productplan. */ -$lang->action->desc->linkstory = '$date, 由 $actor 关联需求 $extra 到计划。' . "\n"; -$lang->action->desc->linkbug = '$date, 由 $actor 关联BUG $extra 到计划。' . "\n"; -$lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n"; -$lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n"; +$lang->action->desc->linkstory = '$date, $actor link stories $extra to plan.' . "\n"; +$lang->action->desc->linkbug = '$date, $actor link bugs $extra to plan.' . "\n"; +$lang->action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; +$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; /* Used to display dynamic information. */ $lang->action->label = new stdclass(); diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 1a927d1e7e..cb2d41453a 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase = '$date, $actor linked $lang->action->desc->unlinkrelatedcase = '$date, $actor unlinked a case $extra.' . "\n"; /* Used to describe the history of operations link story and bug to productplan. */ -$lang->action->desc->linkstory = '$date, 由 $actor 关联需求 $extra 到计划。' . "\n"; -$lang->action->desc->linkbug = '$date, 由 $actor 关联BUG $extra 到计划。' . "\n"; -$lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n"; -$lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n"; +$lang->action->desc->linkstory = '$date, $actor link stories $extra to plan.' . "\n"; +$lang->action->desc->linkbug = '$date, $actor link bugs $extra to plan.' . "\n"; +$lang->action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; +$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; /* Used to display dynamic information. */ $lang->action->label = new stdclass(); diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 534a5cbe99..d6e3830032 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase = '$date, $actor a fait $lang->action->desc->unlinkrelatedcase = '$date, $actor a délié le CasTest $extra.' . "\n"; /* Used to describe the history of operations link story and bug to productplan. */ -$lang->action->desc->linkstory = '$date, 由 $actor 关联需求 $extra 到计划。' . "\n"; -$lang->action->desc->linkbug = '$date, 由 $actor 关联BUG $extra 到计划。' . "\n"; -$lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n"; -$lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n"; +$lang->action->desc->linkstory = '$date, $actor link stories $extra to plan.' . "\n"; +$lang->action->desc->linkbug = '$date, $actor link bugs $extra to plan.' . "\n"; +$lang->action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; +$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; /* Used to display dynamic information. */ $lang->action->label = new stdclass(); From fc60a3f5033109823649cd1701aa8b79cff1636f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Aug 2022 13:16:42 +0800 Subject: [PATCH 4/5] * Fix bug #25964. --- module/execution/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/model.php b/module/execution/model.php index 7ad77afc90..1cce86f1be 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -100,7 +100,7 @@ class executionModel extends model include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php'; } - if($execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist); + if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist); if($execution and $execution->lifetime == 'ops') { From 1247155cc16959b0381434e0a0f68a164a2e81df Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Aug 2022 13:27:05 +0800 Subject: [PATCH 5/5] * Fix bug #25978. --- module/task/css/view.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/task/css/view.css b/module/task/css/view.css index 06e13d58a9..308b600e3f 100644 --- a/module/task/css/view.css +++ b/module/task/css/view.css @@ -18,3 +18,5 @@ .c-consumedAB {width: 60px;} .c-leftAB {width: 60px;} .c-actions {width: 175px;} + +#mainContent .main-actions .btn-toolbar .btn {padding-left: 7px; padding-right: 6px;}