✨ migrate user-facing text to i18n (#581)

nonebot_plugin_tetris_stats/games/__init__.py

@@ -7,7 +7,7 @@ from nonebot.typing import T_Handler
 from nonebot_plugin_alconna import AlcMatches, Alconna, At, CommandMeta, on_alconna
 
 from .. import ns
-from ..i18n.model import Lang
+from ..i18n import Lang
 from ..utils.exception import MessageFormatError, NeedCatchError
 
 command: Alconna = Alconna(
@@ -47,7 +47,7 @@ async def _(matcher: Matcher, matches: AlcMatches):
     if (matches.head_matched and matches.options != {}) or matches.main_args == {}:
         await matcher.finish(
             (f'{matches.error_info!r}\n' if matches.error_info is not None else '')
-            + f'输入"{matches.header_result} --help"查看帮助'
+            + Lang.help.usage(command=matches.header_result)
         )
 
 

nonebot_plugin_tetris_stats/games/tetrio/bind.py

@@ -14,6 +14,7 @@ from yarl import URL
 
 from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
+from ...i18n import Lang
 from ...utils.host import get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
@@ -137,7 +138,7 @@ async def make_bind_image(
                 ),
                 name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
             ),
-            prompt='io查我',
+            prompt=Lang.prompt.io_check(),
             lang=get_lang(),
         ),
     )

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -8,6 +8,7 @@ from nonebot_plugin_user import User
 from sqlalchemy import select
 
 from ...db import trigger
+from ...i18n import Lang
 from . import alc, command
 from .constant import GAME_TYPE
 from .models import TETRIOUserConfig
@@ -48,4 +49,4 @@ async def _(user: User, session: async_scoped_session, event_session: Uninfo, te
         else:
             config.query_template = template
         await session.commit()
-        await UniMessage('配置成功').finish()
+        await UniMessage(Lang.bind.config_success()).finish()

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -5,7 +5,7 @@ from nonebot import get_driver
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import Args, At, Option, Subcommand
-from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_alconna.uniseg import Image, UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_uninfo import Uninfo
 from nonebot_plugin_uninfo.orm import get_session_persist_id
@@ -112,10 +112,16 @@ async def _(  # noqa: PLR0913
                     select(TETRIOUserConfig.query_template).where(TETRIOUserConfig.id == user.id)
                 )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
-            UniMessage.i18n(Lang.interaction.warning.unverified) + await make_query_result(player, template or 'v1')
+            UniMessage.i18n(Lang.interaction.warning.unverified)
+            + (
+                UniMessage('\n')
+                if not (result := await make_query_result(player, template or 'v1')).has(Image)
+                else UniMessage()
+            )
+            + result
         ).finish()
 
 

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -59,7 +59,7 @@ async def _(
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_blitz_image(player))
@@ -80,7 +80,7 @@ async def _(account: Player, event_session: Uninfo):
 async def make_blitz_image(player: Player) -> bytes:
     user, blitz = await gather(player.user, player.blitz)
     if blitz.data.record is None:
-        msg = f'未找到用户 {user.name.upper()} 的 Blitz 记录'
+        msg = Lang.record.not_found(username=user.name.upper(), mode=Lang.record.blitz())
         raise RecordNotFoundError(msg)
     stats = blitz.data.record.results.stats
     clears = stats.clears

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -59,7 +59,7 @@ async def _(
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         player = Player(user_id=bind.game_account, trust=True)
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified) + UniMessage.image(raw=await make_sprint_image(player))
@@ -80,7 +80,7 @@ async def _(account: Player, event_session: Uninfo):
 async def make_sprint_image(player: Player) -> bytes:
     user, sprint = await gather(player.user, player.sprint)
     if sprint.data.record is None:
-        msg = f'未找到用户 {user.name.upper()} 的 40L 记录'
+        msg = Lang.record.not_found(username=user.name.upper(), mode=Lang.record.sprint())
         raise RecordNotFoundError(msg)
     stats = sprint.data.record.results.stats
     clears = stats.clears

nonebot_plugin_tetris_stats/games/tetrio/unbind.py

@@ -13,6 +13,7 @@ from yarl import URL
 
 from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
+from ...i18n import Lang
 from ...utils.host import get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
@@ -44,8 +45,8 @@ async def _(nb_user: User, event_session: Uninfo, interface: QryItrface):
         get_session() as session,
     ):
         if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
-            await UniMessage('您还未绑定 TETR.IO 账号').finish()
-        resp = await suggest('您确定要解绑吗?', ['是', '否'])
+            await UniMessage(Lang.bind.no_account(game='TETR.IO')).finish()
+        resp = await suggest(Lang.bind.confirm_unbind(), ['是', '否'])
         if resp is None or resp.extract_plain_text() == '否':
             return
         player = Player(user_id=bind.game_account, trust=True)
