Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

后端国际化优化 #7118

Merged
merged 2 commits into from
Oct 10, 2023
Merged

后端国际化优化 #7118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
290dd7d
minor: update pre-commit-config
normal-wls Oct 8, 2023
4dafdea
minor: 后端国际化优化
normal-wls Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Binary file modified locale/en/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"
msgstr "JOB task failed，<a href='%s' target='_blank'>GOTO(JOB)</a>"
msgstr "JOB task failed，<a href='{job_inst_url}' target='_blank'>GOTO(JOB)</a>"

#: pipeline_plugins/components/collections/sites/open/job/base.py:537
#: pipeline_plugins/components/collections/sites/open/job/base.py:778
Expand Down
2 changes: 1 addition & 1 deletion locale/zh_hans/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3566,7 +3566,7 @@ msgstr " | get_job_instance_log"
#: pipeline_plugins/components/collections/sites/open/job/base.py:801
#, fuzzy
msgid "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"
msgstr "任务执行失败，<a href='%s' target='_blank'>前往作业平台(JOB)查看详情</a>"
msgstr "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"

#: pipeline_plugins/components/collections/sites/open/job/base.py:537
#: pipeline_plugins/components/collections/sites/open/job/base.py:778
Expand Down
2 changes: 1 addition & 1 deletion pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down
4 changes: 2 additions & 2 deletions pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down Expand Up @@ -393,7 +393,7 @@
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down
4 changes: 2 additions & 2 deletions pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down Expand Up @@ -341,7 +341,7 @@
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down
2 changes: 1 addition & 1 deletion pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ job_start
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down
2 changes: 1 addition & 1 deletion pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ job_start
attrs: {
hookable: false,
type: "primary",
title: '刷新',
title: gettext('刷新'),
size: "normal",
cols: 1,
formViewHidden: true
Expand Down
Loading