Skip to content

Commit

Permalink
Merge pull request #317 from OpenConext/terminology
Browse files Browse the repository at this point in the history
Terminology
  • Loading branch information
MarliesRikken authored Oct 7, 2024
2 parents 1d885f5 + a59e74b commit 16769f2
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
14 changes: 7 additions & 7 deletions client/src/locale/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ const en = {
info: [
//Arrays of titles and info blocks and if a function is an admin function
["Invites", "<p>SURF invites institution managers who can create roles for their applications.</p>" +
"<p>Applications are services connected to SURFconext.</p>", true],
"<p>The application list consists of applications connected to SURFconext.</p>", true],
["Roles", "<p>The application managers will invite colleagues for roles who can in turn invite users.</p>", true],
["Join", "<p>Invited colleagues who accept the invitation are granted access rights for the applications.</p><br/>", false],
["Groups", "<p>The roles are actually group memberships that can be used in SURFconext authorisation rules, or provisioned as attributes or to external SCIM APIs.</p>", false]
],
footer: "<p>SURFconext Invite offers access management to SURFconext-connected service providers.</p>" +
footer: "<p>SURFconext Invite offers access management to SURFconext-connected applications.</p>" +
"<p>Do you want to know more? <a href='https://support.surfconext.nl/invite-en'>Read more</a>.</p>",
},
header: {
Expand Down Expand Up @@ -315,12 +315,12 @@ const en = {
roles: "You don't have any roles.",
info: "SURFconext Invite is by invitation only. Please contact <a href='mailto:[email protected]'>[email protected]</a> with questions.",
preLogin: "Or ",
login: "login",
login: "log in",
postLogin: " again with a different institution",
},
missingAttributes: {
welcome: "Welcome to SURFconext Invite",
attributes: "Your institution has not provided all required attributes. The following attributes are missing:",
attributes: "Your institution has not provided all required personal data. The following are missing:",
info: "If you want more information, please contact <a href='mailto:[email protected]'>[email protected]</a>.",
preLogin: "Or ",
login: "login",
Expand Down Expand Up @@ -349,7 +349,7 @@ const en = {
login: "Log in",
loginWithSub: "Log in",
emailMismatch: "The inviter has indicated that you must accept this invitation with email address {{email}}, " +
"but you have logged in with an account with a different email address. Please login in with a different account."
"but you have logged in with an account with a different email address. Please log in in with a different account."
},
inviter: {
welcome: "Welcome, {{name}}",
Expand Down Expand Up @@ -393,10 +393,10 @@ const en = {
invitationIcon: "Invitation for {{email}} sent at {{createdAt}} with expiration date {{expiryDate}}",
roleShortName: "The unique short name of the role within a provisioning. It is used to format the urn and therefore not all characters are allowed.",
roleUrn: "The urn of the role. It is based on the sanitized name and the role identifier. It is used as the unique global identifier of this role and therefore not all characters are allowed.",
manageService: "The required service from SURFconext, with may have an optional provisioning",
manageService: "The required application from SURFconext, with may have an optional provisioning",
defaultExpiryDays: "The default number of days the role will expire, from the moment a user has accepted the invitation for this role",
enforceEmailEqualityTooltip: "When checked the invitee must accept the invitation with an account with the email address where the invitation was sent to",
eduIDOnlyTooltip: "When checked the invitees will be required to login with eduID",
eduIDOnlyTooltip: "When checked the invitees will be required to log in with eduID",
roleExpiryDateTooltip: "The end date of this role. After this date the role is removed from the user.",
expiryDateTooltip: "The date on which this invitation expires",
rolesTooltip: "Select all the roles that the invitee will be granted after accepting the invitation",
Expand Down
10 changes: 5 additions & 5 deletions client/src/locale/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const nl = {
info: [
//Arrays of titles and info blocks and if a function is an admin function
["Uitnodigen", "<p>Instellingsbeheerders kunnen rollen aanmaken voor hun applicaties.</p>" +
"<p>Applicaties zijn aan SURFconext gekoppelde diensten.</p>", true],
"<p>De applicatielijst bestaat uit aan SURFconext gekoppeld applicaties.</p>", true],
["Rollen", "<p>Applicatiebeheerders nodigen collega's uit die op hun beurt gebruikers kunnen uitnodigen.</p>", true],
["Word lid", "<p>Uitgenodigde collega's die op de uitnodiging zijn ingegaan, krijgen toegang tot applicaties.</p><br/>", false],
["Groepen", "<p>De rollen zijn eigenlijk groepslidmaatschappen die gebruikt kunnen worden in SURFconext-autorisatieregels, doorgegeven als attributen of via externe SCIM API's.</p>", false]
Expand Down Expand Up @@ -314,15 +314,15 @@ const nl = {
roles: "Je hebt nog geen rollen.",
info: "SURFconext Invite is op uitnodiging. Neem bij vragen contact op met <a href='mailto:[email protected]'>[email protected]</a>.",
preLogin: "Of ",
login: "login",
login: "log in",
postLogin: " via een andere instelling",
},
missingAttributes: {
welcome: "Welkom bij SURFconext Invite",
attributes: "Je instelling gaf niet alle benodigde attributen vrij. De volgende ontbreken:",
attributes: "Je instelling gaf niet alle benodigde persoonsgegevens vrij. De volgende ontbreken:",
info: "Hulp nodig? Neem <a href='mailto:[email protected]'>contact met ons op</a>.",
preLogin: "Of ",
login: "login",
login: "log in",
postLogin: " via een andere instelling",
sub: "sub",
email: "email",
Expand Down Expand Up @@ -392,7 +392,7 @@ const nl = {
invitationIcon: "Uitnodiging aan {{email}} verstuurd op {{createdAt}} met verloopdatum {{expiryDate}}",
roleShortName: "Een unieke korte naam voor de rol binnen een provisioning. Wordt gebruikt in de urn, daarom zijn niet alle tekens toegestaan.",
roleUrn: "De urn van deze rol. Deze is gebaseerd op de opgeschoonde naam en de rol-identifier. Hij wordt gebruikt als de unieke globale identifier van deze rol en daarom zijn niet alle tekens toegestaan.",
manageService: "De vereiste dienst uit SURFconext, die optioneel een provisioning heeft.",
manageService: "De vereiste applicatie uit SURFconext, die optioneel een provisioning heeft.",
defaultExpiryDays: "Het standaardaantal dagen waarna de rol verloopt, gerekend vanaf het moment dat de gebruiker de uitnodiging voor de rol accepteert.",
enforceEmailEqualityTooltip: "Indien ingeschakeld moet de genodigde de uitnodiging accepteren met een account dat hetzelfde e-mailadres voert als waarheen deze uitnodiging gestuurd is",
eduIDOnlyTooltip: "Indien ingeschakeld moeten de genodigden eduID gebruiken om in te loggen bij het accepteren",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="documentation">
<div class="convertlinks documentation" style="white-space:pre-wrap">The Policy Decision Point or PDP can be used to determine if certain users, groups or teams can or cannot access a service. Without a Policy Decision any user of an institution will be granted to access a service. Only the service provider is able to deny access of certain groups or users, through e.g. provisioning or a VOOT-connection. The basics of PDP or 'Authorisatie regels' can be found here (Dutch).
<div class="convertlinks documentation" style="white-space:pre-wrap">The Policy Decision Point or PDP can be used to determine if certain users, groups or teams can or cannot access an application. Without a Policy Decision any user of an institution will be granted to access an application. Only the service provider is able to deny access of certain groups or users, through e.g. provisioning or a VOOT-connection. The basics of PDP or 'Authorisatie regels' can be found here (Dutch).

There are two types of rules:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
dataFoldersContent.push({folderid:"id-9255fd6e67f54edc9f08fbfb0a4ff4b9", contentid:"id-df8743d0c9a34528b7d69b2197d4c84e", contenttype:"ApplicationComponent"});
dataElements.push({id:"id-df8743d0c9a34528b7d69b2197d4c84e", type:"ApplicationComponent", specialization:decodeURL(""), name:decodeURL("SURFconext"), documentation:decodeURL("")});
dataFoldersContent.push({folderid:"id-9255fd6e67f54edc9f08fbfb0a4ff4b9", contentid:"id-b7c4a599252349e4ac0a22cebfdbcc37", contenttype:"ApplicationComponent"});
dataElements.push({id:"id-b7c4a599252349e4ac0a22cebfdbcc37", type:"ApplicationComponent", specialization:decodeURL(""), name:decodeURL("PDP"), documentation:decodeURL("The+Policy+Decision+Point+or+PDP+can+be+used+to+determine+if+certain+users%2C+groups+or+teams+can+or+cannot+access+a+service.+Without+a+Policy+Decision+any+user+of+an+institution+will+be+granted+to+access+a+service.+Only+the+service+provider+is+able+to+deny+access+of+certain+groups+or+users%2C+through+e.g.+provisioning+or+a+VOOT-connection.+The+basics+of+PDP+or+%27Authorisatie+regels%27+can+be+found+here+%28Dutch%29.%0A%0AThere+are+two+types+of+rules%3A%0A%0AAuthorization+rules.+These+result+in+a+%22permit%22+or+%22deny%22+access+verdict+for+the+user+in+question.+If+the+user+is+denied%2C+SURFconext+will+show+an+error+page+with+a+specific+message+and+not+allow+the+user+to+proceed+to+the+SP.%0AStepup+rules.+These+can+add+a+Level+of+Assurance+requirement+to+a+login.+If+the+policy+matches%2C+the+user+is+required+to+perform+a+second+factor+authentication+via+SURFsecureID+before+they+can+proceed+to+the+service.%0ABoth+policy+types+can+be+combined+for+an+SP+without+issue.")});
dataElements.push({id:"id-b7c4a599252349e4ac0a22cebfdbcc37", type:"ApplicationComponent", specialization:decodeURL(""), name:decodeURL("PDP"), documentation:decodeURL("The+Policy+Decision+Point+or+PDP+can+be+used+to+determine+if+certain+users%2C+groups+or+teams+can+or+cannot+access+an+application.+Without+a+Policy+Decision+any+user+of+an+institution+will+be+granted+to+access+an+application.+Only+the+service+provider+is+able+to+deny+access+of+certain+groups+or+users%2C+through+e.g.+provisioning+or+a+VOOT-connection.+The+basics+of+PDP+or+%27Authorisatie+regels%27+can+be+found+here+%28Dutch%29.%0A%0AThere+are+two+types+of+rules%3A%0A%0AAuthorization+rules.+These+result+in+a+%22permit%22+or+%22deny%22+access+verdict+for+the+user+in+question.+If+the+user+is+denied%2C+SURFconext+will+show+an+error+page+with+a+specific+message+and+not+allow+the+user+to+proceed+to+the+SP.%0AStepup+rules.+These+can+add+a+Level+of+Assurance+requirement+to+a+login.+If+the+policy+matches%2C+the+user+is+required+to+perform+a+second+factor+authentication+via+SURFsecureID+before+they+can+proceed+to+the+application.%0ABoth+policy+types+can+be+combined+for+an+SP+without+issue.")});
dataFoldersContent.push({folderid:"id-9255fd6e67f54edc9f08fbfb0a4ff4b9", contentid:"id-390297dab03441c784d0b0662f1b5b84", contenttype:"ApplicationService"});
dataElements.push({id:"id-390297dab03441c784d0b0662f1b5b84", type:"ApplicationService", specialization:decodeURL(""), name:decodeURL("SAML"), documentation:decodeURL("")});
dataFoldersContent.push({folderid:"id-9255fd6e67f54edc9f08fbfb0a4ff4b9", contentid:"id-df9b7d18eb064a97bca23e4f8fd084ed", contenttype:"ApplicationComponent"});
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/resources/templates/invitation_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<p style="font-size: 18px;margin:20px 0 15px 0;">Why do I need an eduID account?</p>
<p>An eduID is an account for users within the Dutch educational and research community. It is yours and exists
independent of an educational institution.
With eduID you can log in to various services. Even if you don't have an institutional account. You can use
With eduID you can log in to various applications. Even if you don't have an institutional account. You can use
eduID for example
if you want to follow courses with different institutions. Or if you want to follow a course after you have
graduated.</p>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/resources/templates/invitation_nl.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<p>
Een eduID is een account voor gebruikers binnen het Nederlandse onderwijs en onderzoek. Het
is van jou, en bestaat onafhankelijk van een onderwijsinstelling. Met eduID kan je inloggen op
verschillende diensten. Ook als je geen account van je instelling hebt, kan je met eduID inloggen.
verschillende applicaties. Ook als je geen account van je instelling hebt, kan je met eduID inloggen.
Je kunt eduID bijvoorbeeld gebruiken als je bij meerdere instellingen tegelijk onnderwijs wilt volgen.
Of na je studie als je naast je werk een opleiding of cursus wilt volgen.
</p>
Expand Down
22 changes: 11 additions & 11 deletions welcome/src/locale/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const en = {
landing: {
header: {
title: "Get access to your applications",
login: "Login",
login: "Log in",
sup: "SURFconext Invite is by invite only.",
},
works: "How does it work?",
Expand All @@ -25,7 +25,7 @@ const en = {
title: "SURFconext Invite",
subTitle: "Everything will be Owl right",
links: {
login: "Login",
login: "Log in",
switchApp: "Go to {{app}}",
welcome: "Welcome",
access: "Access",
Expand Down Expand Up @@ -67,15 +67,15 @@ const en = {
roles: "You don't have any roles.",
info: "The SURFconext Invite application is by invite only. If you want to enter, but don't have access, please contact <a href='mailto:[email protected]'>[email protected]</a>.",
preLogin: "Or ",
login: "login",
login: "log in",
postLogin: " again with a different institution",
},
missingAttributes: {
welcome: "Welcome to SURFconext Invite",
attributes: "Your institution has not provided all required attributes. The following attributes are missing:",
attributes: "Your institution has not provided all required personal data. The following are missing:",
info: "If you want more information, please contact <a href='mailto:[email protected]'>[email protected]</a>.",
preLogin: "Or ",
login: "login",
login: "log in",
postLogin: " again with a different institution.",
sub: "sub",
email: "email",
Expand All @@ -94,17 +94,17 @@ const en = {
roles: "roles",
progress: "1",
info: "SURFconext Invite provides access to application based on your roles.",
infoLogin: "You can login with your institution account or eduID.",
infoLoginEduIDOnly: "You must login with eduID.",
infoLoginAgain: "To accept the invitation you'll need to login again.",
login: "Login",
loginWithSub: "Login",
infoLogin: "You can log in with your institution account or eduID.",
infoLoginEduIDOnly: "You must log in with eduID.",
infoLoginAgain: "To accept the invitation you'll need to log in again.",
login: "Log in",
loginWithSub: "Log in",
access: "Access granted",
applicationInfo: "This application has been added to your SURFconext Invite homepage.",
applicationInfoMultiple: "These applications have been added to your SURFconext Invite homepage.",
continue: "Continue",
emailMismatch: "The inviter has indicated that you must accept this invitation with the email {{email}}, " +
"but you have logged in with an account with a different email. Please login in with a different account.",
"but you have logged in with an account with a different email. Please log in in with a different account.",
inviteRedeemUrl: "Your new role requires a microsoft account. Please press Continue to register one.",
graphEmailViolation: "Your new role requires a microsoft account, however microsoft does not support your email. We can not create a microsoft account."
},
Expand Down
14 changes: 7 additions & 7 deletions welcome/src/locale/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const nl = {
landing: {
header: {
title: "Toegang tot je applicaties",
login: "Login",
login: "Inloggen",
sup: "SURFconext Invite is alleen op uitnodiging.",
},
works: "Hoe werkt het?",
Expand All @@ -25,7 +25,7 @@ const nl = {
title: "SURFconext Invite",
subTitle: "Alles gaat uilstekend",
links: {
login: "Login",
login: "Inloggen",
switchApp: "Ga naar {{app}}",
welcome: "Welcome",
access: "Invite",
Expand Down Expand Up @@ -67,15 +67,15 @@ const nl = {
roles: "Je hebt nog geen rollen.",
info: "Deze applicatie is op uitnodiging. Heb je hierover vragen? Neem <a href='mailto:[email protected]'>contact met ons op</a>.",
preLogin: "Of ",
login: "login",
login: "log in",
postLogin: " via een andere instelling",
},
missingAttributes: {
welcome: "Welkom bij SURFconext Invite",
attributes: "Je instelling gaf niet alle benodigde attributen vrij. De volgende ontbreken:",
attributes: "Je instelling gaf niet alle benodigde persoonsgegevens vrij. Het volgende ontbreekt:",
info: "Hulp nodig? Neem <a href='mailto:[email protected]'>contact met ons op</a>.",
preLogin: "Of ",
login: "login",
login: "log in",
postLogin: " via een andere instelling",
sub: "sub",
email: "email",
Expand All @@ -97,8 +97,8 @@ const nl = {
infoLogin: "Je kunt inloggen met je instellings-account of eduID.",
infoLoginEduIDOnly: "Je moet inloggen met eduID.",
infoLoginAgain: "Om de uitnodiging te accepteren moet je opnieuw inloggen.",
login: "Login",
loginWithSub: "Login",
login: "Log in",
loginWithSub: "Log in",
access: "Toegang verleend",
applicationInfo: "Deze applicatie is toegevoegd aan je SURFconext Invite startpagina.",
applicationInfoMultiple:"Deze applicaties zijn toegevoegd aan je SURFconext Invite startpagina.",
Expand Down

0 comments on commit 16769f2

Please sign in to comment.