Update language translations and fix UI issues

Author: smallstone

src/util/ideaBridge.ts

@@ -377,6 +377,7 @@ class IdeaBridge {
   }
 
   resviceSettings(res) {
+    console.log("resviceSettings res: ", res);
     // 用户设置的回调
     const setting = res.payload.setting;
 

src/views/components/Header/index.tsx

@@ -82,11 +82,11 @@ export default function Head() {
               <IconSettings size="1.125rem" />
             </ActionIcon>
           </div>
-          <div>
+          {/* <div>
             <ActionIcon size="sm" onClick={switchLang}>
               <IconLanguage size="1.125rem" />
             </ActionIcon>
-          </div>
+          </div> */}
         </Flex>
       </Flex>
     </Header>

src/views/components/InputMessage/index.tsx

@@ -34,7 +34,11 @@ import Topic from "./Topic";
 import { observer } from "mobx-react-lite";
 import { useMst } from "@/views/stores/RootStore";
 import { ChatContext } from "@/views/stores/InputStore";
+<<<<<<< HEAD
 import { Trans, useTranslation } from "react-i18next";
+=======
+import { useTranslation } from "react-i18next";
+>>>>>>> 36a272b (Update language translations and fix UI issues)
 
 const useStyles = createStyles((theme) => ({
   actionIcon: {

src/views/components/MessageBody/index.tsx

@@ -3,13 +3,21 @@ import React from "react";
 import { observer } from "mobx-react-lite";
 import MessageMarkdown from "@/views/components/MessageMarkdown";
 import { useMst } from "@/views/stores/RootStore";
+<<<<<<< HEAD
 import { Trans, useTranslation } from "react-i18next";
+=======
+import { useTranslation } from "react-i18next";
+>>>>>>> 36a272b (Update language translations and fix UI issues)
 
 interface IProps {
   messageType: string;
   children: string;
   messageDone?: boolean;
+<<<<<<< HEAD
   activeStep?: boolean;
+=======
+  temp?: boolean;
+>>>>>>> 36a272b (Update language translations and fix UI issues)
 }
 
 const useStyles = createStyles((theme, options: any) => ({
@@ -31,18 +39,29 @@ const trasnlateKey = (children: string) => {
 };
 
 const MessageBody = observer((props: IProps) => {
+<<<<<<< HEAD
   const { children, messageType, activeStep = false, messageDone } = props;
+=======
+  const { children, messageType, temp = false, messageDone } = props;
+>>>>>>> 36a272b (Update language translations and fix UI issues)
   const { chat } = useMst();
   const { classes } = useStyles({
     chatPanelWidth: chat.chatPanelWidth,
   });
   const { t } = useTranslation();
+<<<<<<< HEAD
   const transkey = trasnlateKey(children);
+=======
+>>>>>>> 36a272b (Update language translations and fix UI issues)
 
   return messageType === "bot" ? (
     <MessageMarkdown
       className={classes.bodyWidth}
+<<<<<<< HEAD
       activeStep={activeStep}
+=======
+      temp={temp}
+>>>>>>> 36a272b (Update language translations and fix UI issues)
       messageDone={messageDone}
     >
       {children}
@@ -55,7 +74,11 @@ const MessageBody = observer((props: IProps) => {
         width: chat.chatPanelWidth - 20,
       }}
     >
+<<<<<<< HEAD
       <pre className={classes.userContent}>{children}</pre>
+=======
+      <pre className={classes.userContent}>{t(children)}</pre>
+>>>>>>> 36a272b (Update language translations and fix UI issues)
     </Container>
   );
 });

src/views/i18n/zh.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "Delete message": "删除消息及回答",
   "Copied": "已复制",
   "Copy message": "复制回答",
@@ -17,4 +18,15 @@
   "commit changes with commit message in english.": "选择要提交的代码变更，总结英文提交消息，并提交到代码库。",
   "Generate a commit message for the given git diff.": "为给定的 git diff 生成提交消息。",
   "Generate a release note for the given commit log.": "为给定的提交日志生成发布说明。"
+=======
+  "Delete message": "删除",
+  "Copied": "已复制",
+  "Copy message": "复制",
+  "Refilled": "已发送",
+  "Refill message": "再次发送",
+  "User": "用户",
+  "Ask DevChat a question or type ‘/’ for workflow": "向 DevChat 提问或输入 '/' 以查看工作流",
+  "How do I use DevChat?": "如何使用 DevChat？",
+  "balance": "您的余额为 {{formatedCurrency}}，登录 <4>web.devchat.ai</4> 以获得更多 tokens"
+>>>>>>> 36a272b (Update language translations and fix UI issues)
 }