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.

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

"Mute" -> "Hide" #3177

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions static/app-strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,13 @@
"Missing 'claimId' parameter.": "Missing 'claimId' parameter.",
"View Tag": "View Tag",
"Hide": "Hide",
"Unhide": "Unhide",
"Hide Channel": "Hide Channel",
"Unhide Channel": "Unhide Channel",
"Blocked and hidden channels": "Blocked and hidden channels",
"Moderators can block channels on your behalf. Blocked channels will appear in your \"Blocked and Hidden\" list.": "Moderators can block channels on your behalf. Blocked channels will appear in your \"Blocked and Hidden\" list.",
"Hidden channels will be invisible to you in the app. They will not know they are hidden and can still interact with you and your content.": "Hidden channels will be invisible to you in the app. They will not know they are hidden and can still interact with you and your content.",
"You do not have any hidden channels": "You do not have any hidden channels",
"Close": "Close",
"You have blocked this channel content.": "You have blocked this channel content.",
"Network and data settings": "Network and data settings",
Expand Down Expand Up @@ -1707,8 +1714,10 @@
"Muted channels will be invisible to you in the app. They will not know they are muted and can still interact with you and your content.": "Muted channels will be invisible to you in the app. They will not know they are muted and can still interact with you and your content.",
"List of channels that you have blocked as a moderator, along with the list of delegators.": "List of channels that you have blocked as a moderator, along with the list of delegators.",
"This is the global block list.": "This is the global block list.",
"This channel is hidden": "This channel is hidden",
"This channel is blocked": "This channel is blocked",
"This channel is muted": "This channel is muted",
"Are you sure you want to view this content? Viewing will not unhide @%channel%": "Are you sure you want to view this content? Viewing will not unhide @%channel%",
"Are you sure you want to view this content? Viewing will not unblock @%channel%": "Are you sure you want to view this content? Viewing will not unblock @%channel%",
"Are you sure you want to view this content? Viewing will not unmute @%channel%": "Are you sure you want to view this content? Viewing will not unmute @%channel%",
"View Content": "View Content",
Expand Down
2 changes: 1 addition & 1 deletion ui/component/channelMuteButton/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function ChannelMuteButton(props: Props) {
}
}

return <Button button="alt" label={isMuted ? __('Unmute') : __('Mute')} onClick={handleClick} />;
return <Button button="alt" label={isMuted ? __('Unhide') : __('Hide')} onClick={handleClick} />;
}

