diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index 30b0c8a8a..cbfe6e0fa 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -1800,24 +1800,15 @@ func getAppTags(appID uint, lang string) ([]response.TagDTO, error) { } var res []response.TagDTO for _, t := range tags { - if t.Name != "" { + var translations = make(map[string]string) + _ = json.Unmarshal([]byte(t.Translations), &translations) + if name, ok := translations[lang]; ok { tagDTO := response.TagDTO{ ID: t.ID, Key: t.Key, - Name: t.Name, + Name: name, } res = append(res, tagDTO) - } else { - var translations = make(map[string]string) - _ = json.Unmarshal([]byte(t.Translations), &translations) - if name, ok := translations[lang]; ok { - tagDTO := response.TagDTO{ - ID: t.ID, - Key: t.Key, - Name: name, - } - res = append(res, tagDTO) - } } } return res, nil diff --git a/agent/i18n/lang/en.yaml b/agent/i18n/lang/en.yaml index 6cef22bd2..c82d89f50 100644 --- a/agent/i18n/lang/en.yaml +++ b/agent/i18n/lang/en.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: 'Image pull timed out, please configure image acceleration or ma #runtime ErrFileNotExist: '{{ .detail }} file does not exist! Please check the integrity of the source file!' ErrImageBuildErr: 'Image build failed' -ErrImageExist: 'Image already exists!' +ErrImageExist: "Image already exists! Please modify the image name." ErrDelWithWebsite: 'The operating environment is already associated with a website and cannot be deleted' ErrRuntimeStart: 'Startup failed' ErrPackageJsonNotFound: 'package.json file does not exist' diff --git a/agent/i18n/lang/ja.yaml b/agent/i18n/lang/ja.yaml index 1e29dc2ed..92d443843 100644 --- a/agent/i18n/lang/ja.yaml +++ b/agent/i18n/lang/ja.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: 'イメージのプルがタイムアウトしました。イメ #runtime ErrFileNotExist: '{{ .detail }} ファイルが存在しません。ソース ファイルの整合性を確認してください。' ErrImageBuildErr: 'イメージのビルドに失敗しました' -ErrImageExist: '画像がすでに存在します!' +ErrImageExist: "イメージはすでに存在します!イメージ名を変更してください。" ErrDelWithWebsite: 'オペレーティング環境は既に Web サイトに関連付けられているため、削除できません' ErrRuntimeStart: '起動に失敗しました' ErrPackageJsonNotFound: 'package.json ファイルが存在しません' diff --git a/agent/i18n/lang/ko.yaml b/agent/i18n/lang/ko.yaml index 522fb9728..5275d9325 100644 --- a/agent/i18n/lang/ko.yaml +++ b/agent/i18n/lang/ko.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: '이미지 풀링 시간이 초과되었습니다. 이미지 가 #실행 시간 ErrFileNotExist: '{{ .detail }} 파일이 존재하지 않습니다! 소스 파일의 무결성을 확인하세요!' ErrImageBuildErr: '이미지 빌드 실패' -ErrImageExist: '이미지가 이미 존재합니다!' +ErrImageExist: "이미지가 이미 존재합니다! 이미지 이름을 수정하세요." ErrDelWithWebsite: '운영 환경이 이미 웹사이트와 연결되어 있어 삭제할 수 없습니다' ErrRuntimeStart: '시작 실패' ErrPackageJsonNotFound: 'package.json 파일이 존재하지 않습니다' diff --git a/agent/i18n/lang/ms.yaml b/agent/i18n/lang/ms.yaml index 6e014def6..a33314b0a 100644 --- a/agent/i18n/lang/ms.yaml +++ b/agent/i18n/lang/ms.yaml @@ -176,7 +176,7 @@ ErrPgImagePull: 'Tarikh imej tamat masa, sila konfigurasikan pecutan imej atau t #masa berjalan ErrFileNotExist: 'Fail {{ .detail }} tidak wujud! Sila semak integriti fail sumber!' ErrImageBuildErr: 'Pembinaan imej gagal' -ErrImageExist: 'Imej sudah wujud!' +ErrImageExist: "Imej sudah wujud! Sila ubah nama imej." ErrDelWithWebsite: 'Persekitaran pengendalian sudah dikaitkan dengan tapak web dan tidak boleh dipadamkan' ErrRuntimeStart: 'Permulaan gagal' ErrPackageJsonNotFound: 'fail package.json tidak wujud' diff --git a/agent/i18n/lang/pt-BR.yaml b/agent/i18n/lang/pt-BR.yaml index 992818690..25cc24558 100644 --- a/agent/i18n/lang/pt-BR.yaml +++ b/agent/i18n/lang/pt-BR.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: 'Tempo limite para extração de imagem. Configure a aceleraçã #tempo de execução ErrFileNotExist: 'O arquivo {{ .detail }} não existe! Verifique a integridade do arquivo de origem!' ErrImageBuildErr: 'Falha na criação da imagem' -ErrImageExist: 'A imagem já existe!' +ErrImageExist: "A imagem já existe! Por favor, modifique o nome da imagem." ErrDelWithWebsite: 'O ambiente operacional já está associado a um site e não pode ser excluído' ErrRuntimeStart: 'Falha na inicialização' ErrPackageJsonNotFound: 'o arquivo package.json não existe' diff --git a/agent/i18n/lang/ru.yaml b/agent/i18n/lang/ru.yaml index 6ea9f05c1..65d5bd1c6 100644 --- a/agent/i18n/lang/ru.yaml +++ b/agent/i18n/lang/ru.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: 'Время извлечения изображения исте #время выполнения ErrFileNotExist: 'Файл {{ .detail }} не существует! Проверьте целостность исходного файла!' ErrImageBuildErr: 'Сборка образа не удалась' -ErrImageExist: 'Изображение уже существует!' +ErrImageExist: "Изображение уже существует! Пожалуйста, измените имя изображения." ErrDelWithWebsite: 'Операционная среда уже связана с веб-сайтом и не может быть удалена' ErrRuntimeStart: 'Запуск не удался' ErrPackageJsonNotFound: 'файл package.json не существует' diff --git a/agent/i18n/lang/tr.yaml b/agent/i18n/lang/tr.yaml index 3b8b23594..815479861 100644 --- a/agent/i18n/lang/tr.yaml +++ b/agent/i18n/lang/tr.yaml @@ -177,7 +177,7 @@ ErrPgImagePull: 'Image çekme zaman aşımı, lütfen image hızlandırma yapıl #runtime ErrFileNotExist: '{{ .detail }} dosyası mevcut değil! Lütfen kaynak dosyanın bütünlüğünü kontrol edin!' ErrImageBuildErr: 'Image yapı başarısız' -ErrImageExist: 'Image zaten mevcut!' +ErrImageExist: "Görüntü zaten var! Lütfen görüntü adını değiştirin." ErrDelWithWebsite: 'İşletim ortamı zaten bir web sitesiyle ilişkili ve silinemez' ErrRuntimeStart: 'Başlatma başarısız' ErrPackageJsonNotFound: 'package.json dosyası mevcut değil' diff --git a/agent/i18n/lang/zh-Hant.yaml b/agent/i18n/lang/zh-Hant.yaml index a7505c14d..1160ad13d 100644 --- a/agent/i18n/lang/zh-Hant.yaml +++ b/agent/i18n/lang/zh-Hant.yaml @@ -176,7 +176,7 @@ ErrPgImagePull: '鏡像拉取逾時,請配置鏡像加速或手動拉取{{ .na #runtime ErrFileNotExist: '{{ .detail }} 檔案不存在!請檢查來源檔案完整性!' ErrImageBuildErr: '鏡像build 失敗' -ErrImageExist: '鏡像已存在!' +ErrImageExist: "鏡像已存在!請修改鏡像名稱。" ErrDelWithWebsite: '執行環境已經關聯網站,無法刪除' ErrRuntimeStart: '啟動失敗' ErrPackageJsonNotFound: 'package.json 檔案不存在' diff --git a/agent/i18n/lang/zh.yaml b/agent/i18n/lang/zh.yaml index c9d26c3ac..6be914994 100644 --- a/agent/i18n/lang/zh.yaml +++ b/agent/i18n/lang/zh.yaml @@ -176,7 +176,7 @@ ErrPgImagePull: "镜像拉取超时,请配置镜像加速或手动拉取 {{ .n #runtime ErrFileNotExist: "{{ .detail }} 文件不存在!请检查源文件完整性!" ErrImageBuildErr: "镜像 build 失败" -ErrImageExist: "镜像已存在!" +ErrImageExist: "镜像已存在!请修改镜像名称" ErrDelWithWebsite: "运行环境已经关联网站,无法删除" ErrRuntimeStart: "启动失败" ErrPackageJsonNotFound: "package.json 文件不存在"