From 89005ac8bb877bb56db7e7bb5fe50af833861498 Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Wed, 8 Feb 2023 09:19:56 -0600 Subject: [PATCH 1/4] use camelcase for message key name --- src/Pages/Layout.tsx | 2 +- src/Pages/messages.js | 2 +- src/translations/en.json | 2 +- src/translations/es.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Pages/Layout.tsx b/src/Pages/Layout.tsx index 8403b3d3..5f9f2a91 100644 --- a/src/Pages/Layout.tsx +++ b/src/Pages/Layout.tsx @@ -224,7 +224,7 @@ export default function Layout() { accountHeader() ) : ( )} diff --git a/src/Pages/messages.js b/src/Pages/messages.js index 5904e454..a3b795bc 100644 --- a/src/Pages/messages.js +++ b/src/Pages/messages.js @@ -2,7 +2,7 @@ import { defineMessages } from "react-intl"; import { addIdAndDefaultMessageToMessages } from "Util"; const messages = defineMessages({ - Login: "Login", + login: "Login", }); export default addIdAndDefaultMessageToMessages(messages, 'Pages'); diff --git a/src/translations/en.json b/src/translations/en.json index 9142af09..5379ab8a 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,3 +1,3 @@ { - "Pages.Login": "Login" + "Pages.login": "Login" } \ No newline at end of file diff --git a/src/translations/es.json b/src/translations/es.json index dbd4bbb7..2c508963 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -1,3 +1,3 @@ { - "Pages.Login": "Acceso" + "Pages.login": "" } -- 2.45.2 From adb652e5cec8c2ed2b7bc1e2320a2a3c845914b5 Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Wed, 8 Feb 2023 09:27:24 -0600 Subject: [PATCH 2/4] add boilerplate for zh and ja locales --- package.json | 2 +- src/IntlProvider.tsx | 6 ++++++ src/translations/ja.json | 3 +++ src/translations/zh.json | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/translations/ja.json create mode 100644 src/translations/zh.json diff --git a/package.json b/package.json index 1a7b817e..a1266c3c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", - "generate-messages": "extract-messages -l=en,es -o src/translations -d en --flat true **/messages.js" + "generate-messages": "extract-messages -l=en,es,zh,ja -o src/translations -d en --flat true **/messages.js" }, "eslintConfig": { "extends": [ diff --git a/src/IntlProvider.tsx b/src/IntlProvider.tsx index c370d4c6..8f71bdd1 100644 --- a/src/IntlProvider.tsx +++ b/src/IntlProvider.tsx @@ -2,6 +2,8 @@ import { type ReactNode } from 'react' import { IntlProvider as ReactIntlProvider } from 'react-intl' import enMessages from 'translations/en.json' import esMessages from 'translations/es.json' +import zhMessages from 'translations/zh.json' +import jaMessages from 'translations/ja.json' const DEFAULT_LOCALE = 'en-US' @@ -13,6 +15,10 @@ const getMessages = (locale: string) => { return enMessages case 'es': return esMessages + case 'zh': + return zhMessages + case 'ja': + return jaMessages default: return enMessages } diff --git a/src/translations/ja.json b/src/translations/ja.json new file mode 100644 index 00000000..2c508963 --- /dev/null +++ b/src/translations/ja.json @@ -0,0 +1,3 @@ +{ + "Pages.login": "" +} diff --git a/src/translations/zh.json b/src/translations/zh.json new file mode 100644 index 00000000..2c508963 --- /dev/null +++ b/src/translations/zh.json @@ -0,0 +1,3 @@ +{ + "Pages.login": "" +} -- 2.45.2 From dcba8f89d1c40d74921dd8511ac1c54019c70495 Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Wed, 8 Feb 2023 09:31:46 -0600 Subject: [PATCH 3/4] add back translation This was deleted when I updated the key name. --- src/translations/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/es.json b/src/translations/es.json index 2c508963..ccfd66b1 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -1,3 +1,3 @@ { - "Pages.login": "" + "Pages.login": "Acceso" } -- 2.45.2 From 14461ce7b8a3954dbfa85eb8607bca4724889c88 Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Wed, 8 Feb 2023 12:37:09 -0600 Subject: [PATCH 4/4] revert back to uppercase keys --- src/Pages/Layout.tsx | 2 +- src/Pages/messages.js | 2 +- src/translations/en.json | 2 +- src/translations/es.json | 2 +- src/translations/ja.json | 2 +- src/translations/zh.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Pages/Layout.tsx b/src/Pages/Layout.tsx index 5f9f2a91..8403b3d3 100644 --- a/src/Pages/Layout.tsx +++ b/src/Pages/Layout.tsx @@ -224,7 +224,7 @@ export default function Layout() { accountHeader() ) : ( )} diff --git a/src/Pages/messages.js b/src/Pages/messages.js index a3b795bc..5904e454 100644 --- a/src/Pages/messages.js +++ b/src/Pages/messages.js @@ -2,7 +2,7 @@ import { defineMessages } from "react-intl"; import { addIdAndDefaultMessageToMessages } from "Util"; const messages = defineMessages({ - login: "Login", + Login: "Login", }); export default addIdAndDefaultMessageToMessages(messages, 'Pages'); diff --git a/src/translations/en.json b/src/translations/en.json index 5379ab8a..9142af09 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,3 +1,3 @@ { - "Pages.login": "Login" + "Pages.Login": "Login" } \ No newline at end of file diff --git a/src/translations/es.json b/src/translations/es.json index ccfd66b1..dbd4bbb7 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -1,3 +1,3 @@ { - "Pages.login": "Acceso" + "Pages.Login": "Acceso" } diff --git a/src/translations/ja.json b/src/translations/ja.json index 2c508963..407d7699 100644 --- a/src/translations/ja.json +++ b/src/translations/ja.json @@ -1,3 +1,3 @@ { - "Pages.login": "" + "Pages.Login": "" } diff --git a/src/translations/zh.json b/src/translations/zh.json index 2c508963..407d7699 100644 --- a/src/translations/zh.json +++ b/src/translations/zh.json @@ -1,3 +1,3 @@ { - "Pages.login": "" + "Pages.Login": "" } -- 2.45.2