From fb8866a1b766f60ff0fc4013bedf64fbf5c7b426 Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Wed, 15 Oct 2014 18:11:42 +0200 Subject: [PATCH] email templates updated to show the invoice amount and language set to french in order to fix date formats --- synchro_orleans/data/management/commands/email_new_invoices.py | 2 +- synchro_orleans/data/templates/autobilling_invoice_mail.txt | 2 +- synchro_orleans/data/templates/invoice_mail.txt | 2 +- synchro_orleans/data/templates/null_invoice_mail.txt | 2 +- synchro_orleans/data/templates/sub1_invoice_mail.txt | 2 +- synchro_orleans/settings.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/synchro_orleans/data/management/commands/email_new_invoices.py b/synchro_orleans/data/management/commands/email_new_invoices.py index 00dfa37..b811a36 100644 --- a/synchro_orleans/data/management/commands/email_new_invoices.py +++ b/synchro_orleans/data/management/commands/email_new_invoices.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- from datetime import datetime, timedelta import json diff --git a/synchro_orleans/data/templates/autobilling_invoice_mail.txt b/synchro_orleans/data/templates/autobilling_invoice_mail.txt index 29ea757..f6f8562 100644 --- a/synchro_orleans/data/templates/autobilling_invoice_mail.txt +++ b/synchro_orleans/data/templates/autobilling_invoice_mail.txt @@ -1,7 +1,7 @@ Cher(e) {{ first_name }} {{ last_name }}, Nous vous informons que votre facture émise le {{invoice.date_generation|date:"SHORT_DATE_FORMAT" }} -d'un montant de {{invoice.amount }}€ est disponible sur votre Compte citoyen. +d'un montant de {{invoice.solde }}€ est disponible sur votre Compte citoyen. Vous avez la possibilité de visualiser et de régler cette facture en ligne en cliquant ici: {{ invoice_view_url_base }}/{{ invoice.id }}/{{ invoice_hash }} diff --git a/synchro_orleans/data/templates/invoice_mail.txt b/synchro_orleans/data/templates/invoice_mail.txt index ef15d42..5454fe4 100644 --- a/synchro_orleans/data/templates/invoice_mail.txt +++ b/synchro_orleans/data/templates/invoice_mail.txt @@ -1,7 +1,7 @@ Cher(e) {{ first_name }} {{ last_name }}, Nous vous informons que votre facture émise le {{invoice.date_generation|date:"SHORT_DATE_FORMAT" }} -d'un montant de {{invoice.amount }}€ est disponible sur votre Compte citoyen. +d'un montant de {{ invoice.solde }}€ est disponible sur votre Compte citoyen. Vous avez la possibilité de visualiser et de régler cette facture en ligne en cliquant ici: {{ invoice_view_url_base }}/{{ invoice.id }}/{{ invoice_hash }} diff --git a/synchro_orleans/data/templates/null_invoice_mail.txt b/synchro_orleans/data/templates/null_invoice_mail.txt index 1b05eac..f4e3e3a 100644 --- a/synchro_orleans/data/templates/null_invoice_mail.txt +++ b/synchro_orleans/data/templates/null_invoice_mail.txt @@ -1,6 +1,6 @@ Cher(s) {{ first_name }} {{ last_name }}, -Nous vous informons que votre facture émise le {{invoice.date_generation|date:"SHORT_DATE_FORMAT" }} d’un montant de {{invoice.amount }}€ +Nous vous informons que votre facture émise le {{invoice.date_generation|date:"SHORT_DATE_FORMAT" }} d’un montant de {{invoice.solde }}€ est disponible sur votre Compte citoyen. Vous avez la possibilité de visualiser cette facture en cliquant ici: {{ invoice_view_url_base }}/{{ invoice.id }}/{{ invoice_hash }} diff --git a/synchro_orleans/data/templates/sub1_invoice_mail.txt b/synchro_orleans/data/templates/sub1_invoice_mail.txt index 8d56661..ba0dac7 100644 --- a/synchro_orleans/data/templates/sub1_invoice_mail.txt +++ b/synchro_orleans/data/templates/sub1_invoice_mail.txt @@ -1,7 +1,7 @@ Cher(e) {{ first_name }} {{ last_name }}, Nous vous informons que votre facture émise le {{invoice.date_generation|date:"SHORT_DATE_FORMAT" }} -d'un montant de {{invoice.amount }}€ est disponible sur votre Compte citoyen. +d'un montant de {{invoice.solde }}€ est disponible sur votre Compte citoyen. Vous avez la possibilité de visualiser et de régler cette facture en ligne en cliquant ici: {{ invoice_view_url_base }}/{{ invoice.id }}/{{ invoice_hash }} diff --git a/synchro_orleans/settings.py b/synchro_orleans/settings.py index fbc31cd..fdc7c0a 100644 --- a/synchro_orleans/settings.py +++ b/synchro_orleans/settings.py @@ -33,7 +33,7 @@ TIME_ZONE = 'Europe/Paris' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'fr-FR' SITE_ID = 1