From a94bf0d53d50fde7ff012db1e82122984154cbab Mon Sep 17 00:00:00 2001
From: Bruce Wayne <admin@bige0.com>
Date: Wed, 21 Apr 2021 11:17:24 +0800
Subject: [PATCH] Update issue forms

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  4 +---
 .github/ISSUE_TEMPLATE/bug_report.zh-CN.yml   | 19 ++++++++-----------
 .github/ISSUE_TEMPLATE/feature_request.yml    | 14 +++++++++-----
 .../ISSUE_TEMPLATE/feature_request.zh-CN.yml  | 14 +++++++++-----
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3424a49b..a95d29d4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -14,7 +14,6 @@ body:
     attributes:
       label: To Reproduce
       placeholder: |
-        Steps to reproduce the behavior:
         1. Open Netch
         2. ...
     validations:
@@ -30,7 +29,6 @@ body:
   - type: textarea
     id: log
     attributes:
-      render: shell
       label: Log
       description: Attaching any log files in the folder `Netch\logging` is strongly recommended.
     validations:
@@ -49,4 +47,4 @@ body:
     attributes:
       label: Additional information
       description: >
-        In the text box below, you can attach any relevant screenshots and files.
+        If you have any additional information for us, use the field below.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.zh-CN.yml b/.github/ISSUE_TEMPLATE/bug_report.zh-CN.yml
index 1da7c1e5..0c617542 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.zh-CN.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.zh-CN.yml
@@ -1,22 +1,18 @@
 name: 错误报告
-description: "创建错误报告以帮助我们改进"
+description: 创建错误报告以帮助我们改进
 labels: 需要核实
-issue_body: true
 body:
-  - type: markdown
-    attributes:
-      value: "**确保你已经看过 readme，也搜索并阅读过和你遇到的情况相关的问题。否则会被认为是重复的并被立刻关闭。**"
   - type: textarea
     id: error
     attributes:
-      label: "错误描述"
+      label: 错误描述
       description: 对错误的清晰简洁描述
     validations:
       required: true
   - type: textarea
     id: reproduce
     attributes:
-      label: "复现步骤"
+      label: 复现步骤
       placeholder: |
         1. 打开 Netch 软件
         2. ...
@@ -28,12 +24,11 @@ body:
       label: 验证
       description: 请确认下面选项
       options:
-        - label: 我是人类
+        - label: 确保你已经看过 readme，也搜索并阅读过和你遇到的情况相关的问题。否则会被认为是重复的并被立刻关闭。
           required: true
   - type: textarea
     id: log
     attributes:
-      render: shell
       label: 日志
       description: 强烈建议附上任何在 `Netch\logging` 文件夹下面的日志
     validations:
@@ -42,12 +37,14 @@ body:
     id: environment
     attributes:
       label: 操作环境
+      render: txt
       placeholder: |
         操作系统：[Windows 10 专业版 64 位 1903]
         软件版本：[1.0.0-STABLE 64 位]
     validations:
       required: true
-  - type: markdown
+  - type: textarea
     attributes:
-      value: |
+      label: 额外信息
+      description: >
         下面的文本框中你可以附上跟 issue 相关的截图、文件
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 1f06ba75..02ea746a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,15 +1,19 @@
 name: request
-description: "Suggest an idea for this project"
+description: Suggest an idea for this project
 labels: 需要核实
-issue_body: true
 body:
-  - type: markdown
+  - type: checkboxes
+    id: captcha
     attributes:
-      value: "**Make sure you have read the readme, searched and read the issues related to yours. Otherwise it will be considered as a duplicate which will be closed immediately.**"
+      label: CAPTCHA
+      description: Please confirm the options below.
+      options:
+        - label: Make sure you have read the readme, searched and read the issues related to yours. Otherwise it will be considered as a duplicate which will be closed immediately.
+          required: true
   - type: textarea
     id: description
     attributes:
-      label: "Describe the feature you want"
+      label: Describe the feature you want
       description: A clear and concise description of what you want to happen.
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.zh-CN.yml b/.github/ISSUE_TEMPLATE/feature_request.zh-CN.yml
index 87183f41..c46caedd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.zh-CN.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.zh-CN.yml
@@ -1,15 +1,19 @@
 name: 功能请求
-description: "建议这个项目的想法"
+description: 建议这个项目的想法
 labels: 需要核实
-issue_body: true
 body:
-  - type: markdown
+  - type: checkboxes
+    id: captcha
     attributes:
-      value: "**确保你已经看过 readme，也搜索并阅读过和你遇到的情况相关的问题。否则会被认为是重复的并被立刻关闭。**"
+      label: 验证
+      description: 请确认下面选项
+      options:
+        - label: 确保你已经看过 readme，也搜索并阅读过和你遇到的情况相关的问题。否则会被认为是重复的并被立刻关闭。
+          required: true
   - type: textarea
     id: description
     attributes:
-      label: "功能描述"
+      label: 功能描述
       description: 简明扼要地描述需要的功能
     validations:
       required: true