From d3934f95e3c7adf563b7c06f88b5d7b3472c0f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Marti=CC=81n?= <fmartingr@me.com>
Date: Mon, 26 Jan 2015 14:36:09 +0100
Subject: [PATCH] Some template fixes

---
 shelfzilla/themes/bootflat/templates/account/register.html     | 3 ++-
 shelfzilla/themes/bootflat/templates/mailing/registration.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/shelfzilla/themes/bootflat/templates/account/register.html b/shelfzilla/themes/bootflat/templates/account/register.html
index 69b6bcb..1113b10 100644
--- a/shelfzilla/themes/bootflat/templates/account/register.html
+++ b/shelfzilla/themes/bootflat/templates/account/register.html
@@ -31,7 +31,8 @@
                                 <input type="{{ field.field.widget.input_type }}"
                                        class="form-control"
                                        id="input_{{ field.name }}"
-                                       name="{{ field.html_name }}">
+                                       name="{{ field.html_name }}"
+                                       value="{% if field.field.widget.input_type != "password" and field.value %}{{ field.value }}{% endif %}">
                                    {% if field.errors %}
                                    <span class="glyphicon glyphicon-remove form-control-feedback"></span>
                                    {% endif %}
diff --git a/shelfzilla/themes/bootflat/templates/mailing/registration.html b/shelfzilla/themes/bootflat/templates/mailing/registration.html
index 9c17e7e..c4274ae 100644
--- a/shelfzilla/themes/bootflat/templates/mailing/registration.html
+++ b/shelfzilla/themes/bootflat/templates/mailing/registration.html
@@ -1,6 +1,6 @@
 <p>¡Hola {{ user.username }}!</p>
 
-<p>Ahora formas parte de una comunidad creciente de coleccionistas de manga, esperamos que te sientas a gusto y que nos ayudes a todos a mejorarla y sobretodo que sea útil para ti.</p>
+<p>Ahora formas parte de una comunidad creciente de coleccionistas de comics, esperamos que te sientas a gusto y que nos ayudes a todos a mejorarla y sobretodo que sea útil para ti.</p>
 
 <p><a href="http://shelfzilla.com">Entrar en Shelfzilla</a></p>