Fix i18n after merge
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "cp -r public/* dist && parcel src/index.html",
|
"dev": "cp -r public/* dist && parcel src/index.html",
|
||||||
"build": "parcel build src/index.html"
|
"build": "cp -r public/* dist && parcel build src/index.html"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
|
|||||||
@@ -310,7 +310,7 @@ export default function Apply() {
|
|||||||
</Section>
|
</Section>
|
||||||
|
|
||||||
<Button type="submit" className="self-center text-4xl p-6">
|
<Button type="submit" className="self-center text-4xl p-6">
|
||||||
<a href="#submitted" onClick={() => setSubmitSpinner(true)}>t("application.submit.button")</a>
|
<a href="#submitted" onClick={() => setSubmitSpinner(true)}>{t("application.submit.button")}</a>
|
||||||
{submitSpinner && <Spinner data-icon="inline-start" />}
|
{submitSpinner && <Spinner data-icon="inline-start" />}
|
||||||
</Button>
|
</Button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ export default function Careers() {
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<Button className="bg-blue-500 text-white px-4 py-2 rounded mt-4" asChild>
|
<Button className="bg-blue-500 text-white px-4 py-2 rounded mt-4" asChild>
|
||||||
<a href="#apply">t("jobPage.apply")</a>
|
<a href="#apply">{t("jobPage.apply")}</a>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
</Section>
|
</Section>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
import "../i18n";
|
|
||||||
import TitleBar from "@/components/titlebar";
|
import TitleBar from "@/components/titlebar";
|
||||||
import Footer from "@/components/footer";
|
import Footer from "@/components/footer";
|
||||||
import InaccessabilityPopup from "@/components/inacessability/inaccessabilityPopup";
|
import InaccessabilityPopup from "@/components/inacessability/inaccessabilityPopup";
|
||||||
|
|||||||
+2
-2
@@ -4,8 +4,8 @@ import { initReactI18next } from "react-i18next";
|
|||||||
i18n
|
i18n
|
||||||
.use(initReactI18next)
|
.use(initReactI18next)
|
||||||
.init({
|
.init({
|
||||||
fallbackLng: "en",
|
fallbackLng: "emji",
|
||||||
lng: "en",
|
lng: "emji",
|
||||||
interpolation: {
|
interpolation: {
|
||||||
escapeValue: false,
|
escapeValue: false,
|
||||||
},
|
},
|
||||||
|
|||||||
+3
-2
@@ -6,7 +6,8 @@ import Home from "./app/page";
|
|||||||
import Careers from "./app/careers/page";
|
import Careers from "./app/careers/page";
|
||||||
import Apply from "./app/apply/page";
|
import Apply from "./app/apply/page";
|
||||||
import Submitted from "./app/submitted/page";
|
import Submitted from "./app/submitted/page";
|
||||||
|
import { I18nextProvider } from "react-i18next";
|
||||||
|
import i18n from "./i18n";
|
||||||
|
|
||||||
function Router() {
|
function Router() {
|
||||||
const [hash, setHash] = useState(window.location.hash);
|
const [hash, setHash] = useState(window.location.hash);
|
||||||
@@ -39,4 +40,4 @@ function Router() {
|
|||||||
|
|
||||||
ReactDOM.createRoot(
|
ReactDOM.createRoot(
|
||||||
document.getElementById("root")
|
document.getElementById("root")
|
||||||
).render(<App><Router /></App>);
|
).render(<I18nextProvider i18n={i18n}><App><Router /></App></I18nextProvider>);
|
||||||
Reference in New Issue
Block a user