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

Jump to bottom

fix(i18n): update some trans #1884

Merged
merged 1 commit into from
Aug 9, 2024
Merged

fix(i18n): update some trans #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/api/resources/apigateway/bk_apigw_resources_bk-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ paths:
default:
description: ''
x-bk-apigateway-resource:
isPublic: true
allowApplyPermission: true
isPublic: false
allowApplyPermission: false
matchSubpath: false
backend:
type: HTTP
Expand All @@ -338,8 +338,8 @@ paths:
default:
description: ''
x-bk-apigateway-resource:
isPublic: true
allowApplyPermission: true
isPublic: false
allowApplyPermission: false
matchSubpath: false
backend:
type: HTTP
Expand Down
3 changes: 2 additions & 1 deletion src/api/resources/apigateway/definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apigateway:
description: "蓝鲸用户管理 API"
is_public: true
description_en: "User Management API"
is_public: false
maintainers:
- "admin"

Expand Down
2 changes: 1 addition & 1 deletion src/login/bklogin/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link href="{{STATIC_URL}}assets/bk-icon-2.0/iconfont.css" rel="stylesheet" type="text/css" />
<link href="{{STATIC_URL}}assets/blueking-icon/index.css" rel="stylesheet" type="text/css" />
<link href="{{STATIC_URL}}css/login.{{CSS_SUFFIX}}?v={{STATIC_VERSION}}" rel="stylesheet" type="text/css" />
<title>{% trans '登录 | 腾讯蓝鲸智云' %}</title>
<title>{% trans '登录 | 蓝鲸智云' %}</title>

{% if is_plain %}
<style>
Expand Down
4 changes: 2 additions & 2 deletions src/login/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,8 @@ msgid "重新登录"
msgstr "Login again"

#: bklogin/templates/login.html:11
msgid "登录 | 腾讯蓝鲸智云"
msgstr "Login|BlueKing"
msgid "登录 | 蓝鲸智云"
msgstr "Login | Tencent BlueKing"

#: bklogin/templates/login.html:41
msgid "img/logo/logo_ch.png"
Expand Down
2 changes: 1 addition & 1 deletion src/login/locale/zh_Hans/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ msgid "重新登录"
msgstr ""

#: bklogin/templates/login.html:11
msgid "登录 | 腾讯蓝鲸智云"
msgid "登录 | 蓝鲸智云"
msgstr ""

#: bklogin/templates/login.html:41
Expand Down
2 changes: 1 addition & 1 deletion src/saas/bkuser_shell/common/context_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def shell(request):
"APP_ID": settings.APP_ID,
"SITE_URL": settings.SITE_URL,
"AJAX_URL": settings.SITE_URL,
"TITLE": _("用户管理 | 腾讯蓝鲸智云"),
"TITLE": _("用户管理 | 蓝鲸智云"),
# 静态资源
"STATIC_URL": settings.STATIC_URL,
"STATIC_VERSION": settings.STATIC_VERSION,
Expand Down
4 changes: 2 additions & 2 deletions src/saas/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ msgid "users"
msgstr "users"

#: bkuser_shell/common/context_processors.py:27
msgid "用户管理 | 腾讯蓝鲸智云"
msgstr "User Management | BlueKing"
msgid "用户管理 | 蓝鲸智云"
msgstr "User Management | Tencent BlueKing"

#: bkuser_shell/common/error_codes.py:135
msgid "无法找到页面模版"
Expand Down
4 changes: 2 additions & 2 deletions src/saas/locale/zh_Hans/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ msgid "users"
msgstr "users"

#: bkuser_shell/common/context_processors.py:27
msgid "用户管理 | 腾讯蓝鲸智云"
msgstr "用户管理 | 腾讯蓝鲸智云"
msgid "用户管理 | 蓝鲸智云"
msgstr "用户管理 | 蓝鲸智云"

#: bkuser_shell/common/error_codes.py:135
msgid "无法找到页面模版"
Expand Down