diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 93ddc78397..80554fe316 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -38,6 +38,7 @@ Changelog
* Implemented a locale switcher on the forms listing page in the admin (Dan Braghis)
* Implemented a locale switcher on the page chooser modal (Dan Braghis)
* Implemented the `wagtail_site` template tag for Jinja2 (Vladimir Tananko)
+ * Change webmaster to website administrator in the admin (Naomi Morduch Toubman)
* Fix: Accessibility fixes for Windows high contrast mode; Dashboard icons colour and contrast, help/error/warning blocks for fields and general content, side comment buttons within the page editor, dropdown buttons (Sakshi Uppoor, Shariq Jamil, LB (Ben Johnston), Jason Attwood)
* Fix: Rename additional 'spin' CSS animations to avoid clashes with other libraries (Kevin Gutiérrez)
* Fix: `default_app_config` deprecations for Django >= 3.2 (Tibor Leupold)
diff --git a/docs/reference/settings.rst b/docs/reference/settings.rst
index a6885c8033..094493adbd 100644
--- a/docs/reference/settings.rst
+++ b/docs/reference/settings.rst
@@ -449,7 +449,7 @@ Email Notifications
WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'wagtail@myhost.io'
-Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Wagtail will fall back to using Django's ``DEFAULT_FROM_EMAIL`` setting if set, or ``webmaster@localhost`` if not.
+Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Wagtail will fall back to using Django's ``DEFAULT_FROM_EMAIL`` setting.
``WAGTAILADMIN_NOTIFICATION_USE_HTML``
--------------------------------------
diff --git a/docs/releases/2.16.md b/docs/releases/2.16.md
index 69ef22d8da..e9e839be9b 100644
--- a/docs/releases/2.16.md
+++ b/docs/releases/2.16.md
@@ -41,6 +41,7 @@
* Implemented a locale switcher on the forms listing page in the admin (Dan Braghis)
* Implemented a locale switcher on the page chooser modal (Dan Braghis)
* Implemented the `wagtail_site` template tag for Jinja2 (Vladimir Tananko)
+ * Change webmaster to website administrator in the admin (Naomi Morduch Toubman)
### Bug fixes
diff --git a/wagtail/admin/mail.py b/wagtail/admin/mail.py
index a5d1f00b36..305134d89d 100644
--- a/wagtail/admin/mail.py
+++ b/wagtail/admin/mail.py
@@ -41,6 +41,7 @@ def send_mail(subject, message, recipient_list, from_email=None, **kwargs):
elif hasattr(settings, 'DEFAULT_FROM_EMAIL'):
from_email = settings.DEFAULT_FROM_EMAIL
else:
+ # We are no longer using the term `webmaster` except in this case, where we continue to match Django's default: https://github.com/django/django/blob/stable/3.2.x/django/conf/global_settings.py#L223
from_email = 'webmaster@localhost'
connection = kwargs.get('connection', False) or get_connection(
diff --git a/wagtail/admin/views/workflows.py b/wagtail/admin/views/workflows.py
index b25de71e35..e8d32ac099 100644
--- a/wagtail/admin/views/workflows.py
+++ b/wagtail/admin/views/workflows.py
@@ -571,7 +571,7 @@ class BaseTaskChooserView(TemplateView):
def get_form_js_context(self):
return {
'error_label': _("Server Error"),
- 'error_message': _("Report this error to your webmaster with the following information:"),
+ 'error_message': _("Report this error to your website administrator with the following information:"),
}
def get_task_listing_context_data(self):
diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py
index 5af5fd9642..1085d8b39a 100644
--- a/wagtail/documents/views/chooser.py
+++ b/wagtail/documents/views/chooser.py
@@ -109,7 +109,7 @@ class ChooseView(BaseChooseView):
json_data={
'step': 'chooser',
'error_label': _("Server Error"),
- 'error_message': _("Report this error to your webmaster with the following information:"),
+ 'error_message': _("Report this error to your website administrator with the following information:"),
'tag_autocomplete_url': reverse('wagtailadmin_tag_autocomplete'),
}
)
diff --git a/wagtail/images/templates/wagtailimages/multiple/add.html b/wagtail/images/templates/wagtailimages/multiple/add.html
index 719de2cfa6..60e0565bc0 100644
--- a/wagtail/images/templates/wagtailimages/multiple/add.html
+++ b/wagtail/images/templates/wagtailimages/multiple/add.html
@@ -72,7 +72,7 @@
<p class="status-msg failure">{% trans "Sorry, upload failed." %}</p>
<p class="status-msg server-error">
<strong>{% trans "Server Error" %}</strong>
- {% trans "Report this error to your webmaster with the following information:"%}
+ {% trans "Report this error to your website administrator with the following information:"%}
<br /><span class="error-text"></span> - <span class="error-code"></span>
</p>
<p class="status-msg update-success">{% trans "Image updated." %}</p>
diff --git a/wagtail/images/views/chooser.py b/wagtail/images/views/chooser.py
index 5dc4735c23..da8b1e93d5 100644
--- a/wagtail/images/views/chooser.py
+++ b/wagtail/images/views/chooser.py
@@ -123,7 +123,7 @@ class ChooseView(BaseChooseView):
json_data={
'step': 'chooser',
'error_label': _("Server Error"),
- 'error_message': _("Report this error to your webmaster with the following information:"),
+ 'error_message': _("Report this error to your website administrator with the following information:"),
'tag_autocomplete_url': reverse('wagtailadmin_tag_autocomplete'),
}
)