Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c2e1f0984 |
@@ -6,6 +6,7 @@ import { defineMessages, FormattedMessage, injectIntl } from "react-intl";
|
|||||||
|
|
||||||
import ImmutablePropTypes from "react-immutable-proptypes";
|
import ImmutablePropTypes from "react-immutable-proptypes";
|
||||||
|
|
||||||
|
import { languages as preloadedLanguages } from "flavours/glitch/initial_state";
|
||||||
|
|
||||||
// Our imports
|
// Our imports
|
||||||
import LocalSettingsPageItem from "./item";
|
import LocalSettingsPageItem from "./item";
|
||||||
@@ -35,6 +36,12 @@ const messages = defineMessages({
|
|||||||
direct: { id: "privacy.direct.short", defaultMessage: "Mentioned people only" },
|
direct: { id: "privacy.direct.short", defaultMessage: "Mentioned people only" },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const langs = []
|
||||||
|
|
||||||
|
for (const lang of preloadedLanguages) {
|
||||||
|
langs.push({"value": lang[0], "label": lang[1]})
|
||||||
|
}
|
||||||
|
|
||||||
class LocalSettingsPage extends PureComponent {
|
class LocalSettingsPage extends PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@@ -203,6 +210,16 @@ class LocalSettingsPage extends PureComponent {
|
|||||||
({ intl, onChange, settings }) => (
|
({ intl, onChange, settings }) => (
|
||||||
<div className='glitch local-settings__page compose_box_opts'>
|
<div className='glitch local-settings__page compose_box_opts'>
|
||||||
<h1><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box' /></h1>
|
<h1><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box' /></h1>
|
||||||
|
<LocalSettingsPageItem
|
||||||
|
settings={settings}
|
||||||
|
item={["default_language"]}
|
||||||
|
id='mastodon-settings--default-language'
|
||||||
|
select={langs}
|
||||||
|
onChange={onChange}
|
||||||
|
>
|
||||||
|
<FormattedMessage id='settings.default_language' defaultMessage='Default language for new toots' />
|
||||||
|
</LocalSettingsPageItem>
|
||||||
|
|
||||||
<LocalSettingsPageItem
|
<LocalSettingsPageItem
|
||||||
settings={settings}
|
settings={settings}
|
||||||
item={["always_show_spoilers_field"]}
|
item={["always_show_spoilers_field"]}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export default class LocalSettingsPageItem extends PureComponent {
|
|||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { handleChange } = this;
|
const { handleChange } = this;
|
||||||
const { settings, item, id, inputProps, options, children, dependsOn, dependsOnNot, placeholder, disabled } = this.props;
|
const { settings, item, id, inputProps, select, options, children, dependsOn, dependsOnNot, placeholder, disabled } = this.props;
|
||||||
let enabled = !disabled;
|
let enabled = !disabled;
|
||||||
|
|
||||||
if (dependsOn) {
|
if (dependsOn) {
|
||||||
@@ -53,6 +53,31 @@ export default class LocalSettingsPageItem extends PureComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (select && select.length > 0) {
|
||||||
|
const currentValue = settings.getIn(item);
|
||||||
|
const optionElems = select && select.length > 0 && select.map((opt) => {
|
||||||
|
return (
|
||||||
|
<option
|
||||||
|
value={opt.value}
|
||||||
|
selected={currentValue === opt.value}
|
||||||
|
>
|
||||||
|
{opt.label}
|
||||||
|
</option>
|
||||||
|
)
|
||||||
|
})
|
||||||
|
return (
|
||||||
|
<div className='glitch local-settings__page__item select'>
|
||||||
|
<fieldset>
|
||||||
|
<label>Default language:
|
||||||
|
<select>
|
||||||
|
{optionElems}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (options && options.length > 0) {
|
if (options && options.length > 0) {
|
||||||
const currentValue = settings.getIn(item);
|
const currentValue = settings.getIn(item);
|
||||||
const optionElems = options && options.length > 0 && options.map((opt) => {
|
const optionElems = options && options.length > 0 && options.map((opt) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user