Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORL-3148]: copy and style fixes for new commenter and email domain features #4580

Merged
merged 1 commit into from
Mar 20, 2024
Merged

[CORL-3148]: copy and style fixes for new commenter and email domain features #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/core/client/admin/components/BanModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ const BanModal: FunctionComponent<Props> = ({
<Localized id="community-banModal-banEmailDomain-callOut">
<span>
This will prevent any commenter from using this
email domain.
email domain
</span>
</Localized>
</CallOut>
Expand Down
4 changes: 2 additions & 2 deletions client/src/core/client/admin/routes/Configure/sections/General/NewCommenterConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const NewCommenterConfig: FunctionComponent<Props> = ({ disabled }) => (
<ConfigBox
title={
<Localized id="configure-general-newCommenter-title">
<Header container="h2">New commenter</Header>
<Header container="h2">New commenter badge</Header>
</Localized>
}
>
Expand All @@ -48,7 +48,7 @@ const NewCommenterConfig: FunctionComponent<Props> = ({ disabled }) => (
</FormFieldDescription>
<FormField container={<FieldSet />}>
<Localized id="configure-general-newCommenter-enabled">
<Label component="legend">New commenter</Label>
<Label component="legend">Enable new commenter badges</Label>
</Localized>
<OnOffField name="newCommenter.enabled" disabled={disabled} />
</FormField>
Expand Down
4 changes: 2 additions & 2 deletions client/src/core/client/admin/routes/Configure/sections/General/TopCommenterConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const TopCommenterConfig: FunctionComponent<Props> = ({ disabled }) => (
<ConfigBox
title={
<Localized id="configure-general-topCommenter-title">
<Header container="h2">Top commenter</Header>
<Header container="h2">Top commenter badge</Header>
</Localized>
}
>
Expand All @@ -42,7 +42,7 @@ const TopCommenterConfig: FunctionComponent<Props> = ({ disabled }) => (
</Localized>
<FormField container={<FieldSet />}>
<Localized id="configure-general-topCommenter-enabled">
<Label component="legend">Top commenter</Label>
<Label component="legend">Enable top commenter badges</Label>
</Localized>
<OnOffField name="topCommenter.enabled" disabled={disabled} />
</FormField>
Expand Down
3 changes: 2 additions & 1 deletion ...src/core/client/admin/routes/Configure/sections/Moderation/EmailDomainConfigContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ const EmailDomainConfigContainer: FunctionComponent<Props> = ({
<Localized id="configure-moderation-emailDomains-exceptions-helperText">
<HelperText>
These domains cannot be banned. Domains should be written without
www, for example `gmail.com`. Separate domains with a comma.
www, for example "gmail.com". Separate domains with a comma and a
space.
</HelperText>
</Localized>
<Field
Expand Down
4 changes: 4 additions & 0 deletions client/src/core/client/stream/tabs/Comments/Comment/Comment.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,7 @@ $commentTimestampColor: var(--palette-grey-500);
.innerTopBar {
min-height: 25px;
}

.plantIcon {
margin-left: -5px !important;
}
5 changes: 4 additions & 1 deletion client/src/core/client/stream/tabs/Comments/Comment/Comment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ const Comment: FunctionComponent<CommentProps> = (props) => {
data-testid="new-user-badge"
>
<ButtonSvgIcon
className={CLASSES.comment.topBar.newCommenter.plant}
className={cn(
CLASSES.comment.topBar.newCommenter.plant,
styles.plantIcon
)}
Icon={PlantIcon}
filled="currentColor"
/>
Expand Down
12 changes: 6 additions & 6 deletions locales/en-US/admin.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,9 @@ configure-general-featuredBy-title = Featured by
configure-general-featuredBy-enabled = Featured by enabled
configure-general-featuredBy-explanation = Add moderator name to featured comment display

configure-general-topCommenter-title = Top commenter
configure-general-topCommenter-title = Top commenter badge
configure-general-topCommenter-explanation = Add top commenter badge to commenters with featured comments in the last 10 days
configure-general-topCommenter-enabled = Top commenter
configure-general-topCommenter-enabled = Enable top commenter badges

configure-general-flairBadge-header = Custom flair badges
configure-general-flairBadge-description = Encourage user engagement and participation by adding custom flair
Expand Down Expand Up @@ -891,7 +891,7 @@ configure-moderation-emailDomains-confirmDelete = Deleting this email domain wil
configure-moderation-emailDomains-form-description-add = Add a domain and select the action that should be taken when on every new account created using the specified domain.
configure-moderation-emailDomains-form-description-edit = Update the domain or action that should be taken when on every new account using the specified domain.
configure-moderation-emailDomains-exceptions-header = Exceptions
configure-moderation-emailDomains-exceptions-helperText = These domains cannot be banned. Domains should be written without www, for example `gmail.com`. Separate domains with a comma.
configure-moderation-emailDomains-exceptions-helperText = These domains cannot be banned. Domains should be written without www, for example "gmail.com". Separate domains with a comma and a space.

configure-moderation-emailDomains-showCurrent = Show current domain list
configure-moderation-emailDomains-hideCurrent = Hide current domain list
Expand Down Expand Up @@ -1444,7 +1444,7 @@ community-userStatus-removePremod = Remove pre-moderate
community-banModal-allSites-title = Are you sure you want to ban <username></username>?
community-banModal-banEmailDomain-title = Email domain ban
community-banModal-banEmailDomain = Ban all commenter accounts from { $domain }
community-banModal-banEmailDomain-callOut = This will prevent any commenter from using this email domain.
community-banModal-banEmailDomain-callOut = This will prevent any commenter from using this email domain
community-banModal-banEmailDomain-confirmationText = Type in "{ $text }" to confirm
community-banModal-specificSites-title = Are you sure you want to manage the ban status of <username></username>?
community-banModal-noSites-title = Are you sure you want to unban <username></username>?
Expand Down Expand Up @@ -1664,9 +1664,9 @@ configure-general-reactions-sort-input =
configure-general-reactions-preview = Preview
configure-general-reaction-sortMenu-sortBy = Sort by

configure-general-newCommenter-title = New commenter
configure-general-newCommenter-title = New commenter badge
configure-general-newCommenter-explanation = Add <icon></icon> badge to commenters who created their accounts in the past seven days.
configure-general-newCommenter-enabled = New commenter
configure-general-newCommenter-enabled = Enable new commenter badges

configure-general-badges-title = Member badges
configure-general-badges-explanation =
Expand Down
Loading