From e1261e195b7173e4a1da218720e35e859366f3a7 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Tue, 20 Jul 2021 10:09:20 +0200
Subject: [PATCH] NMAAS-999: Updated labels and new domain request email
template
---
src/test/shell/data/i18n/de.json | 13 +++++++++++++
src/test/shell/data/i18n/en.json | 13 +++++++++++++
src/test/shell/data/i18n/fr.json | 13 +++++++++++++
src/test/shell/data/i18n/pl.json | 13 +++++++++++++
src/test/shell/data/mails/newDomainRequest.json | 8 ++++----
5 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/test/shell/data/i18n/de.json b/src/test/shell/data/i18n/de.json
index 15d0be658..4878c5f53 100644
--- a/src/test/shell/data/i18n/de.json
+++ b/src/test/shell/data/i18n/de.json
@@ -837,6 +837,19 @@
"DOMAIN_CODENAME_ERROR": "Ungültiger Domain-Codename",
"JUSTIFICATION": "Bitte um Begründung",
"JUSTIFICATION_DESCRIPTION": "Kurze Begründung für die Erstellung der neuen Domain, einschließlich des Namens der anfragenden Institution und des Hauptzwecks für die Bereitstellung von NMaaS-Anwendungen",
+ "VPN_OPTION": "VPN solution",
+ "VPN_OPTION_DESCRIPTION": "Two types of software-based VPN solutions are currently supported. Select the preferred one",
+ "VPN_USER_IP": "Public IP for VPN tunnel setup",
+ "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end",
+ "VPN_USER_SUBNETS": "Monitored user subnets",
+ "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS",
+ "VPN_USER_SUBNETS_ADD": "Add subnet",
+ "VPN_USER_SUBNETS_SUBNET": "Subnet",
+ "ADDITIONAL_VPN_SUBNETS": "Additional subnets",
+ "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)",
+ "TECH_CONTACT": "Technical contact",
+ "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup",
+ "TECH_CONTACT_PLACEHOLDER": "Name and email",
"ISSUE_DOMAIN_NAME": "Domainname",
"ISSUE_DOMAIN_NAME_PLACEHOLDER": "Domainname",
"ISSUE_DOMAIN_NAME_DESCRIPTION": "Name der vom Problem betroffenen Domain",
diff --git a/src/test/shell/data/i18n/en.json b/src/test/shell/data/i18n/en.json
index 36357b802..3485c3193 100644
--- a/src/test/shell/data/i18n/en.json
+++ b/src/test/shell/data/i18n/en.json
@@ -838,6 +838,19 @@
"DOMAIN_CODENAME_ERROR": "Invalid domain codename",
"JUSTIFICATION": "Request justification",
"JUSTIFICATION_DESCRIPTION": "Brief justification of the request including intended use of the NMaaS service",
+ "VPN_OPTION": "VPN solution",
+ "VPN_OPTION_DESCRIPTION": "Two types of software-based VPN solutions are currently supported. Select the preferred one",
+ "VPN_USER_IP": "Public IP for VPN tunnel setup",
+ "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end",
+ "VPN_USER_SUBNETS": "Monitored user subnets",
+ "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS",
+ "VPN_USER_SUBNETS_ADD": "Add subnet",
+ "VPN_USER_SUBNETS_SUBNET": "Subnet",
+ "ADDITIONAL_VPN_SUBNETS": "Additional subnets",
+ "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)",
+ "TECH_CONTACT": "Technical contact",
+ "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup",
+ "TECH_CONTACT_PLACEHOLDER": "Name and email",
"ISSUE_DOMAIN_NAME": "Domain name",
"ISSUE_DOMAIN_NAME_PLACEHOLDER": "Domain name",
"ISSUE_DOMAIN_NAME_DESCRIPTION": "Name of the domain affected by the issue",
diff --git a/src/test/shell/data/i18n/fr.json b/src/test/shell/data/i18n/fr.json
index b9c56661f..e0f062114 100644
--- a/src/test/shell/data/i18n/fr.json
+++ b/src/test/shell/data/i18n/fr.json
@@ -838,6 +838,19 @@
"DOMAIN_CODENAME_ERROR": "Invalid domain codename",
"JUSTIFICATION": "Request justification",
"JUSTIFICATION_DESCRIPTION": "Brief justification for the new domain creation including the name of the requesting Institution and the main purpose for deployment of NMaaS applications.",
+ "VPN_OPTION": "VPN solution",
+ "VPN_OPTION_DESCRIPTION": "Two types of software-based VPN solutions are currently supported. Select the preferred one",
+ "VPN_USER_IP": "Public IP for VPN tunnel setup",
+ "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end",
+ "VPN_USER_SUBNETS": "Monitored user subnets",
+ "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS",
+ "VPN_USER_SUBNETS_ADD": "Add subnet",
+ "VPN_USER_SUBNETS_SUBNET": "Subnet",
+ "ADDITIONAL_VPN_SUBNETS": "Additional subnets",
+ "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)",
+ "TECH_CONTACT": "Technical contact",
+ "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup",
+ "TECH_CONTACT_PLACEHOLDER": "Name and email",
"ISSUE_DOMAIN_NAME": "Domain name",
"ISSUE_DOMAIN_NAME_PLACEHOLDER": "Domain name",
"ISSUE_DOMAIN_NAME_DESCRIPTION": "Name of the domain affected by the issue",
diff --git a/src/test/shell/data/i18n/pl.json b/src/test/shell/data/i18n/pl.json
index d4cd38657..f6a713358 100644
--- a/src/test/shell/data/i18n/pl.json
+++ b/src/test/shell/data/i18n/pl.json
@@ -838,6 +838,19 @@
"DOMAIN_CODENAME_ERROR": "Niewłaściwy kod domeny",
"JUSTIFICATION": "Uzasadnienie prośby",
"JUSTIFICATION_DESCRIPTION": "Krótkie uzasadnienie prośby zawierajace informację o zamierzonym sposobie wykorzystania usługi NMaaS",
+ "VPN_OPTION": "Rozwiązanie VPN",
+ "VPN_OPTION_DESCRIPTION": "Dwa rozwiązania VPN są aktualnie wpierane. Wybierz preferowaną opcję",
+ "VPN_USER_IP": "Public IP for VPN tunnel setup",
+ "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end",
+ "VPN_USER_SUBNETS": "Monitored user subnets",
+ "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS",
+ "VPN_USER_SUBNETS_ADD": "Nowa podsieć",
+ "VPN_USER_SUBNETS_SUBNET": "Podsieć",
+ "ADDITIONAL_VPN_SUBNETS": "Dodatkowe podsieci",
+ "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)",
+ "TECH_CONTACT": "Kontakt techniczny",
+ "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup",
+ "TECH_CONTACT_PLACEHOLDER": "Nazwisko oraz adres email",
"ISSUE_DOMAIN_NAME": "Nazwa domeny",
"ISSUE_DOMAIN_NAME_PLACEHOLDER": "Nazwa domeny",
"ISSUE_DOMAIN_NAME_DESCRIPTION": "Nazwa domeny, w której wystąpił błąd",
diff --git a/src/test/shell/data/mails/newDomainRequest.json b/src/test/shell/data/mails/newDomainRequest.json
index ad9e597b0..4cf0599ac 100644
--- a/src/test/shell/data/mails/newDomainRequest.json
+++ b/src/test/shell/data/mails/newDomainRequest.json
@@ -12,7 +12,7 @@
"subject": "NMaaS: New Domain Request",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p>",
+ "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p><p>Preferred VPN option: ${vpnTechnology}</p><p>Public IP for VPN tunnel setup: ${vpnUserIp}</p><p>Monitored user subnets:</p><#list userSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Additional subnets:</p><#list additionalSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Technical contact: ${techContact}</p>",
"SENDER": "Best regards,<br />NMaaS Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -23,7 +23,7 @@
"subject": "NMaaS: New Domain Request",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p>",
+ "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p><p>Preferred VPN option: ${vpnTechnology}</p><p>Public IP for VPN tunnel setup: ${vpnUserIp}</p><p>Monitored user subnets:</p><#list userSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Additional subnets:</p><#list additionalSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Technical contact: ${techContact}</p>",
"SENDER": "Best regards,<br />NMaaS Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -34,7 +34,7 @@
"subject": "NMaaS: New Domain Request",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p>",
+ "CONTENT": "<p>New domain creation request was sent from the contact form.</p><p>Requester name: ${name}</p><p>Requester institution: ${institution}</p><p>Requester email: ${email}</p><p>Proposed domain Name: ${domainName}</p><p>Proposed domain codename: ${domainCodename}</p><p>Request justification:</p><p>${justification}</p><p>Preferred VPN option: ${vpnTechnology}</p><p>Public IP for VPN tunnel setup: ${vpnUserIp}</p><p>Monitored user subnets:</p><#list userSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Additional subnets:</p><#list additionalSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Technical contact: ${techContact}</p>",
"SENDER": "Best regards,<br />NMaaS Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -45,7 +45,7 @@
"subject": "NMaaS: Żądanie utworzenia nowej domeny",
"template": {
"HEADER": "Drogi ${username}",
- "CONTENT": "<p>Żądanie utworzenia nowej domeny zostało wysłane przez formularz kontaktowy.</p><p>Imię i Nazwisko: ${name}</p><p>Instytucja: ${institution}</p><p>Adres email: ${email}</p><p>Proponowana nazwa domany: ${domainName}</p><p>Proponowna nazwa kodowa domeny: ${domainCodename}</p><p>Uzasadnienie żądania:</p><p>${justification}</p>",
+ "CONTENT": "<p>Żądanie utworzenia nowej domeny zostało wysłane przez formularz kontaktowy.</p><p>Imię i Nazwisko: ${name}</p><p>Instytucja: ${institution}</p><p>Adres email: ${email}</p><p>Proponowana nazwa domany: ${domainName}</p><p>Proponowna nazwa kodowa domeny: ${domainCodename}</p><p>Uzasadnienie żądania:</p><p>${justification}</p><p>Preferred VPN option: ${vpnTechnology}</p><p>Public IP for VPN tunnel setup: ${vpnUserIp}</p><p>Monitored user subnets:</p><#list userSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Additional subnets:</p><#list additionalSubnets as subnet><p>${subnet.ipAddressWithMask}</p></#list><p>Technical contact: ${techContact}</p>",
"SENDER": "Z pozdrowieniami,<br />Zespół NMaaS",
"NOREPLY": "Ta wiadomość została wygenerowana automatycznie.",
"SENDER_POLICY": ""
--
GitLab