Fixing some stuff...
This commit is contained in:
parent
d733a7b1b4
commit
2ca08f92b5
5 changed files with 35 additions and 26 deletions
|
@ -253,6 +253,6 @@ export function doChangeLanguage(newLanguage) {
|
||||||
app.i18n.setLocale(newLanguage);
|
app.i18n.setLocale(newLanguage);
|
||||||
return {
|
return {
|
||||||
type: types.CHANGE_LANGUAGE,
|
type: types.CHANGE_LANGUAGE,
|
||||||
data: { newLanguage: newLanguage }
|
data: { newLanguage: newLanguage },
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,17 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { doClearCache } from "actions/app";
|
import { doClearCache, doChangeLanguage } from "actions/app";
|
||||||
import { doSetDaemonSetting, doSetClientSetting, doChangeLanguage } from "actions/settings";
|
import {
|
||||||
import { selectDaemonSettings, selectShowNsfw, selectCurrentLanguage } from "selectors/settings";
|
doSetDaemonSetting,
|
||||||
|
doSetClientSetting,
|
||||||
|
} from "actions/settings";
|
||||||
|
import {
|
||||||
|
selectDaemonSettings,
|
||||||
|
selectShowNsfw,
|
||||||
|
} from "selectors/settings";
|
||||||
|
import {
|
||||||
|
selectCurrentLanguage,
|
||||||
|
} from "selectors/app"
|
||||||
import SettingsPage from "./view";
|
import SettingsPage from "./view";
|
||||||
|
|
||||||
const select = state => ({
|
const select = state => ({
|
||||||
|
@ -15,7 +24,7 @@ const perform = dispatch => ({
|
||||||
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
|
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
|
||||||
clearCache: () => dispatch(doClearCache()),
|
clearCache: () => dispatch(doClearCache()),
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
changeLanguage: (newLanguage) => dispatch(doChangeLanguage),
|
changeLanguage: newLanguage => dispatch(doChangeLanguage),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(SettingsPage);
|
export default connect(select, perform)(SettingsPage);
|
||||||
|
|
|
@ -86,7 +86,7 @@ class SettingsPage extends React.PureComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
onLanguageChange(e) {
|
onLanguageChange(e) {
|
||||||
this.props.changeLanguage(e.target.value)
|
this.props.changeLanguage(e.target.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
// onLanguageChange(language) {
|
// onLanguageChange(language) {
|
||||||
|
@ -171,7 +171,7 @@ class SettingsPage extends React.PureComponent {
|
||||||
defaultChecked={this.state.language == "en"}
|
defaultChecked={this.state.language == "en"}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{window.app.i18n.localLanguages.map((dLang) => (
|
{window.app.i18n.localLanguages.map(dLang =>
|
||||||
<div key={dLang} className="form-row">
|
<div key={dLang} className="form-row">
|
||||||
<FormField
|
<FormField
|
||||||
type="radio"
|
type="radio"
|
||||||
|
@ -184,7 +184,7 @@ class SettingsPage extends React.PureComponent {
|
||||||
defaultChecked={this.state.language == dLang}
|
defaultChecked={this.state.language == dLang}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
))}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section className="card">
|
<section className="card">
|
||||||
|
|
|
@ -194,5 +194,5 @@ export const selectBadgeNumber = createSelector(
|
||||||
|
|
||||||
export const selectCurrentLanguage = createSelector(
|
export const selectCurrentLanguage = createSelector(
|
||||||
_selectState,
|
_selectState,
|
||||||
(state) => state.currentLanguage || "en"
|
state => state.currentLanguage || "en"
|
||||||
)
|
);
|
||||||
|
|
Loading…
Add table
Reference in a new issue