From 7c33befc483544d7adba792d47f4f858247ec0c4 Mon Sep 17 00:00:00 2001
From: Timotheus Pokorra <tp@tbits.net>
Date: Mon, 1 May 2017 18:46:12 +0200
Subject: [PATCH] Admin: fix default language selector the binding of the
 control to the value was missing fixes #1164

---
 framework/core/js/admin/dist/app.js                  | 1 +
 framework/core/js/admin/src/components/BasicsPage.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js
index 1a4b82bdd..a044422a4 100644
--- a/framework/core/js/admin/dist/app.js
+++ b/framework/core/js/admin/dist/app.js
@@ -18103,6 +18103,7 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
                     label: app.translator.trans('core.admin.basics.default_language_heading'),
                     children: [Select.component({
                       options: this.localeOptions,
+                      value: this.values.default_locale(),
                       onchange: this.values.default_locale
                     })]
                   }) : '',
diff --git a/framework/core/js/admin/src/components/BasicsPage.js b/framework/core/js/admin/src/components/BasicsPage.js
index 04beba2ed..90ea4b3f4 100644
--- a/framework/core/js/admin/src/components/BasicsPage.js
+++ b/framework/core/js/admin/src/components/BasicsPage.js
@@ -64,6 +64,7 @@ export default class BasicsPage extends Page {
                 children: [
                   Select.component({
                     options: this.localeOptions,
+                    value: this.values.default_locale(),
                     onchange: this.values.default_locale
                   })
                 ]