diff --git a/i18n/index.js b/i18n/index.js index 67d9452..a917cd1 100644 --- a/i18n/index.js +++ b/i18n/index.js @@ -1,5 +1,5 @@ -var ja = require('./translations.en.json'); -var en = require('./translations.ja.json') +var ja = require('./translations.ja.json'); +var en = require('./translations.en.json') const i18n = { translations: { diff --git a/pages/components/Discord/DiscordPlaying.js b/pages/components/Discord/DiscordPlaying.js index c59feb7..36fef77 100644 --- a/pages/components/Discord/DiscordPlaying.js +++ b/pages/components/Discord/DiscordPlaying.js @@ -1,7 +1,11 @@ +// React import React, { useState, useEffect } from 'react'; + +// Data fetching import axios from 'axios'; -import useTranslation from 'next-translate/useTranslation' -import { useRouter } from 'next/router' + +// i18n +import { useTranslation, useLanguageQuery } from 'next-export-i18n'; function App (){ const [data, setData] = useState({ hits: [] }); diff --git a/pages/components/Discord/DiscordStatus.js b/pages/components/Discord/DiscordStatus.js index 203d4ed..43c66ff 100644 --- a/pages/components/Discord/DiscordStatus.js +++ b/pages/components/Discord/DiscordStatus.js @@ -1,4 +1,7 @@ +// React import React, { useState, useEffect } from 'react'; + +// Data fetching import axios from 'axios'; const App = () => { diff --git a/pages/components/LangSelector.js b/pages/components/LangSelector.js index 1db6d59..ba6a646 100644 --- a/pages/components/LangSelector.js +++ b/pages/components/LangSelector.js @@ -1,10 +1,13 @@ import React from "react"; import Popper from "popper.js"; -import { useRouter } from 'next/router' import Link from 'next/link'; import { faLanguage } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +// i18n +import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n'; + + const Dropdown = ({ color }) => { // dropdown props const [dropdownPopoverShow, setDropdownPopoverShow] = React.useState(false); @@ -45,12 +48,12 @@ const Dropdown = ({ color }) => {
- + 日本語 - - + + English - +
diff --git a/pages/components/Menu/FontAwesomeMenu.js b/pages/components/Menu/FontAwesomeMenu.js index 0c7c819..a40e66c 100644 --- a/pages/components/Menu/FontAwesomeMenu.js +++ b/pages/components/Menu/FontAwesomeMenu.js @@ -5,11 +5,11 @@ import Link from 'next/link' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; const FontAwesomeMenu = (props) => { - const { icon, dest } = props + const { icon, dest, query } = props return (
- + diff --git a/pages/components/Menu/MinecraftMenu.js b/pages/components/Menu/MinecraftMenu.js index 10827d8..f4a3e7c 100644 --- a/pages/components/Menu/MinecraftMenu.js +++ b/pages/components/Menu/MinecraftMenu.js @@ -1,10 +1,15 @@ // Next.js import Link from 'next/link' -const MinecraftMenu = () => { +const MinecraftMenu = (props) => { + const { query } = props + + if (!query) { + return

Loading...

+ } else { return (
- + @@ -14,5 +19,6 @@ const MinecraftMenu = () => {
) } +} export default MinecraftMenu \ No newline at end of file diff --git a/pages/components/Minecraft.js b/pages/components/Minecraft.js index 1c6fb20..ebe0dfd 100644 --- a/pages/components/Minecraft.js +++ b/pages/components/Minecraft.js @@ -1,11 +1,16 @@ +// React import React, { useState, useEffect } from 'react'; -import useTranslation from 'next-translate/useTranslation' -import { useRouter } from 'next/router' + +// i18n +import { useTranslation, useLanguageQuery } from 'next-export-i18n'; + import axios from 'axios'; import Image from 'next/image' import { list } from 'postcss'; export default function Minecraft(props) { + const { t } = useTranslation(); + const [query] = useLanguageQuery(); const [data, setData] = useState({ hits: [] }); useEffect(() => { @@ -21,7 +26,7 @@ export default function Minecraft(props) { if (data === undefined){ console.log("[Minecraft Query] データの取得に失敗しました。 / Failed to retrieve data.") return ( -

{t('minecraft:fail')}

+

{t('fail')}

) }else{ const status = data.online @@ -32,13 +37,13 @@ export default function Minecraft(props) { {(() => { if (status == true) { if (player == undefined || player == 0) { - return {t('minecraft:no_one')} + return {t('no_one')} } else { - return {t('minecraft:playing', {count: player})} + return {t('playing', {count: player})} }}else if (status == false) { - return {t('minecraft:offline')} + return {t('offline')} }else { - return {t('minecraft:loading')} + return {t('loading')} } })()} diff --git a/pages/components/Minecraft/Online.js b/pages/components/Minecraft/Online.js index e029ed4..c1e261f 100644 --- a/pages/components/Minecraft/Online.js +++ b/pages/components/Minecraft/Online.js @@ -1,10 +1,18 @@ +// React import React, { useState, useEffect } from 'react'; + +// Data fetching import axios from 'axios'; -import useTranslation from 'next-translate/useTranslation' -import { useRouter } from 'next/router' + +// i18n +import { useTranslation, useLanguageQuery } from 'next-export-i18n'; + +// Components import LastPlayed from './LastPlayed' function App (props) { + const { t } = useTranslation(); + const [query] = useLanguageQuery(); const uuid = props; const [data, setData] = useState({ hits: [] }); diff --git a/pages/components/Minecraft/PlayerName.js b/pages/components/Minecraft/PlayerName.js index 3e47101..81ce135 100644 --- a/pages/components/Minecraft/PlayerName.js +++ b/pages/components/Minecraft/PlayerName.js @@ -1,4 +1,7 @@ +// React import React, { useState, useEffect } from 'react'; + +// Data fetching import axios from 'axios'; function App (props) { diff --git a/pages/components/Navbar.js b/pages/components/Navbar.js index 0c3804f..ba358a9 100644 --- a/pages/components/Navbar.js +++ b/pages/components/Navbar.js @@ -18,7 +18,7 @@ const Navbar = () => { return ( <>
diff --git a/pages/components/Profile/Button.js b/pages/components/Profile/Button.js index 5c77903..a79565b 100644 --- a/pages/components/Profile/Button.js +++ b/pages/components/Profile/Button.js @@ -7,7 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; const Button = (props) => { const { icon, dest, caption } = props return ( - + {showModal ? ( <> @@ -34,17 +36,17 @@ export default function Modal() { {/* Modal body */}
-

{keys}

+

{t('keys')}