From afeab90aee3b9a514b40708ac61988331f534ca6 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Mon, 4 Nov 2019 09:26:53 +0800 Subject: [PATCH 1/2] * Lang changed. My-Mine on suggestions from user. --- module/product/lang/en.php | 2 +- module/project/lang/en.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index d2b3c658ec..4a563911ef 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -22,7 +22,7 @@ $lang->product->deleted = 'Deleted'; $lang->product->close = "Close"; $lang->product->closeAction = "Close {$lang->productCommon}"; $lang->product->select = "Select {$lang->productCommon}"; -$lang->product->mine = 'My:'; +$lang->product->mine = 'Mine:'; $lang->product->other = 'Others:'; $lang->product->closed = 'Closed'; $lang->product->updateOrder = 'Order'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 0ec1bf650a..0fddc140b6 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -61,7 +61,7 @@ $lang->project->all = "All {$lang->projectCommon}s"; $lang->project->undone = 'Unfinished '; $lang->project->unclosed = 'Unclosed'; $lang->project->typeDesc = 'No story, bug, build, test, or burndown chart is allowed in OPS'; -$lang->project->mine = 'My: '; +$lang->project->mine = 'Mine: '; $lang->project->other = 'Others:'; $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; From 5888e67b28ba7dc87f991b08d3231c58c5155334 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Thu, 21 Nov 2019 14:00:16 +0800 Subject: [PATCH 2/2] * Dingding lang updated. --- module/webhook/lang/en.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php index bc294b7748..6f64d32361 100644 --- a/module/webhook/lang/en.php +++ b/module/webhook/lang/en.php @@ -4,7 +4,7 @@ $lang->webhook->list = 'Hook List'; $lang->webhook->api = 'API'; $lang->webhook->entry = 'Entry'; $lang->webhook->log = 'Log'; -$lang->webhook->bind = '绑定用户'; +$lang->webhook->bind = 'Bind User'; $lang->webhook->assigned = 'AssignedTo'; $lang->webhook->setting = 'Settings'; @@ -35,22 +35,22 @@ $lang->webhook->data = 'Data'; $lang->webhook->result = 'Result'; $lang->webhook->typeList[''] = ''; -$lang->webhook->typeList['dingding'] = '钉钉群通知机器人'; -$lang->webhook->typeList['dingapi'] = '钉钉工作消息通知'; -$lang->webhook->typeList['weixin'] = '企业微信'; +$lang->webhook->typeList['dingding'] = 'Dingding Robot'; +$lang->webhook->typeList['dingapi'] = 'Dingding Notifier'; +$lang->webhook->typeList['weixin'] = 'Enterprise WeChat'; $lang->webhook->typeList['default'] = 'Others'; $lang->webhook->sendTypeList['sync'] = 'Synchronous'; $lang->webhook->sendTypeList['async'] = 'Asynchronous'; -$lang->webhook->dingAgentId = '钉钉AgentId'; -$lang->webhook->dingAppKey = '钉钉AppKey'; -$lang->webhook->dingAppSecret = '钉钉AppSecret'; -$lang->webhook->dingUserid = '钉钉Userid'; -$lang->webhook->dingBindStatus = '钉钉绑定状态'; +$lang->webhook->dingAgentId = 'AgentID'; +$lang->webhook->dingAppKey = 'AppKey'; +$lang->webhook->dingAppSecret = 'AppSecret'; +$lang->webhook->dingUserid = 'UserID'; +$lang->webhook->dingBindStatus = 'Bind Status'; -$lang->webhook->dingBindStatusList['0'] = '未绑定'; -$lang->webhook->dingBindStatusList['1'] = '已绑定'; +$lang->webhook->dingBindStatusList['0'] = 'No'; +$lang->webhook->dingBindStatusList['1'] = 'Yes'; $lang->webhook->paramsList['objectType'] = 'Object Type'; $lang->webhook->paramsList['objectID'] = 'Object ID'; @@ -67,8 +67,8 @@ $lang->webhook->confirmDelete = 'Do you want to delete this hook?'; $lang->webhook->trimWords = ''; $lang->webhook->note = new stdClass(); -$lang->webhook->note->async = 'If the sending type is asynchronous, you have to go to Admin-System to turn on the cron.'; -$lang->webhook->note->bind = '只有钉钉工作通知类型才需要绑定用户。'; +$lang->webhook->note->async = 'If it is asynchronous, you have to go to Admin-System to turn on the cron.'; +$lang->webhook->note->bind = 'Bind User is only required for Dingding Notifier.'; $lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of selected {$lang->productCommon} will trigger it."; $lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it.";