From a71180949f4e7c924f4c5638a6302e1fc9bc1f61 Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 6 Jul 2022 16:57:46 +0800 Subject: [PATCH 1/5] fix: some temp --- .i18n-codegen.json | 12 ++++++++++++ packages/mask/shared-ui/locales/en-US.json | 13 ------------- packages/mask/src/plugins/Game/locales/en-US.json | 15 +++++++++++++++ .../src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx | 2 +- .../src/plugins/Pets/SNSAdaptor/RightMenu.tsx | 6 +++--- 5 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 packages/mask/src/plugins/Game/locales/en-US.json diff --git a/.i18n-codegen.json b/.i18n-codegen.json index f51efba6f577..d9ca0d98322d 100644 --- a/.i18n-codegen.json +++ b/.i18n-codegen.json @@ -311,6 +311,18 @@ "namespace": "com.maskbook.box", "trans": "Translate" } + }, + { + "input": "./packages/mask/src/plugins/Game/locales/en-US.json", + "output": "./packages/mask/src/plugins/Game/locales/i18n_generated", + "parser": { "type": "i18next", "contextSeparator": "$", "pluralSeparator": "_" }, + "generator": { + "type": "i18next/react-hooks", + "hooks": "useI18N", + "namespace": "com.maskbook.game", + "trans": "Translate", + "sourceMap": "inline" + } } ] } diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index 21e8f35a7fbb..cef1e0de5449 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -877,25 +877,12 @@ "plugin_pets_dialog_btn": "Confirm", "plugin_pets_dialog_btn_share": "Share", "plugin_pets_dialog_preview": "Preview", - "plugin_pets_dialog_unverified": " (unverified)", "plugin_pets_dialog_created": "Created by NonFFriend", "plugin_pets_dialog_powered": "Powered by RSS3", "powered_by": "Powered by", "plugin_pets_dialog_success": "Your Non-Fungible Friend has been set up successfully", "plugin_pets_dialog_fail": "Setting failed, please try later", "plugin_pets_dialog_check_title": "Show NFT friends on the profile page.", - "plugin_pets_dialog_menu_change": "Change", - "plugin_pets_dialog_menu_ski": "Ski", - "plugin_pets_dialog_menu_about": "About us", - "plugin_game_name": "GAME", - "plugin_game_list_title": "GameList", - "plugin_game_list_rank": "Rank", - "plugin_game_list_play": "Play", - "plugin_game_list_play_error": "Please connect wallet", - "plugin_game_list_play_evm_error": "Please connect to EVM wallet", - "plugin_game_share_btn": "Share", - "plugin_game_share_title": "Share", - "plugin_game_dialog_info": "Share this game to twitter", "wallet_verify_persona_sign": "Persona Sign", "wallet_verify_has_bound": "The wallet has been bound. Please switch wallets.", "wallet_verify_persona_name": "{{personaName}} Sign", diff --git a/packages/mask/src/plugins/Game/locales/en-US.json b/packages/mask/src/plugins/Game/locales/en-US.json new file mode 100644 index 000000000000..1e81f13c6342 --- /dev/null +++ b/packages/mask/src/plugins/Game/locales/en-US.json @@ -0,0 +1,15 @@ +{ + "plugin_game_dialog_menu_change": "Change", + "plugin_game_dialog_menu_ski": "Ski", + "plugin_game_dialog_menu_about": "About us", + "plugin_game_dialog_unverified": " (unverified)", + "plugin_game_name": "GAME", + "plugin_game_list_title": "GameList", + "plugin_game_list_rank": "Rank", + "plugin_game_list_play": "Play", + "plugin_game_list_play_error": "Please connect wallet", + "plugin_game_list_play_evm_error": "Please connect to EVM wallet", + "plugin_game_share_btn": "Share", + "plugin_game_share_title": "Share", + "plugin_game_dialog_info": "Share this game to twitter" +} diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx index 67f0410c0c94..7d14dc393cfa 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx @@ -256,7 +256,7 @@ export function PetSetDialog({ configNFTs, onClose }: PetSetDialogProps) { {renderImg(option)} {option.name} - {blacklist.includes(option.contract) ? t('plugin_pets_dialog_unverified') : ''} + {blacklist.includes(option.contract) ? t('plugin_game_dialog_unverified') : ''} diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx index 663b543bc621..b08eeae3ad5a 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx @@ -173,16 +173,16 @@ function RightMenu(props: Props) { transform: `translate(${isLeft ? '-100%' : 0}, ${isTop ? '-100%' : 0})`, }}>
onClickMenu(MenuType.Setting)}> - {t('plugin_pets_dialog_menu_change')} + {t('plugin_game_dialog_menu_change')}
{visitor.userId === whoAmI?.identifier?.userId ? (
onClickMenu(MenuType.Game)}> - {t('plugin_pets_dialog_menu_ski')} + {t('plugin_game_dialog_menu_ski')}
) : null}
onClickMenu(MenuType.About)}> - {t('plugin_pets_dialog_menu_about')} + {t('plugin_game_dialog_menu_about')}
) From 59108164e0238729b959338cb2927b36cea66a2a Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 6 Jul 2022 17:07:08 +0800 Subject: [PATCH 2/5] fix: plugin i18n --- packages/mask/shared-ui/locales/en-US.json | 4 +++ .../mask/src/plugins/Game/locales/index.ts | 6 +++++ .../src/plugins/Game/locales/languages.ts | 19 +++++++++++++ .../ScamSniffer/src/locales/languages.ts | 27 ++++++++++++++----- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 packages/mask/src/plugins/Game/locales/index.ts create mode 100644 packages/mask/src/plugins/Game/locales/languages.ts diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index cef1e0de5449..d610ff2a1461 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -879,6 +879,10 @@ "plugin_pets_dialog_preview": "Preview", "plugin_pets_dialog_created": "Created by NonFFriend", "plugin_pets_dialog_powered": "Powered by RSS3", + "plugin_pets_dialog_menu_change": "Change", + "plugin_pets_dialog_menu_ski": "Ski", + "plugin_pets_dialog_menu_about": "About us", + "plugin_pets_dialog_unverified": " (unverified)", "powered_by": "Powered by", "plugin_pets_dialog_success": "Your Non-Fungible Friend has been set up successfully", "plugin_pets_dialog_fail": "Setting failed, please try later", diff --git a/packages/mask/src/plugins/Game/locales/index.ts b/packages/mask/src/plugins/Game/locales/index.ts new file mode 100644 index 000000000000..d6ead60252e4 --- /dev/null +++ b/packages/mask/src/plugins/Game/locales/index.ts @@ -0,0 +1,6 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts + +export * from './i18n_generated' diff --git a/packages/mask/src/plugins/Game/locales/languages.ts b/packages/mask/src/plugins/Game/locales/languages.ts new file mode 100644 index 000000000000..51758e76088e --- /dev/null +++ b/packages/mask/src/plugins/Game/locales/languages.ts @@ -0,0 +1,19 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts +import en_US from './en-US.json' +export const languages = { + en: en_US, +} +// @ts-ignore +if (import.meta.webpackHot) { + // @ts-ignore + import.meta.webpackHot.accept(['./en-US.json'], () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: ['com.maskbook.game', { en: en_US }], + }), + ), + ) +} diff --git a/packages/plugins/ScamSniffer/src/locales/languages.ts b/packages/plugins/ScamSniffer/src/locales/languages.ts index 1ca29645231b..71bcc785f745 100644 --- a/packages/plugins/ScamSniffer/src/locales/languages.ts +++ b/packages/plugins/ScamSniffer/src/locales/languages.ts @@ -3,17 +3,32 @@ // Default fallback language in a family of languages are chosen by the alphabet order // To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts import en_US from './en-US.json' +import ja_JP from './ja-JP.json' +import ko_KR from './ko-KR.json' +import qya_AA from './qya-AA.json' +import zh_CN from './zh-CN.json' +import zh_TW from './zh-TW.json' export const languages = { en: en_US, + ja: ja_JP, + ko: ko_KR, + qy: qya_AA, + 'zh-CN': zh_CN, + zh: zh_TW, } // @ts-ignore if (import.meta.webpackHot) { // @ts-ignore - import.meta.webpackHot.accept(['./en-US.json'], () => - globalThis.dispatchEvent?.( - new CustomEvent('MASK_I18N_HMR', { - detail: ['io.scamsniffer.mask-plugin', { en: en_US }], - }), - ), + import.meta.webpackHot.accept( + ['./en-US.json', './ja-JP.json', './ko-KR.json', './qya-AA.json', './zh-CN.json', './zh-TW.json'], + () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: [ + 'io.scamsniffer.mask-plugin', + { en: en_US, ja: ja_JP, ko: ko_KR, qy: qya_AA, 'zh-CN': zh_CN, zh: zh_TW }, + ], + }), + ), ) } From d79fa753447e5dbbbdad0a31cbaf8db5f588c39d Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 6 Jul 2022 17:13:38 +0800 Subject: [PATCH 3/5] fix: some revert --- packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx | 2 +- packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx index 7d14dc393cfa..67f0410c0c94 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx @@ -256,7 +256,7 @@ export function PetSetDialog({ configNFTs, onClose }: PetSetDialogProps) { {renderImg(option)} {option.name} - {blacklist.includes(option.contract) ? t('plugin_game_dialog_unverified') : ''} + {blacklist.includes(option.contract) ? t('plugin_pets_dialog_unverified') : ''} diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx index b08eeae3ad5a..663b543bc621 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/RightMenu.tsx @@ -173,16 +173,16 @@ function RightMenu(props: Props) { transform: `translate(${isLeft ? '-100%' : 0}, ${isTop ? '-100%' : 0})`, }}>
onClickMenu(MenuType.Setting)}> - {t('plugin_game_dialog_menu_change')} + {t('plugin_pets_dialog_menu_change')}
{visitor.userId === whoAmI?.identifier?.userId ? (
onClickMenu(MenuType.Game)}> - {t('plugin_game_dialog_menu_ski')} + {t('plugin_pets_dialog_menu_ski')}
) : null}
onClickMenu(MenuType.About)}> - {t('plugin_game_dialog_menu_about')} + {t('plugin_pets_dialog_menu_about')}
) From c7bce6725714e9a2c946ad272ee2cf4f9cc8d8a9 Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 6 Jul 2022 17:25:43 +0800 Subject: [PATCH 4/5] fix: pets i18n in plugin --- .i18n-codegen.json | 12 +++++++++++ packages/mask/shared-ui/locales/en-US.json | 19 ----------------- .../src/plugins/Game/SNSAdaptor/GameList.tsx | 11 +++++----- .../mask/src/plugins/Pets/locales/en-US.json | 21 +++++++++++++++++++ .../mask/src/plugins/Pets/locales/index.ts | 6 ++++++ .../src/plugins/Pets/locales/languages.ts | 19 +++++++++++++++++ 6 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 packages/mask/src/plugins/Pets/locales/en-US.json create mode 100644 packages/mask/src/plugins/Pets/locales/index.ts create mode 100644 packages/mask/src/plugins/Pets/locales/languages.ts diff --git a/.i18n-codegen.json b/.i18n-codegen.json index d9ca0d98322d..5573e55ff345 100644 --- a/.i18n-codegen.json +++ b/.i18n-codegen.json @@ -323,6 +323,18 @@ "trans": "Translate", "sourceMap": "inline" } + }, + { + "input": "./packages/mask/src/plugins/Pets/locales/en-US.json", + "output": "./packages/mask/src/plugins/Pets/locales/i18n_generated", + "parser": { "type": "i18next", "contextSeparator": "$", "pluralSeparator": "_" }, + "generator": { + "type": "i18next/react-hooks", + "hooks": "useI18N", + "namespace": "com.maskbook.pets", + "trans": "Translate", + "sourceMap": "inline" + } } ] } diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index d610ff2a1461..0c8e7d08ff5c 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -867,26 +867,7 @@ "plugin_furucombo_head_pools": "Pools", "plugin_furucombo_head_action": "Action", "plugin_pets_dialog_title": "Non-Fungible Friends", - "plugin_pets_name": "Non-F Friends", - "plugin_pets_description": "Explore the endless possibilities of NFTs.", - "plugin_pets_dialog_title_share": "Successful", - "plugin_pets_dialog_contract": "NFT Contract", - "plugin_pets_dialog_token": "Token ID", - "plugin_pets_dialog_msg": "Greeting message", - "plugin_pets_dialog_msg_optional": "Optional, 100 characters max.", - "plugin_pets_dialog_btn": "Confirm", - "plugin_pets_dialog_btn_share": "Share", - "plugin_pets_dialog_preview": "Preview", - "plugin_pets_dialog_created": "Created by NonFFriend", - "plugin_pets_dialog_powered": "Powered by RSS3", - "plugin_pets_dialog_menu_change": "Change", - "plugin_pets_dialog_menu_ski": "Ski", - "plugin_pets_dialog_menu_about": "About us", - "plugin_pets_dialog_unverified": " (unverified)", "powered_by": "Powered by", - "plugin_pets_dialog_success": "Your Non-Fungible Friend has been set up successfully", - "plugin_pets_dialog_fail": "Setting failed, please try later", - "plugin_pets_dialog_check_title": "Show NFT friends on the profile page.", "wallet_verify_persona_sign": "Persona Sign", "wallet_verify_has_bound": "The wallet has been bound. Please switch wallets.", "wallet_verify_persona_name": "{{personaName}} Sign", diff --git a/packages/mask/src/plugins/Game/SNSAdaptor/GameList.tsx b/packages/mask/src/plugins/Game/SNSAdaptor/GameList.tsx index fa4883725c97..871e63658399 100644 --- a/packages/mask/src/plugins/Game/SNSAdaptor/GameList.tsx +++ b/packages/mask/src/plugins/Game/SNSAdaptor/GameList.tsx @@ -4,7 +4,8 @@ import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import { makeStyles, useStylesExtends } from '@masknet/theme' import { NetworkPluginID } from '@masknet/web3-shared-base' import { useChainId } from '@masknet/plugin-infra/web3' -import { PluginWalletStatusBar, useI18N } from '../../../utils' +import { PluginWalletStatusBar } from '../../../utils' +import { useI18N } from '../locales' import { ChainBoundary } from '../../../web3/UI/ChainBoundary' import { useGameList } from '../hook' import type { GameInfo } from '../types' @@ -100,7 +101,7 @@ interface Props { } const GameList = (props: Props) => { - const { t } = useI18N() + const t = useI18N() const classes = useStylesExtends(useStyles(), {}) const gameList = useGameList() const chainId = useChainId(NetworkPluginID.PLUGIN_EVM) @@ -122,7 +123,7 @@ const GameList = (props: Props) => { return ( <> - {t('plugin_game_list_title')} + {t.plugin_game_list_title()}
    {gameList ? gameList.map((game, index: number) => ( @@ -145,14 +146,14 @@ const GameList = (props: Props) => { /> - {t('plugin_game_list_rank')} {game.rank} + {t.plugin_game_list_rank()} {game.rank} )) diff --git a/packages/mask/src/plugins/Pets/locales/en-US.json b/packages/mask/src/plugins/Pets/locales/en-US.json new file mode 100644 index 000000000000..03dfc447c02a --- /dev/null +++ b/packages/mask/src/plugins/Pets/locales/en-US.json @@ -0,0 +1,21 @@ +{ + "plugin_pets_name": "Non-F Friends", + "plugin_pets_description": "Explore the endless possibilities of NFTs.", + "plugin_pets_dialog_title_share": "Successful", + "plugin_pets_dialog_contract": "NFT Contract", + "plugin_pets_dialog_token": "Token ID", + "plugin_pets_dialog_msg": "Greeting message", + "plugin_pets_dialog_msg_optional": "Optional, 100 characters max.", + "plugin_pets_dialog_btn": "Confirm", + "plugin_pets_dialog_btn_share": "Share", + "plugin_pets_dialog_preview": "Preview", + "plugin_pets_dialog_created": "Created by NonFFriend", + "plugin_pets_dialog_powered": "Powered by RSS3", + "plugin_pets_dialog_menu_change": "Change", + "plugin_pets_dialog_menu_ski": "Ski", + "plugin_pets_dialog_menu_about": "About us", + "plugin_pets_dialog_unverified": " (unverified)", + "plugin_pets_dialog_success": "Your Non-Fungible Friend has been set up successfully", + "plugin_pets_dialog_fail": "Setting failed, please try later", + "plugin_pets_dialog_check_title": "Show NFT friends on the profile page." +} diff --git a/packages/mask/src/plugins/Pets/locales/index.ts b/packages/mask/src/plugins/Pets/locales/index.ts new file mode 100644 index 000000000000..d6ead60252e4 --- /dev/null +++ b/packages/mask/src/plugins/Pets/locales/index.ts @@ -0,0 +1,6 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts + +export * from './i18n_generated' diff --git a/packages/mask/src/plugins/Pets/locales/languages.ts b/packages/mask/src/plugins/Pets/locales/languages.ts new file mode 100644 index 000000000000..77bae3dd64b4 --- /dev/null +++ b/packages/mask/src/plugins/Pets/locales/languages.ts @@ -0,0 +1,19 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts +import en_US from './en-US.json' +export const languages = { + en: en_US, +} +// @ts-ignore +if (import.meta.webpackHot) { + // @ts-ignore + import.meta.webpackHot.accept(['./en-US.json'], () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: ['com.maskbook.pets', { en: en_US }], + }), + ), + ) +} From fb43105e2d7db449fe3901f63719396f5386dbb6 Mon Sep 17 00:00:00 2001 From: billy Date: Wed, 6 Jul 2022 17:28:13 +0800 Subject: [PATCH 5/5] fix: revert some file --- .../ScamSniffer/src/locales/languages.ts | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/packages/plugins/ScamSniffer/src/locales/languages.ts b/packages/plugins/ScamSniffer/src/locales/languages.ts index 71bcc785f745..1ca29645231b 100644 --- a/packages/plugins/ScamSniffer/src/locales/languages.ts +++ b/packages/plugins/ScamSniffer/src/locales/languages.ts @@ -3,32 +3,17 @@ // Default fallback language in a family of languages are chosen by the alphabet order // To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts import en_US from './en-US.json' -import ja_JP from './ja-JP.json' -import ko_KR from './ko-KR.json' -import qya_AA from './qya-AA.json' -import zh_CN from './zh-CN.json' -import zh_TW from './zh-TW.json' export const languages = { en: en_US, - ja: ja_JP, - ko: ko_KR, - qy: qya_AA, - 'zh-CN': zh_CN, - zh: zh_TW, } // @ts-ignore if (import.meta.webpackHot) { // @ts-ignore - import.meta.webpackHot.accept( - ['./en-US.json', './ja-JP.json', './ko-KR.json', './qya-AA.json', './zh-CN.json', './zh-TW.json'], - () => - globalThis.dispatchEvent?.( - new CustomEvent('MASK_I18N_HMR', { - detail: [ - 'io.scamsniffer.mask-plugin', - { en: en_US, ja: ja_JP, ko: ko_KR, qy: qya_AA, 'zh-CN': zh_CN, zh: zh_TW }, - ], - }), - ), + import.meta.webpackHot.accept(['./en-US.json'], () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: ['io.scamsniffer.mask-plugin', { en: en_US }], + }), + ), ) }