diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 3706d11e18a99c5cb9b0dda8e2e10143a66dc11e..029450d6d9a8a7de175ece572d7d337ca0158871 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -36,6 +36,9 @@ const messages = defineMessages({ security: { id: 'navigation_bar.security', defaultMessage: 'Security' }, menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' }, + information: { id: 'navigation_bar.information', defaultMessage: 'Information' }, + information_acct: { id: 'navigation_bar.information_acct', defaultMessage: 'Fedibird info' }, + hashtag_fedibird: { id: 'navigation_bar.hashtag_fedibird', defaultMessage: 'fedibird' }, }); const mapStateToProps = state => ({ @@ -111,6 +114,14 @@ class GettingStarted extends ImmutablePureComponent { height += 48; } + navItems.push( + <ColumnSubheading key={i++} text={intl.formatMessage(messages.information)} />, + <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/2' />, + <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_fedibird)} to='/timelines/tag/fedibird' />, + ); + + height += 34 + 48*2; + navItems.push( <ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} /> ); diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js index e8df1f427965b1cfab8065248162cf99ed29cd08..a2cd6b41ab896f17bcce9c3ef7a9a3c794cde5ca 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.js +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js @@ -14,6 +14,8 @@ const NavigationPanel = () => ( <NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink> <FollowRequestsNavLink /> <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink> + <NavLink className='column-link column-link--transparent' to='/accounts/2'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='Fedibird info' /></NavLink> + <NavLink className='column-link column-link--transparent' to='/timelines/tag/fedibird'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_fedibird' defaultMessage='Fedibird topics' /></NavLink> <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink> <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink> <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink> diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 35e6300d0afda7b4b93987abe385f2945f8acf94..7d9bafd626fa83d59813b804412cc10f0a8d35aa 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -268,7 +268,10 @@ "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.follows_and_followers": "Follows and followers", + "navigation_bar.hashtag_fedibird": "Fedibird topics", "navigation_bar.info": "About this server", + "navigation_bar.information": "Information", + "navigation_bar.information_acct": "Fedibird info", "navigation_bar.keyboard_shortcuts": "Hotkeys", "navigation_bar.lists": "Lists", "navigation_bar.logout": "Logout", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 08f5f2e38efff8730c6b27856ffd0efa52534d1b..0252a5525acff82860cfaffb08da461cbcbdc30a 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -268,7 +268,10 @@ "navigation_bar.filters": "フィルターè¨å®š", "navigation_bar.follow_requests": "フォãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆ", "navigation_bar.follows_and_followers": "フォãƒãƒ¼ãƒ»ãƒ•ã‚©ãƒãƒ¯ãƒ¼", + "navigation_bar.hashtag_fedibird": "Fedibirdã«é–¢ã™ã‚‹è©±é¡Œ", "navigation_bar.info": "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«ã¤ã„ã¦", + "navigation_bar.information": "ãŠçŸ¥ã‚‰ã›ã¨æƒ…å ±", + "navigation_bar.information_acct": "Fedibirdインフォメーション", "navigation_bar.keyboard_shortcuts": "ホットã‚ー", "navigation_bar.lists": "リスト", "navigation_bar.logout": "ãƒã‚°ã‚¢ã‚¦ãƒˆ",