mirror of
https://github.com/flarum/framework.git
synced 2025-02-23 00:33:27 +08:00
Add option to hide the language selector (#1106)
* Added option to hide the language selector in the header
* Added `hide_language_selector` Switch to BasicsPage
* Added `hideLanguageSelector` property to ForumSerializer
* Apparently fixed the "Add Extension" button locale.... someone must not have compiled their changes :P
* Changed hideLanguageSelector (and such) to showLanguageSelector
* Change `core.admin.basics.show_language_selector_heading` to be `_label`
* Change showLanguageSelector in ForumSerializer to be boolean, default: true
* Ooops! Remove console.log 🤦♂️
This commit is contained in:
parent
cf65b28ccf
commit
1d047909e8
18
framework/core/js/admin/dist/app.js
vendored
18
framework/core/js/admin/dist/app.js
vendored
@ -18017,10 +18017,10 @@ System.register('flarum/components/Badge', ['flarum/Component', 'flarum/helpers/
|
|||||||
});;
|
});;
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flarum/components/FieldSet', 'flarum/components/Select', 'flarum/components/Button', 'flarum/components/Alert', 'flarum/utils/saveSettings', 'flarum/utils/ItemList'], function (_export, _context) {
|
System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flarum/components/FieldSet', 'flarum/components/Select', 'flarum/components/Button', 'flarum/components/Alert', 'flarum/utils/saveSettings', 'flarum/utils/ItemList', 'flarum/components/Switch'], function (_export, _context) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var Page, FieldSet, Select, Button, Alert, saveSettings, ItemList, BasicsPage;
|
var Page, FieldSet, Select, Button, Alert, saveSettings, ItemList, Switch, BasicsPage;
|
||||||
return {
|
return {
|
||||||
setters: [function (_flarumComponentsPage) {
|
setters: [function (_flarumComponentsPage) {
|
||||||
Page = _flarumComponentsPage.default;
|
Page = _flarumComponentsPage.default;
|
||||||
@ -18036,6 +18036,8 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
|
|||||||
saveSettings = _flarumUtilsSaveSettings.default;
|
saveSettings = _flarumUtilsSaveSettings.default;
|
||||||
}, function (_flarumUtilsItemList) {
|
}, function (_flarumUtilsItemList) {
|
||||||
ItemList = _flarumUtilsItemList.default;
|
ItemList = _flarumUtilsItemList.default;
|
||||||
|
}, function (_flarumComponentsSwitch) {
|
||||||
|
Switch = _flarumComponentsSwitch.default;
|
||||||
}],
|
}],
|
||||||
execute: function () {
|
execute: function () {
|
||||||
BasicsPage = function (_Page) {
|
BasicsPage = function (_Page) {
|
||||||
@ -18055,12 +18057,12 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
|
|||||||
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|
||||||
this.fields = ['forum_title', 'forum_description', 'default_locale', 'default_route', 'welcome_title', 'welcome_message'];
|
this.fields = ['forum_title', 'forum_description', 'default_locale', 'show_language_selector', 'default_route', 'welcome_title', 'welcome_message'];
|
||||||
this.values = {};
|
this.values = {};
|
||||||
|
|
||||||
var settings = app.data.settings;
|
var settings = app.data.settings;
|
||||||
this.fields.forEach(function (key) {
|
this.fields.forEach(function (key) {
|
||||||
return _this2.values[key] = m.prop(settings[key]);
|
return _this2.values[key] = m.prop(settings[key] || false);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.localeOptions = {};
|
this.localeOptions = {};
|
||||||
@ -18068,6 +18070,8 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
|
|||||||
for (var i in locales) {
|
for (var i in locales) {
|
||||||
this.localeOptions[i] = locales[i] + ' (' + i + ')';
|
this.localeOptions[i] = locales[i] + ' (' + i + ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1);
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
key: 'view',
|
key: 'view',
|
||||||
@ -18102,6 +18106,12 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
|
|||||||
onchange: this.values.default_locale
|
onchange: this.values.default_locale
|
||||||
})]
|
})]
|
||||||
}) : '',
|
}) : '',
|
||||||
|
Switch.component({
|
||||||
|
state: this.values.show_language_selector(),
|
||||||
|
onchange: this.values.show_language_selector,
|
||||||
|
children: app.translator.trans('core.admin.basics.show_language_selector_label')
|
||||||
|
}),
|
||||||
|
m('br', null),
|
||||||
FieldSet.component({
|
FieldSet.component({
|
||||||
label: app.translator.trans('core.admin.basics.home_page_heading'),
|
label: app.translator.trans('core.admin.basics.home_page_heading'),
|
||||||
className: 'BasicsPage-homePage',
|
className: 'BasicsPage-homePage',
|
||||||
|
@ -5,6 +5,7 @@ import Button from 'flarum/components/Button';
|
|||||||
import Alert from 'flarum/components/Alert';
|
import Alert from 'flarum/components/Alert';
|
||||||
import saveSettings from 'flarum/utils/saveSettings';
|
import saveSettings from 'flarum/utils/saveSettings';
|
||||||
import ItemList from 'flarum/utils/ItemList';
|
import ItemList from 'flarum/utils/ItemList';
|
||||||
|
import Switch from 'flarum/components/Switch';
|
||||||
|
|
||||||
export default class BasicsPage extends Page {
|
export default class BasicsPage extends Page {
|
||||||
init() {
|
init() {
|
||||||
@ -16,6 +17,7 @@ export default class BasicsPage extends Page {
|
|||||||
'forum_title',
|
'forum_title',
|
||||||
'forum_description',
|
'forum_description',
|
||||||
'default_locale',
|
'default_locale',
|
||||||
|
'show_language_selector',
|
||||||
'default_route',
|
'default_route',
|
||||||
'welcome_title',
|
'welcome_title',
|
||||||
'welcome_message'
|
'welcome_message'
|
||||||
@ -23,13 +25,15 @@ export default class BasicsPage extends Page {
|
|||||||
this.values = {};
|
this.values = {};
|
||||||
|
|
||||||
const settings = app.data.settings;
|
const settings = app.data.settings;
|
||||||
this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
|
this.fields.forEach(key => this.values[key] = m.prop(settings[key] || false));
|
||||||
|
|
||||||
this.localeOptions = {};
|
this.localeOptions = {};
|
||||||
const locales = app.data.locales;
|
const locales = app.data.locales;
|
||||||
for (const i in locales) {
|
for (const i in locales) {
|
||||||
this.localeOptions[i] = `${locales[i]} (${i})`;
|
this.localeOptions[i] = `${locales[i]} (${i})`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
view() {
|
view() {
|
||||||
@ -66,6 +70,14 @@ export default class BasicsPage extends Page {
|
|||||||
})
|
})
|
||||||
: ''}
|
: ''}
|
||||||
|
|
||||||
|
{Switch.component({
|
||||||
|
state: this.values.show_language_selector(),
|
||||||
|
onchange: this.values.show_language_selector,
|
||||||
|
children: app.translator.trans('core.admin.basics.show_language_selector_label'),
|
||||||
|
})}
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
|
||||||
{FieldSet.component({
|
{FieldSet.component({
|
||||||
label: app.translator.trans('core.admin.basics.home_page_heading'),
|
label: app.translator.trans('core.admin.basics.home_page_heading'),
|
||||||
className: 'BasicsPage-homePage',
|
className: 'BasicsPage-homePage',
|
||||||
|
2
framework/core/js/forum/dist/app.js
vendored
2
framework/core/js/forum/dist/app.js
vendored
@ -23215,7 +23215,7 @@ System.register('flarum/components/HeaderSecondary', ['flarum/Component', 'flaru
|
|||||||
|
|
||||||
items.add('search', app.search.render(), 30);
|
items.add('search', app.search.render(), 30);
|
||||||
|
|
||||||
if (Object.keys(app.data.locales).length > 1) {
|
if (app.forum.attribute("showLanguageSelector") && Object.keys(app.data.locales).length > 1) {
|
||||||
var locales = [];
|
var locales = [];
|
||||||
|
|
||||||
var _loop = function _loop(locale) {
|
var _loop = function _loop(locale) {
|
||||||
|
@ -39,7 +39,7 @@ export default class HeaderSecondary extends Component {
|
|||||||
|
|
||||||
items.add('search', app.search.render(), 30);
|
items.add('search', app.search.render(), 30);
|
||||||
|
|
||||||
if (Object.keys(app.data.locales).length > 1) {
|
if (app.forum.attribute("showLanguageSelector") && Object.keys(app.data.locales).length > 1) {
|
||||||
const locales = [];
|
const locales = [];
|
||||||
|
|
||||||
for (const locale in app.data.locales) {
|
for (const locale in app.data.locales) {
|
||||||
|
@ -65,6 +65,7 @@ class ForumSerializer extends AbstractSerializer
|
|||||||
$attributes = [
|
$attributes = [
|
||||||
'title' => $this->settings->get('forum_title'),
|
'title' => $this->settings->get('forum_title'),
|
||||||
'description' => $this->settings->get('forum_description'),
|
'description' => $this->settings->get('forum_description'),
|
||||||
|
'showLanguageSelector' => (bool) $this->settings->get('show_language_selector', true),
|
||||||
'baseUrl' => $url = $this->app->url(),
|
'baseUrl' => $url = $this->app->url(),
|
||||||
'basePath' => parse_url($url, PHP_URL_PATH) ?: '',
|
'basePath' => parse_url($url, PHP_URL_PATH) ?: '',
|
||||||
'debug' => $this->app->inDebugMode(),
|
'debug' => $this->app->inDebugMode(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user