Skip to content

Commit

Permalink
sprintfix: 国际化修复 (fixed #1333 fixed #1332)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhuoZhuoCrayon committed Feb 3, 2023
1 parent cf64301 commit ca334ac
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions apps/backend/components/collections/agent_new/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, Dict, List, Optional, Set, Tuple, Union

from django.conf import settings
from django.utils import timezone
from django.utils import timezone, translation
from django.utils.translation import ugettext_lazy as _
from redis.client import Pipeline

Expand Down Expand Up @@ -174,7 +174,11 @@ def _filter_params_list_in_next_step(
def handle_lan_shell_sub_inst(self, install_sub_inst_objs: List[InstallSubInstObj]):
"""处理直连且通过 Shell 执行的机器"""
params_list = [
{"sub_inst_id": install_sub_inst_obj.sub_inst_id, "install_sub_inst_obj": install_sub_inst_obj}
{
"meta": {"blueking_language": translation.get_language()},
"sub_inst_id": install_sub_inst_obj.sub_inst_id,
"install_sub_inst_obj": install_sub_inst_obj,
}
for install_sub_inst_obj in install_sub_inst_objs
]
return concurrent.batch_call_coroutine(func=self.execute_shell_solution_async, params_list=params_list)
Expand Down Expand Up @@ -471,13 +475,18 @@ def execute_job_commands(self, sub_inst_id, installation_tool: InstallationTools
return sub_inst_id

@exc.ExceptionHandler(exc_handler=core.default_sub_inst_task_exc_handler)
async def execute_shell_solution_async(self, sub_inst_id, install_sub_inst_obj: InstallSubInstObj) -> int:
async def execute_shell_solution_async(
self, meta: Dict[str, Any], sub_inst_id: int, install_sub_inst_obj: InstallSubInstObj
) -> int:
"""
执行 Shell 方案
:param meta:
:param sub_inst_id:
:param install_sub_inst_obj:
:return:
"""
translation.activate(meta["blueking_language"])

# sudo 权限提示
await self.sudo_prompt(install_sub_inst_obj)

Expand Down

0 comments on commit ca334ac

Please sign in to comment.