From 0417c40e834a705815f12b1df804a1b5dcefdbf0 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 27 Oct 2021 14:10:45 +0800
Subject: [PATCH] Fix bug #43539.

---
 module/message/lang/de.php    | 24 ++++++++++++++++++++++++
 module/message/lang/en.php    | 24 ++++++++++++++++++++++++
 module/message/lang/fr.php    | 24 ++++++++++++++++++++++++
 module/message/lang/vi.php    | 24 ++++++++++++++++++++++++
 module/message/lang/zh-cn.php | 24 ++++++++++++++++++++++++
 module/message/lang/zh-tw.php | 24 ++++++++++++++++++++++++
 module/message/model.php      |  2 +-
 7 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/module/message/lang/de.php b/module/message/lang/de.php
index 2074f33b10..0637ab9fe0 100644
--- a/module/message/lang/de.php
+++ b/module/message/lang/de.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals
 
 $lang->message->browserSetting->turnonList[1] = 'On';
 $lang->message->browserSetting->turnonList[0] = 'Off';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = 'create';
+$lang->message->label->opened    = 'open';
+$lang->message->label->changed   = 'change';
+$lang->message->label->edited    = 'edit';
+$lang->message->label->assigned  = 'assign';
+$lang->message->label->closed    = 'close';
+$lang->message->label->deleted   = 'delete';
+$lang->message->label->undeleted = 'restore';
+$lang->message->label->commented = 'comment';
+$lang->message->label->activated = 'activate';
+$lang->message->label->resolved  = 'resolve';
+$lang->message->label->reviewed  = 'review';
+$lang->message->label->confirmed = 'confirm Story';
+$lang->message->label->fromBug   = 'convert from Bug';
+$lang->message->label->started   = 'start';
+$lang->message->label->delayed   = 'delay';
+$lang->message->label->suspended = 'suspend';
+$lang->message->label->finished  = 'finish';
+$lang->message->label->paused    = 'pause';
+$lang->message->label->canceled  = 'cancel';
+$lang->message->label->restarted = 'continue';
+$lang->message->label->blocked   = 'block';
diff --git a/module/message/lang/en.php b/module/message/lang/en.php
index 1614a1243b..dbf9f97a64 100644
--- a/module/message/lang/en.php
+++ b/module/message/lang/en.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals
 
 $lang->message->browserSetting->turnonList[1] = 'On';
 $lang->message->browserSetting->turnonList[0] = 'Off';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = 'create';
+$lang->message->label->opened    = 'open';
+$lang->message->label->changed   = 'change';
+$lang->message->label->edited    = 'edit';
+$lang->message->label->assigned  = 'assign';
+$lang->message->label->closed    = 'close';
+$lang->message->label->deleted   = 'delete';
+$lang->message->label->undeleted = 'restore';
+$lang->message->label->commented = 'comment';
+$lang->message->label->activated = 'activate';
+$lang->message->label->resolved  = 'resolve';
+$lang->message->label->reviewed  = 'review';
+$lang->message->label->confirmed = 'confirm Story';
+$lang->message->label->fromBug   = 'convert from Bug';
+$lang->message->label->started   = 'start';
+$lang->message->label->delayed   = 'delay';
+$lang->message->label->suspended = 'suspend';
+$lang->message->label->finished  = 'finish';
+$lang->message->label->paused    = 'pause';
+$lang->message->label->canceled  = 'cancel';
+$lang->message->label->restarted = 'continue';
+$lang->message->label->blocked   = 'block';
diff --git a/module/message/lang/fr.php b/module/message/lang/fr.php
index 6bb0757fb4..cdd7966d0d 100644
--- a/module/message/lang/fr.php
+++ b/module/message/lang/fr.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notifier les intervalles
 
 $lang->message->browserSetting->turnonList[1] = 'On';
 $lang->message->browserSetting->turnonList[0] = 'Off';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = 'create';
+$lang->message->label->opened    = 'open';
+$lang->message->label->changed   = 'change';
+$lang->message->label->edited    = 'edit';
+$lang->message->label->assigned  = 'assign';
+$lang->message->label->closed    = 'close';
+$lang->message->label->deleted   = 'delete';
+$lang->message->label->undeleted = 'restore';
+$lang->message->label->commented = 'comment';
+$lang->message->label->activated = 'activate';
+$lang->message->label->resolved  = 'resolve';
+$lang->message->label->reviewed  = 'review';
+$lang->message->label->confirmed = 'confirm Story';
+$lang->message->label->fromBug   = 'convert from Bug';
+$lang->message->label->started   = 'start';
+$lang->message->label->delayed   = 'delay';
+$lang->message->label->suspended = 'suspend';
+$lang->message->label->finished  = 'finish';
+$lang->message->label->paused    = 'pause';
+$lang->message->label->canceled  = 'cancel';
+$lang->message->label->restarted = 'continue';
+$lang->message->label->blocked   = 'block';
diff --git a/module/message/lang/vi.php b/module/message/lang/vi.php
index 2cd0c2e551..5573a9e618 100644
--- a/module/message/lang/vi.php
+++ b/module/message/lang/vi.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Thông báo khoảng th
 
 $lang->message->browserSetting->turnonList[1] = 'On';
 $lang->message->browserSetting->turnonList[0] = 'Off';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = 'create';
