Skip to content

Commit

Permalink
Invite using Web Share API: hides "Share in English" when locale is E…
Browse files Browse the repository at this point in the history
…nglish
  • Loading branch information
DougReeder committed Oct 8, 2024
1 parent 3928189 commit cfba5b1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
25 changes: 15 additions & 10 deletions src/react-components/room/InvitePopover.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ReactComponent as ShareIcon } from "../icons/Share.svg";

function InvitePopoverContent({ url, embed, inviteRequired, fetchingInvite, inviteUrl, revokeInvite, shareUrlHandler }) {
const [isShareInEnglish, setIsShareInEnglish] = useState(false);
const intl = useIntl();
return (
<Column center padding grow gap="lg" className={styles.invitePopover}>
{inviteRequired ? (
Expand All @@ -29,11 +30,13 @@ function InvitePopoverContent({ url, embed, inviteRequired, fetchingInvite, invi
<FormattedMessage id="invite-popover.share-invitation" defaultMessage="Share Invitation" />
</span>
</Button>
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
{ ! intl?.locale?.startsWith?.('en') &&
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
}
</>
}
<InviteLinkInputField fetchingInvite={fetchingInvite} inviteUrl={inviteUrl} onRevokeInvite={revokeInvite} />
Expand All @@ -47,11 +50,13 @@ function InvitePopoverContent({ url, embed, inviteRequired, fetchingInvite, invi
<FormattedMessage id="invite-popover.share-room-link" defaultMessage="Share Room Link" />
</span>
</Button>
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
{ ! intl?.locale?.startsWith?.('en') &&
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
}
</>
}
<CopyableTextInputField
Expand Down
12 changes: 7 additions & 5 deletions src/react-components/room/RoomSettingsSidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,13 @@ export function RoomSettingsSidebar({
<FormattedMessage id="invite-popover.share-invitation" defaultMessage="Share Invitation" />
</span>
</Button>
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
{ ! intl?.locale?.startsWith?.('en') &&
<Checkbox
label={<FormattedMessage id="invite-popover.share-in-english" defaultMessage="Share in English" />}
checked={isShareInEnglish}
onChange={_event => setIsShareInEnglish(inEnglish => !inEnglish)}
/>
}
</>
}
<InviteLinkInputField fetchingInvite={fetchingInvite} inviteUrl={inviteUrl} onRevokeInvite={onRevokeInvite} />
Expand Down

0 comments on commit cfba5b1

Please sign in to comment.