Skip to content

Commit 7027646

Browse files
authored
Merge pull request #1114 from nscuro/jira-project-key-label
2 parents e9364e2 + de5f3df commit 7027646

File tree

14 files changed

+26
-1
lines changed

14 files changed

+26
-1
lines changed

src/i18n/locales/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Persönlicher Jira-Zugriffstoken",
141141
"jira_desc": "Jira-Authentifizierung",
142142
"jira_password": "Jira-Passwort",
143+
"jira_project_key": "Jira-Projektschlüssel",
143144
"jira_ticket_type": "Jira-Tickettyp",
144145
"jira_url": "Jira-Basis-URL",
145146
"jira_username": "Jira-Benutzer (Dienstkonto). Der Benutzer muss für die entsprechende Jira-Instanz bereitgestellt werden und die Berechtigung zum Erstellen von Problemen haben.",

src/i18n/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Jira personal access token",
141141
"jira_desc": "Jira service authentication",
142142
"jira_password": "Jira password",
143+
"jira_project_key": "Jira project key",
143144
"jira_ticket_type": "Jira ticket type",
144145
"jira_url": "Jira base URL",
145146
"jira_username": "Jira user (service account). The user must be provisioned to the appropriate jira instance and permitted to create issues.",

src/i18n/locales/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Token de acceso personal de Jira",
141141
"jira_desc": "Autenticación del servicio Jira",
142142
"jira_password": "Contraseña de jira",
143+
"jira_project_key": "Clave del proyecto Jira",
143144
"jira_ticket_type": "Tipo de billete de Jira",
144145
"jira_url": "URL base de Jira",
145146
"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.",

src/i18n/locales/fr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Jeton d'accès personnel Jira",
141141
"jira_desc": "Authentification au service Jira",
142142
"jira_password": "Mot de passe Jira",
143+
"jira_project_key": "Clé du projet Jira",
143144
"jira_ticket_type": "Type de ticket Jira",
144145
"jira_url": "URL de base Jira",
145146
"jira_username": "Utilisateur Jira (compte de service). L'utilisateur doit être configuré pour l'instance jira appropriée et autorisé à créer des tickets.",

src/i18n/locales/hi.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "जिरा व्यक्तिगत एक्सेस टोकन",
141141
"jira_desc": "जिरा सेवा प्रमाणीकरण",
142142
"jira_password": "जिरा पासवर्ड",
143+
"jira_project_key": "जीरा परियोजना कुंजी",
143144
"jira_ticket_type": "जिरा टिकट प्रकार",
144145
"jira_url": "जिरा बेस यूआरएल",
145146
"jira_username": "जिरा उपयोगकर्ता (सेवा खाता)। उपयोगकर्ता को उचित जिरा इंस्टेंस के लिए प्रावधानित किया जाना चाहिए और समस्याएं बनाने की अनुमति दी जानी चाहिए।",

src/i18n/locales/it.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Token di accesso personale Jira",
141141
"jira_desc": "Autenticazione del servizio Jira",
142142
"jira_password": "Password Jira",
143+
"jira_project_key": "Chiave del progetto Jira",
143144
"jira_ticket_type": "Tipo di biglietto Jira",
144145
"jira_url": "URL di base di Jira",
145146
"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.",

src/i18n/locales/ja.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Jira 個人アクセス トークン",
141141
"jira_desc": "Jira サービス認証",
142142
"jira_password": "Jira パスワード",
143+
"jira_project_key": "Jira プロジェクト キー",
143144
"jira_ticket_type": "Jira チケットタイプ",
144145
"jira_url": "Jira ベース URL",
145146
"jira_username": "Jira ユーザー (サービス アカウント)。ユーザーは適切な Jira インスタンスにプロビジョニングされ、イシューの作成を許可されている必要があります。",

