diff --git a/services/web/app/views/_mixins/recaptcha.pug b/services/web/app/views/_mixins/recaptcha.pug index 2b4865d29f..4f9d23dcff 100644 --- a/services/web/app/views/_mixins/recaptcha.pug +++ b/services/web/app/views/_mixins/recaptcha.pug @@ -1,5 +1,5 @@ mixin recaptchaConditionsContent - | !{translate("recaptcha_conditions", {}, [{}, {name: 'a', attrs: {href: 'https://policies.google.com/privacy', rel: 'noopener noreferrer', target: '_blank'}}, {name: 'a', attrs: {href: 'https://policies.google.com/terms', rel: 'noopener noreferrer', target: '_blank'}}])} + | #{translate("recaptcha_conditions")} mixin recaptchaConditions .recaptcha-branding diff --git a/services/web/frontend/js/shared/components/recaptcha-conditions.jsx b/services/web/frontend/js/shared/components/recaptcha-conditions.jsx index abf9b28294..8b81cd6d85 100644 --- a/services/web/frontend/js/shared/components/recaptcha-conditions.jsx +++ b/services/web/frontend/js/shared/components/recaptcha-conditions.jsx @@ -1,32 +1,6 @@ -import { Trans } from 'react-i18next' +import { useTranslation } from 'react-i18next' export default function RecaptchaConditions() { - // the component link children below will be overwritten by the translation string - return ( -
- - Privacy Policy - - ), - 2: ( - - Terms of Service - - ), - }} - /> -
- ) + const { t } = useTranslation() + return
{t('recaptcha_conditions')}
} diff --git a/services/web/frontend/stylesheets/ciam/ciam-layout.scss b/services/web/frontend/stylesheets/ciam/ciam-layout.scss index 69109243eb..9118fa963b 100644 --- a/services/web/frontend/stylesheets/ciam/ciam-layout.scss +++ b/services/web/frontend/stylesheets/ciam/ciam-layout.scss @@ -123,6 +123,13 @@ padding-bottom: var(--ds-spacing-250); margin: 0; + text-align: center; +} + +.ciam-register-container .ciam-disclaimers p { + // disclaimers are longer on the register page, + // so we left-align them to improve readability + text-align: left; } .ciam-card-separator { diff --git a/services/web/locales/da.json b/services/web/locales/da.json index ebd337ef0f..1c7396966b 100644 --- a/services/web/locales/da.json +++ b/services/web/locales/da.json @@ -1376,7 +1376,7 @@ "real_time_track_changes": "Realtids <0>ændringshistorik", "realtime_track_changes": "Realtids ændringshistorik", "reauthorize_github_account": "Autoriser din GitHub konto igen", - "recaptcha_conditions": "Denne side er beskyttet af reCAPTCHA og Googles <1>Privatlivspolitik og <2>Brugsvilkår gælder.", + "recaptcha_conditions": "Denne side er beskyttet af reCAPTCHA.", "recent": "Seneste", "recent_commits_in_github": "Seneste commits i GitHub", "recompile": "Genkompilér", diff --git a/services/web/locales/de.json b/services/web/locales/de.json index f2c4e5919c..e723d9a83f 100644 --- a/services/web/locales/de.json +++ b/services/web/locales/de.json @@ -957,7 +957,7 @@ "raw_logs_description": "Raw Logs vom LaTeX-Compiler", "realtime_track_changes": "Änderungen in Echtzeit nachverfolgen", "reauthorize_github_account": "Autorisiere dein GitHub-Konto erneut", - "recaptcha_conditions": "Diese Website ist durch reCAPTCHA geschützt und es gelten die <1>Datenschutzerklärung und die <2>Nutzungsbedingungen von Google.", + "recaptcha_conditions": "Diese Website ist durch reCAPTCHA geschützt.", "recent": "Kürzlich", "recent_commits_in_github": "Neueste Commits auf GitHub", "recompile": "Aktualisieren", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index a039c202b5..d2909b8740 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1932,7 +1932,7 @@ "real_time_track_changes": "Real-time track-changes", "realtime_track_changes": "Real-time track changes", "reauthorize_github_account": "Reauthorize your GitHub Account", - "recaptcha_conditions": "The site is protected by reCAPTCHA and the Google <1>Privacy Policy and <2>Terms of Service apply.", + "recaptcha_conditions": "The site is protected by reCAPTCHA.", "recent": "Recent", "recent_commits_in_github": "Recent commits in GitHub", "recommended": "Recommended", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index 532f8fa169..c2caf7096e 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -1606,7 +1606,7 @@ "real_time_track_changes": "实时<0>跟踪更改", "realtime_track_changes": "实时跟踪更改", "reauthorize_github_account": "重新授权 GitHub 帐号", - "recaptcha_conditions": "本网站受reCAPTCHA保护,谷歌<1>隐私政策和<2>服务条款适用。", + "recaptcha_conditions": "本网站受reCAPTCHA保护。", "recent": "最近的", "recent_commits_in_github": "GitHub中最近的提交", "recommended": "推荐的",