diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1f7c92a70f..298bad9a0e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -366,6 +366,7 @@
"title": "Dein Account wird aktiviert"
},
"login": {
+ "acceptTermsOfServiceOnOAuthLogin": "Beim Login via einen diese Services akzeptierst du die {termsOfServiceLink}.",
"accountless": "Hast du noch keinen Account?",
"email": "E-Mail",
"infoText": {
@@ -385,11 +386,12 @@
"jubladb": "JublaDB",
"midata": "MiData"
},
- "registernow": "Jetzt registrieren"
+ "registernow": "Jetzt registrieren",
+ "termsOfServiceLink": "Nutzungsbedingungen"
},
"register": {
- "acceptTermsOfUse": "Akzeptieren Sie die Nutzungsbedingungen",
- "alreadyHaveAnAccount": "Haben Sie bereits ein Konto?",
+ "acceptTermsOfService": "Nutzungsbedingungen akzeptieren",
+ "alreadyHaveAnAccount": "Hast du bereits ein Konto?",
"passwordConfirmation": "Passwort erneut eingeben",
"register": "Registrieren",
"requiredField": "Pflichtfelder",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 960c9df21f..e3a84edc31 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -366,6 +366,7 @@
"title": "Your account will be activated"
},
"login": {
+ "acceptTermsOfServiceOnOAuthLogin": "By logging in via one of these services, you accept the {termsOfServiceLink}.",
"accountless": "Don't have an account yet?",
"email": "Email",
"infoText": {
@@ -385,10 +386,11 @@
"jubladb": "JublaDB",
"midata": "MiData"
},
- "registernow": "Register now"
+ "registernow": "Register now",
+ "termsOfServiceLink": "terms of service"
},
"register": {
- "acceptTermsOfUse": "Accept the terms of use",
+ "acceptTermsOfService": "Accept the terms of service",
"alreadyHaveAnAccount": "Already have an account?",
"passwordConfirmation": "Enter password again",
"register": "Register",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index f3a9eea96f..b15e35642f 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -358,6 +358,7 @@
"title": "Ton compte sera activé"
},
"login": {
+ "acceptTermsOfServiceOnOAuthLogin": "En te connectant via l'un de ces services, tu acceptes les {termsOfServiceLink}.",
"accountless": "Vous n'avez pas encore de compte?",
"email": "Courriel",
"infoText": {
@@ -377,10 +378,11 @@
"jubladb": "Jubla",
"midata": "MiData"
},
- "registernow": "Inscrivez-vous maintenant"
+ "registernow": "Inscrivez-vous maintenant",
+ "termsOfServiceLink": "conditions d'utilisation"
},
"register": {
- "acceptTermsOfUse": "Accepter les conditions d'utilisation",
+ "acceptTermsOfService": "Accepter les conditions d'utilisation",
"alreadyHaveAnAccount": "Vous avez déjà un compte ?",
"passwordConfirmation": "Entrez à nouveau votre mot de passe",
"register": "S'inscrire",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index f3411f5bec..b679e25720 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -358,6 +358,7 @@
"title": "Il tuo account sarà attivato"
},
"login": {
+ "acceptTermsOfServiceOnOAuthLogin": "Effettuando l'accesso tramite uno di questi servizi, si accettano i {termsOfServiceLink}.",
"accountless": "Non hanno ancora un conto?",
"email": "Indirizzo e-mail",
"infoText": {
@@ -377,10 +378,11 @@
"jubladb": "JublaDB",
"midata": "MiData"
},
- "registernow": "Iscriviti ora"
+ "registernow": "Iscriviti ora",
+ "termsOfServiceLink": "condizioni di utilizzo"
},
"register": {
- "acceptTermsOfUse": "Accettare le condizioni di utilizzo",
+ "acceptTermsOfService": "Accettare le condizioni di utilizzo",
"alreadyHaveAnAccount": "Hai già un conto?",
"passwordConfirmation": "Inserisci di nuovo la password",
"register": "Registrati",
diff --git a/frontend/src/views/auth/Login.vue b/frontend/src/views/auth/Login.vue
index 7682b4bdd3..4883fcf180 100644
--- a/frontend/src/views/auth/Login.vue
+++ b/frontend/src/views/auth/Login.vue
@@ -118,6 +118,20 @@
$tc('views.auth.login.provider.google')
}}
+
+
{{ $tc('views.auth.login.accountless') }}
@@ -134,6 +148,7 @@ import AuthContainer from '@/components/layout/AuthContainer.vue'
import HorizontalRule from '@/components/layout/HorizontalRule.vue'
import IconSpacer from '@/components/layout/IconSpacer.vue'
import { serverErrorToString } from '@/helpers/serverError'
+import { parseTemplate } from 'url-template'
const LOGIN_INFO_TEXT_KEY = window.environment.LOGIN_INFO_TEXT_KEY
@@ -164,6 +179,13 @@ export default {
infoTextKey() {
return `views.auth.login.infoText.${LOGIN_INFO_TEXT_KEY ?? 'dev'}`
},
+ termsOfServiceLink() {
+ return (
+ parseTemplate(window.environment.TERMS_OF_SERVICE_LINK_TEMPLATE || '').expand({
+ lang: this.$store.state.lang.language.substring(0, 2),
+ }) || false
+ )
+ },
},
mounted() {
this.$store.commit('setLanguage', this.$i18n.browserPreferredLocale)
diff --git a/frontend/src/views/auth/Register.vue b/frontend/src/views/auth/Register.vue
index 6b8f627ab2..4f08aa0da0 100644
--- a/frontend/src/views/auth/Register.vue
+++ b/frontend/src/views/auth/Register.vue
@@ -85,11 +85,11 @@
v-model="tos"
:vee-rules="{ required: { allowFalse: false } }"
class="align-center"
- :name="$tc('views.auth.register.acceptTermsOfUse')"
+ :name="$tc('views.auth.register.acceptTermsOfService')"
>
- {{ $tc('views.auth.register.acceptTermsOfUse') }}
+ {{ $tc('views.auth.register.acceptTermsOfService') }}