# HG changeset patch # User Sverre Rabbelier # Date 1235831363 0 # Node ID fe1b141bfc2c1c21095863d9860f3726cf224d7b # Parent 656aace0b15fd61286c77ec247b1cc4b2553a6bc Replaced 'Melange' with site_name where appropriate Also fixed EOL damage in django templates. Patch by: Sverre Rabbelier diff -r 656aace0b15f -r fe1b141bfc2c app/soc/logic/helper/notifications.py --- a/app/soc/logic/helper/notifications.py Sat Feb 28 14:28:28 2009 +0000 +++ b/app/soc/logic/helper/notifications.py Sat Feb 28 14:29:23 2009 +0000 @@ -178,6 +178,8 @@ model_view.notification.view.getParams())} sender = mail_dispatcher.getDefaultMailSender() + site_entity = site_logic.logic.getSingleton() + site_name = site_entity.site_name # get the default mail sender default_sender = mail_dispatcher.getDefaultMailSender() @@ -196,6 +198,7 @@ 'sender_name': sender_name, 'to': to, 'sender': sender, + 'site_name': site_name, 'subject': force_unicode(DEF_NEW_NOTIFICATION_MSG), 'notification' : notification_entity, 'notification_url' : notification_url diff -r 656aace0b15f -r fe1b141bfc2c app/soc/templates/soc/mail/new_notification.html --- a/app/soc/templates/soc/mail/new_notification.html Sat Feb 28 14:28:28 2009 +0000 +++ b/app/soc/templates/soc/mail/new_notification.html Sat Feb 28 14:29:23 2009 +0000 @@ -1,20 +1,25 @@ -{% extends "soc/mail/base.html" %} -{% comment %} -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -{% endcomment %} - -{% block content %} -You have received a new notification entitled "{{ notification.subject }}". -To read, respond to, or delete this notification please click here. -{% endblock %} -{% block signature %}Greetings,
The Melange Team{% endblock %} +{% extends "soc/mail/base.html" %} +{% comment %} +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +{% endcomment %} + + +{% block content %} +You have received a new notification entitled "{{ notification.subject }}". +To read, respond to, or delete this notification please click here. +{% endblock %} + +{% block signature %} +Greetings,
+The {{ site_name }} Team +{% endblock %} diff -r 656aace0b15f -r fe1b141bfc2c app/soc/templates/soc/mail/welcome.html --- a/app/soc/templates/soc/mail/welcome.html Sat Feb 28 14:28:28 2009 +0000 +++ b/app/soc/templates/soc/mail/welcome.html Sat Feb 28 14:29:23 2009 +0000 @@ -1,21 +1,32 @@ -{% extends "soc/mail/base.html" %} -{% comment %} -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -{% endcomment %} - -{% block content %} -Welcome to Melange. If you are reading this it means you have successfully registered as user -on our website. Currently Melange is still under development, if you run into any trouble you can usually -find us at #melange on freenode IRC network. If you find any bugs, please report them to our Issue Tracker. -{% endblock %} -{% block signature %}Greetings,
The Melange Team{% endblock %} +{% extends "soc/mail/base.html" %} +{% comment %} +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +{% endcomment %} + + +{% block content %} +Welcome to {{ site_name }}. If you are reading this it means you have successfully registered as user +on our website. + +{% ifequal site_name "Melange" %} +Currently Melange is still under development, if you run into any trouble you +can usually find us at #melange on freenode IRC network. +If you find any bugs,please report them to our +Issue Tracker. +{% endifequal %} +{% endblock %} + +{% block signature %} +Greetings,
+The {{ site_name }} Team +{% endblock %}