fix: Consistency of member/editor language
fix: 'Delete' option on collection menu should show as dangerous
This commit is contained in:
@@ -161,9 +161,10 @@ export const unstarCollection = createAction({
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const deleteCollection = createAction({
|
export const deleteCollection = createAction({
|
||||||
name: ({ t }) => t("Delete"),
|
name: ({ t }) => `${t("Delete")}…`,
|
||||||
analyticsName: "Delete collection",
|
analyticsName: "Delete collection",
|
||||||
section: CollectionSection,
|
section: CollectionSection,
|
||||||
|
dangerous: true,
|
||||||
icon: <TrashIcon />,
|
icon: <TrashIcon />,
|
||||||
visible: ({ activeCollectionId, stores }) => {
|
visible: ({ activeCollectionId, stores }) => {
|
||||||
if (!activeCollectionId) {
|
if (!activeCollectionId) {
|
||||||
|
|||||||
@@ -51,17 +51,19 @@ const ConfirmationDialog: React.FC<Props> = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit}>
|
<form onSubmit={handleSubmit}>
|
||||||
<Text type="secondary">{children}</Text>
|
<Flex gap={12} column>
|
||||||
|
<Text type="secondary">{children}</Text>
|
||||||
|
|
||||||
<Flex justify="flex-end">
|
<Flex justify="flex-end">
|
||||||
<Button
|
<Button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={isSaving || disabled}
|
disabled={isSaving || disabled}
|
||||||
danger={danger}
|
danger={danger}
|
||||||
autoFocus
|
autoFocus
|
||||||
>
|
>
|
||||||
{isSaving && savingText ? savingText : submitText ?? t("Confirm")}
|
{isSaving && savingText ? savingText : submitText ?? t("Confirm")}
|
||||||
</Button>
|
</Button>
|
||||||
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ const MemberListItem = ({
|
|||||||
) : user.email ? (
|
) : user.email ? (
|
||||||
user.email
|
user.email
|
||||||
) : (
|
) : (
|
||||||
t("Member")
|
t("Editor")
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
actions={
|
actions={
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ function UserMenu({ user }: Props) {
|
|||||||
(ev: React.SyntheticEvent) => {
|
(ev: React.SyntheticEvent) => {
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
dialogs.openModal({
|
dialogs.openModal({
|
||||||
title: t("Change role to member"),
|
title: t("Change role to editor"),
|
||||||
isCentered: true,
|
isCentered: true,
|
||||||
content: (
|
content: (
|
||||||
<UserChangeToMemberDialog
|
<UserChangeToMemberDialog
|
||||||
@@ -155,7 +155,7 @@ function UserMenu({ user }: Props) {
|
|||||||
items={[
|
items={[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
title: `${t("Change role to member")}…`,
|
title: `${t("Change role to editor")}…`,
|
||||||
onClick: handleMember,
|
onClick: handleMember,
|
||||||
visible: can.demote && user.role !== "member",
|
visible: can.demote && user.role !== "member",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -248,7 +248,6 @@
|
|||||||
"Has access through <2>parent</2>": "Has access through <2>parent</2>",
|
"Has access through <2>parent</2>": "Has access through <2>parent</2>",
|
||||||
"Suspended": "Suspended",
|
"Suspended": "Suspended",
|
||||||
"Invited": "Invited",
|
"Invited": "Invited",
|
||||||
"Member": "Member",
|
|
||||||
"Leave": "Leave",
|
"Leave": "Leave",
|
||||||
"Only lowercase letters, digits and dashes allowed": "Only lowercase letters, digits and dashes allowed",
|
"Only lowercase letters, digits and dashes allowed": "Only lowercase letters, digits and dashes allowed",
|
||||||
"Sorry, this link has already been used": "Sorry, this link has already been used",
|
"Sorry, this link has already been used": "Sorry, this link has already been used",
|
||||||
@@ -443,7 +442,7 @@
|
|||||||
"Headings you add to the document will appear here": "Headings you add to the document will appear here",
|
"Headings you add to the document will appear here": "Headings you add to the document will appear here",
|
||||||
"Table of contents": "Table of contents",
|
"Table of contents": "Table of contents",
|
||||||
"Change role to admin": "Change role to admin",
|
"Change role to admin": "Change role to admin",
|
||||||
"Change role to member": "Change role to member",
|
"Change role to editor": "Change role to editor",
|
||||||
"Change role to viewer": "Change role to viewer",
|
"Change role to viewer": "Change role to viewer",
|
||||||
"Change name": "Change name",
|
"Change name": "Change name",
|
||||||
"Suspend user": "Suspend user",
|
"Suspend user": "Suspend user",
|
||||||
|
|||||||
Reference in New Issue
Block a user