From 198e0650440329adbb880575b49f895c73c2c5e2 Mon Sep 17 00:00:00 2001 From: Black-Hole <158blackhole@gmail.com> Date: Wed, 19 Jan 2022 16:17:20 +0800 Subject: [PATCH] fix(i18n): i18n fixes (#1312) * fix(i18n): forget some i18n * fix(classroom): language will be reset upon enter classroom (#1314) * refactor(i18n): improve i18n --- .../src/components/AppStoreButton/index.tsx | 2 +- .../src/components/CloudStorageButton.tsx | 2 +- .../renderer-app/src/components/InviteButton.tsx | 4 +++- .../renderer-app/src/pages/BigClassPage/index.tsx | 6 +++--- .../HomePage/MainRoomListPanel/MainRoomList.tsx | 2 +- .../renderer-app/src/pages/OneToOnePage/index.tsx | 6 +++--- .../renderer-app/src/pages/SmallClassPage/index.tsx | 6 +++--- .../ClassroomPage/CloudRecordBtn/index.tsx | 4 ++++ .../components/ClassroomPage/RaiseHand/index.tsx | 5 ++++- .../src/components/PeriodicRoomPage/MoreMenu.tsx | 2 +- .../RoomDetailPage/RoomDetailFooter/index.tsx | 2 +- packages/flat-i18n/locales/en.json | 13 ++++++++++--- packages/flat-i18n/locales/zh-CN.json | 13 ++++++++++--- .../src/components/AppStoreButton/index.tsx | 2 +- web/flat-web/src/components/CloudStorageButton.tsx | 2 +- web/flat-web/src/components/InviteButton.tsx | 4 +++- web/flat-web/src/pages/BigClassPage/index.tsx | 6 +++--- .../HomePage/MainRoomListPanel/MainRoomList.tsx | 2 +- web/flat-web/src/pages/OneToOnePage/index.tsx | 6 +++--- web/flat-web/src/pages/SmallClassPage/index.tsx | 6 +++--- 20 files changed, 60 insertions(+), 35 deletions(-) diff --git a/desktop/renderer-app/src/components/AppStoreButton/index.tsx b/desktop/renderer-app/src/components/AppStoreButton/index.tsx index c24bb803f5e..27662e606a6 100644 --- a/desktop/renderer-app/src/components/AppStoreButton/index.tsx +++ b/desktop/renderer-app/src/components/AppStoreButton/index.tsx @@ -64,7 +64,7 @@ export const AppStoreButton = observer(function AppStoreBut <> } - title="Open App Store" + title={t("app-store")} onClick={() => setAppStoreIsVisible(true)} /> (function Clo <> } - title="Open Cloud Storage" + title={t("cloud-storage")} onClick={showModal} /> (function InviteButton({ roomInfo }) { + const { t } = useTranslation(); const [isShowInviteModal, showInviteModal] = useState(false); const hideInviteModal = (): void => showInviteModal(false); return (
} - title="Invite" + title={t("invitation")} onClick={() => showInviteModal(true)} /> {roomInfo && ( diff --git a/desktop/renderer-app/src/pages/BigClassPage/index.tsx b/desktop/renderer-app/src/pages/BigClassPage/index.tsx index 0770aa1178d..dfe21058382 100644 --- a/desktop/renderer-app/src/pages/BigClassPage/index.tsx +++ b/desktop/renderer-app/src/pages/BigClassPage/index.tsx @@ -259,7 +259,7 @@ export const BigClassPage = observer(function BigClassPage() ) } - title="Share Screen" + title={t("share-screen.self")} onClick={handleShareScreen} /> )} @@ -281,7 +281,7 @@ export const BigClassPage = observer(function BigClassPage() } - title="Exit" + title={t("exit")} onClick={() => confirm(ExitRoomConfirmType.ExitButton)} /> @@ -293,7 +293,7 @@ export const BigClassPage = observer(function BigClassPage() ) } - title={isRealtimeSideOpen ? "hide side panel" : "show side panel"} + title={isRealtimeSideOpen ? t("side-panel.hide") : t("side-panel.show")} onClick={handleSideOpenerSwitch} /> diff --git a/desktop/renderer-app/src/pages/HomePage/MainRoomListPanel/MainRoomList.tsx b/desktop/renderer-app/src/pages/HomePage/MainRoomListPanel/MainRoomList.tsx index bdba8b0c6ae..c4188fb128f 100644 --- a/desktop/renderer-app/src/pages/HomePage/MainRoomListPanel/MainRoomList.tsx +++ b/desktop/renderer-app/src/pages/HomePage/MainRoomListPanel/MainRoomList.tsx @@ -352,7 +352,7 @@ export const MainRoomList = observer(function MainRoomList({ }); } if (room.roomUUID) { - result.push({ key: "invite", text: t("copy-invitation") }); + result.push({ key: "invite", text: t("invitation") }); } } return result as SubActions; diff --git a/desktop/renderer-app/src/pages/OneToOnePage/index.tsx b/desktop/renderer-app/src/pages/OneToOnePage/index.tsx index f6cc3c9ef30..427848056a3 100644 --- a/desktop/renderer-app/src/pages/OneToOnePage/index.tsx +++ b/desktop/renderer-app/src/pages/OneToOnePage/index.tsx @@ -217,7 +217,7 @@ export const OneToOnePage = observer(function OneToOnePage() ) } - title="Share Screen" + title={t("share-screen.self")} onClick={handleShareScreen} /> )} @@ -239,7 +239,7 @@ export const OneToOnePage = observer(function OneToOnePage() } - title="Exit" + title={t("exit")} onClick={() => confirm(ExitRoomConfirmType.ExitButton)} /> @@ -251,7 +251,7 @@ export const OneToOnePage = observer(function OneToOnePage() ) } - title={isRealtimeSideOpen ? "hide side panel" : "show side panel"} + title={isRealtimeSideOpen ? t("side-panel.hide") : t("side-panel.show")} onClick={handleSideOpenerSwitch} /> diff --git a/desktop/renderer-app/src/pages/SmallClassPage/index.tsx b/desktop/renderer-app/src/pages/SmallClassPage/index.tsx index 1baded21ce2..a9e6c59defb 100644 --- a/desktop/renderer-app/src/pages/SmallClassPage/index.tsx +++ b/desktop/renderer-app/src/pages/SmallClassPage/index.tsx @@ -284,7 +284,7 @@ export const SmallClassPage = observer(function SmallClassP ) } - title="Share Screen" + title={t("share-screen.self")} onClick={handleShareScreen} /> )} @@ -306,7 +306,7 @@ export const SmallClassPage = observer(function SmallClassP } - title="Exit" + title={t("exit")} onClick={() => confirm(ExitRoomConfirmType.ExitButton)} /> @@ -318,7 +318,7 @@ export const SmallClassPage = observer(function SmallClassP ) } - title={isRealtimeSideOpen ? "hide side panel" : "show side panel"} + title={isRealtimeSideOpen ? t("side-panel.hide") : t("side-panel.show")} onClick={() => openRealtimeSide(isRealtimeSideOpen => !isRealtimeSideOpen)} /> diff --git a/packages/flat-components/src/components/ClassroomPage/CloudRecordBtn/index.tsx b/packages/flat-components/src/components/ClassroomPage/CloudRecordBtn/index.tsx index 407465da8ba..32fcb98d091 100644 --- a/packages/flat-components/src/components/ClassroomPage/CloudRecordBtn/index.tsx +++ b/packages/flat-components/src/components/ClassroomPage/CloudRecordBtn/index.tsx @@ -3,6 +3,7 @@ import { observer } from "mobx-react-lite"; import React from "react"; import RecordIdleSVG from "./icons/record-idle.svg"; import RecordStartedSVG from "./icons/record-started.svg"; +import { useTranslation } from "react-i18next"; export type CloudRecordBtnProps = { isRecording: boolean; @@ -11,9 +12,12 @@ export type CloudRecordBtnProps = { export const CloudRecordBtn: React.FC = observer( ({ isRecording, onClick }) => { + const { t } = useTranslation(); + return ( } + title={t("recording")} onClick={onClick} /> ); diff --git a/packages/flat-components/src/components/ClassroomPage/RaiseHand/index.tsx b/packages/flat-components/src/components/ClassroomPage/RaiseHand/index.tsx index dd771df0ba0..cb29e3b2e38 100644 --- a/packages/flat-components/src/components/ClassroomPage/RaiseHand/index.tsx +++ b/packages/flat-components/src/components/ClassroomPage/RaiseHand/index.tsx @@ -3,6 +3,7 @@ import raiseHandActiveSVG from "./icons/raise-hand-active.svg"; import "./style.less"; import React from "react"; +import { useTranslation } from "react-i18next"; export interface RaiseHandProps { isRaiseHand?: boolean; @@ -15,8 +16,10 @@ export const RaiseHand: React.FC = ({ disableHandRaising, onRaiseHandChange, }) => { + const { t } = useTranslation(); + return disableHandRaising ? null : ( - ); diff --git a/packages/flat-components/src/components/PeriodicRoomPage/MoreMenu.tsx b/packages/flat-components/src/components/PeriodicRoomPage/MoreMenu.tsx index 16710d0d1f2..388773d95e0 100644 --- a/packages/flat-components/src/components/PeriodicRoomPage/MoreMenu.tsx +++ b/packages/flat-components/src/components/PeriodicRoomPage/MoreMenu.tsx @@ -49,7 +49,7 @@ export const MoreMenu: React.FC = ({ )} setInviteRoomVisible(true)}> - {t("copy-invitation")} + {t("invitation")} (function RoomDet )}