Merge pull request #14 from toyg/i18n

marked all strings for i18n
yourcelf · Sep 4, 2013 · f4c053c · f4c053c
2 parents 8b26668 + fad2db8
commit f4c053c
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 51 deletions.
diff --git a/registration_defaults/templates/registration/activate.html b/registration_defaults/templates/registration/activate.html
@@ -1,10 +1,14 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
+{% load i18n %}
+{% url 'auth_login' as auth_login_url %}
+{% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %}
 {% block content %}
 {% if account %}
-Thanks {{ account }}, activation complete!  You may now <a href='{% url 'auth_login' %}'>login</a> using the username and password you set at registration.
+{% blocktrans %}
+Thanks {{ account }}, activation complete!
+You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration.
+{% endblocktrans %}
 {% else %}
-Oops &ndash; it seems that your activation key is invalid.  Please check the url again.
+{% blocktrans %}Oops &ndash; it seems that your activation key is invalid.  Please check the url again.{% endblocktrans %}
 {% endif %}
 {% endblock %}
-
diff --git a/registration_defaults/templates/registration/activation_complete.html b/registration_defaults/templates/registration/activation_complete.html
@@ -1,7 +1,11 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Activation complete{% endblock %}
+{% load i18n %}
+{% url 'auth_login' as auth_login_url %}
+{% block title %}{% trans "Activation complete" %}{% endblock %}
 {% block content %}
-Thanks, activation complete!  You may now <a href='{% url 'auth_login' %}'>login</a> using the username and password you set at registration.
+{% blocktrans %}
+Thanks, activation complete!  You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration.
+{% endblocktrans %}
 {% endblock %}
 
 
