From d29b6ab08a609df18c33ce2bf00e66eadc800f9f Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 11 Sep 2023 01:56:43 +0000 Subject: [PATCH] * Fix bug #38505. --- module/story/config.php | 3 +-- module/story/lang/de.php | 2 +- module/story/lang/en.php | 2 +- module/story/lang/fr.php | 2 +- module/story/lang/zh-cn.php | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/module/story/config.php b/module/story/config.php index bbddc1276a..19acddaec5 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -121,7 +121,7 @@ $config->story->datatable->fieldList['estimate']['sortType'] = true; $config->story->datatable->fieldList['estimate']['width'] = '50'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; -$config->story->datatable->fieldList['reviewer']['title'] = 'reviewedBy'; +$config->story->datatable->fieldList['reviewer']['title'] = 'reviewer'; $config->story->datatable->fieldList['reviewer']['type'] = 'html'; $config->story->datatable->fieldList['reviewer']['sortType'] = true; $config->story->datatable->fieldList['reviewer']['control'] = 'multiple'; @@ -134,7 +134,6 @@ $config->story->datatable->fieldList['reviewedBy']['sortType'] = true; $config->story->datatable->fieldList['reviewedBy']['width'] = '100'; $config->story->datatable->fieldList['reviewedBy']['required'] = 'no'; $config->story->datatable->fieldList['reviewedBy']['control'] = 'multiple'; -$config->story->datatable->fieldList['reviewedBy']['dataSource'] = array('module' => 'story', 'method' => 'getStoriesReviewer', 'params' => '$productID'); $config->story->datatable->fieldList['reviewedDate']['title'] = 'reviewedDate'; $config->story->datatable->fieldList['reviewedDate']['fixed'] = 'no'; diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 4534f3ca0d..325d63f062 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -158,7 +158,7 @@ $lang->story->rejectedReason = 'Abgelehnt weil'; $lang->story->changedBy = 'ChangedBy'; $lang->story->changedDate = 'ChangedDate'; $lang->story->reviewedBy = 'Prüfer'; -$lang->story->reviewer = $lang->story->reviewedBy; +$lang->story->reviewer = 'Reviewers'; $lang->story->reviewers = 'Reviewers'; $lang->story->reviewedDate = 'Geprüft am'; $lang->story->activatedDate = 'Activated Date'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index a49e0a282e..45276f8f7f 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -158,7 +158,7 @@ $lang->story->rejectedReason = 'Reject Reason'; $lang->story->changedBy = 'ChangedBy'; $lang->story->changedDate = 'ChangedDate'; $lang->story->reviewedBy = 'ReviewedBy'; -$lang->story->reviewer = $lang->story->reviewedBy; +$lang->story->reviewer = 'Reviewers'; $lang->story->reviewers = 'Reviewers'; $lang->story->reviewedDate = 'ReviewedDate'; $lang->story->activatedDate = 'Activated Date'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 6912606a45..601647ba6d 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -158,7 +158,7 @@ $lang->story->rejectedReason = 'Raison du Rejet'; $lang->story->changedBy = 'ChangedBy'; $lang->story->changedDate = 'ChangedDate'; $lang->story->reviewedBy = 'Validée par'; -$lang->story->reviewer = $lang->story->reviewedBy; +$lang->story->reviewer = 'Reviewers'; $lang->story->reviewers = 'Reviewers'; $lang->story->reviewedDate = 'Date Validation'; $lang->story->activatedDate = 'Activated Date'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 15c26b4944..9e058fd6d7 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -157,8 +157,8 @@ $lang->story->closedReason = '关闭原因'; $lang->story->rejectedReason = '拒绝原因'; $lang->story->changedBy = '由谁变更'; $lang->story->changedDate = '变更时间'; -$lang->story->reviewedBy = '评审者'; -$lang->story->reviewer = $lang->story->reviewedBy; +$lang->story->reviewedBy = '由谁评审'; +$lang->story->reviewer = '评审者'; $lang->story->reviewers = '评审人员'; $lang->story->reviewedDate = '评审时间'; $lang->story->activatedDate = '激活日期';