diff options
author | Hailey <me@haileyok.com> | 2024-05-16 08:37:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-16 08:37:04 -0700 |
commit | 400c269330e15921de3f01fb69f36e036ae92d51 (patch) | |
tree | 4cf84721519175822ce916ec3918414728828e7a | |
parent | b635d000b51a440b3c0eb8a2c0c01cf8e8c54ed3 (diff) | |
download | voidsky-400c269330e15921de3f01fb69f36e036ae92d51.tar.zst |
[🐴] Copy tweaks (#4042)
* `notifications` -> `conversation` * `users` -> `people` * `other participants` -> `the other participant` * rename
-rw-r--r-- | src/components/dms/ConvoMenu.tsx | 8 | ||||
-rw-r--r-- | src/components/dms/MessageMenu.tsx | 2 | ||||
-rw-r--r-- | src/screens/Messages/Conversation/index.tsx | 2 | ||||
-rw-r--r-- | src/screens/Messages/Settings.tsx | 2 | ||||
-rw-r--r-- | src/view/com/util/UserAvatar.tsx | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index 16e8d98c6..cf1dbc171 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -171,13 +171,13 @@ let ConvoMenu = ({ <Menu.ItemIcon icon={Person} /> </Menu.Item> <Menu.Item - label={_(msg`Mute notifications`)} + label={_(msg`Mute conversation`)} onPress={() => muteConvo({mute: !convo?.muted})}> <Menu.ItemText> {convo?.muted ? ( - <Trans>Unmute notifications</Trans> + <Trans>Unmute conversation</Trans> ) : ( - <Trans>Mute notifications</Trans> + <Trans>Mute conversation</Trans> )} </Menu.ItemText> <Menu.ItemIcon icon={convo?.muted ? Unmute : Mute} /> @@ -222,7 +222,7 @@ let ConvoMenu = ({ control={leaveConvoControl} title={_(msg`Leave conversation`)} description={_( - msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for other participants.`, + msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participant.`, )} confirmButtonCta={_(msg`Leave`)} confirmButtonColor="negative" diff --git a/src/components/dms/MessageMenu.tsx b/src/components/dms/MessageMenu.tsx index f4645f286..553e1be53 100644 --- a/src/components/dms/MessageMenu.tsx +++ b/src/components/dms/MessageMenu.tsx @@ -119,7 +119,7 @@ export let MessageMenu = ({ control={deleteControl} title={_(msg`Delete message`)} description={_( - msg`Are you sure you want to delete this message? The message will be deleted for you, but not for other participants.`, + msg`Are you sure you want to delete this message? The message will be deleted for you, but not for the other participant.`, )} confirmButtonCta={_(msg`Delete`)} confirmButtonColor="negative" diff --git a/src/screens/Messages/Conversation/index.tsx b/src/screens/Messages/Conversation/index.tsx index 29019eff5..4a7c4ce9b 100644 --- a/src/screens/Messages/Conversation/index.tsx +++ b/src/screens/Messages/Conversation/index.tsx @@ -277,7 +277,7 @@ function HeaderReady({ size={32} profile={profile} moderation={moderation.ui('avatar')} - disable={moderation.blocked} + disableHoverCard={moderation.blocked} /> <Text style={[a.text_lg, a.font_bold, a.pt_sm, a.pb_2xs]} diff --git a/src/screens/Messages/Settings.tsx b/src/screens/Messages/Settings.tsx index 7ad21b400..84b804b42 100644 --- a/src/screens/Messages/Settings.tsx +++ b/src/screens/Messages/Settings.tsx @@ -62,7 +62,7 @@ export function MessagesSettingsScreen({}: Props) { } items={[ {label: _(msg`Everyone`), value: 'all'}, - {label: _(msg`People I Follow`), value: 'following'}, + {label: _(msg`Users I follow`), value: 'following'}, {label: _(msg`No one`), value: 'none'}, ]} onSelect={onSelectItem} diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 19e2cf880..f23f4f7a5 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -51,7 +51,7 @@ interface EditableUserAvatarProps extends BaseUserAvatarProps { interface PreviewableUserAvatarProps extends BaseUserAvatarProps { moderation?: ModerationUI profile: AppBskyActorDefs.ProfileViewBasic - disable?: boolean + disableHoverCard?: boolean onBeforePress?: () => void } @@ -384,7 +384,7 @@ export {EditableUserAvatar} let PreviewableUserAvatar = ({ moderation, profile, - disable, + disableHoverCard, onBeforePress, ...rest }: PreviewableUserAvatarProps): React.ReactNode => { @@ -397,7 +397,7 @@ let PreviewableUserAvatar = ({ }, [profile, queryClient, onBeforePress]) return ( - <ProfileHoverCard did={profile.did} disable={disable}> + <ProfileHoverCard did={profile.did} disable={disableHoverCard}> <Link label={_(msg`See profile`)} to={makeProfileLink({ |