Change firehose labels depending on which feeds are accessible (#36607)
This commit is contained in:
@@ -24,6 +24,14 @@ import StatusListContainer from '../ui/containers/status_list_container';
|
|||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
title: { id: 'column.firehose', defaultMessage: 'Live feeds' },
|
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 = () => {
|
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 (
|
return (
|
||||||
<Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
|
<Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
|
||||||
<ColumnHeader
|
<ColumnHeader
|
||||||
icon='globe'
|
icon='globe'
|
||||||
iconComponent={PublicIcon}
|
iconComponent={PublicIcon}
|
||||||
active={hasUnread}
|
active={hasUnread}
|
||||||
title={intl.formatMessage(messages.title)}
|
title={intl.formatMessage(title)}
|
||||||
onPin={handlePin}
|
onPin={handlePin}
|
||||||
onClick={handleHeaderClick}
|
onClick={handleHeaderClick}
|
||||||
multiColumn={multiColumn}
|
multiColumn={multiColumn}
|
||||||
|
|||||||
@@ -61,6 +61,10 @@ const messages = defineMessages({
|
|||||||
},
|
},
|
||||||
explore: { id: 'explore.title', defaultMessage: 'Trending' },
|
explore: { id: 'explore.title', defaultMessage: 'Trending' },
|
||||||
firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
|
firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
|
||||||
|
firehose_singular: {
|
||||||
|
id: 'column.firehose_singular',
|
||||||
|
defaultMessage: 'Live feed',
|
||||||
|
},
|
||||||
direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
|
direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
|
||||||
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
|
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
|
||||||
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
|
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
|
||||||
@@ -275,7 +279,12 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
|
|||||||
icon='globe'
|
icon='globe'
|
||||||
iconComponent={PublicIcon}
|
iconComponent={PublicIcon}
|
||||||
isActive={isFirehoseActive}
|
isActive={isFirehoseActive}
|
||||||
text={intl.formatMessage(messages.firehose)}
|
text={intl.formatMessage(
|
||||||
|
canViewFeed(signedIn, permissions, localLiveFeedAccess) &&
|
||||||
|
canViewFeed(signedIn, permissions, remoteLiveFeedAccess)
|
||||||
|
? messages.firehose
|
||||||
|
: messages.firehose_singular,
|
||||||
|
)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -173,6 +173,8 @@
|
|||||||
"column.edit_list": "Edit list",
|
"column.edit_list": "Edit list",
|
||||||
"column.favourites": "Favorites",
|
"column.favourites": "Favorites",
|
||||||
"column.firehose": "Live feeds",
|
"column.firehose": "Live feeds",
|
||||||
|
"column.firehose_local": "Live feed for this server",
|
||||||
|
"column.firehose_singular": "Live feed",
|
||||||
"column.follow_requests": "Follow requests",
|
"column.follow_requests": "Follow requests",
|
||||||
"column.home": "Home",
|
"column.home": "Home",
|
||||||
"column.list_members": "Manage list members",
|
"column.list_members": "Manage list members",
|
||||||
|
|||||||
Reference in New Issue
Block a user