moved locales to glitch, created add settings entry

This commit is contained in:
cwm
2017-12-09 15:15:11 -06:00
parent fbd2a0127c
commit 8606e53384
5 changed files with 14 additions and 2 deletions

View File

@ -59,6 +59,15 @@ export default class LocalSettingsPage extends React.PureComponent {
>
<FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' />
</LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['favourite_modal']}
id='mastodon-settings--favourite_modal'
onChange={onChange}
>
<FormattedMessage id='settings.favourite_modal' defaultMessage='Show confirmation dialog before favouriting' />
</LocalSettingsPageItem>
<section>
<h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2>
<LocalSettingsPageItem

View File

@ -57,6 +57,7 @@ const mapStateToProps = state => ({
layout: state.getIn(['local_settings', 'layout']),
isWide: state.getIn(['local_settings', 'stretch']),
navbarUnder: state.getIn(['local_settings', 'navbar_under']),
favouriteModal: state.getIn(['local_settings', 'favourite_modal']),
});
const keyMap = {
@ -103,6 +104,7 @@ export default class UI extends React.Component {
isWide: PropTypes.bool,
systemFontUi: PropTypes.bool,
navbarUnder: PropTypes.bool,
favouriteModal: PropTypes.bool,
isComposing: PropTypes.bool,
hasComposingText: PropTypes.bool,
location: PropTypes.object,

View File

@ -9,6 +9,7 @@ const initialState = ImmutableMap({
layout : 'auto',
stretch : true,
navbar_under : false,
favourite_modal : false,
side_arm : 'none',
collapsed : ImmutableMap({
enabled : true,