Skip to content

feat: Add i18n #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Add i18n #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b9715
feat: Add i18n
curtisy1 Oct 9, 2021
fe6297c
test: Fix tests
curtisy1 Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

dist/
dist/

.idea
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"html-webpack-plugin": "4.0.0-beta.5",
"http-proxy-middleware": "^0.20.0",
"husky": "^4.2.5",
"i18next": "^21.2.4",
"identity-obj-proxy": "3.0.0",
"invariant": "^2.2.4",
"is-wsl": "^1.1.0",
Expand Down Expand Up @@ -74,6 +75,7 @@
"react-dom": "^16.12.0",
"react-dplayer": "^0.4.1",
"react-hotkeys": "^2.0.0",
"react-i18next": "^11.12.0",
"react-lazy-load-image-component": "^1.3.2",
"react-load-script": "^0.0.6",
"react-monaco-editor": "^0.36.0",
Expand Down
260 changes: 131 additions & 129 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Suspense } from "react";
import React, { Suspense, useEffect } from "react";
import AuthRoute from "./middleware/AuthRoute";
import Navbar from "./component/Navbar/Navbar.js";
import useMediaQuery from "@material-ui/core/useMediaQuery";
Expand Down Expand Up @@ -30,6 +30,7 @@ import ResetForm from "./component/Login/ResetForm";
import Reset from "./component/Login/Reset";
import PageLoading from "./component/Placeholder/PageLoading";
import CodeViewer from "./component/Viewer/Code";
import { useTranslation } from "react-i18next";
const PDFViewer = React.lazy(() =>
import(/* webpackChunkName: "pdf" */ "./component/Viewer/PDF")
);
Expand All @@ -38,6 +39,7 @@ export default function App() {
const themeConfig = useSelector((state) => state.siteConfig.theme);
const isLogin = useSelector((state) => state.viewUpdate.isLogin);
const prefersDarkMode = useMediaQuery("(prefers-color-scheme: dark)");
const { t } = useTranslation();

const theme = React.useMemo(() => {
themeConfig.palette.type = prefersDarkMode ? "dark" : "light";
Expand Down Expand Up @@ -82,133 +84,133 @@ export default function App() {

const { path } = useRouteMatch();
return (
<React.Fragment>
<ThemeProvider theme={theme}>
<div className={classes.root} id="container">
<CssBaseline />
<AlertBar />
<Navbar />
<main className={classes.content}>
<div className={classes.toolbar} />
<Switch>
<AuthRoute exact path={path} isLogin={isLogin}>
<Redirect
to={{
pathname: "/home",
}}
/>
</AuthRoute>

<AuthRoute path={`${path}home`} isLogin={isLogin}>
<FileManager />
</AuthRoute>

<AuthRoute path={`${path}video`} isLogin={isLogin}>
<VideoPreview />
</AuthRoute>

<AuthRoute path={`${path}text`} isLogin={isLogin}>
<TextViewer />
</AuthRoute>

<AuthRoute path={`${path}doc`} isLogin={isLogin}>
<DocViewer />
</AuthRoute>

<AuthRoute path={`${path}pdf`} isLogin={isLogin}>
<Suspense fallback={<PageLoading />}>
<PDFViewer />
</Suspense>
</AuthRoute>

<AuthRoute path={`${path}code`} isLogin={isLogin}>
<CodeViewer />
</AuthRoute>

<AuthRoute path={`${path}aria2`} isLogin={isLogin}>
<Download />
</AuthRoute>

<AuthRoute path={`${path}shares`} isLogin={isLogin}>
<MyShare />
</AuthRoute>

<Route path={`${path}search`} isLogin={isLogin}>
<SearchResult />
</Route>

<Route path={`${path}setting`} isLogin={isLogin}>
<UserSetting />
</Route>

<AuthRoute
path={`${path}profile/:id`}
isLogin={isLogin}
>
<Profile />
</AuthRoute>

<AuthRoute path={`${path}webdav`} isLogin={isLogin}>
<WebDAV />
</AuthRoute>

<AuthRoute path={`${path}tasks`} isLogin={isLogin}>
<Tasks />
</AuthRoute>

<Route path={`${path}login`} exact>
<LoginForm />
</Route>

<Route path={`${path}signup`} exact>
<Register />
</Route>

<Route path={`${path}activate`} exact>
<Activation />
</Route>

<Route path={`${path}reset`} exact>
<ResetForm />
</Route>

<Route path={`${path}forget`} exact>
<Reset />
</Route>

<Route exact path={`${path}s/:id`}>
<SharePreload />
</Route>

<Route path={`${path}s/:id/video(/)*`}>
<VideoPreview />
</Route>

<Route path={`${path}s/:id/doc(/)*`}>
<DocViewer />
</Route>

<Route path={`${path}s/:id/text(/)*`}>
<TextViewer />
</Route>

<Route path={`${path}s/:id/pdf(/)*`}>
<Suspense fallback={<PageLoading />}>
<PDFViewer />
</Suspense>
</Route>

<Route path={`${path}s/:id/code(/)*`}>
<CodeViewer />
</Route>

<Route path="*">
<NotFound msg={"页面不存在"} />
</Route>
</Switch>
</main>
</div>
</ThemeProvider>
</React.Fragment>
<React.Fragment>
<ThemeProvider theme={theme}>
<div className={classes.root} id="container">
<CssBaseline />
<AlertBar />
<Navbar />
<main className={classes.content}>
<div className={classes.toolbar} />
<Switch>
<AuthRoute exact path={path} isLogin={isLogin}>
<Redirect
to={{
pathname: "/home",
}}
/>
</AuthRoute>

<AuthRoute path={`${path}home`} isLogin={isLogin}>
<FileManager />
</AuthRoute>

<AuthRoute path={`${path}video`} isLogin={isLogin}>
<VideoPreview />
</AuthRoute>

<AuthRoute path={`${path}text`} isLogin={isLogin}>
<TextViewer />
</AuthRoute>

<AuthRoute path={`${path}doc`} isLogin={isLogin}>
<DocViewer />
</AuthRoute>

<AuthRoute path={`${path}pdf`} isLogin={isLogin}>
<Suspense fallback={<PageLoading />}>
<PDFViewer />
</Suspense>
</AuthRoute>

<AuthRoute path={`${path}code`} isLogin={isLogin}>
<CodeViewer />
</AuthRoute>

<AuthRoute path={`${path}aria2`} isLogin={isLogin}>
<Download />
</AuthRoute>

<AuthRoute path={`${path}shares`} isLogin={isLogin}>
<MyShare />
</AuthRoute>

<Route path={`${path}search`} isLogin={isLogin}>
<SearchResult />
</Route>

<Route path={`${path}setting`} isLogin={isLogin}>
<UserSetting />
</Route>

<AuthRoute
path={`${path}profile/:id`}
isLogin={isLogin}
>
<Profile />
</AuthRoute>

<AuthRoute path={`${path}webdav`} isLogin={isLogin}>
<WebDAV />
</AuthRoute>

<AuthRoute path={`${path}tasks`} isLogin={isLogin}>
<Tasks />
</AuthRoute>

<Route path={`${path}login`} exact>
<LoginForm />
</Route>

<Route path={`${path}signup`} exact>
<Register />
</Route>

<Route path={`${path}activate`} exact>
<Activation />
</Route>

<Route path={`${path}reset`} exact>
<ResetForm />
</Route>

<Route path={`${path}forget`} exact>
<Reset />
</Route>

<Route exact path={`${path}s/:id`}>
<SharePreload />
</Route>

<Route path={`${path}s/:id/video(/)*`}>
<VideoPreview />
</Route>

<Route path={`${path}s/:id/doc(/)*`}>
<DocViewer />
</Route>

<Route path={`${path}s/:id/text(/)*`}>
<TextViewer />
</Route>

<Route path={`${path}s/:id/pdf(/)*`}>
<Suspense fallback={<PageLoading />}>
<PDFViewer />
</Suspense>
</Route>

<Route path={`${path}s/:id/code(/)*`}>
<CodeViewer />
</Route>

<Route path="*">
<NotFound msg={t('Page does not exist')} />
</Route>
</Switch>
</main>
</div>
</ThemeProvider>
</React.Fragment>
);
}
5 changes: 3 additions & 2 deletions src/actions/explorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import i18next from 'i18next';
import { isMac } from "../utils";
import pathHelper from "../utils/page";
import Auth from "../middleware/Auth";
Expand Down Expand Up @@ -59,7 +60,7 @@ export const openPreview = () => {
if (isShare) {
const user = Auth.GetUser();
if (!Auth.Check() && user && !user.group.shareDownload) {
dispatch(toggleSnackbar("top", "right", "请先登录", "warning"));
dispatch(toggleSnackbar("top", "right", i18next.t('please log in first'), "warning"));
dispatch(changeContextMenu("file", false));
return;
}
Expand Down Expand Up @@ -188,7 +189,7 @@ export const openPreview = () => {
);
return;
default:
dispatch(openLoadingDialog("获取下载地址..."));
dispatch(openLoadingDialog(i18next.t('Get download address...')));
return;
}
};
Expand Down
4 changes: 3 additions & 1 deletion src/component/Admin/Common/DomainInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useTranslation } from "react-i18next";
import React, { useEffect, useState } from "react";
import FormControl from "@material-ui/core/FormControl";
import InputLabel from "@material-ui/core/InputLabel";
Expand All @@ -11,6 +12,7 @@ export default function DomainInput({ onChange, value, required, label }) {
const [domain, setDomain] = useState("");
const [protocol, setProtocol] = useState("https://");
const [error, setError] = useState();
const { t } = useTranslation();

useState(() => {
value = value ? value : "";
Expand All @@ -28,7 +30,7 @@ export default function DomainInput({ onChange, value, required, label }) {
useEffect(() => {
if (protocol === "http://" && window.location.protocol === "https:") {
setError(
"您当前站点启用了 HTTPS ，此处选择 HTTP 可能会导致无法连接。"
t('HTTPS is enabled on your current site. Selecting HTTP here may cause connection failure.')
);
} else {
setError("");
Expand Down
Loading