- add properties for sending email copies of each message notification

- add recipent first and last name
- cleanup

diff --git a/example/settings.py b/example/settings.py
index a9acee3472ec5821abee16ceb8df0146b14e896a..6abee7371801894a6ecc0214eefe50205917cc99 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -11,7 +11,8 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-    ('Guillaume Pellerin', 'yomguy@parisson.com'),
+    ('Guillaume Pellerin', 'webmaster@parisson.com'),
+    ('Lists', 'lists@parisson.com'),
 )
 
 MANAGERS = ADMINS
@@ -155,7 +156,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.static',
 )
 
-TELEMETA_ORGANIZATION = 'Parisson'
+TELEMETA_ORGANIZATION = 'Pré-Barreau'
 TELEMETA_SUBJECTS = ('test', 'telemeta', 'sandbox')
 TELEMETA_DESCRIPTION = "Telemeta TEST sandbox"
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
@@ -175,9 +176,11 @@ LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk')
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
-EMAIL_HOST = 'smtp.free.fr'
+EMAIL_HOST = 'smtp.numericable.fr'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
+SERVER_EMAIL = 'webmaster@parisson.com'
+EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION.decode('utf8') + '] '
 
-POSTMAN_AUTO_MODERATE_AS=True
+POSTMAN_AUTO_MODERATE_AS = True
 
 #FILE_PROTECTION_METHOD = 'xsendfile'

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 9cba67ec0b2a4fdec74ef373ad664a9fdd88cbce..0c7bf92c0f7878e399b19e65fea0a0d8c84a9c52 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 5f8c8e716821cc5e600dc80bc1ce37f48b7deeee..5128d8fd1fe3e250daaede68b3f232796f0266c2 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-03 12:06+0200\n"
+"POT-Creation-Date: 2012-07-03 18:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -383,26 +383,22 @@ msgstr ""
 msgid "No messages."
 msgstr "Messages"
 
-#: templates/postman/base_write.html:23
+#: templates/postman/base_write.html:13
 msgid "to an administrator"
 msgstr "à un administrateur"
 
-#: templates/postman/base_write.html:31
+#: templates/postman/base_write.html:21
 msgid "to a professor"
 msgstr "à un professeur"
 
-#: templates/postman/base_write.html:39
-msgid "to an IEJ"
-msgstr "à un IEJ"
-
-#: templates/postman/base_write.html:57
+#: templates/postman/base_write.html:38
 #: templates/teleforma/inc/chat_room.html:13
 msgid "Send"
 msgstr ""
 
 #: templates/postman/email_user.txt:1
-msgid "Dear user,"
-msgstr ""
+msgid "Hello"
+msgstr "Bonjour"
 
 #: templates/postman/email_user.txt:3 templates/postman/email_visitor.txt:3
 #, python-format
@@ -444,19 +440,19 @@ msgstr ""
 "Vous pouvez lire et répondre à ce message depuis votre bureau e-learning en "
 "suivant ce lien :"
 
-#: templates/postman/email_user.txt:18 templates/postman/email_visitor.txt:14
+#: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:14
 msgid "Thank you again for your interest in our services."
 msgstr ""
 
-#: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:16
+#: templates/postman/email_user.txt:20 templates/postman/email_visitor.txt:16
 msgid "The site administrator"
 msgstr ""
 
-#: templates/postman/email_user.txt:19
+#: templates/postman/email_user.txt:20
 msgid "of"
 msgstr "de"
 
-#: templates/postman/email_user.txt:21 templates/postman/email_visitor.txt:18
+#: templates/postman/email_user.txt:22 templates/postman/email_visitor.txt:18
 msgid ""
 "Note: This message is issued by an automated system.\n"
 "Do not reply, this would not be taken into account."
@@ -517,7 +513,7 @@ msgstr ""
 msgid "Conversation"
 msgstr ""
 
-#: templates/postman/view.html:9 templates/telemeta/inc/user_list.html:69
+#: templates/postman/view.html:9 templates/telemeta/inc/user_list.html:72
 #, fuzzy
 msgid "Message"
 msgstr "Messages"
@@ -901,11 +897,11 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#: templates/telemeta/inc/user_list.html:55
+#: templates/telemeta/inc/user_list.html:56
 msgid "Administrator"
 msgstr ""
 
-#: templates/telemeta/inc/user_list.html:62
+#: templates/telemeta/inc/user_list.html:64
 msgid "Unknown"
 msgstr ""
 
@@ -929,6 +925,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#~ msgid "to an IEJ"
+#~ msgstr "à un IEJ"
+
 #~ msgid "Annal"
 #~ msgstr "Annale"
 

diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html
index 0f99c0400038a966fec610924f0bca217800ec80..ea08e5c493baf5ca7961f6dc2c780bee3b5bbe20 100644 (file)
--- a/teleforma/templates/postman/base_write.html
+++ b/teleforma/templates/postman/base_write.html
@@ -2,16 +2,6 @@
 {% load i18n %}
 {% load teleforma_tags %}
 
-{% block extrahead %}{{ block.super }}
-{% if is_autocompleted %}
-{# using the available admin jQuery is enough #}
-<script type="text/javascript" src="{% load adminmedia %}{% admin_media_prefix %}js/jquery.min.js"></script>
-{# <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script> #}
-<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.autocomplete.min.js"></script>
-<link href="{{ MEDIA_URL }}css/jquery.autocomplete.css" type="text/css" media="all" rel="stylesheet" />
-{% endif %}
-{% endblock %}
-
 {% block content %}
 <div id="postman" class="desk_messages">
 <h1>{% block pm_write_title %}{% endblock %}</h1>

diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt
index 48d626aaaab3c9a8d21998f5289aa4362cde2c06..944a32ffff026cc0c1330defb6034c908233662c 100644 (file)
--- a/teleforma/templates/postman/email_user.txt
+++ b/teleforma/templates/postman/email_user.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Dear user," %}
+{% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }},
 {% if action == 'rejection' %}
 {% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_recipient as recipient %}On {{ date }}, you asked to send a message to the user '{{ recipient }}'.{% endblocktrans %}
 
@@ -12,6 +12,7 @@
 {% endif %}
 {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %}
 {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %}
+
 http://{{ site.name }}/messages/inbox/
 {# 'acceptance' #}