From a2a48515d48829a95964ea635483d87760ca7d17 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <matthias1.knopp@googlemail.com>
Date: Sun, 22 Jan 2017 14:07:54 +0100
Subject: [PATCH] Fixed language and locale preset for new users

---
 cps/templates/user_edit.html | 4 ++--
 cps/web.py                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index bb6368d9..bdace538 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -27,14 +27,14 @@
     <label for="locale">{{_('Language')}}</label>
         <select name="locale" id="locale" class="form-control">
             {%  for translation in translations %}
-                <option value="{{translation}}" {% if translation|string == content.locale %}selected{% endif %}>{{ translation.display_name }}</option>
+                <option value="{{translation.language}}" {% if translation.language == content.locale %}selected{% endif %} {% if new_user == 1 and loop.first %}selected{% endif %}>{{ translation.display_name }}</option>
             {% endfor %}
         </select>
     </div>
     <div class="form-group">
       <label for="default_language">{{_('Show books with language')}}</label>
         <select name="default_language" id="default_language" class="form-control">
-            <option value="all" >{{ _('Show all') }}</option>
+            <option value="all" {% if new_user == 1 %}selected{% endif %}>{{ _('Show all') }}</option>
             {%  for language in languages %}
             <option value="{{ language.lang_code }}" {% if content.default_language == language.lang_code %}selected{% endif %}>{{ language.name }}</option>
             {% endfor %}
diff --git a/cps/web.py b/cps/web.py
index 53b529fb..2ee71662 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1513,7 +1513,7 @@ def new_user():
         content.nickname = to_save["nickname"]
         content.email = to_save["email"]
         content.default_language = to_save["default_language"]
-        content.locale = to_save["locale"]
+            content.locale = to_save["locale"]
         content.random_books = 0
         content.language_books = 0
         content.series_books = 0
@@ -1547,7 +1547,7 @@ def new_user():
             ub.session.rollback()
             flash(_(u"Found an existing account for this email address or nickname."), category="error")
     return render_template("user_edit.html", new_user=1, content=content, translations=translations,
-                           languages=languages, title="Add new user")
+                           languages=languages, title=_("Add new user"))
 
 
 @app.route("/admin/mailsettings", methods=["GET", "POST"])