Explorar o código

[web] Update captcha notice (#32286)

* feat: remove translations

* feat: remove scss

* fix: remove the last translation

* feat: remove pug

* fix: forgotten conditions

* feat: also remove from react

* Revert changes

* Remove links from `recaptcha_conditions`

* Center short reCAPTCHA notice on CIAM screens

* Re-add the Chinese translation

---------

Co-authored-by: Antoine Clausse <antoine.clausse@overleaf.com>
GitOrigin-RevId: 64e7b8a38c2a4b4f7e60d5c9df6740c35b8763d8
Olzhas Askar hai 4 meses
pai
achega
b345bf9485

+ 1 - 1
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

+ 3 - 29
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 (
-    <div className="recaptcha-branding">
-      <Trans
-        i18nKey="recaptcha_conditions"
-        components={{
-          1: (
-            <a
-              rel="noopener noreferrer"
-              target="_blank"
-              href="https://policies.google.com/privacy"
-            >
-              Privacy Policy
-            </a>
-          ),
-          2: (
-            <a
-              rel="noopener noreferrer"
-              target="_blank"
-              href="https://policies.google.com/terms"
-            >
-              Terms of Service
-            </a>
-          ),
-        }}
-      />
-    </div>
-  )
+  const { t } = useTranslation()
+  return <div className="recaptcha-branding">{t('recaptcha_conditions')}</div>
 }

+ 7 - 0
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 {

+ 1 - 1
services/web/locales/da.json

@@ -1376,7 +1376,7 @@
   "real_time_track_changes": "Realtids <0>ændringshistorik</0>",
   "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</1> og <2>Brugsvilkår</2> gælder.",
+  "recaptcha_conditions": "Denne side er beskyttet af reCAPTCHA.",
   "recent": "Seneste",
   "recent_commits_in_github": "Seneste commits i GitHub",
   "recompile": "Genkompilér",

+ 1 - 1
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</1> und die <2>Nutzungsbedingungen</2> von Google.",
+  "recaptcha_conditions": "Diese Website ist durch reCAPTCHA geschützt.",
   "recent": "Kürzlich",
   "recent_commits_in_github": "Neueste Commits auf GitHub",
   "recompile": "Aktualisieren",

+ 1 - 1
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</1> and <2>Terms of Service</2> apply.",
+  "recaptcha_conditions": "The site is protected by reCAPTCHA.",
   "recent": "Recent",
   "recent_commits_in_github": "Recent commits in GitHub",
   "recommended": "Recommended",

+ 1 - 1
services/web/locales/zh-CN.json

@@ -1606,7 +1606,7 @@
   "real_time_track_changes": "实时<0>跟踪更改</0>",
   "realtime_track_changes": "实时跟踪更改",
   "reauthorize_github_account": "重新授权 GitHub 帐号",
-  "recaptcha_conditions": "本网站受reCAPTCHA保护,谷歌<1>隐私政策</1>和<2>服务条款</2>适用。",
+  "recaptcha_conditions": "本网站受reCAPTCHA保护。",
   "recent": "最近的",
   "recent_commits_in_github": "GitHub中最近的提交",
   "recommended": "推荐的",