Change webmaster to website administrator in the admin (#6857)

Co-authored-by: Thibaud Colas <thibaudcolas@gmail.com>

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)

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``
 --------------------------------------

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
 

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(

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):

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'),
             }
         )

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>

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'),
             }
         )