I have added some diff comments with my anal retentive proofreader hat on.
Diff comments:
> === modified file 'templates/notification/email_body.txt'
> --- templates/notification/email_body.txt 2009-02-20 16:46:21 +0000
> +++ templates/notification/email_body.txt 2015-03-15 20:23:54 +0000
> @@ -1,6 +1,5 @@
> {% load i18n %}{% blocktrans %}You have received the following notice from
> {{ current_site }}:
>
> {{ message }}
> -
> To see other notices or change how you receive notifications, please go to
> {{ notices_url }}.
> -{% endblocktrans %}
> +{% endblocktrans %}
> \ No newline at end of file
>
> === modified file 'templates/notification/forum_new_post/full.txt'
> --- templates/notification/forum_new_post/full.txt 2010-06-10 12:13:43
> +0000
> +++ templates/notification/forum_new_post/full.txt 2015-03-15 20:23:54
> +0000
> @@ -1,7 +1,10 @@
> -{% load i18n %}{% blocktrans with topic.get_absolute_url as topic_url %} A
> new forum post was added under topic "{{ topic }}" by "{{ user }}".
> +{% load i18n %}A new forum post was added under topic "{{ topic }}":
... was added to the topic ...
or:
A new topic "{{ topic }}" has been added to the forum.
>
> -http://{{ current_site }}{{ topic_url }}
> -{% endblocktrans %}
> -{{ topic }}:
> +"{{ user }}" wrotes:
>
"{{ user }}" wrote:
drop the s.
> {{ post.body_text }}
> +{% blocktrans with post.get_absolute_url as post_url and
> topic.get_absolute_url as topic_url %}
> +–––––––––––
> +Link to post: http://{{ current_site }}{{ post_url }}
> +Link to topic: http://{{ current_site }}{{ topic_url }}
> +{% endblocktrans %}
Do we want new lines for the links? Links can get screwed up by the email
programs' word wrapping.
> \ No newline at end of file
>
> === modified file 'templates/notification/forum_new_post/notice.html'
> --- templates/notification/forum_new_post/notice.html 2010-06-10 12:13:43
> +0000
> +++ templates/notification/forum_new_post/notice.html 2015-03-15 20:23:54
> +0000
> @@ -1,2 +1,2 @@
> {% load i18n %}{% url profile_view user.username as user_url %}
> -{% blocktrans with topic.get_absolute_url as topic_url %}A new forum post
> has be created in forum under topic <a href="{{ topic_url }}">{{ topic }}</a>
> by <a href="{{ user_url }}">{{ user }}</a>.{% endblocktrans %}
> +{% blocktrans with topic.get_absolute_url as topic_url and
> post.get_absolute_url as post_url%}A new <a href="{{ post_url }}">forum
> post</a> has be created in forum under topic <a href="{{ topic_url }}">{{
> topic }}</a> by <a href="{{ user_url }}">{{ user }}</a>.{% endblocktrans %}
A new forum post has been added to the topic X by Y.
or:
Y has replied to the forum topic X.
with links for Y, replied, and X.
>
--
https://code.launchpad.net/~franku/widelands-website/forum_notifyings_contain_links_to_post/+merge/253003
Your team Widelands Developers is requested to review the proposed merge of
lp:~franku/widelands-website/forum_notifyings_contain_links_to_post into
lp:widelands-website.
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
