forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Improve localization of {els} string on Create Account page (#3912)
Co-authored-by: Hailey <me@haileyok.com>
authored by
Minseo Lee
Hailey
and committed by
GitHub
25e3c93e
1118fd68
+54
-32
+52
-31
src/screens/Signup/StepInfo/Policies.tsx
+52
-31
src/screens/Signup/StepInfo/Policies.tsx
···
1
-
import React from 'react'
1
+
import React, {ReactElement} from 'react'
2
2
import {View} from 'react-native'
3
3
import {ComAtprotoServerDescribeServer} from '@atproto/api'
4
4
import {msg, Trans} from '@lingui/macro'
···
42
42
)
43
43
}
44
44
45
-
const els = []
46
-
if (tos) {
47
-
els.push(
48
-
<InlineLinkText
49
-
label={_(msg`Read the Bluesky Terms of Service`)}
50
-
key="tos"
51
-
to={tos}>
52
-
{_(msg`Terms of Service`)}
53
-
</InlineLinkText>,
45
+
let els: ReactElement
46
+
if (tos && pp) {
47
+
els = (
48
+
<Trans>
49
+
By creating an account you agree to the{' '}
50
+
<InlineLinkText
51
+
label={_(msg`Read the Bluesky Terms of Service`)}
52
+
key="tos"
53
+
to={tos}>
54
+
Terms of Service
55
+
</InlineLinkText>{' '}
56
+
and{' '}
57
+
<InlineLinkText
58
+
label={_(msg`Read the Bluesky Privacy Policy`)}
59
+
key="pp"
60
+
to={pp}>
61
+
Privacy Policy
62
+
</InlineLinkText>
63
+
.
64
+
</Trans>
54
65
)
55
-
}
56
-
if (pp) {
57
-
els.push(
58
-
<InlineLinkText
59
-
label={_(msg`Read the Bluesky Privacy Policy`)}
60
-
key="pp"
61
-
to={pp}>
62
-
{_(msg`Privacy Policy`)}
63
-
</InlineLinkText>,
66
+
} else if (tos) {
67
+
els = (
68
+
<Trans>
69
+
By creating an account you agree to the{' '}
70
+
<InlineLinkText
71
+
label={_(msg`Read the Bluesky Terms of Service`)}
72
+
key="tos"
73
+
to={tos}>
74
+
Terms of Service
75
+
</InlineLinkText>
76
+
.
77
+
</Trans>
64
78
)
65
-
}
66
-
if (els.length === 2) {
67
-
els.splice(
68
-
1,
69
-
0,
70
-
<Text key="and" style={[t.atoms.text_contrast_medium]}>
71
-
{' '}
72
-
and{' '}
73
-
</Text>,
79
+
} else if (pp) {
80
+
els = (
81
+
<Trans>
82
+
By creating an account you agree to the{' '}
83
+
<InlineLinkText
84
+
label={_(msg`Read the Bluesky Privacy Policy`)}
85
+
key="pp"
86
+
to={pp}>
87
+
Privacy Policy
88
+
</InlineLinkText>
89
+
.
90
+
</Trans>
74
91
)
92
+
} else {
93
+
return null
75
94
}
76
95
77
96
return (
78
97
<View style={[a.gap_sm]}>
79
-
<Text style={[a.leading_snug, t.atoms.text_contrast_medium]}>
80
-
<Trans>By creating an account you agree to the {els}.</Trans>
81
-
</Text>
98
+
{els ? (
99
+
<Text style={[a.leading_snug, t.atoms.text_contrast_medium]}>
100
+
{els}
101
+
</Text>
102
+
) : null}
82
103
83
104
{under13 ? (
84
105
<Text style={[a.font_bold, a.leading_snug, t.atoms.text_contrast_high]}>
+2
-1
src/screens/Signup/index.tsx
+2
-1
src/screens/Signup/index.tsx
···
168
168
<View
169
169
style={[a.w_full, a.py_lg, a.flex_row, a.gap_lg, a.align_center]}>
170
170
<AppLanguageDropdown />
171
-
<Text style={[t.atoms.text, !gtMobile && a.text_md]}>
171
+
<Text
172
+
style={[t.atoms.text_contrast_medium, !gtMobile && a.text_md]}>
172
173
<Trans>Having trouble?</Trans>{' '}
173
174
<InlineLinkText
174
175
label={_(msg`Contact support`)}