Skip to content

Commit

Permalink
Replace Data Protection Agreement with Data Processing Agreement
Browse files Browse the repository at this point in the history
  • Loading branch information
lil5 committed Feb 14, 2024
1 parent 7028c78 commit 909f47a
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 50 deletions.
8 changes: 4 additions & 4 deletions frontend/public/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Gemischte Taschen funktionieren in der Regel am besten, daher empfehlen wir entweder alle drei Kästchen (X)S- M-(X)L für einen gemischte Loop anzukreuzen, oder einen separaten Loop für Plusgrößen zu starten.",
"termsOfService": "AGB",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Datenschutz",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "Ich bin nicht minderjährig und akzeptiere die <1>Nutzungsbedingungen</1> und <2>Datenschutzrichtlinie</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Las bolsas combinadas generalmente funcionan mejor, por lo que recomendamos marcar las tres casillas (X)S- M-(X)L para un Loop mixto, o para iniciar un Loop separado para tamaños plus.",
"termsOfService": "Términos de Servicio",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacidad",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "No soy menor y estoy de acuerdo y acepto las <1>Condiciones de uso</1> y la <2>Política de privacidad</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "En général, les sacs mixtes fonctionnent le mieux. Nous vous conseillons soit de cocher les trois cases (X)S- M-(X)L pour un Loop mixte, soit de créer un Loop séparé pour les grandes tailles.",
"termsOfService": "Conditions de service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Confidentialité",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "Je ne suis pas mineur et j'accepte les <1>Conditions d'utilisation</1> et la <2>Politique de confidentialité</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/he/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "שקיות מעורבות בדרך-כלל עובדות הכי טוב, ולכן אנו ממליצים לסמן את כל שלוש הקופסאות (אקסטרא) סמול- מדיום-(אקסטרא) לארג' כדי ליצור לולאה מגוונת, או להתחיל לולאה נפרדת למידות גדולות.",
"termsOfService": "תנאי שימוש",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "מדיניות פרטיות",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "איננו קטינים ואנו מקבלים ומסכימים ל<1>תנאי השימוש</1>ו<2>מדיניות פרטיות</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Mixed bags usually work best, therefore we recommend to either tick all three boxes (X)S- M-(X)L for a mixed Loop, or to start a separate Loop for plus sizes.",
"termsOfService": "Terms of service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "I am not a minor and accept and agree to the <1>Terms of Use</1> and <2>Privacy Policy</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Mixed bags usually work best, therefore we recommend to either tick all three boxes (X)S- M-(X)L for a mixed Loop, or to start a separate Loop for plus sizes.",
"termsOfService": "Terms of service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "I am not a minor and accept and agree to the <1>Terms of Use</1> and <2>Privacy Policy</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Mixed bags usually work best, therefore we recommend to either tick all three boxes (X)S- M-(X)L for a mixed Loop, or to start a separate Loop for plus sizes.",
"termsOfService": "Terms of service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "I am not a minor and accept and agree to the <1>Terms of Use</1> and <2>Privacy Policy</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Gemengde tassen werken meestal het beste, daarom raden we aan om beide de drie dozen (X)S, M en (X)L aan te vinken voor een gemengde Loop, of start een aparte Loop voor plus groottes.",
"termsOfService": "Servicevoorwaarden",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "Ik ben geen minderjarige en accepteer en ga akkoord met de <1>gebruiksvoorwaarden</1> en het <2>privacybeleid</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Mixed bags usually work best, therefore we recommend to either tick all three boxes (X)S- M-(X)L for a mixed Loop, or to start a separate Loop for plus sizes.",
"termsOfService": "Terms of service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "I am not a minor and accept and agree to the <1>Terms of Use</1> and <2>Privacy Policy</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Mixed bags usually work best, therefore we recommend to either tick all three boxes (X)S- M-(X)L for a mixed Loop, or to start a separate Loop for plus sizes.",
"termsOfService": "Terms of service",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Privacy",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "I am not a minor and accept and agree to the <1>Terms of Use</1> and <2>Privacy Policy</2>*",
Expand Down
8 changes: 4 additions & 4 deletions frontend/public/locales/sv/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@
"mixedBagsUsuallyWorkBestThereforeWeRecommentTo": "Blandade påsar fungerar vanligtvis bäst, därför rekommenderar vi att antingen kryssa i alla tre rutorna (X)S-M-(X)L för en blandad loop, eller att starta en separat loop för plusstorlekar.",
"termsOfService": "Användarvillkor",
"termsOfHosts": "Terms of hosts",
"dataProtectionAgreement": "Data protection agreement",
"dataProtectionAgreement": "Data processing agreement",
"acceptTohTitle": "Accept Terms of Hosts",
"acceptDpaTitle": "Accept Data Protection Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Protection Agreement to continue to organise your Loop(s)",
"acceptDpaTitle": "Accept Data Processing Agreement",
"acceptTohSubtitle": "As a host, you have to accept the Terms of Hosts and the Data Processing Agreement to continue to organise your Loop(s)",
"youMustScrollToAcceptToh": "You must have scrolled to the bottom to accept or deny the Terms of Hosts.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Protection Agreement.",
"youMustScrollToAcceptDpa": "You must have scrolled to the bottom to accept or deny the Data Processing Agreement.",
"ifClickDenyTohSetHost": "If you click “Deny” you will be set as a participant on all your Loops.",
"privacy": "Integritet",
"iAmNotAMinor<1>Tos</1>And<2>PrivacyPolicy</2>Star": "Jag är inte minderårig och accepterar och godkänner <1>Användarvillkoren</1> och <2>Sekretesspolicyn</2>*",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/AdminDashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function AdminDashboard() {
if (authUser.accepted_toh)
console.log("You have not accepted the Terms of Hosts!");
if (authUser.accepted_dpa)
console.log("You have not accepted the Data Protection Agreement!");
console.log("You have not accepted the Data Processing Agreement!");
PopupLegal({
t,
authUserRefresh,
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/pages/DataProtectionAgreement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ export default function DataProtectionAgreement() {
return (
<>
<Helmet>
<title>The Clothing Loop | Data Protection Agreement</title>
<meta name="description" content="Data Protection Agreement" />
<title>The Clothing Loop | Data Processing Agreement</title>
<meta name="description" content="Data Processing Agreement" />
</Helmet>
<div className="container mx-auto px-4 md:px-20 py-10">
<h1 className="font-serif text-secondary font-bold text-5xl mb-4">
{"Data Protection Agreement - The Clothing Loop"}
{"Data Processing Agreement - The Clothing Loop"}
</h1>

<DataProtectionAgreementHTML
Expand All @@ -37,7 +37,7 @@ export function DataProtectionAgreementHTML(
<div className={props.className}>
<p>Version dated 2024, February 14th</p>

<h2>Data Protection Agreement</h2>
<h2>Data Processing Agreement</h2>

<table className="table mx-auto text-center w-auto border border-base-200">
<tbody>
Expand Down Expand Up @@ -1225,7 +1225,7 @@ export function DataProtectionAgreementHTML(
</p>
<p>
Controller protects access keys. Access keys are given on a need to use
basis. Access keys are granted only if a Data Protection Agreement is
basis. Access keys are granted only if a Data Processing Agreement is
signed.{" "}
</p>
<p className="text-base-300 text-center tracking-widest">Schedules 3/4</p>
Expand Down

0 comments on commit 909f47a

Please sign in to comment.