Skip to content

Commit 323c7db

Browse files
perf: Modify pwd api msg
1 parent eab3423 commit 323c7db

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

backend/apps/system/api/user.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ async def query(session: SessionDep, trans: Trans, id: int) -> UserEditor:
120120
@router.post("")
121121
async def create(session: SessionDep, creator: UserCreator, trans: Trans):
122122
if check_account_exists(session=session, account=creator.account):
123-
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.account') [{creator.account}]}"))
123+
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.account')} [{creator.account}]"))
124124
if check_email_exists(session=session, email=creator.email):
125-
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email') [{creator.email}]}"))
125+
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email')} [{creator.email}]"))
126126
if not check_email_format(creator.email):
127-
raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email') [{creator.email}]}"))
127+
raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email')} [{creator.email}]"))
128128
data = creator.model_dump(exclude_unset=True)
129129
user_model = UserModel.model_validate(data)
130130
#user_model.create_time = get_timestamp()
@@ -154,9 +154,9 @@ async def update(session: SessionDep, editor: UserEditor, trans: Trans):
154154
if editor.account != user_model.account:
155155
raise Exception(f"account cannot be changed!")
156156
if editor.email != user_model.email and check_email_exists(session=session, account=editor.email):
157-
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email') [{editor.email}]}"))
157+
raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email')} [{editor.email}]"))
158158
if not check_email_format(editor.email):
159-
raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email') [{editor.email}]}"))
159+
raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email')} [{editor.email}]"))
160160
origin_oid: int = user_model.oid
161161
del_stmt = sqlmodel_delete(UserWsModel).where(UserWsModel.uid == editor.id)
162162
session.exec(del_stmt)

backend/common/utils/locale.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def _get_nested_translation(self, data: Dict[str, Any], key_path: str) -> str:
4545

4646
return current if isinstance(current, str) else key_path
4747

48-
def __call__(self, key: str, **kwargs) -> str:
48+
def __call__(self, arg_key: str, **kwargs) -> str:
4949
lang_data = self.i18n.translations.get(self.lang, {})
50-
text = self._get_nested_translation(lang_data, key)
50+
text = self._get_nested_translation(lang_data, arg_key)
5151

5252
if kwargs:
5353
try:

0 commit comments

Comments
 (0)