export default ChannelMuteButton;
19 changes: 10 additions & 9 deletions ui/component/claimMenuList/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,14 @@ function ClaimMenuList(props: Props) {
{(!claimIsMine || channelIsBlocked) && contentChannelUri ? (
!incognitoClaim && (
<>
<MenuItem className="comment__menu-option" onSelect={handleToggleBlock}>
<div className="menu__link">
<Icon aria-hidden icon={ICONS.BLOCK} />
{channelIsBlocked ? __('Unblock Channel') : __('Block Channel')}
</div>
</MenuItem>
{isChannelPage && (
<MenuItem className="comment__menu-option" onSelect={handleToggleBlock}>
<div className="menu__link">
<Icon aria-hidden icon={ICONS.BLOCK} />
{channelIsBlocked ? __('Unblock Channel') : __('Block Channel')}
</div>
</MenuItem>
)}

{isAdmin && (
<MenuItem className="comment__menu-option" onSelect={handleToggleAdminBlock}>
Expand All @@ -563,11 +565,10 @@ function ClaimMenuList(props: Props) {
</div>
</MenuItem>
)}

<MenuItem className="comment__menu-option" onSelect={handleToggleMute}>
<div className="menu__link">
<Icon aria-hidden icon={ICONS.MUTE} />
{channelIsMuted ? __('Unmute Channel') : __('Mute Channel')}
<Icon aria-hidden icon={ICONS.EYE_OFF} />
{channelIsMuted ? __('Unhide Channel') : __('Hide Channel')}
</div>
</MenuItem>
</>
Expand Down
4 changes: 2 additions & 2 deletions ui/component/commentMenuList/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ function CommentMenuList(props: Props) {
</MenuItem>
<MenuItem className="comment__menu-option" onSelect={() => muteChannel(authorUri)}>
<div className="menu__link">
<Icon aria-hidden icon={ICONS.MUTE} />
{__('Mute')}
<Icon aria-hidden icon={ICONS.EYE_OFF} />
{__('Hide')}
</div>
{activeChannelIsCreator && (
<span className="comment__menu-help">{__('Hide this channel for you only.')}</span>
Expand Down
2 changes: 1 addition & 1 deletion ui/component/settingContent/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default function SettingContent(props: Props) {
/>
</SettingsRow>

<SettingsRow title={__('Blocked and muted channels')}>
<SettingsRow title={__('Blocked and hidden channels')}>
<Button
button="inverse"
label={__('Manage')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ const HELP = {
MIN_SUPER: 'Enabling a minimum amount to hyperchat will force all TIPPED comments to have this value in order to be shown. This still allows regular comments to be posted.',
MIN_SUPER_OFF: '(This settings is not applicable if all comments require a tip.)',
BLOCKED_WORDS: 'Comments and livestream chat containing these words will be blocked.',
MODERATORS: 'Moderators can block channels on your behalf. Blocked channels will appear in your "Blocked and Muted" list.',
MODERATORS: 'Moderators can block channels on your behalf. Blocked channels will appear in your "Blocked and Hidden" list.',
MODERATOR_SEARCH: 'Enter a channel name or URL to add as a moderator.\nExamples:\n - @channel\n - @channel#3\n - https://odysee.com/@Odysee:8\n - lbry://@Odysee#8',
MEMBERS_ONLY_COMMENTS: 'Only channel members with "Members-only chat" perk can participate in public comments sections.',
MEMBERS_ONLY_CHAT: 'Only channel members with "Members-only chat" perk can participate in public livestream chats.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,13 @@ function ChannelPage(props: Props) {
) : (isBlocked || isMuted) && !viewBlockedChannel ? (
<div className="main--empty">
<Yrbl
title={isBlocked ? __('This channel is blocked') : __('This channel is muted')}
title={isBlocked ? __('This channel is blocked') : __('This channel is hidden')}
subtitle={
isBlocked
? __('Are you sure you want to view this content? Viewing will not unblock @%channel%', {
channel: channelName,
})
: __('Are you sure you want to view this content? Viewing will not unmute @%channel%', {
: __('Are you sure you want to view this content? Viewing will not unhide @%channel%', {
channel: channelName,
})
}
Expand Down
8 changes: 4 additions & 4 deletions ui/page/listBlocked/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function ListBlocked(props: Props) {
return __('List of channels that you have blocked as a moderator, along with the list of delegators.');
case VIEW.MUTED:
return __(
'Muted channels will be invisible to you in the app. They will not know they are muted and can still interact with you and your content.'
'Hidden channels will be invisible to you in the app. They will not know they are hidden and can still interact with you and your content.'
);
}
}
Expand All @@ -185,7 +185,7 @@ function ListBlocked(props: Props) {
case VIEW.BLOCKED:
return __('You do not have any blocked channels');
case VIEW.MUTED:
return __('You do not have any muted channels');
return __('You do not have any hidden channels');
case VIEW.ADMIN:
return __('You do not have any globally-blocked channels');
case VIEW.MODERATOR:
Expand Down Expand Up @@ -256,7 +256,7 @@ function ListBlocked(props: Props) {
noFooter
noSideNavigation
settingsPage
backout={{ title: __('Blocked and muted channels'), backLabel: __('Back') }}
backout={{ title: __('Blocked and hidden channels'), backLabel: __('Back') }}
>
{fetchingModerationBlockList && (
<div className="main--empty">
Expand All @@ -271,7 +271,7 @@ function ListBlocked(props: Props) {
{getViewElem(VIEW.BLOCKED, 'Blocked', ICONS.BLOCK)}
{isAdmin && getViewElem(VIEW.ADMIN, 'Global', ICONS.BLOCK)}
{isModerator && getViewElem(VIEW.MODERATOR, 'Moderator', ICONS.BLOCK)}
{getViewElem(VIEW.MUTED, 'Muted', ICONS.MUTE)}
{getViewElem(VIEW.MUTED, 'Hidden', ICONS.EYE_OFF)}
</div>
<div className="section__actions--inline">{getRefreshElem()}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/page/settingsCreator/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ const HELP = {
MIN_SUPER: 'Enabling a minimum amount to hyperchat will force all TIPPED comments to have this value in order to be shown. This still allows regular comments to be posted.',
MIN_SUPER_OFF: '(This settings is not applicable if all comments require a tip.)',
BLOCKED_WORDS: 'Comments and livestream chat containing these words will be blocked.',
MODERATORS: 'Moderators can block channels on your behalf. Blocked channels will appear in your "Blocked and Muted" list.',
MODERATORS: 'Moderators can block channels on your behalf. Blocked channels will appear in your "Blocked and Hidden" list.',
MODERATOR_SEARCH: 'Enter a channel name or URL to add as a moderator.\nExamples:\n - @channel\n - @channel#3\n - https://odysee.com/@Odysee:8\n - lbry://@Odysee#8',
MEMBERS_ONLY_COMMENTS: 'Only channel members with "Members-only chat" perk can participate in public comments sections.',
MEMBERS_ONLY_CHAT: 'Only channel members with "Members-only chat" perk can participate in public livestream chats.',
Expand Down
Loading