diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2017-06-09 23:50:33 +0300 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2017-06-09 23:50:33 +0300 |
| commit | aac893584d27142dc4f4bc73008cc913567c1002 (patch) | |
| tree | 483624073ae29250a073ae8243a1e62a58b98079 | |
| parent | 683c9cc66c6ac8a8d9765f9b434cad2d624a5c6b (diff) | |
| parent | ec9a93fef02fb164e0a9a90e62bb76343a7e7aef (diff) | |
| download | mediagoblin-aac893584d27142dc4f4bc73008cc913567c1002.tar.lz mediagoblin-aac893584d27142dc4f4bc73008cc913567c1002.tar.xz mediagoblin-aac893584d27142dc4f4bc73008cc913567c1002.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
| -rw-r--r-- | mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/register.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html index 8c16daeb..bad33c8c 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html @@ -52,7 +52,7 @@ {% if request.user and request.user.username==user.username %} <p>You have not created any blog yet.</p> {% else %} - <p>No blog has been created by <strong>{{ user.username }}</strong>yet.</p> + <p>No blog has been created by <strong>{{ user.username }}</strong> yet.</p> {% endif %} {% endif %} <br/> diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index a7b8033f..b52ecff4 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -37,6 +37,7 @@ {% template_hook("register_link") %} {{ wtforms_util.render_divs(register_form, True) }} {{ csrf_token }} + {% template_hook("register_captcha") %} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Create{% endtrans %}" class="button_form" /> |