From e264b10fd6b520efb9d2a3b1a4d1b0ff0a25e399 Mon Sep 17 00:00:00 2001 From: mandrag0ra Date: Fri, 23 May 2014 17:22:32 +0200 Subject: [PATCH] {% trans %} on .html files --- nsupdate/accounts/templates/accounts/user_profile.html | 9 ++++----- nsupdate/accounts/templates/registration/activate.html | 2 +- .../templates/registration/activation_complete.html | 2 +- .../templates/registration/activation_email.html | 2 +- .../templates/registration/registration_base.html | 2 +- .../templates/registration/registration_complete.html | 2 +- .../templates/registration/registration_form.html | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nsupdate/accounts/templates/accounts/user_profile.html b/nsupdate/accounts/templates/accounts/user_profile.html index 4fc2021..c26ddbf 100644 --- a/nsupdate/accounts/templates/accounts/user_profile.html +++ b/nsupdate/accounts/templates/accounts/user_profile.html @@ -1,11 +1,10 @@ {% extends "base.html" %} -{% load i18n %} -{% load bootstrap %} +{% load i18n %}{% load bootstrap %} {% block content %}
-

User Profile of {{ request.user.username }}

+

{% trans "User Profile of" %} {{ request.user.username }}


{% csrf_token %} @@ -18,14 +17,14 @@
-

Associate with remote Account

+

{% trans "Associate with remote Account" %}

{% for backend in backends.not_associated %}
{% endfor %} -

Deassociate from remote Account

+

{% trans "Deassociate from remote Account" %}

{% for socauth in backends.associated %}
diff --git a/nsupdate/accounts/templates/registration/activate.html b/nsupdate/accounts/templates/registration/activate.html index b3efa90..af3efb0 100644 --- a/nsupdate/accounts/templates/registration/activate.html +++ b/nsupdate/accounts/templates/registration/activate.html @@ -1,5 +1,5 @@ {% extends "registration/registration_base.html" %} -{% load i18n %} +{% load i18n %}{% load bootstrap %} {% url 'auth_login' as auth_login_url %} {% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %} {% block content %} diff --git a/nsupdate/accounts/templates/registration/activation_complete.html b/nsupdate/accounts/templates/registration/activation_complete.html index c9522c0..6bcdf4c 100644 --- a/nsupdate/accounts/templates/registration/activation_complete.html +++ b/nsupdate/accounts/templates/registration/activation_complete.html @@ -1,5 +1,5 @@ {% extends "registration/registration_base.html" %} -{% load i18n %} +{% load i18n %}{% load bootstrap %} {% block title %}Activation complete{% endblock %} {% block content %}

Thanks, activation complete!

diff --git a/nsupdate/accounts/templates/registration/activation_email.html b/nsupdate/accounts/templates/registration/activation_email.html index c6ebc26..22b4368 100644 --- a/nsupdate/accounts/templates/registration/activation_email.html +++ b/nsupdate/accounts/templates/registration/activation_email.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n %}{% load bootstrap %} {% comment %} This template is used for the html alternative of the activation email if you use a django-registration backend that looks for it. e.g. diff --git a/nsupdate/accounts/templates/registration/registration_base.html b/nsupdate/accounts/templates/registration/registration_base.html index c4c0b0f..65a22b3 100644 --- a/nsupdate/accounts/templates/registration/registration_base.html +++ b/nsupdate/accounts/templates/registration/registration_base.html @@ -1,2 +1,2 @@ {% extends "base.html" %} -{% load i18n %} +{% load i18n %}{% load bootstrap %} diff --git a/nsupdate/accounts/templates/registration/registration_complete.html b/nsupdate/accounts/templates/registration/registration_complete.html index 872292b..4cf3b7e 100644 --- a/nsupdate/accounts/templates/registration/registration_complete.html +++ b/nsupdate/accounts/templates/registration/registration_complete.html @@ -1,5 +1,5 @@ {% extends "registration/registration_base.html" %} -{% load i18n %} +{% load i18n %}{% load bootstrap %} {% block title %}{% trans "Activation email sent" %}{% endblock %} {% block content %} {% blocktrans %}An activation email has been sent. diff --git a/nsupdate/accounts/templates/registration/registration_form.html b/nsupdate/accounts/templates/registration/registration_form.html index 0903d06..51939d0 100644 --- a/nsupdate/accounts/templates/registration/registration_form.html +++ b/nsupdate/accounts/templates/registration/registration_form.html @@ -1,5 +1,5 @@ {% extends "registration/registration_base.html" %} -{% load i18n %} +{% load i18n %}{% load bootstrap %} {% load bootstrap %} {% block title %}{% trans "Register for an account" %}{% endblock %} {% block content %}