From a72a778a033507fc1d5d8f5ce954fc4926697a07 Mon Sep 17 00:00:00 2001
From: yude <i@yude.jp>
Date: Sat, 11 Dec 2021 18:17:20 +0900
Subject: [PATCH] WIP

---
 i18n/translations.en.json         |  2 +-
 pages/components/Footer/Footer.js |  8 +++++++-
 pages/components/Navbar.js        | 11 +++++++++++
 pages/hcunews.js                  |  5 ++---
 pages/index.js                    |  5 +++--
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/i18n/translations.en.json b/i18n/translations.en.json
index 63b6335..147d8ef 100644
--- a/i18n/translations.en.json
+++ b/i18n/translations.en.json
@@ -10,7 +10,7 @@
     "mutual": "Mutual links",
     "status": "Service Status",
     "icon_1": "Icon: ",
-    "icon_2": "",
+    "icon_2": " ",
     "post_list": "Posts listing",
     "hcunews": "About @hcunews",
     "house": "yude's house",
diff --git a/pages/components/Footer/Footer.js b/pages/components/Footer/Footer.js
index 7ff65af..63124a6 100644
--- a/pages/components/Footer/Footer.js
+++ b/pages/components/Footer/Footer.js
@@ -1,9 +1,15 @@
+// Tailwind CSS
 import "tailwindcss/tailwind.css";
+
+// Next.js
 import Link from 'next/link';
+
 // i18n
-import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n';
+import { useTranslation, useLanguageQuery } from 'next-export-i18n';
 
 export default function Footer(props) {
+  const { t } = useTranslation();
+  const [query] = useLanguageQuery();
     return (
       <>
         <div className="container mx-auto px-6">
diff --git a/pages/components/Navbar.js b/pages/components/Navbar.js
index dd8c912..0c3804f 100644
--- a/pages/components/Navbar.js
+++ b/pages/components/Navbar.js
@@ -1,9 +1,20 @@
+// Tailwind CSS
 import "tailwindcss/tailwind.css";
+
+// Next.js
 import Link from 'next/link';
+
+// Components
 import LangSelector from "./LangSelector"
 import ThemeSelector from "./ThemeSelector"
 
+// i18n
+import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n';
+
 const Navbar = () => {
+  const { t } = useTranslation();
+  const [query] = useLanguageQuery();
+  
     return (
       <>
         <nav className='flex items-center flex-wrap p-3'>
diff --git a/pages/hcunews.js b/pages/hcunews.js
index b64e70d..285c335 100644
--- a/pages/hcunews.js
+++ b/pages/hcunews.js
@@ -3,8 +3,6 @@ import Layout from "./components/Layout"
 
 // i18n
 import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n';
-const { t } = useTranslation();
-const [query] = useLanguageQuery();
 
 // React
 import React from "react"
@@ -16,7 +14,8 @@ import ja from '../docs/hcunews/ja.md'
 import en from '../docs/hcunews/en.md'
 
 export default function HcuNews() {
-    const { t, lang } = useTranslation("hcunews")
+    const { t } = useTranslation();
+const [query] = useLanguageQuery();
 
     return(
         <Layout title={t('hcunews')}>
diff --git a/pages/index.js b/pages/index.js
index bbf51ad..887fb36 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -13,7 +13,7 @@ import Image from 'next/image'
 import Link from 'next/link'
 
 // i18n
-import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n';
+import { useTranslation, useLanguageQuery } from 'next-export-i18n';
 
 // React Router
 import { useRouter } from 'next/router'
@@ -26,6 +26,7 @@ import { faBook, faUser, faServer, faHouseUser, faHeart } from '@fortawesome/fre
 export default function Index(props) {
   const { t } = useTranslation();
   const [query] = useLanguageQuery();
+  
   return (
     <>
       <Layout title={t('home')}>
@@ -60,7 +61,7 @@ export default function Index(props) {
           </div>
           
           {/* Avatar by */}
-          <p className="mt-3 text-sm font-bold text-gray-900 dark:text-gray-400">{t('common:icon_1')}<Link href="https://twitter.com/R_I_R_U_"><a className="hover:underline">梨留りる {t('common:icon_2')}</a></Link></p>
+          <p className="mt-3 text-sm font-bold text-gray-900 dark:text-gray-400">{t('icon_1')}<Link href="https://twitter.com/R_I_R_U_"><a className="hover:underline">梨留りる {t('icon_2')}</a></Link></p>
         </div>
       </Layout>
     </>