Skip to content
Browse files

Merge branch 'develop' into python3

  • Loading branch information...
2 parents 2cbc197 + 6d245c2 commit eebf95a87d421d739ba2daa0c74743f4d3279d87 @zsiciarz committed Jan 24, 2013
View
3 envelope/templates/envelope/contact.html
@@ -1,11 +1,12 @@
{% extends "layout.html" %}
+{% load url from future %}
{% load i18n %}
{% load envelope_tags %}
{% block content %}
<section id="contact">
<h1>{% trans "Contact" %}</h1>
- <form action="{% url envelope-contact %}" method="post">
+ <form action="{% url 'envelope-contact' %}" method="post">
{% csrf_token %}
{% antispam_fields %}
<fieldset>
View
4 envelope/templates/envelope/email_body.txt
@@ -2,10 +2,10 @@
{% trans "Message from the contact form" %}
{% trans "Sender" %}: {{ sender }} ({{ email }})
{% trans "Category" %}: {{ category }}
-{% trans "The message follows." %}
+{% trans "The message follows." %}
================================================================================
{{ message }}
================================================================================
---
+--
{% trans "message sent with envelope - a contact form app for Django" %}
View
3 envelope/tests/templates/contact.html
@@ -1,11 +1,12 @@
{% extends "layout.html" %}
+{% load url from future %}
{% load i18n %}
{% load envelope_tags %}
{% block content %}
<section id="contact">
<h1>{% trans "Contact" %}</h1>
- <form action="{% url customized_class_contact %}" method="post">
+ <form action="{% url 'customized_class_contact' %}" method="post">
{% csrf_token %}
{% antispam_fields %}
<fieldset>

0 comments on commit eebf95a

Please sign in to comment.
Something went wrong with that request. Please try again.