From b0000ce145f405faa49534ed2834626203fc52e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Thu, 25 Apr 2024 22:45:32 +0900
Subject: [PATCH 1/6] refactor i18n keys

---
 src/i18n/en/translation.json | 6 ++++--
 src/i18n/ja/translation.json | 6 ++++--
 src/routes/Home/Home.tsx     | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index ffce5ea..79f809b 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -1,5 +1,7 @@
 {
     "codeOfConduct": "Code of Conduct",
-    "helloWorld": "✨ Hello World ✨",
-    "joinUs": "✨ Join us on Slack ✨"
+    "home": {
+        "helloWorld": "✨ Hello World ✨",
+        "joinUs": "✨ Join us on Slack ✨"
+    }
 }
\ No newline at end of file
diff --git a/src/i18n/ja/translation.json b/src/i18n/ja/translation.json
index 45dca53..e69f7d9 100644
--- a/src/i18n/ja/translation.json
+++ b/src/i18n/ja/translation.json
@@ -1,5 +1,7 @@
 {
     "codeOfConduct": "行動規範",
-    "helloWorld": "✨ Hello 世界 ✨",
-    "joinUs": "✨ スラックに参加する ✨"
+    "home": {
+        "helloWorld": "✨ Hello 世界 ✨",
+        "joinUs": "✨ スラックに参加する ✨"
+    }
 }
