LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-27 15:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing some stuff...

Browse source
This commit is contained in:
Fillerino 2017-07-07 15:26:03 +02:00
parent d733a7b1b4
commit 2ca08f92b5
5 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/js/actions/app.js
View file

@ -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 },
} };
} }

2
ui/js/constants/action_types.js
View file

@ -99,4 +99,4 @@ export const CLAIM_REWARD_FAILURE = "CLAIM_REWARD_FAILURE";
export const CLAIM_REWARD_CLEAR_ERROR = "CLAIM_REWARD_CLEAR_ERROR"; export const CLAIM_REWARD_CLEAR_ERROR = "CLAIM_REWARD_CLEAR_ERROR";
//Language //Language
export const LANGUAGE_CHANGED = "LANGUAGE_CHANGED"; export const LANGUAGE_CHANGED = "LANGUAGE_CHANGED";

17
ui/js/page/settings/index.js
View file

@ -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);

34
ui/js/page/settings/view.jsx
View file

@ -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) {
@ -166,27 +166,27 @@ class SettingsPage extends React.PureComponent {
name="language" name="language"
label={__("English")} label={__("English")}
onChange={() => { onChange={() => {
this.onLanguageChange.bind(this); this.onLanguageChange.bind(this);
}} }}
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"
name="language" name="language"
key={dLang} key={dLang}
label={window.app.i18n.resLang(dLang)} label={window.app.i18n.resLang(dLang)}
onChange={() => { onChange={() => {
this.onLanguageChange.bind(this); this.onLanguageChange.bind(this);
}} }}
defaultChecked={this.state.language == dLang} defaultChecked={this.state.language == dLang}
/> />
</div>
)}
</div> </div>
))} </section>
</div>
</section>
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Download Directory")}</h3> <h3>{__("Download Directory")}</h3>

4
ui/js/selectors/app.js
View file

@ -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"
) );