src/i18n/locales/pl.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Osobisty token dostępu Jira",
141141
"jira_desc": "Uwierzytelnianie usługi Jira",
142142
"jira_password": "Hasło do Jiry",
143+
"jira_project_key": "Klucz projektu Jira",
143144
"jira_ticket_type": "Typ biletu Jira",
144145
"jira_url": "Podstawowy adres URL Jira",
145146
"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.",

src/i18n/locales/pt-BR.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Token de acesso pessoal do Jira",
141141
"jira_desc": "Autenticação do serviço Jira",
142142
"jira_password": "Senha Jira",
143+
"jira_project_key": "Chave do projeto Jira",
143144
"jira_ticket_type": "Tipo de ticket Jira",
144145
"jira_url": "URL base do Jira",
145146
"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.",

src/i18n/locales/pt.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Token de acesso pessoal do Jira",
141141
"jira_desc": "Autenticação do serviço Jira",
142142
"jira_password": "Palavra passe Jira",
143+
"jira_project_key": "Chave do projeto Jira",
143144
"jira_ticket_type": "Tipo de ticket Jira",
144145
"jira_url": "URL base do Jira",
145146
"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.",

src/i18n/locales/ru.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Личный токен доступа Jira",
141141
"jira_desc": "Аутентификация сервиса Jira",
142142
"jira_password": "Пароль Jira",
143+
"jira_project_key": "Ключ проекта Jira",
143144
"jira_ticket_type": "Тип тикета Jira",
144145
"jira_url": "Базовый URL Jira",
145146
"jira_username": "Пользователь Jira (служебная учетная запись). Пользователь должен быть подключен к соответствующему экземпляру Jira и иметь права для создания тикетов.",

src/i18n/locales/uk-UA.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Персональний маркер доступу Jira",
141141
"jira_desc": "Аутентифікація служби Jira",
142142
"jira_password": "Пароль Jira",
143+
"jira_project_key": "Ключ проекту Jira",
143144
"jira_ticket_type": "Тип квитка Jira",
144145
"jira_url": "Основна URL-адреса Jira",
145146
"jira_username": "Користувач Jira (сервісний обліковий запис). \nКористувач повинен бути підключений до відповідного екземпляра jira та мати дозвіл створювати проблеми.",

src/i18n/locales/zh.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
"jira_auth_with_token": "Jira 个人访问令牌",
141141
"jira_desc": "Jira 服务身份验证",
142142
"jira_password": "Jira 密码",
143+
"jira_project_key": "Jira 项目密钥",
143144
"jira_ticket_type": "Jira 票证类型",
144145
"jira_url": "Jira URL",
145146
"jira_username": "Jira 用户(服务帐户)。必须将用户配置到适当的 jira 实例并允许其创建问题。",

src/views/administration/notifications/Alerts.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default {
145145
<b-form-group id="fieldset-3" :label="this.$t('admin.notification_level')" label-for="input-3">
146146
<b-form-select id="input-3" v-model="notificationLevel" :options="availableLevels" required></b-form-select>
147147
</b-form-group>
148-
<b-input-group-form-input id="input-destination" :label="$t('admin.destination')" input-group-size="mb-3"
148+
<b-input-group-form-input id="input-destination" :label="this.destinationLabel" input-group-size="mb-3"
149149
:required="(!(this.alert.hasOwnProperty('teams') && this.alert.teams != null && this.alert.teams.length > 0)).toString()"
150150
type="text" v-model="destination" lazy="true" />
151151
<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"
@@ -296,6 +296,18 @@ export default {
296296
},
297297
tag: 'searchTags',
298298
},
299+
computed: {
300+
destinationLabel() {
301+
if (
302+
this.publisherClass ===
303+
'org.dependencytrack.notification.publisher.JiraPublisher'
304+
) {
305+
return this.$t('admin.jira_project_key');
306+
}
307+
308+
return this.$t('admin.destination');
309+
},
310+
},
299311
methods: {
300312
initializeTags: function () {
301313
this.tags = (this.alert.tags || []).map((tag) => ({

0 commit comments

Comments
 (0)