2
0

Change firehose labels depending on which feeds are accessible (#36607)

This commit is contained in:
Claire
2025-10-28 17:59:37 +01:00
committed by GitHub
parent 795aaa14bf
commit 4896d2c4c6
3 changed files with 31 additions and 2 deletions

View File

@@ -24,6 +24,14 @@ import StatusListContainer from '../ui/containers/status_list_container';
const messages = defineMessages({
title: { id: 'column.firehose', defaultMessage: 'Live feeds' },
title_local: {
id: 'column.firehose_local',
defaultMessage: 'Live feed for this server',
},
title_singular: {
id: 'column.firehose_singular',
defaultMessage: 'Live feed',
},
});
const ColumnSettings = () => {
@@ -161,13 +169,23 @@ const Firehose = ({ feedType, multiColumn }) => {
/>
);
let title;
if (canViewFeed(signedIn, permissions, localLiveFeedAccess) && canViewFeed(signedIn, permissions, remoteLiveFeedAccess)) {
title = messages.title;
} else if (canViewFeed(signedIn, permissions, localLiveFeedAccess)) {
title = messages.title_local;
} else {
title = messages.title_singular;
}
return (
<Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
<ColumnHeader
icon='globe'
iconComponent={PublicIcon}
active={hasUnread}
title={intl.formatMessage(messages.title)}
title={intl.formatMessage(title)}
onPin={handlePin}
onClick={handleHeaderClick}
multiColumn={multiColumn}

View File

@@ -61,6 +61,10 @@ const messages = defineMessages({
},
explore: { id: 'explore.title', defaultMessage: 'Trending' },
firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
firehose_singular: {
id: 'column.firehose_singular',
defaultMessage: 'Live feed',
},
direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
@@ -275,7 +279,12 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
icon='globe'
iconComponent={PublicIcon}
isActive={isFirehoseActive}
text={intl.formatMessage(messages.firehose)}
text={intl.formatMessage(
canViewFeed(signedIn, permissions, localLiveFeedAccess) &&
canViewFeed(signedIn, permissions, remoteLiveFeedAccess)
? messages.firehose
: messages.firehose_singular,
)}
/>
)}

View File

@@ -173,6 +173,8 @@
"column.edit_list": "Edit list",
"column.favourites": "Favorites",
"column.firehose": "Live feeds",
"column.firehose_local": "Live feed for this server",
"column.firehose_singular": "Live feed",
"column.follow_requests": "Follow requests",
"column.home": "Home",
"column.list_members": "Manage list members",