diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 61544f301d..9ad273b602 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,13 +5,12 @@ repos: hooks: - id: check-merge-conflict - repo: https://github.com/psf/black - rev: 22.3.0 + rev: stable hooks: - id: black - name: black - language: python + language_version: python3.6 - repo: https://github.com/pycqa/isort - rev: 5.11.5 + rev: 5.6.4 hooks: - id: isort args: ["--profile", "black", "--filter-files"] diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index d3f2620751..58e61dfdd2 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index da395f337e..411a801dbf 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -3422,7 +3422,7 @@ msgstr " | get_job_instance_log" #: pipeline_plugins/components/collections/sites/open/job/base.py:714 #: pipeline_plugins/components/collections/sites/open/job/base.py:801 msgid "任务执行失败,前往作业平台(JOB)查看详情" -msgstr "JOB task failed,GOTO(JOB)" +msgstr "JOB task failed,GOTO(JOB)" #: pipeline_plugins/components/collections/sites/open/job/base.py:537 #: pipeline_plugins/components/collections/sites/open/job/base.py:778 diff --git a/locale/zh_hans/LC_MESSAGES/django.po b/locale/zh_hans/LC_MESSAGES/django.po index 16de7330bd..42115435ea 100644 --- a/locale/zh_hans/LC_MESSAGES/django.po +++ b/locale/zh_hans/LC_MESSAGES/django.po @@ -3566,7 +3566,7 @@ msgstr " | get_job_instance_log" #: pipeline_plugins/components/collections/sites/open/job/base.py:801 #, fuzzy msgid "任务执行失败,前往作业平台(JOB)查看详情" -msgstr "任务执行失败,前往作业平台(JOB)查看详情" +msgstr "任务执行失败,前往作业平台(JOB)查看详情" #: pipeline_plugins/components/collections/sites/open/job/base.py:537 #: pipeline_plugins/components/collections/sites/open/job/base.py:778 diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js index 4142a6f4b1..6c4aeef6b2 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js @@ -111,7 +111,7 @@ attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js index 91b9f152a1..211799acfa 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js @@ -122,7 +122,7 @@ attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true @@ -393,7 +393,7 @@ attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js index 9d9d9bde1e..d646cc4020 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js @@ -122,7 +122,7 @@ attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true @@ -341,7 +341,7 @@ attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js index ccae0ef1b8..1a9816cd24 100644 --- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js +++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js @@ -743,7 +743,7 @@ job_start attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js index 292e7f1704..fafa4f23f5 100644 --- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js +++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js @@ -975,7 +975,7 @@ job_start attrs: { hookable: false, type: "primary", - title: '刷新', + title: gettext('刷新'), size: "normal", cols: 1, formViewHidden: true