@@ -76,7 +77,7 @@ async def _(nb_user: User, event_session: Uninfo, interface: QryItrface):
                         ),
                         name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
-                    prompt='io绑定{游戏ID}',
+                    prompt=Lang.prompt.io_bind(),
                     lang=get_lang(),
                 ),
             )

nonebot_plugin_tetris_stats/games/tetrio/verify.py

@@ -13,6 +13,7 @@ from yarl import URL
 
 from ...config.config import global_config
 from ...db import create_or_update_bind, query_bind_info, trigger
+from ...i18n import Lang
 from ...utils.host import get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
@@ -46,9 +47,9 @@ try:
             get_session() as session,
         ):
             if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
-                await UniMessage('您还未绑定 TETR.IO 账号').finish()
+                await UniMessage(Lang.bind.no_account(game='TETR.IO')).finish()
             if bind.verify is True:
-                await UniMessage('您已经完成了验证.').finish()
+                await UniMessage(Lang.bind.verify_already()).finish()
             player = Player(user_id=bind.game_account, trust=True)
             user_info = await player.get_info()
             verify = (
@@ -56,7 +57,7 @@ try:
                 and user_info.data.connections.discord.id == event_session.user.id
             )
             if verify is False:
-                await UniMessage('您未通过验证, 请确认目标 TETR.IO 账号绑定了当前 Discord 账号').finish()
+                await UniMessage(Lang.bind.verify_failed(game='TETR.IO')).finish()
             await create_or_update_bind(
                 session=session,
                 user=nb_user,
@@ -90,7 +91,7 @@ try:
                             ),
                             name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
-                        prompt='io查我',
+                        prompt=Lang.prompt.io_check(),
                         lang=get_lang(),
                     ),
                 )
@@ -107,4 +108,4 @@ async def _(event_session: Uninfo):
         command_type='verify',
         command_args=[],
     ):
-        await UniMessage('目前仅支持 Discord 账号验证').finish()
+        await UniMessage(Lang.bind.only_discord()).finish()

nonebot_plugin_tetris_stats/games/top/bind.py

@@ -9,6 +9,7 @@ from nonebot_plugin_user import User
 
 from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
+from ...i18n import Lang
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
 from ...utils.render import render_image
@@ -60,7 +61,7 @@ async def _(nb_user: User, account: Player, event_session: Uninfo, interface: Qr
                             ),
                             name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
-                        prompt='top查我',
+                        prompt=Lang.prompt.top_check(),
                         lang=get_lang(),
                     ),
                 )

nonebot_plugin_tetris_stats/games/top/query.py

@@ -1,7 +1,7 @@
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
-from nonebot_plugin_alconna.uniseg import UniMessage
+from nonebot_plugin_alconna.uniseg import Image, UniMessage
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_uninfo import Uninfo
 from nonebot_plugin_uninfo.orm import get_session_persist_id
@@ -41,10 +41,19 @@ async def _(event: Event, matcher: Matcher, target: At | Me, event_session: Unin
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         await (
             UniMessage.i18n(Lang.interaction.warning.unverified)
-            + await make_query_result(await Player(user_name=bind.game_account, trust=True).get_profile())
+            + (
+                UniMessage('\n')
+                if not (
+                    result := await make_query_result(
+                        await Player(user_name=bind.game_account, trust=True).get_profile()
+                    )
+                ).has(Image)
+                else UniMessage()
+            )
+            + result
         ).finish()
 
 
@@ -101,18 +110,18 @@ def make_query_text(profile: UserProfile) -> UniMessage:
     message = ''
     if profile.today is not None:
         today = get_metrics(lpm=profile.today.lpm, apm=profile.today.apm)
-        message += f'用户 {profile.user_name} 24小时内统计数据为: '
-        message += f"\nL'PM: {today.lpm} ( {today.pps} pps )"
-        message += f'\nAPM: {today.apm} ( x{today.apl} )'
+        message += Lang.stats.daily_stats(name=profile.user_name)
+        message += Lang.stats.lpm(lpm=today.lpm, pps=today.pps)
+        message += Lang.stats.apm(apm=today.apm, apl=today.apl)
     else:
-        message += f'用户 {profile.user_name} 暂无24小时内统计数据'
+        message += Lang.stats.no_daily(name=profile.user_name)
     if profile.total is not None:
         total = get_avg_metrics(profile.total)
-        message += '\n历史统计数据为: '
-        message += f"\nL'PM: {total.lpm} ( {total.pps} pps )"
-        message += f'\nAPM: {total.apm} ( x{total.apl} )'
+        message += Lang.stats.history_stats()
+        message += Lang.stats.lpm(lpm=total.lpm, pps=total.pps)
+        message += Lang.stats.apm(apm=total.apm, apl=total.apl)
     else:
-        message += '\n暂无历史统计数据'
+        message += Lang.stats.no_history()
     return UniMessage(message)
 
 

nonebot_plugin_tetris_stats/games/top/unbind.py

@@ -10,6 +10,7 @@ from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 
 from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
+from ...i18n import Lang
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
 from ...utils.render import render_image
@@ -36,8 +37,8 @@ async def _(
         get_session() as session,
     ):
         if (bind := await query_bind_info(session=session, user=nb_user, game_platform=GAME_TYPE)) is None:
-            await UniMessage('您还未绑定 TOP 账号').finish()
-        resp = await suggest('您确定要解绑吗?', ['是', '否'])
+            await UniMessage(Lang.bind.no_account(game='TOP')).finish()
+        resp = await suggest(Lang.bind.confirm_unbind(), ['是', '否'])
         if resp is None or resp.extract_plain_text() == '否':
             return
         player = Player(user_name=bind.game_account, trust=True)
@@ -66,7 +67,7 @@ async def _(
                         ),
                         name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
-                    prompt='top绑定{游戏ID}',
+                    prompt=Lang.prompt.top_bind(),
                     lang=get_lang(),
                 ),
             )

