Skip to content

Commit

Permalink
Merge pull request #1114 from nscuro/jira-project-key-label
Browse files Browse the repository at this point in the history
  • Loading branch information
nscuro authored Dec 12, 2024
2 parents e9364e2 + de5f3df commit 7027646
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Persönlicher Jira-Zugriffstoken",
"jira_desc": "Jira-Authentifizierung",
"jira_password": "Jira-Passwort",
"jira_project_key": "Jira-Projektschlüssel",
"jira_ticket_type": "Jira-Tickettyp",
"jira_url": "Jira-Basis-URL",
"jira_username": "Jira-Benutzer (Dienstkonto). Der Benutzer muss für die entsprechende Jira-Instanz bereitgestellt werden und die Berechtigung zum Erstellen von Problemen haben.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Jira personal access token",
"jira_desc": "Jira service authentication",
"jira_password": "Jira password",
"jira_project_key": "Jira project key",
"jira_ticket_type": "Jira ticket type",
"jira_url": "Jira base URL",
"jira_username": "Jira user (service account). The user must be provisioned to the appropriate jira instance and permitted to create issues.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Token de acceso personal de Jira",
"jira_desc": "Autenticación del servicio Jira",
"jira_password": "Contraseña de jira",
"jira_project_key": "Clave del proyecto Jira",
"jira_ticket_type": "Tipo de billete de Jira",
"jira_url": "URL base de Jira",
"jira_username": "Usuario de Jira (cuenta de servicio). El usuario debe estar aprovisionado en la instancia de Jira adecuada y se le debe permitir crear problemas.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Jeton d'accès personnel Jira",
"jira_desc": "Authentification au service Jira",
"jira_password": "Mot de passe Jira",
"jira_project_key": "Clé du projet Jira",
"jira_ticket_type": "Type de ticket Jira",
"jira_url": "URL de base Jira",
"jira_username": "Utilisateur Jira (compte de service). L'utilisateur doit être configuré pour l'instance jira appropriée et autorisé à créer des tickets.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "जिरा व्यक्तिगत एक्सेस टोकन",
"jira_desc": "जिरा सेवा प्रमाणीकरण",
"jira_password": "जिरा पासवर्ड",
"jira_project_key": "जीरा परियोजना कुंजी",
"jira_ticket_type": "जिरा टिकट प्रकार",
"jira_url": "जिरा बेस यूआरएल",
"jira_username": "जिरा उपयोगकर्ता (सेवा खाता)। उपयोगकर्ता को उचित जिरा इंस्टेंस के लिए प्रावधानित किया जाना चाहिए और समस्याएं बनाने की अनुमति दी जानी चाहिए।",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Token di accesso personale Jira",
"jira_desc": "Autenticazione del servizio Jira",
"jira_password": "Password Jira",
"jira_project_key": "Chiave del progetto Jira",
"jira_ticket_type": "Tipo di biglietto Jira",
"jira_url": "URL di base di Jira",
"jira_username": "Utente Jira (account di servizio). L'utente deve essere sottoposto al provisioning dell'istanza Jira appropriata e deve essere autorizzato a creare problemi.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Jira 個人アクセス トークン",
"jira_desc": "Jira サービス認証",
"jira_password": "Jira パスワード",
"jira_project_key": "Jira プロジェクト キー",
"jira_ticket_type": "Jira チケットタイプ",
"jira_url": "Jira ベース URL",
"jira_username": "Jira ユーザー (サービス アカウント)。ユーザーは適切な Jira インスタンスにプロビジョニングされ、イシューの作成を許可されている必要があります。",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Osobisty token dostępu Jira",
"jira_desc": "Uwierzytelnianie usługi Jira",
"jira_password": "Hasło do Jiry",
"jira_project_key": "Klucz projektu Jira",
"jira_ticket_type": "Typ biletu Jira",
"jira_url": "Podstawowy adres URL Jira",
"jira_username": "Użytkownik Jira (konto usługi). Użytkownik musi mieć dostęp do odpowiedniej instancji jira i mieć pozwolenie na tworzenie problemów.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Token de acesso pessoal do Jira",
"jira_desc": "Autenticação do serviço Jira",
"jira_password": "Senha Jira",
"jira_project_key": "Chave do projeto Jira",
"jira_ticket_type": "Tipo de ticket Jira",
"jira_url": "URL base do Jira",
"jira_username": "Usuário Jira (conta de serviço). O usuário deve ser provisionado para a instância apropriada do jira e ter permissão para criar problemas.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Token de acesso pessoal do Jira",
"jira_desc": "Autenticação do serviço Jira",
"jira_password": "Palavra passe Jira",
"jira_project_key": "Chave do projeto Jira",
"jira_ticket_type": "Tipo de ticket Jira",
"jira_url": "URL base do Jira",
"jira_username": "Utilizador Jira (conta de serviço). O utilizador deve ser provisionado para a instância apropriada do jira e ter permissão para criar problemas.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Личный токен доступа Jira",
"jira_desc": "Аутентификация сервиса Jira",
"jira_password": "Пароль Jira",
"jira_project_key": "Ключ проекта Jira",
"jira_ticket_type": "Тип тикета Jira",
"jira_url": "Базовый URL Jira",
"jira_username": "Пользователь Jira (служебная учетная запись). Пользователь должен быть подключен к соответствующему экземпляру Jira и иметь права для создания тикетов.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/uk-UA.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Персональний маркер доступу Jira",
"jira_desc": "Аутентифікація служби Jira",
"jira_password": "Пароль Jira",
"jira_project_key": "Ключ проекту Jira",
"jira_ticket_type": "Тип квитка Jira",
"jira_url": "Основна URL-адреса Jira",
"jira_username": "Користувач Jira (сервісний обліковий запис). \nКористувач повинен бути підключений до відповідного екземпляра jira та мати дозвіл створювати проблеми.",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"jira_auth_with_token": "Jira 个人访问令牌",
"jira_desc": "Jira 服务身份验证",
"jira_password": "Jira 密码",
"jira_project_key": "Jira 项目密钥",
"jira_ticket_type": "Jira 票证类型",
"jira_url": "Jira URL",
"jira_username": "Jira 用户(服务帐户)。必须将用户配置到适当的 jira 实例并允许其创建问题。",
Expand Down
14 changes: 13 additions & 1 deletion src/views/administration/notifications/Alerts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default {
<b-form-group id="fieldset-3" :label="this.$t('admin.notification_level')" label-for="input-3">
<b-form-select id="input-3" v-model="notificationLevel" :options="availableLevels" required></b-form-select>
</b-form-group>
<b-input-group-form-input id="input-destination" :label="$t('admin.destination')" input-group-size="mb-3"
<b-input-group-form-input id="input-destination" :label="this.destinationLabel" input-group-size="mb-3"
:required="(!(this.alert.hasOwnProperty('teams') && this.alert.teams != null && this.alert.teams.length > 0)).toString()"
type="text" v-model="destination" lazy="true" />
<b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.WebhookPublisher'" id="input-token-header" :label="$t('admin.api_token_header')" input-group-size="mb-3"
Expand Down Expand Up @@ -296,6 +296,18 @@ export default {
},
tag: 'searchTags',
},
computed: {
destinationLabel() {
if (
this.publisherClass ===
'org.dependencytrack.notification.publisher.JiraPublisher'
) {
return this.$t('admin.jira_project_key');
}
return this.$t('admin.destination');
},
},
methods: {
initializeTags: function () {
this.tags = (this.alert.tags || []).map((tag) => ({
Expand Down

0 comments on commit 7027646

Please sign in to comment.