From f6ec470070a34e5fbe10423333588ab8537f15b1 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 16 Sep 2021 09:47:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?issue-=E6=96=87=E6=A1=88=E3=80=81=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/Releases.jsx | 2 +-
 src/forge/Merge/merge_form.js    | 2 +-
 src/forge/New/Index.js           | 6 +++---
 src/forge/Order/order_form.js    | 6 +++---
 src/forge/Settings/Index.js      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 6d4d0acf4..3983f600f 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -27,7 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
           })
         :
         <div className="mt8">
-          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
+          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
         </div>
       }
       
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 9332d9b85..61a70ba82 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -329,7 +329,7 @@ class MergeForm extends Component {
                         placeholder={
                           issue_tags && issue_tags.length > 0
                             ? "未选择标签"
-                            : "请在仓库设置里添加标签"
+                            : "请在仓库设置里添加标记"
                         }
                         showSearch
                       >
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 832f0a1a4..c6eb2c3d5 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -219,7 +219,7 @@ class Index extends Component {
           user_id:owners_id
         }).then((result) => {
           if (result && result.data.id) {
-            projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`项目创建成功!`);
             this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
           }
           this.setState({
@@ -351,7 +351,7 @@ class Index extends Component {
                           required: true, message: '请填写镜像版本库地址'
                         }],
                       })(
-                        <Input placeholder="输入需要同步到本项目的镜像版本库地址" onChange={this.ChangeAddr} />
+                        <Input placeholder="请输入需要导入到本项目的仓库地址" onChange={this.ChangeAddr} />
                       )}
                     </Form.Item>
                     <p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
@@ -386,7 +386,7 @@ class Index extends Component {
                           {getFieldDecorator('password', {
                             rules: [],
                           })(
-                            <Input.Password placeholder="请输入对应平台的登录用户名" autocomplete='new-password' style={{width:"240px"}}/>
+                            <Input.Password placeholder="请输入对应平台的登录密码" autocomplete='new-password' style={{width:"240px"}}/>
                           )}
                         </Form.Item>
                       </div>
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 6515dde86..936dc3d11 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -442,13 +442,13 @@ class order_form extends Component {
                     </Select>
                   )}
                 </Form.Item>
-                <Form.Item label="标签">
+                <Form.Item label="标记">
                   {getFieldDecorator("issue_tag_ids", {rules: []})(
                     <Select>
                       <Option value={""}>
                         {issue_chosen && issue_chosen.issue_tag.length > 0
-                          ? "未选择标签"
-                          : "请在仓库设置里添加标签"}
+                          ? "未选择标记"
+                          : "请在仓库设置里添加标记"}
                       </Option>
                       {this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
                     </Select>
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index 3ebb5b49a..75e26b007 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -103,7 +103,7 @@ class Index extends Component {
               <p>
                 <Link to={`/${owner}/${projectsId}/settings/labels`} className="w-100">
                   <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
-                  项目标签
+                  项目标记
                 </Link>
               </p>
             </li>

From 917374ba11a19f2270fc978ab33636fc3e4e975e Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 16 Sep 2021 10:03:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=20to=20?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Settings/new_tags.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js
index bc763f9c8..ed9269cbb 100644
--- a/src/forge/Settings/new_tags.js
+++ b/src/forge/Settings/new_tags.js
@@ -348,7 +348,7 @@ class NewTags extends Component {
             </a>
             <Popconfirm
               placement="bottom"
-              title={"删除标签会将其从所有引用中删除。继续？"}
+              title={"删除标记会将其从所有引用中删除，是否继续？"}
               okText="是"
               cancelText="否"
               onConfirm={() => this.deletetag(item.id)}
@@ -383,7 +383,7 @@ class NewTags extends Component {
         return (
           <div>
             <div className="topWrapper" style={{borderBottom:"1px solid #eee"}}>
-              <span>共{data && data.issue_tags_count}个标签</span>
+              <span>共{data && data.issue_tags_count}个标记</span>
               <ul className="topWrapper_select">
                 <li>
                   <Dropdown
@@ -393,7 +393,7 @@ class NewTags extends Component {
                     placement="bottomCenter"
                   >
                     <span>
-                      标签
+                    标记
                       <Icon type="caret-down" className="ml5" />
                     </span>
                   </Dropdown>
@@ -423,11 +423,11 @@ class NewTags extends Component {
           className="flex-a-center baseForm bbr"
           style={{ "justify-content": "space-between" }}
         >
-          <span className="font-18 text-black">项目标签</span>
+          <span className="font-18 text-black">项目标记</span>
           {data && data.user_admin_or_member ? (
             <Button type="primary" ghost onClick={this.newshow}>
               <Icon type="plus"></Icon>
-              创建标签
+              创建标记
             </Button>
           ) : (
             ""
@@ -442,7 +442,7 @@ class NewTags extends Component {
                     rules: [
                       {
                         required: true,
-                        message: "请填写标签名字",
+                        message: "请填写标记名字",
                       },
                     ],
                   })(<Input placeholder="名称，10字以内" maxLength="10" />)}
@@ -481,7 +481,7 @@ class NewTags extends Component {
                     onClick={this.createtagpost}
                     className="fr"
                   >
-                    创建标签
+                    创建标记
                   </Button>
                   {/* <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a> */}
                   <a onClick={this.newclose} className="a_btn cancel_btn fr">
@@ -497,7 +497,7 @@ class NewTags extends Component {
           </div>
         </div>
         <Modal
-          title="编辑标签"
+          title="编辑标记"
           onCancel={this.handleCancel}
           visible={this.state.isShow}
           onOk={this.handleok}