nonebot_plugin_tetris_stats/games/tos/bind.py

@@ -9,6 +9,7 @@ from nonebot_plugin_user import User
 
 from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
+from ...i18n import Lang
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
 from ...utils.render import render_image
@@ -66,7 +67,7 @@ async def _(
                             ),
                             name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
-                        prompt='茶服查我',
+                        prompt=Lang.prompt.tos_check(),
                         lang=get_lang(),
                     ),
                 )

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -127,7 +127,7 @@ async def _(
                 game_platform=GAME_TYPE,
             )
         if bind is None:
-            await matcher.finish('未查询到绑定信息')
+            await matcher.finish(Lang.bind.not_found())
         message = UniMessage.i18n(Lang.interaction.warning.unverified)
         player = Player(teaid=bind.game_account, trust=True)
         user_info, game_data = await gather(player.get_info(), get_game_data(player))
@@ -142,7 +142,7 @@ async def _(
                     )
                 )
             ).finish()
-        await (message + make_query_text(user_info, game_data)).finish()
+        await (message + UniMessage('\n') + make_query_text(user_info, game_data)).finish()
 
 
 @alc.assign('TOS.query')
@@ -308,19 +308,26 @@ async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, even
 
 def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> UniMessage:
     user_data = user_info.data
-    message = f'用户 {user_data.name} ({user_data.teaid}) '
+    message = Lang.stats.user_info(name=user_data.name, id=user_data.teaid)
     if user_data.ranked_games == '0':
-        message += '暂无段位统计数据'
+        message += Lang.stats.no_rank()
     else:
-        message += f', 段位分 {round(float(user_data.rating_now), 2)}±{round(float(user_data.rd_now), 2)} ({round(float(user_data.vol_now), 2)}) '
+        message += Lang.stats.rank_info(
+            rating=round(float(user_data.rating_now), 2),
+            rd=round(float(user_data.rd_now), 2),
+            vol=round(float(user_data.vol_now), 2),
+        )
     if game_data is None:
-        message += ', 暂无游戏数据'
+        message += Lang.stats.no_game()
     else:
-        message += f', 最近 {game_data.game_num} 局数据'
-        message += f"\nL'PM: {game_data.metrics.lpm} ( {game_data.metrics.pps} pps )"
-        message += f'\nAPM: {game_data.metrics.apm} ( x{game_data.metrics.apl} )'
-        message += f'\nADPM: {game_data.metrics.adpm} ( x{game_data.metrics.adpl} ) ( {game_data.metrics.vs}vs )'
-    message += f'\n40L: {float(user_data.pb_sprint) / 1000:.2f}s' if user_data.pb_sprint != '2147483647' else ''
-    message += f'\nMarathon: {user_data.pb_marathon}' if user_data.pb_marathon != '0' else ''
-    message += f'\nChallenge: {user_data.pb_challenge}' if user_data.pb_challenge != '0' else ''
+        message += Lang.stats.recent_games(count=game_data.game_num)
+        message += Lang.stats.lpm(lpm=game_data.metrics.lpm, pps=game_data.metrics.pps)
+        message += Lang.stats.apm(apm=game_data.metrics.apm, apl=game_data.metrics.apl)
+        message += Lang.stats.adpm(adpm=game_data.metrics.adpm, adpl=game_data.metrics.adpl, vs=game_data.metrics.vs)
+    if user_data.pb_sprint != '2147483647':
+        message += Lang.stats.sprint_pb(time=f'{float(user_data.pb_sprint) / 1000:.2f}')
+    if user_data.pb_marathon != '0':
+        message += Lang.stats.marathon_pb(score=user_data.pb_marathon)
+    if user_data.pb_challenge != '0':
+        message += Lang.stats.challenge_pb(score=user_data.pb_challenge)
     return UniMessage(message)