From fa13842e5f261b3045d9e55f0e31f68c120ea21c Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@comptel.com>
Date: Sat, 13 May 2017 10:40:38 +0300
Subject: [PATCH] More general fixes, add error page

---
 members/templates/settings.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/members/templates/settings.html b/members/templates/settings.html
index 1428684..cb9e559 100644
--- a/members/templates/settings.html
+++ b/members/templates/settings.html
@@ -3,6 +3,9 @@
 {% load static %}
 {% load i18n %}
 {% block content %}
+
+{% get_current_language as LANGUAGE_CODE %}
+
 <div>
     <div>
         <h3>{% trans "Settings" %}</h3>
@@ -14,8 +17,8 @@
             <h4>{% trans "Language" %}</h4>
 
             <select name="language" class="form-control">
-                <option value="fi">{% trans "Finnish" %}</option>
-                <option value="en">{% trans "English" %}</option>
+                <option value="fi" {% if LANGUAGE_CODE == "fi" %} selected {% endif %}>{% trans "Finnish" %}</option>
+                <option value="en" {% if LANGUAGE_CODE == "en" %} selected {% endif %}>{% trans "English" %}</option>
             </select>
             <input type="submit" class="btn btn-success">
         </form>