From 56f7bfb1b302c9ce1c5ea13cbf523b0954848b04 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 9 Jan 2024 10:00:01 +0800
Subject: [PATCH] * Fix bug #42738.

---
 module/testcase/lang/de.php          | 2 +-
 module/testcase/lang/en.php          | 2 +-
 module/testcase/lang/fr.php          | 2 +-
 module/testcase/lang/zh-cn.php       | 4 ++--
 module/testcase/ui/review.html.php   | 2 +-
 module/testcase/view/review.html.php | 2 +-
 module/testtask/ui/batchrun.html.php | 2 +-
 module/testtask/ui/results.html.php  | 4 ++--
 module/testtask/ui/runcase.html.php  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 50a1980b96..bea3b4b62a 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -40,6 +40,7 @@ $lang->testcase->openedByAB       = 'Reporter';
 $lang->testcase->openedDate       = 'Erstellt am';
 $lang->testcase->lastEditedBy     = 'Bearbeitet von';
 $lang->testcase->result           = 'Ergebnis';
+$lang->testcase->resultAB         = 'Ergebnis';
 $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
 $lang->testcase->files            = 'Dateien';
@@ -59,7 +60,6 @@ $lang->testcase->reviewedDate     = 'Überprüft von';
 $lang->testcase->reviewResult     = 'Prüfungsbericht';
 $lang->testcase->reviewedByAB     = 'Von';
 $lang->testcase->reviewedDateAB   = 'Datum';
-$lang->testcase->reviewResultAB   = 'Ergebnis';
 $lang->testcase->forceNotReview   = 'Keine Überprüfung';
 $lang->testcase->isReviewed       = 'is it reviewed';
 $lang->testcase->lastEditedByAB   = 'Bearbeiter';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index bc00fd3a9f..2f917e30fc 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -40,6 +40,7 @@ $lang->testcase->openedByAB       = 'Reporter';
 $lang->testcase->openedDate       = 'CreatedDate';
 $lang->testcase->lastEditedBy     = 'EditedBy';
 $lang->testcase->result           = 'Result';
+$lang->testcase->resultAB         = 'Result';
 $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
 $lang->testcase->files            = 'Files';
@@ -59,7 +60,6 @@ $lang->testcase->reviewedDate     = 'ReviewedDate';
 $lang->testcase->reviewResult     = 'Review Result';
 $lang->testcase->reviewedByAB     = 'ReviewedBy';
 $lang->testcase->reviewedDateAB   = 'ReviewedDate';
-$lang->testcase->reviewResultAB   = 'Result';
 $lang->testcase->forceNotReview   = 'No Review Required';
 $lang->testcase->isReviewed       = 'is it reviewed';
 $lang->testcase->lastEditedByAB   = 'EditedBy';
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 35cbe1bf7b..b556c30e58 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -40,6 +40,7 @@ $lang->testcase->openedByAB       = 'Détecteur';
 $lang->testcase->openedDate       = 'Créé le';
 $lang->testcase->lastEditedBy     = 'Modifié par';
 $lang->testcase->result           = 'Résultat';
+$lang->testcase->resultAB         = 'Résultat';
 $lang->testcase->real             = 'Détails';
 $lang->testcase->keywords         = 'Tags';
 $lang->testcase->files            = 'Fichiers';
@@ -59,7 +60,6 @@ $lang->testcase->reviewedDate     = 'Validé le';
 $lang->testcase->reviewResult     = 'Résultat validation';
 $lang->testcase->reviewedByAB     = 'Validé par';
 $lang->testcase->reviewedDateAB   = 'Validé le';
