Skip to content
Snippets Groups Projects
Commit e1261e19 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

NMAAS-999: Updated labels and new domain request email template

parent 2ac49ec6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/test/shell/data/i18n/de.json
+ 13
− 0
View file @ e1261e19
......@@ -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",
......
src/test/shell/data/i18n/en.json
+ 13
− 0
View file @ e1261e19
......@@ -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",
......
src/test/shell/data/i18n/fr.json
+ 13
− 0
View file @ e1261e19
......@@ -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",
......
src/test/shell/data/i18n/pl.json
+ 13
− 0
View file @ e1261e19
......@@ -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",
......
src/test/shell/data/mails/newDomainRequest.json
+ 4
− 4
View file @ e1261e19
......@@ -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": ""
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment