From 4b7d113e243e2ad58e3b0596fe3b449bef52a830 Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Wed, 23 Oct 2024 14:54:21 -0700 Subject: [PATCH 1/6] feature/aadding privacy policy to app, creating a helper to call OpeURL into screens ui, adding a proper translations and adding a break lines to greek about translation --- assets/translations/el.json | 3 ++- assets/translations/en.json | 3 ++- assets/translations/fr.json | 2 +- src/screens/lib/utils/helpers.ts | 14 +++++++++++ src/screens/ui/LoginScreen.tsx | 19 +++++++++------ src/screens/ui/SignUpScreen.tsx | 41 ++++++++++++++++++++------------ 6 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 src/screens/lib/utils/helpers.ts diff --git a/assets/translations/el.json b/assets/translations/el.json index e9f9e3a95..b15c6a90b 100644 --- a/assets/translations/el.json +++ b/assets/translations/el.json @@ -5,6 +5,7 @@ "password": "Κωδικός πρόσβασης", "i_agree": "Συμφωνώ με τους", "terms_of_service": "Όρους χρήσης υπηρεσιών του MindLogger", + "privacy_policy": "Πολιτική Απορρήτου", "password_updated": "Ο κωδικός πρόσβασης ενημερώθηκε" }, "activity": { @@ -86,7 +87,7 @@ "title_with_version": "Τι είναι το MindLogger; έκδ.{{version}}", "title": "Εκτός εάν αναφέρεται αλλού, τα εικονίδια προέρχονται από τα OpenMoji και NounProject.", "subtitle": "Εκτός εάν αναφέρεται αλλού, τα εικονίδια προέρχονται από τα OpenMoji και NounProject.", - "mindlogger_about": "## ### Τι είναι το MindLogger; Η εφαρμογή αυτή αποτελεί μέρος της πλατφόρμας συλλογής και ανάλυσης δεδομένων ανοιχτού κώδικα MindLogger, η οποία σχεδιάστηκε από το MATTER Lab στο Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). # ### Τι μπορεί να κάνει το MindLogger; Το σύνολο λειτουργιών του MindLogger αυξάνεται συνεχώς και επί του παρόντος υποστηρίζει μια μεγάλη γκάμα τύπων εισαγωγής δεδομένων. Κάθε οθόνη σε μια δραστηριότητα MindLogger μπορεί να περιλαμβάνει οποιοδήποτε από τα ακόλουθα: - Κείμενο, εικόνα και ήχο - Ερώτηση ακολουθούμενη από επιλογές απάντησης εικόνας ή/και κειμένου - Ρυθμιστικό ολίσθησης - Εισαγωγή κειμένου - Εισαγωγή πίνακα - Ηχογράφηση - Λήψη φωτογραφίας/βίντεο - Σχεδίαση ή χρήση αφής για επιλογή - Τρέχουσα γεωγραφική θέση - Απλή γνωστική εργασία - Καθυστέρηση πριν από την απάντηση - Χρονόμετρο - Υποθετική λογική, για να προσδιοριστεί η επόμενη ερώτηση #### Πού μπορώ να μάθω περισσότερες πληροφορίες; Επισκεφτείτε το [https://mindlogger.org](https://mindlogger.org) για περισσότερες πληροφορίες. ## [Υποστήριξη]({{credits_link}}) ##### Με φιλικούς χαιρετισμούς, ##### Η Ομάδα MindLogger ##### Child Mind Institute" + "mindlogger_about": "## \n ### Τι είναι το MindLogger; \n\n Η εφαρμογή αυτή αποτελεί μέρος της πλατφόρμας συλλογής και ανάλυσης δεδομένων ανοιχτού κώδικα MindLogger, η οποία σχεδιάστηκε από το MATTER Lab στο Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). \n # \n ### Τι μπορεί να κάνει το MindLogger; \n\n Το σύνολο λειτουργιών του MindLogger αυξάνεται συνεχώς και επί του παρόντος υποστηρίζει μια μεγάλη γκάμα τύπων εισαγωγής δεδομένων. Κάθε οθόνη σε μια δραστηριότητα MindLogger μπορεί να περιλαμβάνει οποιοδήποτε από τα ακόλουθα: \n - Κείμενο, εικόνα και ήχο \n - Ερώτηση ακολουθούμενη από επιλογές απάντησης εικόνας ή/και κειμένου \n - Ρυθμιστικό ολίσθησης \n - Εισαγωγή κειμένου \n - Εισαγωγή πίνακα \n - Ηχογράφηση \n - Λήψη φωτογραφίας/βίντεο \n - Σχεδίαση ή χρήση αφής για επιλογή \n - Τρέχουσα γεωγραφική θέση \n - Απλή γνωστική εργασία \n - Καθυστέρηση πριν από την απάντηση \n - Χρονόμετρο \n - Υποθετική λογική, για να προσδιοριστεί η επόμενη ερώτηση \n\n #### Πού μπορώ να μάθω περισσότερες πληροφορίες; \n Επισκεφτείτε το [https://mindlogger.org](https://mindlogger.org) για περισσότερες πληροφορίες. \n ## [Υποστήριξη]({{credits_link}}) \n ## [Όροι χρήσης](https://mindlogger.org/terms-of-service) \n ## [Πολιτική απορρήτου](https://mindlogger.org/privacy-policy) \n\n ##### Με φιλικούς χαιρετισμούς, \n\n ##### Η Ομάδα MindLogger \n\n ##### Child Mind Institute" }, "applet_footer": { "surveys": "Έρευνες", diff --git a/assets/translations/en.json b/assets/translations/en.json index 44f604d47..3d313c8dd 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -5,6 +5,7 @@ "password": "Password", "i_agree": "I agree to the", "terms_of_service": "Terms of Service", + "privacy_policy": "Privacy Policy", "password_updated": "Password updated" }, "activity": { @@ -86,7 +87,7 @@ "title_with_version": "What is MindLogger? v.{{version}}", "title": "Unless stated elsewhere, icons are drawn from OpenMoji and NounProject.", "subtitle": "Unless stated elsewhere, icons are drawn from OpenMoji and NounProject.", - "mindlogger_about": "## \n ### What is MindLogger? \n\n This app is part of the open source MindLogger data collection and analysis platform designed by the MATTER Lab at the Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). \n # \n ### What can MindLogger do? \n\n MindLogger's feature set is growing, and currently supports a wide variety of input types. Each screen in a MindLogger activity can include any of the following: \n - Text, picture, and audio \n - Question followed by image and/or text response options \n - Slider bar \n - Text entry \n - Table entry \n - Audio record \n - Photo/video capture \n - Drawing or tapping \n - Current geolocation \n - Simple cognitive task \n - Delay before response \n - Timer \n - Conditional logic to determine where to go next \n\n #### Where can I learn more? \n Please visit [https://mindlogger.org](https://mindlogger.org) for more information. \n ## [Support]({{credits_link}}) \n\n ##### Cheers, \n\n ##### MindLogger Team \n\n ##### Child Mind Institute" + "mindlogger_about": "## \n ### What is MindLogger? \n\n This app is part of the open source MindLogger data collection and analysis platform designed by the MATTER Lab at the Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). \n # \n ### What can MindLogger do? \n\n MindLogger's feature set is growing, and currently supports a wide variety of input types. Each screen in a MindLogger activity can include any of the following: \n - Text, picture, and audio \n - Question followed by image and/or text response options \n - Slider bar \n - Text entry \n - Table entry \n - Audio record \n - Photo/video capture \n - Drawing or tapping \n - Current geolocation \n - Simple cognitive task \n - Delay before response \n - Timer \n - Conditional logic to determine where to go next \n\n #### Where can I learn more? \n Please visit [https://mindlogger.org](https://mindlogger.org) for more information. \n ## [Support]({{credits_link}}) \n ## [Terms of service](https://mindlogger.org/terms-of-service) \n ## [Privacy policy](https://mindlogger.org/privacy-policy) \n\n ##### Cheers, \n\n ##### MindLogger Team \n\n ##### Child Mind Institute" }, "applet_footer": { "surveys": "Surveys", diff --git a/assets/translations/fr.json b/assets/translations/fr.json index 3b1ecc294..58cf2936d 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -86,7 +86,7 @@ "title_with_version": "Qu'est-ce que MindLogger? v.{{version}}", "title": "Sauf indication contraire, les icônes sont tirées de OpenMoji et Nounproject.", "subtitle": "Sauf indication contraire, les icônes sont tirées de OpenMoji et Nounproject.", - "mindlogger_about": "## \n ### Qu'est-ce que MindLogger ? \n\n Cette application fait partie de la plateforme open source de collecte et d'analyse de données MindLogger conçue par le MATTER Lab du Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). \n # \n ### Que peut faire MindLogger ? \n\n L'ensemble des fonctionnalités de MindLogger se développe, et prend actuellement en charge une grande variété de types d'entrées. Chaque écran d'une activité de MindLogger peut comprendre l'un des éléments suivants : \n - Texte, image et audio \n - Question suivie d'une option de répose en image et/ou textuelle \n -Curseur \n - Entrée textuelle \n - Saisie sous forme de tableau \n - Enregistrement audio \n - Capture photo/vidéo \n - Dessin ou tapotement \n - Géolocalisation \n - Tâche cognitive simple \n - Délai avant réponse \n - Minuterie \n - Logique conditionnelle pour déterminer la suite \n\n #### Où puis-je en apprendre davantage ? \n Veuillez consulter le site [https://mindlogger.org](https://mindlogger.org) pour plus d'informations. \n ## [Support]({{credits_link}}) \n\n ##### Santé, \n\n ##### MindLogger Team, \n\n ##### Child Mind Institute" + "mindlogger_about": "## \n ### Qu'est-ce que MindLogger ? \n\n Cette application fait partie de la plateforme open source de collecte et d'analyse de données MindLogger conçue par le MATTER Lab du Child Mind Institute ([https://matter.childmind.org](https://matter.childmind.org)). \n # \n ### Que peut faire MindLogger ? \n\n L'ensemble des fonctionnalités de MindLogger se développe, et prend actuellement en charge une grande variété de types d'entrées. Chaque écran d'une activité de MindLogger peut comprendre l'un des éléments suivants : \n - Texte, image et audio \n - Question suivie d'une option de répose en image et/ou textuelle \n -Curseur \n - Entrée textuelle \n - Saisie sous forme de tableau \n - Enregistrement audio \n - Capture photo/vidéo \n - Dessin ou tapotement \n - Géolocalisation \n - Tâche cognitive simple \n - Délai avant réponse \n - Minuterie \n - Logique conditionnelle pour déterminer la suite \n\n #### Où puis-je en apprendre davantage ? \n Veuillez consulter le site [https://mindlogger.org](https://mindlogger.org) pour plus d'informations. \n ## [Support]({{credits_link}}) \n ## [Conditions d'utilisation](https://mindlogger.org/terms-of-service) \n ## [Politique de confidentialité](https://mindlogger.org/privacy-policy) \n\n ##### Santé, \n\n ##### MindLogger Team, \n\n ##### Child Mind Institute" }, "applet_footer": { "surveys": "Enquêtes", diff --git a/src/screens/lib/utils/helpers.ts b/src/screens/lib/utils/helpers.ts new file mode 100644 index 000000000..e1175e3b8 --- /dev/null +++ b/src/screens/lib/utils/helpers.ts @@ -0,0 +1,14 @@ +import { Alert, Linking } from 'react-native'; + +export const openUrl = (url: string) => { + Linking.canOpenURL(url).then(supported => { + if (supported) { + Linking.openURL(url); + } else { + Alert.alert( + 'Alert', + 'Unable to open url' + ) + } + }); + } \ No newline at end of file diff --git a/src/screens/ui/LoginScreen.tsx b/src/screens/ui/LoginScreen.tsx index f1a5bfe06..cf799bcf3 100644 --- a/src/screens/ui/LoginScreen.tsx +++ b/src/screens/ui/LoginScreen.tsx @@ -1,6 +1,5 @@ import { FC } from 'react'; import { - Linking, StatusBar, Keyboard, TouchableWithoutFeedback, @@ -15,6 +14,7 @@ import { Box, XStack } from '@app/shared/ui/base'; import { CloudLogo } from '@app/shared/ui/icons/CloudLogo'; import { Link } from '@app/shared/ui/Link'; import { SubmitButton } from '@app/shared/ui/SubmitButton'; +import { openUrl } from '@app/screens/lib/utils/helpers'; export const LoginScreen: FC = () => { const { navigate } = useNavigation(); @@ -28,10 +28,6 @@ export const LoginScreen: FC = () => { navigate('ChangeLanguage'); }; - const navigateToTerms = () => { - Linking.openURL('https://mindlogger.org/terms'); - }; - const onLoginSuccess = () => { navigate('Applets'); }; @@ -73,8 +69,9 @@ export const LoginScreen: FC = () => { { openUrl('https://mindlogger.org/privacy-policy')} + accessibilityLabel="privacy_policy_link" + > + {t('auth:privacy_policy')} + + + openUrl('https://mindlogger.org/terms-of-service')} accessibilityLabel="terms_of_service_link" > {t('auth:terms_of_service')} diff --git a/src/screens/ui/SignUpScreen.tsx b/src/screens/ui/SignUpScreen.tsx index 99b037880..8c175d816 100644 --- a/src/screens/ui/SignUpScreen.tsx +++ b/src/screens/ui/SignUpScreen.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { Keyboard, TouchableWithoutFeedback, Linking } from 'react-native'; +import { Keyboard, TouchableWithoutFeedback } from 'react-native'; import { useNavigation } from '@react-navigation/native'; import { useTranslation } from 'react-i18next'; @@ -11,15 +11,12 @@ import { KeyboardAvoidingView } from '@app/shared/ui/KeyboardAvoidingView'; import { ScrollView } from '@app/shared/ui/ScrollView'; import { StatusBar } from '@app/shared/ui/StatusBar'; import { Text } from '@app/shared/ui/Text'; +import { openUrl } from '@app/screens/lib/utils/helpers'; export const SignUpScreen: FC = () => { const { navigate } = useNavigation(); const { t } = useTranslation(); - const navigateToTerms = () => { - Linking.openURL('https://mindlogger.org/terms'); - }; - return ( { > {t('sign_up_form:sign_up_agree')} - - - {t('auth:terms_of_service')} - + openUrl('https://mindlogger.org/privacy-policy')} + accessibilityLabel="privacy_policy_link" + > + {t('auth:privacy_policy')} + + openUrl('https://mindlogger.org/terms-of-service')} + > + {t('auth:terms_of_service')} + + From 7446f74543cc2e542f97d0a7fbe99ecfa72cc021 Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Wed, 23 Oct 2024 15:33:35 -0700 Subject: [PATCH 2/6] lint fix --- src/screens/lib/utils/helpers.ts | 19 ++++++++----------- src/screens/ui/LoginScreen.tsx | 14 +++++--------- src/screens/ui/SignUpScreen.tsx | 16 ++++++++++------ 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/screens/lib/utils/helpers.ts b/src/screens/lib/utils/helpers.ts index e1175e3b8..bf077ac9c 100644 --- a/src/screens/lib/utils/helpers.ts +++ b/src/screens/lib/utils/helpers.ts @@ -1,14 +1,11 @@ import { Alert, Linking } from 'react-native'; export const openUrl = (url: string) => { - Linking.canOpenURL(url).then(supported => { - if (supported) { - Linking.openURL(url); - } else { - Alert.alert( - 'Alert', - 'Unable to open url' - ) - } - }); - } \ No newline at end of file + Linking.canOpenURL(url).then(supported => { + if (supported) { + Linking.openURL(url); + } else { + Alert.alert('Alert', 'Unable to open url'); + } + }); +}; diff --git a/src/screens/ui/LoginScreen.tsx b/src/screens/ui/LoginScreen.tsx index cf799bcf3..07cdcf6e0 100644 --- a/src/screens/ui/LoginScreen.tsx +++ b/src/screens/ui/LoginScreen.tsx @@ -1,20 +1,16 @@ import { FC } from 'react'; -import { - StatusBar, - Keyboard, - TouchableWithoutFeedback, -} from 'react-native'; +import { StatusBar, Keyboard, TouchableWithoutFeedback } from 'react-native'; import { useNavigation } from '@react-navigation/native'; import { useTranslation } from 'react-i18next'; import { isTablet } from 'react-native-device-info'; import { LoginForm } from '@app/features/login/ui/LoginForm'; +import { openUrl } from '@app/screens/lib/utils/helpers'; import { Box, XStack } from '@app/shared/ui/base'; import { CloudLogo } from '@app/shared/ui/icons/CloudLogo'; import { Link } from '@app/shared/ui/Link'; import { SubmitButton } from '@app/shared/ui/SubmitButton'; -import { openUrl } from '@app/screens/lib/utils/helpers'; export const LoginScreen: FC = () => { const { navigate } = useNavigation(); @@ -71,7 +67,7 @@ export const LoginScreen: FC = () => { { openUrl('https://mindlogger.org/privacy-policy')} + onPress={() => openUrl('https://mindlogger.org/privacy-policy')} accessibilityLabel="privacy_policy_link" > {t('auth:privacy_policy')} @@ -91,7 +87,7 @@ export const LoginScreen: FC = () => { openUrl('https://mindlogger.org/terms-of-service')} + onPress={() => openUrl('https://mindlogger.org/terms-of-service')} accessibilityLabel="terms_of_service_link" > {t('auth:terms_of_service')} diff --git a/src/screens/ui/SignUpScreen.tsx b/src/screens/ui/SignUpScreen.tsx index 8c175d816..443463e6b 100644 --- a/src/screens/ui/SignUpScreen.tsx +++ b/src/screens/ui/SignUpScreen.tsx @@ -6,12 +6,12 @@ import { useTranslation } from 'react-i18next'; import { isTablet } from 'react-native-device-info'; import { SignUpForm } from '@app/features/sign-up/ui/SignUpForm'; +import { openUrl } from '@app/screens/lib/utils/helpers'; import { Box } from '@app/shared/ui/base'; import { KeyboardAvoidingView } from '@app/shared/ui/KeyboardAvoidingView'; import { ScrollView } from '@app/shared/ui/ScrollView'; import { StatusBar } from '@app/shared/ui/StatusBar'; import { Text } from '@app/shared/ui/Text'; -import { openUrl } from '@app/screens/lib/utils/helpers'; export const SignUpScreen: FC = () => { const { navigate } = useNavigation(); @@ -58,17 +58,19 @@ export const SignUpScreen: FC = () => { {t('sign_up_form:sign_up_agree')} openUrl('https://mindlogger.org/privacy-policy')} + onPress={() => + openUrl('https://mindlogger.org/privacy-policy') + } accessibilityLabel="privacy_policy_link" - > + > {t('auth:privacy_policy')} { ta="center" textDecorationLine="underline" accessibilityLabel="terms_of_service_link" - onPress={()=>openUrl('https://mindlogger.org/terms-of-service')} + onPress={() => + openUrl('https://mindlogger.org/terms-of-service') + } > {t('auth:terms_of_service')} From 216f0dd815d9787c9401944d35dd4560f4bf9f4d Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Thu, 24 Oct 2024 22:36:33 -0700 Subject: [PATCH 3/6] adding the privacy policy to french translation --- assets/translations/fr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/translations/fr.json b/assets/translations/fr.json index 58cf2936d..c868569c1 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -5,6 +5,7 @@ "password": "Mot de passe", "i_agree": "J'accepte les", "terms_of_service": "Conditions d'utilisation", + "privacy_policy": "Politique de confidentialité", "password_updated": "Mot de passe mis à jour" }, "activity": { From 49b5318413f5e3837f44ed107914400edb76d533 Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Fri, 25 Oct 2024 10:50:47 -0700 Subject: [PATCH 4/6] chore/fixing layout and adding terms and privacy short word to sigIn --- assets/translations/el.json | 2 ++ assets/translations/en.json | 2 ++ assets/translations/fr.json | 2 ++ src/screens/ui/LoginScreen.tsx | 15 +++++++-------- src/screens/ui/SignUpScreen.tsx | 21 ++++++++++++++------- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/assets/translations/el.json b/assets/translations/el.json index b15c6a90b..40ae8e839 100644 --- a/assets/translations/el.json +++ b/assets/translations/el.json @@ -5,6 +5,8 @@ "password": "Κωδικός πρόσβασης", "i_agree": "Συμφωνώ με τους", "terms_of_service": "Όρους χρήσης υπηρεσιών του MindLogger", + "terms": "Οροι", + "privacy": "μυστικότητα", "privacy_policy": "Πολιτική Απορρήτου", "password_updated": "Ο κωδικός πρόσβασης ενημερώθηκε" }, diff --git a/assets/translations/en.json b/assets/translations/en.json index 3d313c8dd..7e1616d98 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -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" }, diff --git a/assets/translations/fr.json b/assets/translations/fr.json index c868569c1..b67fb97ee 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -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" }, diff --git a/src/screens/ui/LoginScreen.tsx b/src/screens/ui/LoginScreen.tsx index 07cdcf6e0..23635656e 100644 --- a/src/screens/ui/LoginScreen.tsx +++ b/src/screens/ui/LoginScreen.tsx @@ -65,9 +65,8 @@ export const LoginScreen: FC = () => { { 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')} 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')} diff --git a/src/screens/ui/SignUpScreen.tsx b/src/screens/ui/SignUpScreen.tsx index 443463e6b..cfb64d6cb 100644 --- a/src/screens/ui/SignUpScreen.tsx +++ b/src/screens/ui/SignUpScreen.tsx @@ -12,6 +12,7 @@ import { KeyboardAvoidingView } from '@app/shared/ui/KeyboardAvoidingView'; import { ScrollView } from '@app/shared/ui/ScrollView'; import { StatusBar } from '@app/shared/ui/StatusBar'; import { Text } from '@app/shared/ui/Text'; +import { center } from '@shopify/react-native-skia'; export const SignUpScreen: FC = () => { const { navigate } = useNavigation(); @@ -59,31 +60,37 @@ export const SignUpScreen: FC = () => { - openUrl('https://mindlogger.org/privacy-policy') + openUrl('https://mindlogger.org/terms-of-service') } - accessibilityLabel="privacy_policy_link" > - {t('auth:privacy_policy')} + {t('auth:terms_of_service')} + and - 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_policy')} From 9675272d71ba84f3f394d9992031d59450a81875 Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Fri, 25 Oct 2024 11:17:57 -0700 Subject: [PATCH 5/6] adding period to the sign up --- src/screens/ui/SignUpScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/ui/SignUpScreen.tsx b/src/screens/ui/SignUpScreen.tsx index 09220a742..1dd05f83d 100644 --- a/src/screens/ui/SignUpScreen.tsx +++ b/src/screens/ui/SignUpScreen.tsx @@ -83,7 +83,7 @@ export const SignUpScreen: FC = () => { } accessibilityLabel="privacy_policy_link" > - {t('auth:privacy_policy')} + {t('auth:privacy_policy')}. From c11fc845d4ab33c90362e52d79896cd08c800c2a Mon Sep 17 00:00:00 2001 From: Felipe Imperio Date: Fri, 25 Oct 2024 11:49:47 -0700 Subject: [PATCH 6/6] adding short word for terms and privacy on sigup, creating the and translable and adding a period --- assets/translations/el.json | 3 ++- assets/translations/en.json | 3 ++- assets/translations/fr.json | 3 ++- src/screens/ui/SignUpScreen.tsx | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assets/translations/el.json b/assets/translations/el.json index 93fbd8803..d5375db64 100644 --- a/assets/translations/el.json +++ b/assets/translations/el.json @@ -256,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 χαρακτήρες", diff --git a/assets/translations/en.json b/assets/translations/en.json index e52265588..0dae4556c 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -256,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", diff --git a/assets/translations/fr.json b/assets/translations/fr.json index f865c4bcd..51a702162 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -242,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", diff --git a/src/screens/ui/SignUpScreen.tsx b/src/screens/ui/SignUpScreen.tsx index 1dd05f83d..8f1fd83d5 100644 --- a/src/screens/ui/SignUpScreen.tsx +++ b/src/screens/ui/SignUpScreen.tsx @@ -68,10 +68,10 @@ export const SignUpScreen: FC = () => { openUrl('https://mindlogger.org/terms-of-service') } > - {t('auth:terms_of_service')} + {t('auth:terms')} - and + {t('sign_up_form:and')} { } accessibilityLabel="privacy_policy_link" > - {t('auth:privacy_policy')}. + {t('auth:privacy')}.