From 7238c713d7912d73750ea88b6632994f1af1fc35 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 8 Feb 2019 11:39:30 +0000
Subject: [PATCH] Add language selector to bottom of welcome

---
 res/css/_components.scss             |  1 +
 res/css/views/auth/_Welcome.scss     | 26 ++++++++++++++++++++++++++
 src/components/views/auth/Welcome.js | 10 +++++++---
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 res/css/views/auth/_Welcome.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index dc2091b389..f5fc936bca 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -34,6 +34,7 @@
 @import "./views/auth/_LanguageSelector.scss";
 @import "./views/auth/_ServerConfig.scss";
 @import "./views/auth/_ServerTypeSelector.scss";
+@import "./views/auth/_Welcome.scss";
 @import "./views/avatars/_BaseAvatar.scss";
 @import "./views/avatars/_MemberStatusMessageAvatar.scss";
 @import "./views/context_menus/_MessageContextMenu.scss";
diff --git a/res/css/views/auth/_Welcome.scss b/res/css/views/auth/_Welcome.scss
new file mode 100644
index 0000000000..9043289184
--- /dev/null
+++ b/res/css/views/auth/_Welcome.scss
@@ -0,0 +1,26 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_Welcome {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.mx_Welcome .mx_AuthBody_language {
+    width: 120px;
+    margin-bottom: 10px;
+}
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 96e71394d4..848655d5f9 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -22,15 +22,19 @@ export default class Welcome extends React.PureComponent {
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
+        const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
 
         const pagesConfig = SdkConfig.get().pages;
         const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html';
 
         return (
             <AuthPage>
-                <EmbeddedPage className="mx_WelcomePage"
-                    url={pageUrl}
-                />
+                <div className="mx_Welcome">
+                    <EmbeddedPage className="mx_WelcomePage"
+                        url={pageUrl}
+                    />
+                    <LanguageSelector />
+                </div>
             </AuthPage>
         );
     }