tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change privacy policy to be rendered in web UI, add REST API (#19310)

Browse Source 
Source string no longer localized, Markdown instead of raw HTML
This commit is contained in:
Eugen Rochko
2022-10-08 06:01:11 +02:00
committed by GitHub
parent 7fb738c837
commit a2ba011326
15 changed files with 282 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/link_footer.js
View File

@ -54,7 +54,7 @@ class LinkFooter extends React.PureComponent {
items.push(<a key='about' href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About' /></a>);
items.push(<a key='mastodon' href='https://joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.what_is_mastodon' defaultMessage='About Mastodon' /></a>);
items.push(<a key='docs' href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a>);
items.push(<a key='privacy-policy' href='/privacy-policy' target='_blank'><FormattedMessage id='getting_started.privacy_policy' defaultMessage='Privacy Policy' /></a>);
items.push(<Link key='privacy-policy' to='/privacy-policy'><FormattedMessage id='getting_started.privacy_policy' defaultMessage='Privacy Policy' /></Link>);
items.push(<Link key='hotkeys' to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link>);
if (profileDirectory) {

2
app/javascript/mastodon/features/ui/index.js
View File

@ -52,6 +52,7 @@ import {
Explore,
FollowRecommendations,
About,
PrivacyPolicy,
} from './util/async-components';
import { me, title } from '../../initial_state';
import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
@ -173,6 +174,7 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
<WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
<WrappedRoute path='/about' component={About} content={children} />
<WrappedRoute path='/privacy-policy' component={PrivacyPolicy} content={children} />
<WrappedRoute path={['/home', '/timelines/home']} component={HomeTimeline} content={children} />
<WrappedRoute path={['/public', '/timelines/public']} exact component={PublicTimeline} content={children} />

4
app/javascript/mastodon/features/ui/util/async-components.js
View File

@ -169,3 +169,7 @@ export function FilterModal () {
export function About () {
return import(/*webpackChunkName: "features/about" */'../../about');
}
export function PrivacyPolicy () {
return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy');
}