-$lang->testcase->reviewResultAB   = 'Résultat validation';
 $lang->testcase->forceNotReview   = 'Aucune Validation Requise';
 $lang->testcase->isReviewed       = 'is it reviewed';
 $lang->testcase->lastEditedByAB   = 'Modifié par';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index c31b95acdc..172f91a184 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -39,7 +39,8 @@ $lang->testcase->openedBy         = '由谁创建';
 $lang->testcase->openedByAB       = '创建者';
 $lang->testcase->openedDate       = '创建日期';
 $lang->testcase->lastEditedBy     = '最后修改者';
-$lang->testcase->result           = '测试结果';
+$lang->testcase->result           = '结果';
+$lang->testcase->resultAB         = '测试结果';
 $lang->testcase->real             = '实际情况';
 $lang->testcase->keywords         = '关键词';
 $lang->testcase->files            = '附件';
@@ -59,7 +60,6 @@ $lang->testcase->reviewedDate     = '评审时间';
 $lang->testcase->reviewResult     = '评审结果';
 $lang->testcase->reviewedByAB     = '评审人';
 $lang->testcase->reviewedDateAB   = '日期';
-$lang->testcase->reviewResultAB   = '结果';
 $lang->testcase->forceNotReview   = '不需要评审';
 $lang->testcase->isReviewed       = '是否评审';
 $lang->testcase->lastEditedByAB   = '修改者';
diff --git a/module/testcase/ui/review.html.php b/module/testcase/ui/review.html.php
index f5bcb269e3..d8d0047d57 100644
--- a/module/testcase/ui/review.html.php
+++ b/module/testcase/ui/review.html.php
@@ -27,7 +27,7 @@ formPanel
     formGroup
     (
         set::width('1/3'),
-        set::label($lang->testcase->reviewResultAB),
+        set::label($lang->testcase->result),
         set::required(true),
         picker
         (
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index 1503d5136a..00eabc6b49 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -29,7 +29,7 @@
         <td class='w-p25-f'><?php echo html::input('reviewedDate', helper::today(), "class='form-control form-date'");?></td><td></td>
       </tr>
       <tr>
-        <th><?php echo $lang->testcase->reviewResultAB;?></th>
+        <th><?php echo $lang->testcase->result;?></th>
         <td><?php echo html::select('result', $lang->testcase->reviewResultList, '', 'class=form-control required');?></td><td></td>
       </tr>
       <tr class='hide'>
diff --git a/module/testtask/ui/batchrun.html.php b/module/testtask/ui/batchrun.html.php
index 30950cca2b..c04ac091af 100644
--- a/module/testtask/ui/batchrun.html.php
+++ b/module/testtask/ui/batchrun.html.php
@@ -184,7 +184,7 @@ formPanel
                 h::th
                 (
                     set::width('100px'),
-                    $lang->testcase->result
+                    $lang->testcase->resultAB
                 ),
                 h::th
                 (
diff --git a/module/testtask/ui/results.html.php b/module/testtask/ui/results.html.php
index ad7710bd43..174c865569 100644
--- a/module/testtask/ui/results.html.php
+++ b/module/testtask/ui/results.html.php
@@ -206,7 +206,7 @@ foreach($results as $i => $result)
                         (
                             width('80px'),
                             setClass('text-center border-r'),
-                            $lang->testcase->result
+                            $lang->testcase->resultAB
                         ),
                         div
                         (
@@ -274,7 +274,7 @@ div
         set::id('casesResults'),
         $case->auto != 'unit' && $type != 'fail' ? formRowGroup
         (
-            set::title($lang->testcase->result),
+            set::title($lang->testcase->resultAB),
             set::items
             (
                 $resultItem
diff --git a/module/testtask/ui/runcase.html.php b/module/testtask/ui/runcase.html.php
index e7e27062ae..1cbbc0d316 100644
--- a/module/testtask/ui/runcase.html.php
+++ b/module/testtask/ui/runcase.html.php
@@ -191,7 +191,7 @@ form
                 (
                     setClass('result-td'),
                     width('96px'),
-                    $lang->testcase->result
+                    $lang->testcase->resultAB
                 ),
                 h::td
                 (