Commits

twidi committed dd4ea61 Merge

merged from upstream

Comments (0)

Files changed (7)

 \#*\#
 .*.sw?
 *.egg
+.hg
+
 \#*\#
 .*.sw?
 *.egg
+.git

satchmo/apps/product/locale/fr/LC_MESSAGES/django.mo

Binary file modified.

satchmo/apps/product/locale/fr/LC_MESSAGES/django.po

 "during checkout when you enter the code \"%(code)s\" during our %(desc)s "
 "which ends on %(enddate)s.</p>\n"
 msgstr ""
-"<p>Certains produits de cette page peuvent faire l'objet d'une réductions de %"
+"<p>Certains produits de cette page peuvent faire l'objet d'une réduction de %"
 "(pct)s lors de la validation si vous entrez le code \"%(code)s\" pendant "
 "notre %(desc)s qui se termine le %(enddate)s.</p>\n"
 

satchmo/apps/satchmo_store/contact/templates/registration/password_reset_complete.html

+{% extends "shop/base.html" %}
+{% load i18n %}
+
+{% block navbar %}
+   <li class="first"><a href="{{ shop_base }}/">{% trans "Home" %}</a></li>
+{% endblock %}
+
+{% block content %}
+
+<h2>{% trans 'Password reset complete' %}</h1>
+
+<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+
+<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+
+{% endblock %}

satchmo/apps/satchmo_store/contact/templates/registration/password_reset_confirm.html

+{% extends "shop/base.html" %}
+{% load i18n %}
+
+{% block navbar %}
+   <li class="first"><a href="{{ shop_base }}/">{% trans "Home" %}</a></li>
+{% endblock %}
+
+{% block content %}
+
+{% if validlink %}
+
+    <h2>{% trans 'Enter new password' %}</h1>
+
+    <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+    <form action="" method="post">{% csrf_token %}
+        <p<label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
+        {% if form.new_password1.errors %}
+            <p class="error">{{ form.new_password2.errors }}</p>
+        {% endif %}
+        <p><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
+        {% if form.new_password1.errors %}
+            <p class="error">{{ form.new_password2.errors }}</p>
+        {% endif %}
+        <p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+    </form>
+
+{% else %}
+
+    <h2>{% trans 'Password reset unsuccessful' %}</h1>
+
+    <p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+{% endif %}
+
+{% endblock %}

satchmo/apps/satchmo_store/contact/templates/registration/password_reset_form.html

 
 <form action="" method="post">{% csrf_token %}
 
+	<label for="id_email">{% trans "Email address" %}:</label> {{ form.email }}
 	{% if form.email.errors %}
 		<p class="error">{{ form.email.errors }}</p>
 	{% endif %}
-	<label for="id_email">{% trans "Email address" %}:</label> {{ form.email }}
 	<p>{% trans "Be sure to enter the same e-mail address you used to register." %}</p>
     <input id="id_submit" type="submit" value="{% trans "Reset password" %}" />