Skip to content

Commit

Permalink
frequentlyUsedLanguages not updated correctly (mastodon#31386)
Browse files Browse the repository at this point in the history
  • Loading branch information
c960657 authored Sep 3, 2024
1 parent 19849eb commit 8adf67f
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
12 changes: 0 additions & 12 deletions app/javascript/mastodon/actions/languages.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ class LanguageDropdown extends PureComponent {
frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
intl: PropTypes.object.isRequired,
onChange: PropTypes.func,
onClose: PropTypes.func,
};

state = {
Expand All @@ -257,14 +256,11 @@ class LanguageDropdown extends PureComponent {
};

handleClose = () => {
const { value, onClose } = this.props;

if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
}

this.setState({ open: false });
onClose(value);
};

handleChange = value => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { connect } from 'react-redux';


import { changeComposeLanguage } from 'mastodon/actions/compose';
import { useLanguage } from 'mastodon/actions/languages';

import LanguageDropdown from '../components/language_dropdown';

Expand All @@ -28,11 +27,6 @@ const mapDispatchToProps = dispatch => ({
dispatch(changeComposeLanguage(value));
},

onClose (value) {
// eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
dispatch(useLanguage(value));
},

});

export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
4 changes: 2 additions & 2 deletions app/javascript/mastodon/reducers/settings.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Map as ImmutableMap, fromJS } from 'immutable';

import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
import { COMPOSE_LANGUAGE_CHANGE } from '../actions/compose';
import { EMOJI_USE } from '../actions/emojis';
import { LANGUAGE_USE } from '../actions/languages';
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
Expand Down Expand Up @@ -175,7 +175,7 @@ export default function settings(state = initialState, action) {
return changeColumnParams(state, action.uuid, action.path, action.value);
case EMOJI_USE:
return updateFrequentEmojis(state, action.emoji);
case LANGUAGE_USE:
case COMPOSE_LANGUAGE_CHANGE:
return updateFrequentLanguages(state, action.language);
case SETTING_SAVE:
return state.set('saved', true);
Expand Down

0 comments on commit 8adf67f

Please sign in to comment.