From 8fdb7d7cd6a0b658b1ae243ca74abd5af803b1d6 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Wed, 20 Nov 2024 11:52:24 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=20kvmd=20=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E5=B8=A6=E6=9D=A5=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4fc188dbc891dacb54268c08cef5a4051772104e. --- kvmd/apps/kvmd/__init__.py | 4 +--- kvmd/apps/kvmd/auth.py | 24 ++++++++++---------- kvmd/i18n/zh/LC_MESSAGES/message.mo | Bin 8047 -> 7505 bytes kvmd/i18n/zh/LC_MESSAGES/message.po | 33 ++-------------------------- message.pot | 31 +------------------------- 5 files changed, 15 insertions(+), 77 deletions(-) diff --git a/kvmd/apps/kvmd/__init__.py b/kvmd/apps/kvmd/__init__.py index 2d0379c2..7cf8430c 100644 --- a/kvmd/apps/kvmd/__init__.py +++ b/kvmd/apps/kvmd/__init__.py @@ -26,8 +26,6 @@ from ...plugins.hid import get_hid_class from ...plugins.atx import get_atx_class from ...plugins.msd import get_msd_class -from ...lanuages import Lanuages - from .. import init from .auth import AuthManager @@ -112,4 +110,4 @@ def main(argv: (list[str] | None)=None) -> None: stream_forever=config.streamer.forever, ).run(**config.server._unpack()) - get_logger(0).info(Lanuages().gettext("Bye-bye")) + get_logger(0).info("Bye-bye") diff --git a/kvmd/apps/kvmd/auth.py b/kvmd/apps/kvmd/auth.py index 786fdf55..ec7c8295 100644 --- a/kvmd/apps/kvmd/auth.py +++ b/kvmd/apps/kvmd/auth.py @@ -34,7 +34,6 @@ from ...plugins.auth import get_auth_service_class from ...htserver import HttpExposed -from ...lanuages import Lanuages # ===== class AuthManager: @@ -52,32 +51,31 @@ class AuthManager: totp_secret_path: str, ) -> None: - self.gettext=Lanuages().gettext + _ = translation(domain="message",localedir="/kvmd/i18n",languages=["zh"]).gettext self.__enabled = enabled if not enabled: - get_logger().warning(self.gettext("AUTHORIZATION IS DISABLED")) + get_logger().warning(_("AUTHORIZATION IS DISABLED")) self.__unauth_paths = frozenset(unauth_paths) # To speed up for path in self.__unauth_paths: - get_logger().warning(self.gettext("Authorization is disabled for API %r"), path) + get_logger().warning(_("Authorization is disabled for API %r"), path) self.__internal_service: (BaseAuthService | None) = None if enabled: self.__internal_service = get_auth_service_class(internal_type)(**internal_kwargs) - get_logger().info(self.gettext("Using internal auth service %r"), self.__internal_service.get_plugin_name()) + get_logger().info(_("Using internal auth service %r"), self.__internal_service.get_plugin_name()) self.__force_internal_users = force_internal_users self.__external_service: (BaseAuthService | None) = None if enabled and external_type: self.__external_service = get_auth_service_class(external_type)(**external_kwargs) - get_logger().info(self.gettext("Using external auth service %r"), self.__external_service.get_plugin_name()) + get_logger().info(_("Using external auth service %r"), self.__external_service.get_plugin_name()) self.__totp_secret_path = totp_secret_path self.__tokens: dict[str, str] = {} # {token: user} - def is_auth_enabled(self) -> bool: return self.__enabled @@ -100,7 +98,7 @@ class AuthManager: if secret: code = passwd[-6:] if not pyotp.TOTP(secret).verify(code): - get_logger().error(self.gettext("Got access denied for user %r by TOTP"), user) + get_logger().error(_("Got access denied for user %r by TOTP"), user) return False passwd = passwd[:-6] @@ -111,9 +109,9 @@ class AuthManager: ok = (await service.authorize(user, passwd)) if ok: - get_logger().info(self.gettext("Authorized user %r via auth service %r"), user, service.get_plugin_name()) + get_logger().info(_("Authorized user %r via auth service %r"), user, service.get_plugin_name()) else: - get_logger().error(self.gettext("Got access denied for user %r from auth service %r"), user, service.get_plugin_name()) + get_logger().error(_("Got access denied for user %r from auth service %r"), user, service.get_plugin_name()) return ok async def login(self, user: str, passwd: str) -> (str | None): @@ -123,7 +121,7 @@ class AuthManager: if (await self.authorize(user, passwd)): token = self.__make_new_token() self.__tokens[token] = user - get_logger().info(self.gettext("Logged in user %r"), user) + get_logger().info(_("Logged in user %r"), user) return token else: return None @@ -133,7 +131,7 @@ class AuthManager: token = secrets.token_hex(32) if token not in self.__tokens: return token - raise AssertionError(self.gettext("Can't generate new unique token")) + raise AssertionError(_("Can't generate new unique token")) def logout(self, token: str) -> None: assert self.__enabled @@ -144,7 +142,7 @@ class AuthManager: if r_user == user: count += 1 del self.__tokens[r_token] - get_logger().info(self.gettext("Logged out user %r (%d)"), user, count) + get_logger().info(_("Logged out user %r (%d)"), user, count) def check(self, token: str) -> (str | None): assert self.__enabled diff --git a/kvmd/i18n/zh/LC_MESSAGES/message.mo b/kvmd/i18n/zh/LC_MESSAGES/message.mo index ec6a1c48c7f989eee013dc964b2b1895234984de..e43d416bd32eb2d1610739c1817706ad6769bf38 100644 GIT binary patch delta 1449 zcmYM!TS(Jk7{~E<=3Fz6o0g?>GxJbtrX6P`cnE{M=&(yA5y2ZtDq=#&L^O(^i-tlM zfveXyG3GY=6IjM`@>}B-U%hJldD-b{~3Zk09$r z%mfd9I%aKG&__Gnm6%w8ducagF?M4i-nILmqL=n8>Hy0az`v+<{M(Jm#nY&9mrwzA z<9_xxV?5|YGgyj0u>`$tV`?#oyRZiXID|zQ!!n$~6S#)TM0si=V@;@e?Wn+RU^d>j z`yXL3`+}qHl*W4OoR)*o#MS0Cg2FQ74F_Hg={ZtVd-gj2SqJ2QY?OcOG+a z36=2;j3~m~^hBgps1uw)WuODK;Vsk&#_=4!!76mKOC27^!*~s~!DH0AuTk?CQ1e$X zfT=_yD>BKyPS{F^Y)3_W1r^8x)QMi$E}*XD7xHIHnAGba8>n$H@~e&BVy)m(kc-G`Kgd4gWkMV0cvVN4uVeBV*2^{~4(szn77;zJu;MP0!VYTR?w zxR180c#L)y1;W1s)8dOxIR~u9l%T_kx!yXhcj^5}R)5xchodGsmtE$lu{N{Aj%`h$ b)@WT`ffe;uI;{1amK5t*{%}(Cdf}gc*Q%Bf delta 1979 zcmZ|Pe@xVM9LMp`F%PsbPB21+_?imlQtSs}C)Q*&w=B(&Hf-iVzBQ)Y)g8fDt&`1( z6&f1@CPFNe!Egk5O&a2C{g};K*|J<)wKn-4&D&V`~7@BpZELy z`SImj|KuZ)Us7ka7(UziX7c?#L3cMlBVJ<`aC;il@ggq8KQIT=5{*ehKQ6=~RKFdV zkJYHSeVBn~-TPlL)tHF6%7p^@h?0%@t|fRc_pe|UcA)~C#(VGwT!K@0H)hR_w-;g> z_d8LE!)Rd>D$WOZCw_xzz%%GWPqHx&VJa%{ zM$`n#P>I`I&!bjm&Rk>ez~#6C3s4g&$A}tQxKN^xaXy|$ZH0p>%*$w*g_==5YDJz# z6;OkkQ4?;$eq4!D=*L`wKZxb1_^qgT$5U8;1^AQ(1^5{){M&UA)74%V;v(FMT7g$x z8&MPJL>2Z0YQ~pb6XwNdx)=#*wqej?Oa-dng;dsGiT~m#-iJO;P9CmD&ZVhBb*x4e z+KgJ_e$-)#p$^k5rlmu?5NR@xqPDUaHNF;gMq2TH{0KGva)b*Vn%P9La5d_|R#bo> z>JT=g3K&Ked;t~sPgfuBoR%~X_4;k(M}CF;YNjXF%FScDCzGjR^JrxU1tSFr#KI4FJ$qMr95In6L?<-S9$>=n$>`#+yn zC0>UrWCv=%Yp9vD;A7Z}%W(n=F`a!{jm5}$GW$?_--?=fAL?*^f?DbcRGzsc(N^SP z=HpzH=mJBigm0tv=qPI7In=<*uE{j6;eHkJKgihG&D*_ulZxu>mF0DI^hdAXv*e|+ zP}sJfDBiN!vTN)>we>BD2-FCI#S{8~XCw=aH&VI2nTy2N!3M*jOTD$gC zs&m*5hbw~tdWF}yZDA`AtfisCJY!b{Yv_Ny@AZJUbd7$Uyf>k6H{${~Gh5}AfwE9t zyegGpN&^4wa;@TPC2mS7_IUD}yL`Ex{ODO7;E1bpZMtTTcf8=PL8xQ*ZQt3207hru|wTXf7}0zBd$BNX~222H`aeF s)^X5@{&9G~i!-PH1x6TqApigX diff --git a/kvmd/i18n/zh/LC_MESSAGES/message.po b/kvmd/i18n/zh/LC_MESSAGES/message.po index 6171e244..af3a1f87 100644 --- a/kvmd/i18n/zh/LC_MESSAGES/message.po +++ b/kvmd/i18n/zh/LC_MESSAGES/message.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-08-06 21:57+0800\n" -"PO-Revision-Date: 2024-08-06 21:57+0800\n" +"POT-Creation-Date: 2024-08-06 21:17+0800\n" +"PO-Revision-Date: 2024-08-06 21:17+0800\n" "Last-Translator: \n" "Language: zh\n" "Language-Team: zh \n" @@ -22,31 +22,6 @@ msgstr "" msgid "Can't determine filename" msgstr "无法确定文件名" -#: kvmd/htserver.py:356 -#, python-format -msgid "Registered new client session: %s; clients now: %d" -msgstr "已注册新客户端会话：%s；现在的客户：%d" - -#: kvmd/htserver.py:371 -#, python-format -msgid "Can't parse JSON event from websocket: %r" -msgstr "无法解析来自 websocket 的 JSON 事件：%r" - -#: kvmd/htserver.py:377 -#, python-format -msgid "Unknown websocket event: %r" -msgstr "未知 websocket 事件：%r" - -#: kvmd/htserver.py:384 -#, python-format -msgid "Unknown websocket binary event: %r" -msgstr "未知 websocket 二进制事件：%r" - -#: kvmd/htserver.py:415 -#, python-format -msgid "Removed client socket: %s; clients now: %d" -msgstr "已移除客户端套接字：%s；现在的客户端：%d" - #: kvmd/inotify.py:199 #, python-format msgid "Watching for %s" @@ -91,10 +66,6 @@ msgstr "尝试使用 --help 选项来了解某项服务的功能。\n" msgid "Make sure you understand exactly what you are doing!" msgstr "请确定你自己在做什么！" -#: kvmd/apps/kvmd/__init__.py:115 -msgid "Bye-bye" -msgstr "再见" - #: kvmd/apps/kvmd/auth.py:57 msgid "AUTHORIZATION IS DISABLED" msgstr "身份验证服务已被禁用" diff --git a/message.pot b/message.pot index ff584f26..13862a32 100644 --- a/message.pot +++ b/message.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-08-06 21:57+0800\n" +"POT-Creation-Date: 2024-08-06 21:17+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,31 +21,6 @@ msgstr "" msgid "Can't determine filename" msgstr "" -#: kvmd/htserver.py:356 -#, python-format -msgid "Registered new client session: %s; clients now: %d" -msgstr "" - -#: kvmd/htserver.py:371 -#, python-format -msgid "Can't parse JSON event from websocket: %r" -msgstr "" - -#: kvmd/htserver.py:377 -#, python-format -msgid "Unknown websocket event: %r" -msgstr "" - -#: kvmd/htserver.py:384 -#, python-format -msgid "Unknown websocket binary event: %r" -msgstr "" - -#: kvmd/htserver.py:415 -#, python-format -msgid "Removed client socket: %s; clients now: %d" -msgstr "" - #: kvmd/inotify.py:199 #, python-format msgid "Watching for %s" @@ -90,10 +65,6 @@ msgstr "" msgid "Make sure you understand exactly what you are doing!" msgstr "" -#: kvmd/apps/kvmd/__init__.py:115 -msgid "Bye-bye" -msgstr "" - #: kvmd/apps/kvmd/auth.py:57 msgid "AUTHORIZATION IS DISABLED" msgstr ""