diff --git a/alerts/tasks.py b/alerts/tasks.py index c95f8a8..0369eab 100644 --- a/alerts/tasks.py +++ b/alerts/tasks.py @@ -38,7 +38,7 @@ def _send_alert(issue_id, subject_prefix, alert_article, alert_reason): base_template_name="alerts/issue_alert", recipient_list=[membership.user.email], context={ - "site_name": settings.SITE_NAME, + "site_title": settings.SITE_TITLE, "base_url": settings.BASE_URL + "/", "issue_title": issue.title(), "project_name": issue.project.name, diff --git a/alerts/templates/alerts/issue_alert.html b/alerts/templates/alerts/issue_alert.html index 704e94c..4c8f4ec 100644 --- a/alerts/templates/alerts/issue_alert.html +++ b/alerts/templates/alerts/issue_alert.html @@ -462,7 +462,7 @@ - {{ site_name }} + {{ site_title }} diff --git a/alerts/templates/alerts/issue_alert.txt b/alerts/templates/alerts/issue_alert.txt index 5330570..b1b143a 100644 --- a/alerts/templates/alerts/issue_alert.txt +++ b/alerts/templates/alerts/issue_alert.txt @@ -3,7 +3,7 @@ The issue title is: {{ issue_title|truncatechars:100 }} -View it on {{ site_name }}: +View it on {{ site_title }}: {{ issue_url }} Manage notification settings: diff --git a/alerts/views.py b/alerts/views.py index b7c3ded..9b0fa10 100644 --- a/alerts/views.py +++ b/alerts/views.py @@ -3,7 +3,7 @@ from django.conf import settings DEBUG_CONTEXTS = { "issue_alert": { - "site_name": settings.SITE_NAME, + "site_title": settings.SITE_TITLE, "base_url": settings.BASE_URL + "/", "issue_title": "AttributeError: 'NoneType' object has no attribute 'data'", "project_name": "My first project", diff --git a/bugsink/settings.py b/bugsink/settings.py index 6b34f47..221c749 100644 --- a/bugsink/settings.py +++ b/bugsink/settings.py @@ -164,7 +164,7 @@ if SENTRY_DSN is not None: ) BASE_URL = "http://bugsink:9000" # no trailing slash -SITE_NAME = "Bugsink" # you can customize this as e.g. "My Bugsink" or "Bugsink for My Company" +SITE_TITLE = "Bugsink" # you can customize this as e.g. "My Bugsink" or "Bugsink for My Company" CELERY_BROKER_URL = 'amqp://bugsink:bugsink@localhost/' diff --git a/bugsink/urls.py b/bugsink/urls.py index 0c5bc5d..5df90e2 100644 --- a/bugsink/urls.py +++ b/bugsink/urls.py @@ -7,8 +7,8 @@ from .views import home, trigger_error, favicon from alerts.views import debug_email -admin.site.site_header = settings.SITE_NAME -admin.site.site_title = settings.SITE_NAME +admin.site.site_header = settings.SITE_TITLE +admin.site.site_title = settings.SITE_TITLE admin.site.index_title = "Admin" # everyone calls this the "admin" anyway. Let's set the title accordingly.