Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove hard coded references to the wger.de domain

Roland Geider6a4685bca364
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 804f8bea8..4cd4b842d 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -24,6 +24,7 @@ from django.db import models
from django.template.loader import render_to_string
from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!
from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import python_2_unicode_compatible
from django.utils import translation
@@ -304,7 +305,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
subject = _('Exercise was successfully added to the general database')
context = {
'exercise': self.name,
- 'url': url
+ 'url': url,
+ 'site': Site.objects.get_current().domain
}
message = render_to_string('exercise/email_new.html', context)
mail.send_mail(subject,
diff --git a/wger/exercises/templates/exercise/email_new.html b/wger/exercises/templates/exercise/email_new.html
index b25c88466..57c6cf58a 100644
--- a/wger/exercises/templates/exercise/email_new.html
+++ b/wger/exercises/templates/exercise/email_new.html
@@ -6,4 +6,4 @@ added to workouts. You can access it on this address:{% endblocktrans %}
{{url}}
{% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}
- — {% blocktrans %}the wger.de team{% endblocktrans %}
\ No newline at end of file
+ — {% blocktrans %}The {{ site_name }} team{% endblocktrans %}
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 21d56c47a..0be8ca4a4 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -27,6 +27,7 @@ from django.core.urlresolvers import reverse
from django.core import mail
from django.core.cache import cache
from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from django.utils import translation
@@ -425,7 +426,8 @@ class Ingredient(AbstractLicenseModel, models.Model):
subject = _('Ingredient was successfully added to the general database')
context = {
'ingredient': self.name,
- 'url': url
+ 'url': url,
+ 'site': Site.objects.get_current().domain
}
message = render_to_string('ingredient/email_new.html', context)
mail.send_mail(subject,
diff --git a/wger/nutrition/templates/ingredient/email_new.html b/wger/nutrition/templates/ingredient/email_new.html
index 0546fdb82..7c2442806 100644
--- a/wger/nutrition/templates/ingredient/email_new.html
+++ b/wger/nutrition/templates/ingredient/email_new.html
@@ -6,4 +6,4 @@ added to nutrition plans. You can access it on this address:{% endblocktrans %}
{{url}}
{% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}
- — {% trans "the wger.de team" %}
\ No newline at end of file
+ — {% blocktrans %}The {{ site_name }} team{% endblocktrans %}