Skip to content

Commit

Permalink
Merge pull request #1912 from SUNET/cat-translations
Browse files Browse the repository at this point in the history 
Cat translations
  • Loading branch information
@cartja
cartja authored Nov 28, 2024
2 parents 456f587 + 0ccfaa3 commit d9d6c5f
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 130 deletions.
2 changes: 1 addition & 1 deletion src/components/Common/Footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const Footer = (): JSX.Element => {
<nav>
<ul>
<li>
<Link className="help-link" to="/help">
<Link className="help-link" to="/help" target="_blank">
<FormattedMessage defaultMessage="Help" description="Footer help" />
</Link>
</li>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/MultiFactorAuthentication.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export function MultiFactorAuthentication(): React.ReactElement | null {
defaultMessage={`You can read more about security keys in the Help section: {HelpSecurityKeys}.`}
values={{
HelpSecurityKeys: (
<Link className="text-link" to={`../../../help`}>
<Link className="text-link" to={`../../../help`} target="_blank">
<FormattedMessage
description="about security key - handle"
defaultMessage="Improving the security level of eduID"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/PersonalDataForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function SelectDisplayName(props: { readonly setChosenGivenName: (name: string)
<p className="help-text">
<FormattedMessage
defaultMessage={`If your identity is verified you can choose which of your first names from the population
register to use as your display name for some services. If you wish to change it, select at least one first name below.`}
register to use as your display name for some services. Select at least one first name below if you wish to change it.`}
description="Display name select paragraph"
/>
</p>
Expand Down
38 changes: 17 additions & 21 deletions src/components/Dashboard/Recommendations.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,17 @@ function ConfirmedAccountStatus(props: { readonly email?: string }): JSX.Element
<FormattedMessage description="Confirmed account heading" defaultMessage="Confirmed account" />
</h3>
<span>
{props.email ? (
props.email
) : (
<FormattedMessage
description="confirmed account description"
defaultMessage="Add your name at {account}"
values={{
account: (
<Link key={ACCOUNT_PATH} to={ACCOUNT_PATH} aria-label="go to account page">
<FormattedMessage description="recommendations account link" defaultMessage="Account" />
</Link>
),
}}
/>
)}
<FormattedMessage
description="confirmed account description"
defaultMessage="Read more details about your confirmed account at {account}"
values={{
account: (
<Link key={ACCOUNT_PATH} to={ACCOUNT_PATH} aria-label="go to account page">
<FormattedMessage description="recommendations account link" defaultMessage="Account" />
</Link>
),
}}
/>
</span>
</div>
</div>
Expand Down Expand Up @@ -60,8 +56,8 @@ function VerifiedIdentityStatus(props: { readonly identities?: UserIdentities })
<span>
{props.identities?.is_verified === true ? (
<FormattedMessage
description="See more details about your verified identity description"
defaultMessage="See more details about your verified identity at {identity}"
description="read more details about your verified identity description"
defaultMessage="Read more details about your verified identity at {identity}"
values={{
identity: identityLink,
}}
Expand Down Expand Up @@ -103,8 +99,8 @@ function ImprovedSecurityStatus(props: { readonly tokens?: CredentialType[] }):
<span>
{props.tokens?.length ? (
<FormattedMessage
description="See more about your two-factor authentication description"
defaultMessage="See more about your two-factor authentication at {security}"
description="read more about your two-factor authentication description"
defaultMessage="Read more about your two-factor authentication at {security}"
values={{
security: securityLink,
}}
Expand Down Expand Up @@ -146,7 +142,7 @@ function VerifiedSecurityStatus(props: { readonly tokens?: CredentialType[] }):
{verifiedToken ? (
<FormattedMessage
description="verified security key description"
defaultMessage="See more details about your verified two-factor authentication at {security}"
defaultMessage="Read more details about your verified two-factor authentication at {security}"
values={{
security: securityLink,
}}
Expand Down Expand Up @@ -213,7 +209,7 @@ export function Recommendations(): JSX.Element | null {
organisation you are accessing with your eduID, can be found in the Assurance levels section in {help}.`}
values={{
help: (
<Link key="/help" to="/help" aria-label="go to help page">
<Link key="/help" to="/help" aria-label="go to help page" target="_blank">
<FormattedMessage description="recommendations help link" defaultMessage="Help" />
</Link>
),
Expand Down
121 changes: 66 additions & 55 deletions src/components/Help.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1045,93 +1045,104 @@ export function Help(): JSX.Element {
<p>
<FormattedMessage
description="Assurance levels with your eduID - paragraph1"
defaultMessage={`At the logged in start page an overview of the status of your eduID is presented.`}
defaultMessage={`At the logged in start page an overview of the status of your eduID is presented. This is what it typically indicates regarding your assurance level and the services you may authenticate against:`}
/>
</p>
<p>
<strong>
<FormattedMessage
description="Assurance levels with your eduID - paragraph2strong"
defaultMessage={`Confirmed account:
`}
/>
</strong>
&nbsp;

<strong>
<FormattedMessage
description="Assurance levels with your eduID - paragraph2"
defaultMessage={`when successfully creating an eduID you have a confirmed account (confirmed email-address and passed CAPTCHA) which generally conforms to {emphasis}.
description="Assurance levels with your eduID - paragraph2strong"
defaultMessage={`Confirmed account:
`}
values={{
emphasis: <em>AL1</em>,
}}
/>
</p>
<p>
<strong>
</strong>
<ul className="bullets">
<li>
<FormattedMessage
description="Assurance levels with your eduID - paragraph3strong"
defaultMessage={`Verified identity:
description="Assurance levels with your eduID - paragraph2"
defaultMessage={`services requiring a low level of assurance, often called {emphasis}.
`}
values={{
emphasis: <em>AL1 / RAF Low</em>,
}}
/>
</strong>
&nbsp;
</li>
</ul>
<strong>
<FormattedMessage
description="Assurance levels with your eduID - paragraph3"
defaultMessage={`the eduID account generally reaches {emphasis}, which is at a sufficient level for many services at higher education institutions and e.g. Ladok.
description="Assurance levels with your eduID - paragraph3strong"
defaultMessage={`Verified identity:
`}
values={{
emphasis: <em>AL2</em>,
}}
/>
</p>
<p>
<strong>
</strong>
<ul className="bullets">
<li>
<FormattedMessage
description="Assurance levels with your eduID - paragraph4strong"
defaultMessage={`Enhanced security:
description="Assurance levels with your eduID - paragraph3"
defaultMessage={`services requiring a medium level of assurance, including many higher education institutions, often called {emphasis}.
`}
values={{
emphasis: <em>AL2 / RAF Medium</em>,
}}
/>
</strong>
&nbsp;
<FormattedMessage
description="Assurance levels with your eduID - paragraph4"
defaultMessage={`is added in the form of additional multi factor authentication.
</li>
</ul>

<strong>
<FormattedMessage
description="Assurance levels with your eduID - paragraph4strong"
defaultMessage={`Enhanced security:
`}
/>
</p>
<p>
<strong>
</strong>
<ul className="bullets">
<li>
<FormattedMessage
description="Assurance levels with your eduID - paragraph4strong"
defaultMessage={`Verified security key:
description="Assurance levels with your eduID - paragraph4"
defaultMessage={`services requiring you to log in using multi factor authentication, often called {emphasis}.
`}
values={{
emphasis: <em>REFEDS MFA</em>,
}}
/>
</strong>
&nbsp;
</li>
</ul>

<strong>
<FormattedMessage
description="Assurance levels with your eduID - paragraph4"
defaultMessage={`your added security key is connected to your identity.
description="Assurance levels with your eduID - paragraph5strong"
defaultMessage={`Verified security key:
`}
/>
</strong>
<ul className="bullets">
<li>
<FormattedMessage
description="Assurance levels with your eduID - paragraph5"
defaultMessage={`services requiring a strong binding between your identity and your login, often called {emphasis}.
`}
/>
</p>
values={{
emphasis: <em>AL3 / RAF High / LoA2</em>,
}}
/>
</li>
</ul>

<p>
<FormattedMessage
description="Assurance levels with your eduID - paragraph5"
defaultMessage={`With a verified Swedish identity and a verified security key the account generally conforms to {emphasis} and is at a sufficient level for the purpose of e.g. Digital National Exams (DNP) and Nice.
description="Assurance levels with your eduID - paragraph7"
defaultMessage={`Note: this is a generalization and is subject to change, complete information as to what is required of your eduID must be provided by the connecting services.
`}
values={{
emphasis: <em>Swamid AL3/ DIGG LOA2</em>,
}}
/>
</p>
<p>
<FormattedMessage
description="Assurance levels with your eduID - paragraph6"
defaultMessage={`Note: this is only a generalization and is subject to change, complete information as to what is required of your eduID must be provided by the connecting services.
defaultMessage={`As an exemple, with a verified Swedish identity and a verified security key the account is at a sufficient level for the purpose of e.g. Digital National Exams (DNP) and Nice.
`}
/>
</p>
Expand Down
Loading

0 comments on commit d9d6c5f

Please sign in to comment.