\ No newline at end of file
diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx
index 2f19cc8..a610fe8 100644
--- a/src/routes/Home/Home.tsx
+++ b/src/routes/Home/Home.tsx
@@ -10,7 +10,7 @@ const Home: FC = () => {
 
     return <Container style={{ padding: 32 }}>
         <Stack spacing={2}>
-            <Typography variant="h1">{t('helloWorld')}</Typography>
+            <Typography variant="h1">{t('home.helloWorld')}</Typography>
             <Typography variant="body1">
                 Many of us were saddened to hear of the sudden closure of Women Who Code.
                 There is a need for an organization to empower diverse women in technology careers in Tokyo and across Japan.
@@ -31,7 +31,7 @@ const Home: FC = () => {
                 href='https://join.slack.com/t/womencodersjapan/shared_invite/zt-2h79966bm-dE7SyiGvv2CXBxbz_0JzKw'
                 target='_blank'
             >
-                {t('joinUs')}
+                {t('home.joinUs')}
             </Button>
         </Stack>
     </Container>

From 48e9af857088c236e25ab33ae2fb67b7b4265fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Thu, 25 Apr 2024 22:47:27 +0900
Subject: [PATCH 2/6] make english keys

---
 src/i18n/en/translation.json |  5 ++++-
 src/routes/Home/Home.tsx     | 10 +++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index 79f809b..6c3d24e 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -2,6 +2,9 @@
     "codeOfConduct": "Code of Conduct",
     "home": {
         "helloWorld": "✨ Hello World ✨",
-        "joinUs": "✨ Join us on Slack ✨"
+        "joinUs": "✨ Join us on Slack ✨",
+        "paragraph1": "Many of us were saddened to hear of the sudden closure of Women Who Code. There is a need for an organization to empower diverse women in technology careers in Tokyo and across Japan.",
+        "paragraph2": "We are not giving up on this mission. Please join us in rebuilding community so that we can empower women in Japan in Software Engineering careers.",
+        "paragraph3": "Our events target professional women in software careers with 2+ years of experience. Beginners to seasoned professionals are welcome to participate. While this organization focuses on women, all genders are welcome at our events. Software-adjacent roles like Data Science, Product, UI/UX, Machine Learning, etc., are welcome, too."
     }
 }
\ No newline at end of file
diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx
index a610fe8..65fa958 100644
--- a/src/routes/Home/Home.tsx
+++ b/src/routes/Home/Home.tsx
@@ -12,18 +12,14 @@ const Home: FC = () => {
         <Stack spacing={2}>
             <Typography variant="h1">{t('home.helloWorld')}</Typography>
             <Typography variant="body1">
-                Many of us were saddened to hear of the sudden closure of Women Who Code.
-                There is a need for an organization to empower diverse women in technology careers in Tokyo and across Japan.
+                {t('home.paragraph1')}
             </Typography>
             <Typography>
-                We are not giving up on this mission.
-                Please join us in rebuilding community so that we can empower women in Japan in Software Engineering careers.
+                {t('home.paragraph2')}
             </Typography>
 
             <Typography>
-                Our events target professional women in software careers with 2+ years of experience. Beginners to seasoned professionals are welcome to participate.
-                While this organization focuses on women, all genders are welcome at our events.
-                Software-adjacent roles like Data Science, Product, UI/UX, Machine Learning, etc., are welcome, too.
+                {t('home.paragraph3')}
             </Typography>
 
             <Button

From 31b956d90681fff8e5821da4499482c7410be071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Thu, 25 Apr 2024 22:51:23 +0900
Subject: [PATCH 3/6] add ja translation

---
 src/i18n/ja/translation.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ja/translation.json b/src/i18n/ja/translation.json
index e69f7d9..10c5000 100644
--- a/src/i18n/ja/translation.json
+++ b/src/i18n/ja/translation.json
@@ -2,6 +2,9 @@
     "codeOfConduct": "行動規範",
     "home": {
         "helloWorld": "✨ Hello 世界 ✨",
-        "joinUs": "✨ スラックに参加する ✨"
+        "joinUs": "✨ スラックに参加する ✨",
+        "paragraph1": "Women Who Code(WWCode)の活動中止のニュースに対し、多くの人々が悲しみました。東京や日本全体で、IT業界の多様な女性を支援する組織が必要とされています。",
+        "paragraph2": "この使命を諦めるつもりはありません。WWCodeの志を引き継ぐために、日本の女性がソフトウェアエンジニアとしてキャリアを築けるよう、私たちと共にコミュニティを再構築していきます。",
+        "paragraph3": "私たちのイベントは、2年以上の経験を持つITプロフェッショナルの女性を中心に、新卒からベテランまでどなたでも参加できるイベントをやっています。この組織は女性に焦点を当てていますが、イベントにはすべてのジェンダーの方が歓迎されています。また、データサイエンティスト、プロダクトマネジャー、UI/UXデザイナー、機械学習エンジニアなどのソフトウェアに関連した役割も歓迎いたします。"
     }
 }
\ No newline at end of file

From ece31258848e05d5939f85219890c12a25a69e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Thu, 25 Apr 2024 22:54:41 +0900
Subject: [PATCH 4/6] update header

---
 src/components/Header/DesktopHeader.tsx | 7 +++++--
 src/i18n/en/translation.json            | 5 ++++-
 src/i18n/ja/translation.json            | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/Header/DesktopHeader.tsx b/src/components/Header/DesktopHeader.tsx
index a7e61ca..3e18361 100644
--- a/src/components/Header/DesktopHeader.tsx
+++ b/src/components/Header/DesktopHeader.tsx
@@ -6,6 +6,7 @@ import Typography from '@mui/material/Typography';
 import { styled } from '@mui/material/styles';
 import SideDrawer from '../SideDrawer/SideDrawer';
 import StyledNavLink from '@/components/StyledNavLink/StyledNavLink'
+import { useTranslation } from 'react-i18next';
 
 
 const StyledToolbar = styled(Toolbar)(({ theme }) => ({
@@ -22,16 +23,18 @@ const StyledToolbar = styled(Toolbar)(({ theme }) => ({
 
 
 const DesktopHeader: FC = () => {
+    const { t } = useTranslation();
+
     return <StyledToolbar aria-label="desktop-toolbar">
         <Stack direction='row' spacing={2} sx={{ alignItems: 'center' }}>
             <SideDrawer />
             <StyledNavLink to="/" style={{ textDecoration: 'none', color: 'white' }}>
                 <Typography variant="h1">WiSE Japan</Typography>
-                <Typography variant="caption">Women in Software Engineering Japan</Typography>
+                <Typography variant="caption">{t('header.subtitle')}</Typography>
             </StyledNavLink>
 
             <StyledNavLink to="/codeofconduct" style={{ textDecoration: 'none', color: 'white' }}>
-                <Typography variant="overline">Code of Conduct</Typography>
+                <Typography variant="overline">{t('header.codeOfConduct')}</Typography>
             </StyledNavLink>
         </Stack>
     </StyledToolbar>
diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index 6c3d24e..be95bb6 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -1,5 +1,8 @@
 {
-    "codeOfConduct": "Code of Conduct",
+    "header": {
+        "codeOfConduct": "Code of Conduct",
+        "subtitle": "Women in Software Engineering Japan"
+    },
     "home": {
         "helloWorld": "✨ Hello World ✨",
         "joinUs": "✨ Join us on Slack ✨",
diff --git a/src/i18n/ja/translation.json b/src/i18n/ja/translation.json
index 10c5000..27022fc 100644
--- a/src/i18n/ja/translation.json
+++ b/src/i18n/ja/translation.json
@@ -1,5 +1,8 @@
 {
-    "codeOfConduct": "行動規範",
+    "header": {
+        "codeOfConduct": "行動規範",
+        "subtitle": "ウーマン・イン・ソフトウェアエンジニアリング"
+    },
     "home": {
         "helloWorld": "✨ Hello 世界 ✨",
         "joinUs": "✨ スラックに参加する ✨",

From 0fdfb457d5b344eba93c25f860e2f1cde6a6d629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Fri, 26 Apr 2024 00:25:19 +0900
Subject: [PATCH 5/6] update the link to a forever link, improve testing, add a
 test stub

---
 src/routes/Home/Home.tsx               | 2 +-
 src/routes/Home/__test__/Home.test.tsx | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx
index 65fa958..c782008 100644
--- a/src/routes/Home/Home.tsx
+++ b/src/routes/Home/Home.tsx
@@ -24,7 +24,7 @@ const Home: FC = () => {
 
             <Button
                 variant='contained'
-                href='https://join.slack.com/t/womencodersjapan/shared_invite/zt-2h79966bm-dE7SyiGvv2CXBxbz_0JzKw'
+                href='https://join.slack.com/t/wise-japan/shared_invite/zt-2h79966bm-dE7SyiGvv2CXBxbz_0JzKw'
                 target='_blank'
             >
                 {t('home.joinUs')}
diff --git a/src/routes/Home/__test__/Home.test.tsx b/src/routes/Home/__test__/Home.test.tsx
index 1d52ea5..fe6da23 100644
--- a/src/routes/Home/__test__/Home.test.tsx
+++ b/src/routes/Home/__test__/Home.test.tsx
@@ -8,6 +8,14 @@ describe('Home Route', () => {
         render(<Home />)
         const hello = await screen.findByText('✨ Hello World ✨')
         expect(hello).toBeVisible()
+
+        const link = await screen.findByRole('link', { name: '✨ Join us on Slack ✨' })
+        expect(link).toBeEnabled()
+        expect(link).toHaveAttribute('href', 'https://join.slack.com/t/wise-japan/shared_invite/zt-2h79966bm-dE7SyiGvv2CXBxbz_0JzKw')
+        expect(link).toHaveAttribute('target', '_blank')
     })
 
+    it.todo('should show text in Japanese when the ja locale is set', async () => {
+
+    })
 })

From 1c66f3b4cd48b2b988a8b7f27e3e85d3d49322c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ann=20=E6=9D=8F=20Kilzer?= <akilzer@gmail.com>
Date: Fri, 26 Apr 2024 00:27:22 +0900
Subject: [PATCH 6/6] fix key

---
 src/routes/CodeOfConduct/CodeOfConduct.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/CodeOfConduct/CodeOfConduct.tsx b/src/routes/CodeOfConduct/CodeOfConduct.tsx
index 7a98742..8583990 100644
--- a/src/routes/CodeOfConduct/CodeOfConduct.tsx
+++ b/src/routes/CodeOfConduct/CodeOfConduct.tsx
@@ -10,7 +10,7 @@ const CodeOfConduct: FC = () => {
     return <Container style={{ padding: 32 }}>
         <Stack spacing={2}>
             <Typography variant='h1'>
-                {t('codeOfConduct')}
+                {t('header.codeOfConduct')}
             </Typography>
             <Typography variant='body2' >
                 Women in Software Engineering Japan (WiSE Japan) is dedicated to providing an empowering experience for everyone who participates in or supports our community. Our events are intended to inspire women to excel in technology careers, and anyone who is there for this purpose is welcome. Because we value the safety and security of our members and strive to have an inclusive community, we do not tolerate harassment of members or event participants in any form. This Code of Conduct was created to clearly define what we mean by a harassment-free experience, so that our community and those who support it are clear about our intent and have access to procedures for addressing issues, should they arise.