From 2bf915a33d58fc78c9c13ffc64685219c28a4732 Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Wed, 14 Dec 2022 15:21:04 +0800
Subject: [PATCH] fix(i18n): missing translations for "About" and wrong place
 for language setting

---
 public/locales/en-US/application.json |  5 +++-
 public/locales/zh-CN/application.json |  5 +++-
 src/component/Setting/UserSetting.js  | 42 +++++++++++++--------------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/public/locales/en-US/application.json b/public/locales/en-US/application.json
index 70ed786..ba191e3 100644
--- a/public/locales/en-US/application.json
+++ b/public/locales/en-US/application.json
@@ -479,6 +479,9 @@
     "connectByiOS": "Connect to <0>{{title}}</0> through iOS devices.",
     "downloadOurApp": "Download our iOS App:",
     "fillInEndpoint": "Enter \"{{url}}\" as the \"Endpoint\";",
-    "loginApp": "Sign in using your Email and password."
+    "loginApp": "Sign in using your Email and password.",
+    "aboutCloudreve": "About Cloudreve",
+    "githubRepo": "GitHub Repository",
+    "homepage": "Homepage"
   }
 }
diff --git a/public/locales/zh-CN/application.json b/public/locales/zh-CN/application.json
index 439172b..532ddd1 100644
--- a/public/locales/zh-CN/application.json
+++ b/public/locales/zh-CN/application.json
@@ -479,6 +479,9 @@
     "connectByiOS": "通过 iOS 设备连接到 <0>{{title}}</0>",
     "downloadOurApp": "下载并安装我们的 iOS 应用：",
     "fillInEndpoint": "在 “站点地址” 中填入 “{{url}}”；",
-    "loginApp": "输入您的用户名及密码完成登录。"
+    "loginApp": "输入您的用户名及密码完成登录。",
+    "aboutCloudreve": "关于 Cloudreve",
+    "githubRepo": "GitHub 仓库",
+    "homepage": "主页"
   }
 }
diff --git a/src/component/Setting/UserSetting.js b/src/component/Setting/UserSetting.js
index d6372dd..bb87535 100644
--- a/src/component/Setting/UserSetting.js
+++ b/src/component/Setting/UserSetting.js
@@ -949,6 +949,24 @@ class UserSettingCompoment extends Component {
                                     />
                                 </ListItemSecondaryAction>
                             </ListItem>
+                            <Divider />
+                            <ListItem
+                                onClick={() => this.props.selectLanguage()}
+                                button
+                            >
+                                <ListItemIcon className={classes.iconFix}>
+                                    <Translate />
+                                </ListItemIcon>
+                                <ListItemText primary={t("setting.language")} />
+
+                                <ListItemSecondaryAction
+                                    className={classes.flexContainer}
+                                >
+                                    <RightIcon
+                                        className={classes.rightIconWithText}
+                                    />
+                                </ListItemSecondaryAction>
+                            </ListItem>
                         </List>
                     </Paper>
                     {user.group.webdav && (
@@ -1045,7 +1063,7 @@ class UserSettingCompoment extends Component {
                         className={classes.sectionTitle}
                         variant="subtitle2"
                     >
-                        关于 Cloudreve
+                        {t("setting.aboutCloudreve")}
                     </Typography>
                     <Paper>
                         <List className={classes.desenList}>
@@ -1060,7 +1078,7 @@ class UserSettingCompoment extends Component {
                                 <ListItemIcon className={classes.iconFix}>
                                     <GitHub />
                                 </ListItemIcon>
-                                <ListItemText primary="GitHub 仓库" />
+                                <ListItemText primary={t("setting.githubRepo")} />
 
                                 <ListItemSecondaryAction
                                     className={classes.flexContainer}
@@ -1080,25 +1098,7 @@ class UserSettingCompoment extends Component {
                                 <ListItemIcon className={classes.iconFix}>
                                     <Home />
                                 </ListItemIcon>
-                                <ListItemText primary="主页" />
-
-                                <ListItemSecondaryAction
-                                    className={classes.flexContainer}
-                                >
-                                    <RightIcon
-                                        className={classes.rightIconWithText}
-                                    />
-                                </ListItemSecondaryAction>
-                            </ListItem>
-                            <Divider />
-                            <ListItem
-                                onClick={() => this.props.selectLanguage()}
-                                button
-                            >
-                                <ListItemIcon className={classes.iconFix}>
-                                    <Translate />
-                                </ListItemIcon>
-                                <ListItemText primary={t("setting.language")} />
+                                <ListItemText primary={t("setting.homepage")} />
 
                                 <ListItemSecondaryAction
                                     className={classes.flexContainer}