Skip to content

Standardize on using Privacy instead of Privacy Policy #14335

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

Merged
AndrewGable merged 4 commits into from
Jan 17, 2023
Merged

Standardize on using Privacy instead of Privacy Policy #14335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
219a72d
rename readTheTermsAndPrivacyPolicy to readTheTermsAndPrivacy
luacmartins Jan 16, 2023
ac581ed
rm policy from termsOfUse
luacmartins Jan 16, 2023
1692b12
rm privacyPolicy const
luacmartins Jan 16, 2023
db6851f
Merge branch 'main' into cmartins-usePrivacy
luacmartins Jan 17, 2023
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
7 changes: 3 additions & 4 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export default {
and: 'and',
details: 'Details',
privacy: 'Privacy',
privacyPolicy: 'Privacy policy',
delete: 'Delete',
archived: 'archived',
contacts: 'Contacts',
Expand Down Expand Up @@ -379,11 +378,11 @@ export default {
signOut: 'Sign out',
signOutConfirmationText: 'You\'ll lose any offline changes if you sign-out.',
versionLetter: 'v',
readTheTermsAndPrivacyPolicy: {
readTheTermsAndPrivacy: {
phrase1: 'Read the',
phrase2: 'terms of service',
phrase3: 'and',
phrase4: 'privacy policy',
phrase4: 'privacy',
},
help: 'Help',
},
Expand Down Expand Up @@ -517,7 +516,7 @@ export default {
phrase1: 'By logging in, you agree to the',
phrase2: 'terms of service',
phrase3: 'and',
phrase4: 'privacy policy',
phrase4: 'privacy',
phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its',
phrase6: 'licenses',
},
Expand Down
7 changes: 3 additions & 4 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export default {
and: 'y',
details: 'Detalles',
privacy: 'Privacidad',
privacyPolicy: 'Política de privacidad',
delete: 'Eliminar',
archived: 'archivado',
contacts: 'Contactos',
Expand Down Expand Up @@ -379,11 +378,11 @@ export default {
signOut: 'Desconectar',
signOutConfirmationText: 'Si cierras sesión perderás los cambios hechos mientras estabas desconectado',
versionLetter: 'v',
readTheTermsAndPrivacyPolicy: {
readTheTermsAndPrivacy: {
phrase1: 'Leer los',
phrase2: 'términos de servicio',
phrase3: 'y',
phrase4: 'política de privacidad',
phrase4: 'privacidad',
},
help: 'Ayuda',
},
Expand Down Expand Up @@ -517,7 +516,7 @@ export default {
phrase1: 'Al iniciar sesión, estás accediendo a los',
phrase2: 'términos de servicio',
phrase3: 'y',
phrase4: 'política de privacidad',
phrase4: 'privacidad',
phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus',
phrase6: 'licencias',
},
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EnablePayments/OnfidoPrivacy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class OnfidoPrivacy extends React.Component {
<TextLink
href="https://onfido.com/privacy/"
>
{this.props.translate('common.privacyPolicy')}
{this.props.translate('common.privacy')}
</TextLink>
{` ${this.props.translate('common.and')} `}
<TextLink
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EnablePayments/TermsStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class TermsStep extends React.Component {
</Text>

<TextLink href="https://use.expensify.com/privacy">
{`${this.props.translate('common.privacyPolicy')} `}
{`${this.props.translate('common.privacy')} `}
</TextLink>

<Text>{`${this.props.translate('common.and')} `}</Text>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReimbursementAccount/RequestorStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class RequestorStep extends React.Component {
href="https://onfido.com/privacy/"
style={styles.textMicro}
>
{this.props.translate('common.privacyPolicy')}
{this.props.translate('common.privacy')}
</TextLink>
{` ${this.props.translate('common.and')} `}
<TextLink
Expand Down
8 changes: 4 additions & 4 deletions src/pages/settings/AboutPage/AboutPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,22 @@ const AboutPage = (props) => {
numberOfLines={1}
>
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase1',
'initialSettingsPage.readTheTermsAndPrivacy.phrase1',
)}
{' '}
<TextLink style={[styles.textMicroSupporting, styles.link]} href={CONST.TERMS_URL}>
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase2',
'initialSettingsPage.readTheTermsAndPrivacy.phrase2',
)}
</TextLink>
{' '}
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase3',
'initialSettingsPage.readTheTermsAndPrivacy.phrase3',
)}
{' '}
<TextLink style={[styles.textMicroSupporting, styles.link]} href={CONST.PRIVACY_URL}>
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase4',
'initialSettingsPage.readTheTermsAndPrivacy.phrase4',
)}
</TextLink>
.
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspaceInvitePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ class WorkspaceInvitePage extends React.Component {
>
<View style={[styles.flexRow]}>
<Text style={[styles.mr1, styles.label, styles.link]}>
{this.props.translate('common.privacyPolicy')}
{this.props.translate('common.privacy')}
</Text>
</View>
</Pressable>
Expand Down