From d805dec08fa58dd0828eabc8b56d9a5abd81f825 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Tue, 18 Feb 2025 01:52:06 +0900 Subject: Fix "log in", "log out" to "sign in", "sign out" (#7739) * log to sign * logged to signed --- src/App.native.tsx | 2 +- src/App.web.tsx | 2 +- src/components/AccountList.tsx | 2 +- src/components/dialogs/Signin.tsx | 2 +- src/screens/Deactivated.tsx | 10 +++++----- src/screens/Login/LoginForm.tsx | 6 ++++-- src/screens/Settings/components/AddAppPasswordDialog.tsx | 2 +- src/screens/Settings/components/DeactivateAccountDialog.tsx | 2 +- src/screens/Settings/components/Email2FAToggle.tsx | 2 +- src/screens/SignupQueued.tsx | 4 ++-- src/screens/Takendown.tsx | 4 ++-- src/state/queries/list-memberships.ts | 4 ++-- src/state/queries/list.ts | 4 ++-- src/state/queries/messages/actor-declaration.ts | 4 ++-- src/state/queries/pinned-post.ts | 2 +- src/state/queries/starter-packs.ts | 2 +- src/view/com/auth/SplashScreen.tsx | 2 +- src/view/com/auth/SplashScreen.web.tsx | 2 +- src/view/com/profile/ProfileMenu.tsx | 2 +- src/view/com/util/forms/PostDropdownBtnMenuItems.tsx | 2 +- src/view/com/util/post-ctrls/PostCtrls.tsx | 2 +- src/view/screens/DebugMod.tsx | 4 ++-- 22 files changed, 35 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/App.native.tsx b/src/App.native.tsx index 0c146dcc9..318258aa7 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -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', ) }) diff --git a/src/App.web.tsx b/src/App.web.tsx index f0fb87a31..2142c26bd 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -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', ) }) diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx index 0555dd411..52d149eb5 100644 --- a/src/components/AccountList.tsx +++ b/src/components/AccountList.tsx @@ -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}) => ( } diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx index 134046ff3..c258b24d8 100644 --- a/src/screens/Login/LoginForm.tsx +++ b/src/screens/Login/LoginForm.tsx @@ -298,7 +298,9 @@ export const LoginForm = ({ /> - Check your email for a login code and enter it here. + + Check your email for a sign in code and enter it here. + )} @@ -319,7 +321,7 @@ export const LoginForm = ({ ) diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx index 5eb787e80..c714a775e 100644 --- a/src/screens/Takendown.tsx +++ b/src/screens/Takendown.tsx @@ -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')}> - Log Out + Sign Out ) diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts index 83a2c2db1..b93dc059d 100644 --- a/src/state/queries/list-memberships.ts +++ b/src/state/queries/list-memberships.ts @@ -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}, @@ -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({ diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts index 405cb4ae3..be7542880 100644 --- a/src/state/queries/list.ts +++ b/src/state/queries/list.ts @@ -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' && @@ -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') diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts index 1105e2b3c..828b85d9e 100644 --- a/src/state/queries/messages/actor-declaration.ts +++ b/src/state/queries/messages/actor-declaration.ts @@ -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', @@ -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, diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts index 7e2c8ee79..7e6fc6677 100644 --- a/src/state/queries/pinned-post.ts +++ b/src/state/queries/pinned-post.ts @@ -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, }) diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts index 4066f8f19..b90a57037 100644 --- a/src/state/queries/starter-packs.ts +++ b/src/state/queries/starter-packs.ts @@ -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) { diff --git a/src/view/com/auth/SplashScreen.tsx b/src/view/com/auth/SplashScreen.tsx index e205bb540..9de36665c 100644 --- a/src/view/com/auth/SplashScreen.tsx +++ b/src/view/com/auth/SplashScreen.tsx @@ -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" diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx index d718ca832..eded80358 100644 --- a/src/view/com/auth/SplashScreen.web.tsx +++ b/src/view/com/auth/SplashScreen.web.tsx @@ -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" diff --git a/src/view/com/profile/ProfileMenu.tsx b/src/view/com/profile/ProfileMenu.tsx index 102b34922..df9283efe 100644 --- a/src/view/com/profile/ProfileMenu.tsx +++ b/src/view/com/profile/ProfileMenu.tsx @@ -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`)} diff --git a/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx b/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx index 41f7e74a6..030873c2a 100644 --- a/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx +++ b/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx @@ -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`)} diff --git a/src/view/com/util/post-ctrls/PostCtrls.tsx b/src/view/com/util/post-ctrls/PostCtrls.tsx index b61bad2ca..9515b770c 100644 --- a/src/view/com/util/post-ctrls/PostCtrls.tsx +++ b/src/view/com/util/post-ctrls/PostCtrls.tsx @@ -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`)} diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx index 4ff0a4b8b..2224a4462 100644 --- a/src/view/screens/DebugMod.tsx +++ b/src/view/screens/DebugMod.tsx @@ -378,9 +378,9 @@ export const DebugModScreen = ({}: NativeStackScreenProps< Adult disabled - + - Logged out + Signed out -- cgit 1.4.1