diff --git a/registration_defaults/templates/registration/activation_email.html b/registration_defaults/templates/registration/activation_email.html
@@ -1,22 +1,26 @@
+{% load i18n %}
 {% 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.
 https://github.com/huseyinyilmaz/django-registration-extended-backend
-{% endcomment %}<body>
-<h3>Account registration for {{ site.name }}</h3>
+{% endcomment %}
+{% url 'registration_activate' activation_key as activation_key_url %}
+{% blocktrans with sitename=site.name sitedomain=site.domain%}<body>
+<h3>Account registration for {{ sitename }}</h3>
 <p>
 You (or someone pretending to be you) have asked to register an account at
-<b>{{ site.name }}</b>.<br/>
+<b>{{ sitename }}</b>.<br/>
 If this wasn't you, please ignore this email and your address will be removed
 from our records.
 </p>
 <p>
 To activate this account, please click the following link within the next 
 <b>{{ expiration_days }}</b> days:<br/>
-<a href="http://{{site.domain}}{% url 'registration_activate' activation_key %}">http://{{site.domain}}{% url 'registration_activate' activation_key %}</a>
+<a href="http://{{ sitedomain }}{{ activation_key_url }}">http://{{ sitedomain }}{{  activation_key_url }}</a>
 </p>
 <p>
 Sincerely,<br/>
-{{ site.name }} Management
+{{ sitename }} Management
 </p>
 </body>
+{% endblocktrans %}
diff --git a/registration_defaults/templates/registration/activation_email.txt b/registration_defaults/templates/registration/activation_email.txt
@@ -1,11 +1,15 @@
-You (or someone pretending to be you) have asked to register an account at 
-{{ site.name }}.  If this wasn't you, please ignore this email
+{% load i18n %}
+{% url 'registration_activate' activation_key as activation_key_url%}
+{% blocktrans with sitename=site.name siteurl=site.domain %}
+You (or someone pretending to be you) have asked to register an account at
+{{ sitename }}.  If this wasn't you, please ignore this email
 and your address will be removed from our records.
 
 To activate this account, please click the following link within the next 
 {{ expiration_days }} days:
 
-http://{{site.domain}}{% url 'registration_activate' activation_key %}
+http://{{ siteurl }}{{ activation_key_url }}
 
 Sincerely,
-{{ site.name }} Management
+{{ sitename }} Management
+{% endblocktrans %}
diff --git a/registration_defaults/templates/registration/activation_email_subject.txt b/registration_defaults/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-Account registration for {{ site.name }}
+{% load i18n %}{% blocktrans with sitename=site.name %}Account registration for {{ sitename }}{% endblocktrans %}
diff --git a/registration_defaults/templates/registration/login.html b/registration_defaults/templates/registration/login.html
@@ -1,25 +1,29 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Login{% endblock %}
+{% load i18n %}
+{% url 'auth_password_reset' as auth_pwd_reset_url %}
+{% url 'registration_register' as register_url%}
+{% block title %}{% trans "Login" %}{% endblock %}
 {% block content %}
 
 {% if form.errors %}
-<p>Your username and password didn't match. Please try again.</p>
+<p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
 {% endif %}
 
 <form method="post" action="{% url 'auth_login' %}">{% csrf_token %}
 <table>
 <tr>
-    <td>{{ form.username.label_tag }}</td>
+    <td>{% trans form.username.label_tag %}</td>
     <td>{{ form.username }}</td>
 </tr>
 <tr>
-    <td>{{ form.password.label_tag }}</td>
+    <td>{% trans form.password.label_tag %}</td>
     <td>{{ form.password }}</td>
 </tr>
 </table>
-<p><a href="{% url 'auth_password_reset' %}">Forgot</a> your password?  <a href="{% url 'registration_register' %}">Need an account</a>?</p>
+<p>{% blocktrans %}<a href="{{ auth_pwd_reset_url }}">Forgot</a> your password?
+    <a href="{{ register_url }}">Need an account</a>?{% endblocktrans %}</p>
 
-<input type="submit" value="login" />
+<input type="submit" value="{% trans "login" %}" />
 <input type="hidden" name="next" value="{{ next }}" />
 </form>
 

diff --git a/registration_defaults/templates/registration/logout.html b/registration_defaults/templates/registration/logout.html
@@ -1,5 +1,6 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Logged out{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Logged out" %}{% endblock %}
 {% block content %}
-Successfully logged out!
+{% trans "Successfully logged out!" %}
 {% endblock %}
diff --git a/registration_defaults/templates/registration/password_change_done.html b/registration_defaults/templates/registration/password_change_done.html
@@ -1,6 +1,7 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Password changed{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Password changed" %}{% endblock %}
 {% block content %}
-Password successfully changed!
+{% trans "Password successfully changed!" %}
 {% endblock %}
 
diff --git a/registration_defaults/templates/registration/password_change_form.html b/registration_defaults/templates/registration/password_change_form.html
@@ -1,10 +1,11 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Change password{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Change password" %}{% endblock %}
 {% block content %}
 <form method='post' action=''>{% csrf_token %}
 <table>
     {{ form }}
-    <tr><td></td><td><input type='submit' value="Change password" /></td></tr>
+    <tr><td></td><td><input type='submit' value="{% trans "Change password" %}" /></td></tr>
 </table>
 </form>
 {% endblock %}
diff --git a/registration_defaults/templates/registration/password_reset_complete.html b/registration_defaults/templates/registration/password_reset_complete.html
@@ -1,5 +1,6 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Password reset complete{% endblock %}
-{% block content %}
+{% load i18n %}
+{% block title %}{% trans "Password reset complete" %}{% endblock %}
+{% block content %}{% blocktrans %}
 Your password has been reset!  You may now <a href="{{ login_url }}">log in</a>.
-{% endblock %}
+{% endblocktrans %}{% endblock %}
diff --git a/registration_defaults/templates/registration/password_reset_confirm.html b/registration_defaults/templates/registration/password_reset_confirm.html
@@ -1,11 +1,12 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Confirm password reset{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Confirm password reset" %}{% endblock %}
 {% block content %}
-Enter your new password below to reset your password:
+{% trans "Enter your new password below to reset your password:" %}
 <form method="post" action="">{% csrf_token %}
 <table>
     {{ form.as_table }}
-    <tr><td></ td><td><input type="submit" value="Set password" /></td></tr>
+    <tr><td></ td><td><input type="submit" value="{% trans "Set password" %}"/></td></tr>
 </table>
 </form>
 {% endblock %}
diff --git a/registration_defaults/templates/registration/password_reset_done.html b/registration_defaults/templates/registration/password_reset_done.html
@@ -1,8 +1,9 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Password reset{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Password reset" %}{% endblock %}
 {% block content %}
 <p>
-We have sent you an email with a link to reset your password.  Please check
-your email and click the link to continue.
+{% blocktrans %}We have sent you an email with a link to reset your password.
+Please check your email and click the link to continue.{% endblocktrans %}
 </p>
 {% endblock %}
diff --git a/registration_defaults/templates/registration/password_reset_email.html b/registration_defaults/templates/registration/password_reset_email.html
@@ -1,16 +1,17 @@
-Greetings {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user }}{% endif %},
+{% load i18n %}{% trans "Greetings" %} {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user }}{% endif %},
 
-You are receiving this email because you (or someone pretending to be you)
+{% blocktrans %}You are receiving this email because you (or someone pretending to be you)
 requested that your password be reset on the {{ domain }} site.  If you do not 
 wish to reset your password, please ignore this message.
 
 To reset your password, please click the following link, or copy and paste it
-into your web browser:
+into your web browser:{% endblocktrans %}
 
 {{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uid token %}
 
-Your username, in case you've forgotten: {{ user.username }}
-
+{% blocktrans with username=user.username %}
+Your username, in case you've forgotten: {{ username }}
 
 Best regards,
-{{ site_name }} Management
+{{ site_name }} Management
+{% endblocktrans %}
diff --git a/registration_defaults/templates/registration/password_reset_form.html b/registration_defaults/templates/registration/password_reset_form.html
@@ -1,12 +1,13 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Reset password{% endblock %}
-{% block content %}
+{% load i18n %}
+{% block title %}{% trans "Reset password" %}{% endblock %}
+{% block content %}{% blocktrans %}
 Forgot your password?  Enter your email in the form below and we'll send you
-instructions for creating a new one.
+instructions for creating a new one.{% endblocktrans %}
 <form method='post' action=''>{% csrf_token %}
 <table>
     {{ form }}
-    <tr><td></td><td><input type='submit' value="Reset password" /></td></tr>
+    <tr><td></td><td><input type='submit' value="{% trans="Reset password"  %}" /></td></tr>
 </table>
 </form>
 {% endblock %}
diff --git a/registration_defaults/templates/registration/registration_base.html b/registration_defaults/templates/registration/registration_base.html
@@ -1 +1,2 @@
 {% extends "base.html" %}
+{% load i18n %}
diff --git a/registration_defaults/templates/registration/registration_complete.html b/registration_defaults/templates/registration/registration_complete.html
@@ -1,6 +1,8 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Activation email sent{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Activation email sent" %}{% endblock %}
 {% block content %}
-An activation email has been sent.  Please check your email and click on the link to activate your account.
+{% blocktrans %}An activation email has been sent.
+Please check your email and click on the link to activate your account.{% endblocktrans %}
 {% endblock %}
 
diff --git a/registration_defaults/templates/registration/registration_form.html b/registration_defaults/templates/registration/registration_form.html
@@ -1,10 +1,11 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Register for an account{% endblock %}
+{% load i18n %}
+{% block title %}{% trans "Register for an account" %}{% endblock %}
 {% block content %}
 <table>
     <form method='post' action=''>{% csrf_token %}
         {{ form }}
-        <tr><td></td><td><input type="submit" value="Send activation email" /></td>
+        <tr><td></td><td><input type="submit" value="{% trans "Send activation email" %}" /></td>
     </form>
 </table>
 {% endblock %}