From d6ea51c1aedabf9a5e5f45ed6e0c80536416f734 Mon Sep 17 00:00:00 2001
From: benero <benero@gmail.com>
Date: Wed, 14 Aug 2024 17:48:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=86=85=E5=AE=B9=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION                         | 2 +-
 app.yml                         | 2 +-
 app_desc.yaml                   | 2 +-
 docs/RELEASE.md                 | 3 +++
 docs/RELEASE_EN.md              | 4 ++++
 itsm/component/constants/iam.py | 8 ++++----
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 32b932e89..42f82b148 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.28
+2.6.29
diff --git a/app.yml b/app.yml
index 407126035..106d52a82 100644
--- a/app.yml
+++ b/app.yml
@@ -5,7 +5,7 @@ author: 蓝鲸智云
 category: 办公应用
 introduction: 流程服务是蓝鲸推出的轻量级ITSM，通过可自定义设计的流程模块，覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程，提升沟通及管理效率。
 introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
-version: 2.6.28
+version: 2.6.29
 language: python
 is_use_celery: True
 is_use_celery_with_gevent: False
diff --git a/app_desc.yaml b/app_desc.yaml
index 38853a735..b5a5b3768 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "2.6.28"
+app_version: "2.6.29"
 app:
     region: default
     bk_app_code: bk_itsm
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index 8b0ab44d2..9a37ef80b 100644
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -1,4 +1,7 @@
 # Changelog
+## [Version: 2.6.29] - 2024-08-14
+【修复】修复权限申请内容国际化问题  
+
 ## [Version: 2.6.28] - 2024-08-08
 【修复】修复表单提交XSS漏洞
 
diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
index b88ad4ed7..0cd3215d6 100644
--- a/docs/RELEASE_EN.md
+++ b/docs/RELEASE_EN.md
@@ -1,4 +1,8 @@
 # Changelog
+
+## [Version: 2.6.29] - 2024-08-14
+【Fixed】Fix the internationalization issue in permission application content.  
+
 ## [Version: 2.6.28] - 2024-08-08
 【Fixed】Fix the XSS vulnerability in form submission.
 
diff --git a/itsm/component/constants/iam.py b/itsm/component/constants/iam.py
index e1b1fedaa..10602490c 100644
--- a/itsm/component/constants/iam.py
+++ b/itsm/component/constants/iam.py
@@ -22,10 +22,10 @@
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
-from django.utils.translation import ugettext as _
-from settings import BK_IAM_SYSTEM_ID
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
-BK_IAM_SYSTEM_ID = BK_IAM_SYSTEM_ID
+BK_IAM_SYSTEM_ID = settings.BK_IAM_SYSTEM_ID
 ACTIONS = [
     {
         "id": "project_create",
@@ -520,7 +520,7 @@
     {"id": "task_template", "name": _("任务模版"), "parent_id": None},
 ]
 
-BK_IAM_SYSTEM_NAME = "流程服务"
+BK_IAM_SYSTEM_NAME = _("流程服务")
 
 HTTP_499_IAM_FORBIDDEN = 499