projects
/
matthijs
/
projects
/
xerxes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f2c52d
)
Add the influence url to notification emails.
author
Matthijs Kooijman
<matthijs@stdin.nl>
Wed, 4 Feb 2009 10:15:36 +0000
(11:15 +0100)
committer
Matthijs Kooijman
<matthijs@stdin.nl>
Wed, 4 Feb 2009 10:15:36 +0000
(11:15 +0100)
locale/nl/LC_MESSAGES/django.po
patch
|
blob
|
history
templates/influences/email/influence_changed.html
patch
|
blob
|
history
templates/influences/email/influence_comment_added.html
patch
|
blob
|
history
diff --git
a/locale/nl/LC_MESSAGES/django.po
b/locale/nl/LC_MESSAGES/django.po
index ed0d963414e4bf0c60a2efb1a5ff0734b72a30b9..c8258eecd6605f4401870fad4370a5ee7693d68b 100644
(file)
--- a/
locale/nl/LC_MESSAGES/django.po
+++ b/
locale/nl/LC_MESSAGES/django.po
@@
-499,6
+499,11
@@
msgstr ""
msgid "The influence has been modified. The current status is"
msgstr "De invloed is veranderd. De status is nu"
msgid "The influence has been modified. The current status is"
msgstr "De invloed is veranderd. De status is nu"
+#: templates/influences/email/influence_changed.html:46
+#: templates/influences/email/influence_comment_added.html:26
+msgid "View the influence and comments here:"
+msgstr "Bekijk de invloed en het commentaar hier:"
+
#: templates/influences/email/influence_comment_added.html:6
#, python-format
msgid "Comment added to influence \"%(influence)s\"."
#: templates/influences/email/influence_comment_added.html:6
#, python-format
msgid "Comment added to influence \"%(influence)s\"."
diff --git
a/templates/influences/email/influence_changed.html
b/templates/influences/email/influence_changed.html
index 3c563373e0d847d18da15b17a39fe8112e30e5e9..197aef508cb41e148c8c001e5a806d9d01b94083 100644
(file)
--- a/
templates/influences/email/influence_changed.html
+++ b/
templates/influences/email/influence_changed.html
@@
-41,5
+41,9
@@
You have submitted an influence on {{ creation_date }}.
{{ influence.result }}
{% endfilter %}
{% endif %}
{{ influence.result }}
{% endfilter %}
{% endif %}
+\\
+\\
+{% trans "View the influence and comments here:" %}
+http://xerxes.evolution-events.nl{{ influence.get_absolute_url }}
{% endautoescape %}
{% endgapless %}
{% endautoescape %}
{% endgapless %}
diff --git
a/templates/influences/email/influence_comment_added.html
b/templates/influences/email/influence_comment_added.html
index 7ebe70ca52c98e57656c92e3103283b714b14ca0..8390a3a5ac92d588bae633b916ffcd672d5ee8b4 100644
(file)
--- a/
templates/influences/email/influence_comment_added.html
+++ b/
templates/influences/email/influence_comment_added.html
@@
-1,5
+1,6
@@
{% load gapless %}{% gapless %}
{% load i18n %}
{% load gapless %}{% gapless %}
{% load i18n %}
+{% load uri %}
{% autoescape off %}
From: Xerxes (Evolution Events)<xerxes@evolution-events.nl>
X-Mailer: Xerxes
{% autoescape off %}
From: Xerxes (Evolution Events)<xerxes@evolution-events.nl>
X-Mailer: Xerxes
@@
-18,5
+19,11
@@
Subject: {% blocktrans %}Comment added to influence "{{ influence }}".{% endbloc
\\
{{comment.comment}}
{% endfilter %}
\\
{{comment.comment}}
{% endfilter %}
+\\
+\\
+{# This is ugly and hardcoded, but we don't have access to the request #}
+{# when notifying currently, so this should do for now. #}
+{% trans "View the influence and comments here:" %}
+http://xerxes.evolution-events.nl{{ influence.get_absolute_url }}
{% endautoescape %}
{% endgapless %}
{% endautoescape %}
{% endgapless %}