Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/m2 8061 changing terms of service #877

Merged
merged 7 commits into from
Oct 28, 2024
Merged

Feature/m2 8061 changing terms of service #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b7d113
feature/aadding privacy policy to app, creating a helper to call OpeU…
Oct 23, 2024
7446f74
lint fix
Oct 23, 2024
216f0dd
adding the privacy policy to french translation
Oct 25, 2024
49b5318
chore/fixing layout and adding terms and privacy short word to sigIn
Oct 25, 2024
84dd74d
rebasing with dev, resolving conflicts and eslint fix
Oct 25, 2024
9675272
adding period to the sign up
Oct 25, 2024
c11fc84
adding short word for terms and privacy on sigup, creating the and tr…
Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion assets/translations/el.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"password": "Κωδικός πρόσβασης",
"i_agree": "Συμφωνώ με τους",
"terms_of_service": "Όρους χρήσης υπηρεσιών του MindLogger",
"terms": "Οροι",
"privacy": "μυστικότητα",
"privacy_policy": "Πολιτική Απορρήτου",
"password_updated": "Ο κωδικός πρόσβασης ενημερώθηκε"
},
Expand Down Expand Up @@ -254,7 +256,8 @@
"password_placeholder": "Κωδικός πρόσβασης",
"please_accept_terms": "Αποδεχτείτε τους όρους χρήσης υπηρεσιών.",
"email_looks_incomplete": "Φαίνεται ότι το email αυτό δεν είναι πλήρες",
"sign_up_agree": "Με την εγγραφή σας, συμφωνείτε με τους"
"sign_up_agree": "Με την εγγραφή σας, συμφωνείτε με τους",
"and": "και"
},
"password_requirements": {
"at_least_characters": "να έχει 6 χαρακτήρες",
Expand Down
5 changes: 4 additions & 1 deletion assets/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"password": "Password",
"i_agree": "I agree to the",
"terms_of_service": "Terms of Service",
"terms": "Terms",
"privacy": "Privacy",
"privacy_policy": "Privacy Policy",
"password_updated": "Password updated"
},
Expand Down Expand Up @@ -254,7 +256,8 @@
"password_placeholder": "Password",
"please_accept_terms": "Please accept terms of service.",
"email_looks_incomplete": "Looks like this email is incomplete",
"sign_up_agree": "By signing up, you agree to MindLogger’s"
"sign_up_agree": "By signing up, you agree to MindLogger’s",
"and": "and"
},
"password_requirements": {
"at_least_characters": "6 characters",
Expand Down
5 changes: 4 additions & 1 deletion assets/translations/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"password": "Mot de passe",
"i_agree": "J'accepte les",
"terms_of_service": "Conditions d'utilisation",
"terms": "Termes",
"privacy": "Confidentialité",
"privacy_policy": "Politique de confidentialité",
"password_updated": "Mot de passe mis à jour"
},
Expand Down Expand Up @@ -240,7 +242,8 @@
"password_placeholder": "Mot de passe",
"please_accept_terms": "Veuillez accepter les conditions d'utilisation.",
"email_looks_incomplete": "Il semble que cet e-mail soit incomplet",
"sign_up_agree": "By signing up, you agree to MindLogger’s"
"sign_up_agree": "By signing up, you agree to MindLogger’s",
"and": "et"
},
"password_requirements": {
"at_least_characters": "6 caractères",
Expand Down
12 changes: 6 additions & 6 deletions src/screens/ui/LoginScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,18 @@ export const LoginScreen: FC = () => {

<Link
textDecorationLine="underline"
onPress={() => openUrl('https://mindlogger.org/privacy-policy')}
accessibilityLabel="privacy_policy_link"
onPress={() => openUrl('https://mindlogger.org/terms-of-service')}
accessibilityLabel="terms_of_service_link"
>
{t('auth:privacy_policy')}
{t('auth:terms')}
</Link>

<Link
textDecorationLine="underline"
onPress={() => openUrl('https://mindlogger.org/terms-of-service')}
accessibilityLabel="terms_of_service_link"
onPress={() => openUrl('https://mindlogger.org/privacy-policy')}
accessibilityLabel="privacy_policy_link"
>
{t('auth:terms_of_service')}
{t('auth:privacy')}
</Link>
</XStack>
</Box>
Expand Down
20 changes: 10 additions & 10 deletions src/screens/ui/SignUpScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,33 +57,33 @@ export const SignUpScreen: FC = () => {
>
{t('sign_up_form:sign_up_agree')}
</Text>
<Box
flexDirection={'row'}
jc={isTablet() ? 'space-around' : 'space-between'}
>
<Box flexDirection={'row'} jc={'center'} gap={8}>
<Text
fontSize={16}
color="$white"
ta="center"
textDecorationLine="underline"
accessibilityLabel="terms_of_service_link"
onPress={() =>
openUrl('https://mindlogger.org/privacy-policy')
openUrl('https://mindlogger.org/terms-of-service')
}
accessibilityLabel="privacy_policy_link"
>
{t('auth:privacy_policy')}
{t('auth:terms')}
</Text>
<Text fontSize={16} color="$white" ta="center">
{t('sign_up_form:and')}
</Text>
<Text
fontSize={16}
color="$white"
ta="center"
textDecorationLine="underline"
accessibilityLabel="terms_of_service_link"
onPress={() =>
openUrl('https://mindlogger.org/terms-of-service')
openUrl('https://mindlogger.org/privacy-policy')
}
accessibilityLabel="privacy_policy_link"
>
{t('auth:terms_of_service')}
{t('auth:privacy')}.
</Text>
</Box>
</Box>
Expand Down
Loading