Skip to content

Commit

Permalink
Fix "log in", "log out" to "sign in", "sign out" (#7739)
Browse files Browse the repository at this point in the history
* log to sign

* logged to signed
  • Loading branch information
quiple authored Feb 17, 2025
1 parent 326445d commit d805dec
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/App.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function InnerApp() {
useEffect(() => {
return listenSessionDropped(() => {
Toast.show(
_(msg`Sorry! Your session expired. Please log in again.`),
_(msg`Sorry! Your session expired. Please sign in again.`),
'info',
)
})
Expand Down
2 changes: 1 addition & 1 deletion src/App.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function InnerApp() {
useEffect(() => {
return listenSessionDropped(() => {
Toast.show(
_(msg`Sorry! Your session expired. Please log in again.`),
_(msg`Sorry! Your session expired. Please sign in again.`),
'info',
)
})
Expand Down
2 changes: 1 addition & 1 deletion src/components/AccountList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function AccountList({
testID="chooseAddAccountBtn"
style={[a.flex_1]}
onPress={pendingDid ? undefined : onPressAddAccount}
label={_(msg`Login to account that is not listed`)}>
label={_(msg`Sign in to account that is not listed`)}>
{({hovered, pressed}) => (
<View
style={[
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialogs/Signin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {

return (
<Dialog.ScrollableInner
label={_(msg`Sign into Bluesky or create a new account`)}
label={_(msg`Sign in to Bluesky or create a new account`)}
style={[gtMobile ? {width: 'auto', maxWidth: 420} : a.w_full]}>
<View style={[!isNative && a.p_2xl]}>
<View
Expand Down
10 changes: 5 additions & 5 deletions src/screens/Deactivated.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function Deactivated() {
case 'Bad token scope':
setError(
_(
msg`You're logged in with an App Password. Please log in with your main password to continue deactivating your account.`,
msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
),
)
break
Expand Down Expand Up @@ -148,7 +148,7 @@ export function Deactivated() {
{pending && <ButtonIcon icon={Loader} position="right" />}
</Button>
<Button
label={_(msg`Cancel reactivation and log out`)}
label={_(msg`Cancel reactivation and sign out`)}
size="large"
variant="solid"
color="secondary"
Expand Down Expand Up @@ -183,7 +183,7 @@ export function Deactivated() {
<>
<Text
style={[t.atoms.text_contrast_medium, a.pb_md, a.leading_snug]}>
<Trans>Or, log into one of your other accounts.</Trans>
<Trans>Or, sign in to one of your other accounts.</Trans>
</Text>
<AccountList
onSelectAccount={onSelectAccount}
Expand All @@ -199,13 +199,13 @@ export function Deactivated() {
<Trans>Or, continue with another account.</Trans>
</Text>
<Button
label={_(msg`Log in or sign up`)}
label={_(msg`Sign in or sign up`)}
size="large"
variant="solid"
color="secondary"
onPress={() => setShowLoggedOut(true)}>
<ButtonText>
<Trans>Log in or sign up</Trans>
<Trans>Sign in or sign up</Trans>
</ButtonText>
</Button>
</>
Expand Down
6 changes: 4 additions & 2 deletions src/screens/Login/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,9 @@ export const LoginForm = ({
/>
</TextField.Root>
<Text style={[a.text_sm, t.atoms.text_contrast_medium, a.mt_sm]}>
<Trans>Check your email for a login code and enter it here.</Trans>
<Trans>
Check your email for a sign in code and enter it here.
</Trans>
</Text>
</View>
)}
Expand All @@ -319,7 +321,7 @@ export const LoginForm = ({
<Button
testID="loginRetryButton"
label={_(msg`Retry`)}
accessibilityHint={_(msg`Retries login`)}
accessibilityHint={_(msg`Retries sign in`)}
variant="solid"
color="secondary"
size="large"
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Settings/components/AddAppPasswordDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
</Text>
<Text style={[a.text_md, a.leading_snug]}>
<Trans>
Use this to sign into the other app along with your handle.
Use this to sign in to the other app along with your handle.
</Trans>
</Text>
<CopyButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function DeactivateAccountDialogInner({
case 'Bad token scope':
setError(
_(
msg`You're logged in with an App Password. Please log in with your main password to continue deactivating your account.`,
msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
),
)
break
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Settings/components/Email2FAToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export function Email2FAToggle() {
<Prompt.Basic
control={enableDialogControl}
title={_(msg`Enable Email 2FA`)}
description={_(msg`Require an email code to log in to your account.`)}
description={_(msg`Require an email code to sign in to your account.`)}
onConfirm={enableEmailAuthFactor}
confirmButtonCta={_(msg`Enable`)}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/screens/SignupQueued.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ export function SignupQueued() {
variant="ghost"
size="large"
color="primary"
label={_(msg`Log out`)}
label={_(msg`Sign out`)}
onPress={() => logoutCurrentAccount('SignupQueued')}>
<ButtonText>
<Trans>Log out</Trans>
<Trans>Sign out</Trans>
</ButtonText>
</Button>
)
Expand Down
4 changes: 2 additions & 2 deletions src/screens/Takendown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ export function Takendown() {
variant="solid"
size="large"
color="secondary_inverted"
label={_(msg`Log out`)}
label={_(msg`Sign out`)}
onPress={() => logoutCurrentAccount('Takendown')}>
<ButtonText>
<Trans>Log Out</Trans>
<Trans>Sign Out</Trans>
</ButtonText>
</Button>
)
Expand Down
4 changes: 2 additions & 2 deletions src/state/queries/list-memberships.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function useListMembershipAddMutation() {
>({
mutationFn: async ({listUri, actorDid}) => {
if (!currentAccount) {
throw new Error('Not logged in')
throw new Error('Not signed in')
}
const res = await agent.app.bsky.graph.listitem.create(
{repo: currentAccount.did},
Expand Down Expand Up @@ -160,7 +160,7 @@ export function useListMembershipRemoveMutation() {
>({
mutationFn: async ({membershipUri}) => {
if (!currentAccount) {
throw new Error('Not logged in')
throw new Error('Not signed in')
}
const membershipUrip = new AtUri(membershipUri)
await agent.app.bsky.graph.listitem.delete({
Expand Down
4 changes: 2 additions & 2 deletions src/state/queries/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export function useListCreateMutation() {
avatar,
}) {
if (!currentAccount) {
throw new Error('Not logged in')
throw new Error('Not signed in')
}
if (
purpose !== 'app.bsky.graph.defs#curatelist' &&
Expand Down Expand Up @@ -126,7 +126,7 @@ export function useListMetadataMutation() {
async mutationFn({uri, name, description, descriptionFacets, avatar}) {
const {hostname, rkey} = new AtUri(uri)
if (!currentAccount) {
throw new Error('Not logged in')
throw new Error('Not signed in')
}
if (currentAccount.did !== hostname) {
throw new Error('You do not own this list')
Expand Down
4 changes: 2 additions & 2 deletions src/state/queries/messages/actor-declaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function useUpdateActorDeclaration({

return useMutation({
mutationFn: async (allowIncoming: 'all' | 'none' | 'following') => {
if (!currentAccount) throw new Error('Not logged in')
if (!currentAccount) throw new Error('Not signed in')
const result = await agent.api.com.atproto.repo.putRecord({
repo: currentAccount.did,
collection: 'chat.bsky.actor.declaration',
Expand Down Expand Up @@ -68,7 +68,7 @@ export function useDeleteActorDeclaration() {

return useMutation({
mutationFn: async () => {
if (!currentAccount) throw new Error('Not logged in')
if (!currentAccount) throw new Error('Not signed in')
// TODO(sam): remove validate: false once PDSes have the new lexicon
const result = await agent.api.com.atproto.repo.deleteRecord({
repo: currentAccount.did,
Expand Down
2 changes: 1 addition & 1 deletion src/state/queries/pinned-post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function usePinnedPostMutation() {
updatePostShadow(queryClient, postUri, {pinned: pinCurrentPost})

// get the currently pinned post so we can optimistically remove the pin from it
if (!currentAccount) throw new Error('Not logged in')
if (!currentAccount) throw new Error('Not signed in')
const {data: profile} = await agent.getProfile({
actor: currentAccount.did,
})
Expand Down
2 changes: 1 addition & 1 deletion src/state/queries/starter-packs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export function useDeleteStarterPackMutation({
return useMutation({
mutationFn: async ({listUri, rkey}: {listUri?: string; rkey: string}) => {
if (!agent.session) {
throw new Error(`Requires logged in user`)
throw new Error(`Requires signed in user`)
}

if (listUri) {
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/auth/SplashScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const SplashScreen = ({
onPress={onPressSignin}
label={_(msg`Sign in`)}
accessibilityHint={_(
msg`Opens flow to sign into your existing Bluesky account`,
msg`Opens flow to sign in to your existing Bluesky account`,
)}
size="large"
variant="solid"
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/auth/SplashScreen.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const SplashScreen = ({
onPress={onPressSignin}
label={_(msg`Sign in`)}
accessibilityHint={_(
msg`Opens flow to sign into your existing Bluesky account`,
msg`Opens flow to sign in to your existing Bluesky account`,
)}
size="large"
variant="solid"
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/profile/ProfileMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ let ProfileMenu = ({
control={loggedOutWarningPromptControl}
title={_(msg`Note about sharing`)}
description={_(
msg`This profile is only visible to logged-in users. It won't be visible to people who aren't logged in.`,
msg`This profile is only visible to logged-in users. It won't be visible to people who aren't signed in.`,
)}
onConfirm={onPressShare}
confirmButtonCta={_(msg`Share anyway`)}
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/util/forms/PostDropdownBtnMenuItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ let PostDropdownMenuItems = ({
control={loggedOutWarningPromptControl}
title={_(msg`Note about sharing`)}
description={_(
msg`This post is only visible to logged-in users. It won't be visible to people who aren't logged in.`,
msg`This post is only visible to logged-in users. It won't be visible to people who aren't signed in.`,
)}
onConfirm={onSharePost}
confirmButtonCta={_(msg`Share anyway`)}
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/util/post-ctrls/PostCtrls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ let PostCtrls = ({
control={loggedOutWarningPromptControl}
title={_(msg`Note about sharing`)}
description={_(
msg`This post is only visible to logged-in users. It won't be visible to people who aren't logged in.`,
msg`This post is only visible to logged-in users. It won't be visible to people who aren't signed in.`,
)}
onConfirm={onShare}
confirmButtonCta={_(msg`Share anyway`)}
Expand Down
4 changes: 2 additions & 2 deletions src/view/screens/DebugMod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
<Toggle.Checkbox />
<Toggle.LabelText>Adult disabled</Toggle.LabelText>
</Toggle.Item>
<Toggle.Item name="loggedOut" label="Logged out">
<Toggle.Item name="loggedOut" label="Signed out">
<Toggle.Checkbox />
<Toggle.LabelText>Logged out</Toggle.LabelText>
<Toggle.LabelText>Signed out</Toggle.LabelText>
</Toggle.Item>
</View>
</Toggle.Group>
Expand Down

0 comments on commit d805dec

Please sign in to comment.