Skip to content

Commit

Permalink
Merge pull request #14335 from Expensify/cmartins-usePrivacy
Browse files Browse the repository at this point in the history
Standardize on using Privacy instead of Privacy Policy
  • Loading branch information
AndrewGable authored Jan 17, 2023
2 parents 3636f1f + db6851f commit 6902b94
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 16 deletions.
7 changes: 3 additions & 4 deletions src/languages/en.js
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
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
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
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
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
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
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

0 comments on commit 6902b94

Please sign in to comment.