me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved locales to glitch, created add settings entry

Browse source
This commit is contained in:
cwm 2017-12-09 15:15:11 -06:00
parent 38a5aa6c9e
commit 7a066e814b
5 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/flavours/glitch/features/local_settings/page/index.js
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)' /> <FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' />
</LocalSettingsPageItem> </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> <section>
<h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2> <h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2>
<LocalSettingsPageItem <LocalSettingsPageItem

2
app/javascript/flavours/glitch/features/ui/index.js
View file

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

1
app/javascript/flavours/glitch/reducers/local_settings.js
View file

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

2
app/javascript/glitch/locales/en.json
View file

@ -32,6 +32,8 @@
"status.collapse": "Collapse", "status.collapse": "Collapse",
"status.uncollapse": "Uncollapse", "status.uncollapse": "Uncollapse",
"favourite_modal.combo": "You can press {combo} to skip this next time",
"home.column_settings.show_direct": "Show DMs", "home.column_settings.show_direct": "Show DMs",
"notification.markForDeletion": "Mark for deletion", "notification.markForDeletion": "Mark for deletion",

2
app/javascript/mastodon/locales/en.json
View file

@ -25,7 +25,6 @@
"account.unmute_notifications": "Unmute notifications from @{name}", "account.unmute_notifications": "Unmute notifications from @{name}",
"account.view_full_profile": "View full profile", "account.view_full_profile": "View full profile",
"boost_modal.combo": "You can press {combo} to skip this next time", "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.body": "Something went wrong while loading this component.",
"bundle_column_error.retry": "Try again", "bundle_column_error.retry": "Try again",
"bundle_column_error.title": "Network error", "bundle_column_error.title": "Network error",
@ -110,7 +109,6 @@
"home.settings": "Column settings", "home.settings": "Column settings",
"keyboard_shortcuts.back": "to navigate back", "keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.boost": "to boost", "keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea", "keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description", "keyboard_shortcuts.description": "Description",