+$lang->message->label->opened    = 'open';
+$lang->message->label->changed   = 'change';
+$lang->message->label->edited    = 'edit';
+$lang->message->label->assigned  = 'assign';
+$lang->message->label->closed    = 'close';
+$lang->message->label->deleted   = 'delete';
+$lang->message->label->undeleted = 'restore';
+$lang->message->label->commented = 'comment';
+$lang->message->label->activated = 'activate';
+$lang->message->label->resolved  = 'resolve';
+$lang->message->label->reviewed  = 'review';
+$lang->message->label->confirmed = 'confirm Story';
+$lang->message->label->fromBug   = 'convert from Bug';
+$lang->message->label->started   = 'start';
+$lang->message->label->delayed   = 'delay';
+$lang->message->label->suspended = 'suspend';
+$lang->message->label->finished  = 'finish';
+$lang->message->label->paused    = 'pause';
+$lang->message->label->canceled  = 'cancel';
+$lang->message->label->restarted = 'continue';
+$lang->message->label->blocked   = 'block';
diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php
index eb458ddb64..f6f83c700e 100644
--- a/module/message/lang/zh-cn.php
+++ b/module/message/lang/zh-cn.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = '通知的时间间隔，
 
 $lang->message->browserSetting->turnonList[1] = '打开';
 $lang->message->browserSetting->turnonList[0] = '关闭';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = '创建';
+$lang->message->label->opened    = '创建';
+$lang->message->label->changed   = '变更';
+$lang->message->label->edited    = '编辑';
+$lang->message->label->assigned  = '指派';
+$lang->message->label->closed    = '关闭';
+$lang->message->label->deleted   = '删除';
+$lang->message->label->undeleted = '还原';
+$lang->message->label->commented = '评论';
+$lang->message->label->activated = '激活';
+$lang->message->label->blocked   = '阻塞';
+$lang->message->label->resolved  = '解决';
+$lang->message->label->reviewed  = '评审';
+$lang->message->label->confirmed = "确认{$lang->SRCommon}";
+$lang->message->label->frombug   = "转{$lang->SRCommon}";
+$lang->message->label->started   = '开始';
+$lang->message->label->canceled  = '取消';
+$lang->message->label->finished  = '完成';
+$lang->message->label->paused    = '暂停';
+$lang->message->label->delayed   = '延期';
+$lang->message->label->suspended = '挂起';
+$lang->message->label->restarted = '继续';
diff --git a/module/message/lang/zh-tw.php b/module/message/lang/zh-tw.php
index a3d30d6c0c..0c0dfa9737 100644
--- a/module/message/lang/zh-tw.php
+++ b/module/message/lang/zh-tw.php
@@ -16,3 +16,27 @@ $lang->message->browserSetting->pollTimePlaceholder = '通知的時間間隔，
 
 $lang->message->browserSetting->turnonList[1] = '打開';
 $lang->message->browserSetting->turnonList[0] = '關閉';
+
+$lang->message->label = new stdclass();
+$lang->message->label->created   = '創建';
+$lang->message->label->opened    = '創建';
+$lang->message->label->changed   = '變更';
+$lang->message->label->edited    = '編輯';
+$lang->message->label->assigned  = '指派';
+$lang->message->label->closed    = '關閉';
+$lang->message->label->deleted   = '刪除';
+$lang->message->label->undeleted = '還原';
+$lang->message->label->commented = '評論';
+$lang->message->label->activated = '激活';
+$lang->message->label->blocked   = '阻塞';
+$lang->message->label->resolved  = '解決';
+$lang->message->label->reviewed  = '評審';
+$lang->message->label->confirmed = "確認{$lang->SRCommon}";
+$lang->message->label->frombug   = "轉{$lang->SRCommon}";
+$lang->message->label->started   = '開始';
+$lang->message->label->restarted = '繼續';
+$lang->message->label->canceled  = '取消';
+$lang->message->label->finished  = '完成';
+$lang->message->label->paused    = '暫停';
+$lang->message->label->delayed   = '延期';
+$lang->message->label->suspended = '掛起';
diff --git a/module/message/model.php b/module/message/model.php
index bae3422d26..cdb2e3a35e 100644
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -49,7 +49,7 @@ class messageModel extends model
         {
             foreach($actions as $action)
             {
-                $objectActions[$objectType][$action] = str_replace($this->lang->webhook->trimWords, '', $this->lang->action->label->$action);
+                $objectActions[$objectType][$action] = $this->lang->message->label->$action;
             }
         }
         return $objectActions;