diff --git a/AquaNet/src/components/settings/GeneralGameSettings.svelte b/AquaNet/src/components/settings/GeneralGameSettings.svelte index f582bc89..79611862 100644 --- a/AquaNet/src/components/settings/GeneralGameSettings.svelte +++ b/AquaNet/src/components/settings/GeneralGameSettings.svelte @@ -10,7 +10,7 @@
- {ts("settings.gameNotice")} + {ts("settings.siteNotice")}
diff --git a/AquaNet/src/libs/i18n/en_ref.ts b/AquaNet/src/libs/i18n/en_ref.ts index 0024409f..9f85cf8b 100644 --- a/AquaNet/src/libs/i18n/en_ref.ts +++ b/AquaNet/src/libs/i18n/en_ref.ts @@ -144,7 +144,7 @@ export const EN_REF_HOME = { export const EN_REF_SETTINGS = { 'settings.title': 'Settings', 'settings.tabs.profile': 'Profile', - 'settings.tabs.game': 'Game', + 'settings.tabs.global': 'Global', 'settings.tabs.chu3': 'Chuni', 'settings.tabs.mai2': 'Mai', 'settings.tabs.ongeki': 'Ongeki', @@ -208,10 +208,10 @@ export const EN_REF_SETTINGS = { 'settings.export': 'Export Player Data', 'settings.batchManualExport': "Export in Batch Manual (for Tachi)", 'settings.cabNotice': "Note: These settings will only affect your own cab/setup. If you're playing on someone else's setup, please contact them to change these settings.", - 'settings.gameNotice': "These only apply to Mai and Wacca.", - 'settings.regionNotice': "These only apply to Mai, Ongeki and Chuni.", + 'settings.siteNotice': "These settings only apply to the website.", + 'settings.regionNotice': "These settings are shared amongst Mai, Ongeki and Chuni.", 'settings.regionSelector.title': "Prefecture Selector", - 'settings.regionSelector.desc': "Select the region where you want the game to think you are playing", + 'settings.regionSelector.desc': "Select the region where you want the game to identify you", 'settings.regionSelector.select': "Select Prefecture", } diff --git a/AquaNet/src/libs/i18n/zh.ts b/AquaNet/src/libs/i18n/zh.ts index fdf16e7f..e1abb124 100644 --- a/AquaNet/src/libs/i18n/zh.ts +++ b/AquaNet/src/libs/i18n/zh.ts @@ -156,7 +156,7 @@ const zhHome: typeof EN_REF_HOME = { const zhSettings: typeof EN_REF_SETTINGS = { 'settings.title': '用户设置', 'settings.tabs.profile': '个人资料', - 'settings.tabs.game': '游戏设置', + 'settings.tabs.global': '全局', 'settings.tabs.chu3': '中二', 'settings.tabs.mai2': '舞萌', 'settings.tabs.ongeki': '音击', @@ -220,9 +220,10 @@ const zhSettings: typeof EN_REF_SETTINGS = { 'settings.export': '导出玩家数据', 'settings.batchManualExport': "导出 Batch Manual 格式(用于 Tachi)", 'settings.cabNotice': '注意:下面这些设置只会影响你自己的机器,如果你是在其他人的机器上玩的话,请联系机主来改设置', - 'settings.gameNotice': "这些设置仅对舞萌和华卡生效。", // AI - 'settings.regionNotice': "这些设置仅适用于舞萌、音击和中二。", + 'settings.siteNotice': "这些设置仅适用于网站。", + // AI + 'settings.regionNotice': "这些设置在舞萌、音击和中二节奏之间共享。", // AI 'settings.regionSelector.title': "地区选择器", // AI diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte index 31fda27a..d9c60778 100644 --- a/AquaNet/src/pages/User/Settings.svelte +++ b/AquaNet/src/pages/User/Settings.svelte @@ -23,7 +23,7 @@ let error: string; let submitting = "" let tab = 0 - let tabs = [ 'profile', 'game' ] + let tabs = ['profile'] const profileFields = [ [ 'displayName', t('settings.profile.name') ], @@ -45,18 +45,11 @@ me = m CARD.userGames(m.username).then(games => { - if (games.chu3 && !tabs.includes('chu3')) { - tabs = [...tabs, 'chu3'] - } - if (games.mai2 && !tabs.includes('mai2')) { - tabs = [...tabs, 'mai2'] - } - if (games.wacca && !tabs.includes('wacca')) { - tabs = [...tabs, 'wacca'] - } - if (games.ongeki && !tabs.includes('ongeki')) { - tabs = [...tabs, 'ongeki'] - } + tabs = [ + ...tabs, + ...['chu3', 'mai2','wacca', 'ongeki'].filter(v => games[v as keyof typeof games]), // :xdx: + 'global' + ] }) }).catch(e => error = e.message) getMe() @@ -217,7 +210,7 @@ {:else if tabs[tab] === 'ongeki'} - {:else if tabs[tab] === 'game'} + {:else if tabs[tab] === 'global'} {/if}