From 920b4129eba966b98ca9654db74939f14b900041 Mon Sep 17 00:00:00 2001 From: Patrick Altman Date: Tue, 17 Mar 2015 15:28:03 -0500 Subject: [PATCH] Wrap rest of strings in templates for translation Unblocks #84 --- pinax_theme_bootstrap/templates/account/delete.html | 8 ++++---- .../templates/account/email/invite_user.txt | 5 +++-- .../templates/account/email/invite_user_subject.txt | 2 +- .../templates/account/email/password_change.txt | 2 +- .../templates/account/email/password_change_subject.txt | 2 +- pinax_theme_bootstrap/templates/account/settings.html | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pinax_theme_bootstrap/templates/account/delete.html b/pinax_theme_bootstrap/templates/account/delete.html index 1e3b62de..c72d4fc5 100644 --- a/pinax_theme_bootstrap/templates/account/delete.html +++ b/pinax_theme_bootstrap/templates/account/delete.html @@ -5,16 +5,16 @@ {% block body_class %}account account-delete{% endblock %} -{% block head_title %}Delete Account{% endblock %} +{% block head_title %}{% trans "Delete Account" %}{% endblock %} {% block body %} -

Delete Account

+

{% trans "Delete Account" %}

-

If you go ahead and delete your account, your information will be expunged within {{ ACCOUNT_DELETION_EXPUNGE_HOURS }} hours.

+

{% blocktrans %}If you go ahead and delete your account, your information will be expunged within {{ ACCOUNT_DELETION_EXPUNGE_HOURS }} hours.{% endblocktrans %}

{% csrf_token %} - +
{% endblock %} diff --git a/pinax_theme_bootstrap/templates/account/email/invite_user.txt b/pinax_theme_bootstrap/templates/account/email/invite_user.txt index 66bf5491..a8173375 100644 --- a/pinax_theme_bootstrap/templates/account/email/invite_user.txt +++ b/pinax_theme_bootstrap/templates/account/email/invite_user.txt @@ -1,3 +1,4 @@ -You have been invited to sign up at {{ current_site.name }}. +{% load i18n %}{% blocktrans with name=current_site.name %}You have been invited to sign up at {{ name }}. -{{ signup_url }} \ No newline at end of file +{{ signup_url }} +{% endblocktrans %} \ No newline at end of file diff --git a/pinax_theme_bootstrap/templates/account/email/invite_user_subject.txt b/pinax_theme_bootstrap/templates/account/email/invite_user_subject.txt index 72b1c882..86a4b06e 100644 --- a/pinax_theme_bootstrap/templates/account/email/invite_user_subject.txt +++ b/pinax_theme_bootstrap/templates/account/email/invite_user_subject.txt @@ -1 +1 @@ -Create an account on {{ current_site.name }} \ No newline at end of file +{% load i18n %}{% blocktrans with name=current_site.name %}Create an account on {{ name }}{% endblocktrans %} \ No newline at end of file diff --git a/pinax_theme_bootstrap/templates/account/email/password_change.txt b/pinax_theme_bootstrap/templates/account/email/password_change.txt index 4c8f5456..66f40e9b 100644 --- a/pinax_theme_bootstrap/templates/account/email/password_change.txt +++ b/pinax_theme_bootstrap/templates/account/email/password_change.txt @@ -1 +1 @@ -This is the email notification to confirm your password has been changed on {{ user.account.now }}. \ No newline at end of file +{% load i18n %}{% blocktrans with now=user.account.now %}This is the email notification to confirm your password has been changed on {{ now }}.{% endblocktrans %} \ No newline at end of file diff --git a/pinax_theme_bootstrap/templates/account/email/password_change_subject.txt b/pinax_theme_bootstrap/templates/account/email/password_change_subject.txt index 83279ead..e722a8ae 100644 --- a/pinax_theme_bootstrap/templates/account/email/password_change_subject.txt +++ b/pinax_theme_bootstrap/templates/account/email/password_change_subject.txt @@ -1 +1 @@ -Change password email notification \ No newline at end of file +{% load i18n %}{% trans "Change password email notification" %} \ No newline at end of file diff --git a/pinax_theme_bootstrap/templates/account/settings.html b/pinax_theme_bootstrap/templates/account/settings.html index 1f652a50..7e7598ca 100644 --- a/pinax_theme_bootstrap/templates/account/settings.html +++ b/pinax_theme_bootstrap/templates/account/settings.html @@ -5,16 +5,16 @@ {% block body_class %}account account-settings{% endblock %} -{% block head_title %}Account{% endblock %} +{% block head_title %}{% trans "Account" %}{% endblock %} {% block body %}
- Account + {% trans "Account" %} {% csrf_token %} {{ form|bootstrap }} - +