mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-06 10:16:34 +00:00
moved locales to glitch, created add settings entry
This commit is contained in:
parent
fbd2a0127c
commit
8606e53384
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -9,6 +9,7 @@ const initialState = ImmutableMap({
|
|||
layout : 'auto',
|
||||
stretch : true,
|
||||
navbar_under : false,
|
||||
favourite_modal : false,
|
||||
side_arm : 'none',
|
||||
collapsed : ImmutableMap({
|
||||
enabled : true,
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
"status.collapse": "Collapse",
|
||||
"status.uncollapse": "Uncollapse",
|
||||
|
||||
"favourite_modal.combo": "You can press {combo} to skip this next time",
|
||||
|
||||
"home.column_settings.show_direct": "Show DMs",
|
||||
|
||||
"notification.markForDeletion": "Mark for deletion",
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
"account.unmute_notifications": "Unmute notifications from @{name}",
|
||||
"account.view_full_profile": "View full profile",
|
||||
"boost_modal.combo": "You can press {combo} to skip this next time",
|
||||
"favourite_modal.combo": "You can press {combo} to skip this next time",
|
||||
"bundle_column_error.body": "Something went wrong while loading this component.",
|
||||
"bundle_column_error.retry": "Try again",
|
||||
"bundle_column_error.title": "Network error",
|
||||
|
@ -110,7 +109,6 @@
|
|||
"home.settings": "Column settings",
|
||||
"keyboard_shortcuts.back": "to navigate back",
|
||||
"keyboard_shortcuts.boost": "to boost",
|
||||
"keyboard_shortcuts.favourite": "to favourite",
|
||||
"keyboard_shortcuts.column": "to focus a status in one of the columns",
|
||||
"keyboard_shortcuts.compose": "to focus the compose textarea",
|
||||
"keyboard_shortcuts.description": "Description",
|
||||
|
|
Loading…
Reference in a new issue