From 8e4deaa8c83fdca7a9676e5a7ef178a17818c611 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Fri, 15 Oct 2021 11:52:13 +1100
Subject: [PATCH] Standardize spelling of email / e-mail

(Spoiler: I chose "email")
---
 InvenTree/InvenTree/forms.py                     |  4 ++--
 InvenTree/common/models.py                       |  2 +-
 InvenTree/templates/InvenTree/settings/user.html | 12 ++++++------
 InvenTree/templates/account/email_confirm.html   |  8 ++++----
 InvenTree/templates/account/password_reset.html  |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/InvenTree/InvenTree/forms.py b/InvenTree/InvenTree/forms.py
index c5cd7fad58..084de06472 100644
--- a/InvenTree/InvenTree/forms.py
+++ b/InvenTree/InvenTree/forms.py
@@ -224,11 +224,11 @@ class CustomSignupForm(SignupForm):
         # check for two mail fields
         if InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_TWICE'):
             self.fields["email2"] = forms.EmailField(
-                label=_("E-mail (again)"),
+                label=_("Email (again)"),
                 widget=forms.TextInput(
                     attrs={
                         "type": "email",
-                        "placeholder": _("E-mail address confirmation"),
+                        "placeholder": _("Email address confirmation"),
                     }
                 ),
             )
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index d4f26af739..fbe143de5a 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -822,7 +822,7 @@ class InvenTreeSetting(BaseInvenTreeSetting):
             'validator': bool,
         },
         'LOGIN_MAIL_REQUIRED': {
-            'name': _('E-Mail required'),
+            'name': _('Email required'),
             'description': _('Require user to supply mail on signup'),
             'default': False,
             'validator': bool,
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 569b218b43..d6cbf998a7 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -39,12 +39,12 @@
 </table>
 
 <div class='panel-heading'>
-    <h4>{% trans "E-Mail" %}</h4>
+    <h4>{% trans "Email" %}</h4>
 </div>
 
 <div>
     {% if user.emailaddress_set.all %}
-    <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+    <p>{% trans 'The following email addresses are associated with your account:' %}</p>
 
     <form action="{% url 'account_email' %}" class="email_list" method="post">
     {% csrf_token %}
@@ -78,19 +78,19 @@
 
     {% else %}
     <p><strong>{% trans 'Warning:'%}</strong>
-        {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}
+        {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}
     </p>
 
     {% endif %}
 
     {% if can_add_email %}
         <br>
-        <h4>{% trans "Add E-mail Address" %}</h4>
+        <h4>{% trans "Add Email Address" %}</h4>
 
         <form method="post" action="{% url 'account_email' %}" class="add_email">
             {% csrf_token %}
             {{ add_email_form|crispy }}
-            <button class="btn btn-primary" name="action_add" type="submit">{% trans "Add E-mail" %}</button>
+            <button class="btn btn-primary" name="action_add" type="submit">{% trans "Add Email" %}</button>
         </form>
     {% endif %}
     <br>
@@ -220,7 +220,7 @@
 
 {% block js_ready %}
 (function() {
-  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  var message = "{% trans 'Do you really want to remove the selected email address?' %}";
   var actions = document.getElementsByName('action_remove');
   if (actions.length) {
     actions[0].addEventListener("click", function(e) {
diff --git a/InvenTree/templates/account/email_confirm.html b/InvenTree/templates/account/email_confirm.html
index 12b041f710..1bdd051fdc 100644
--- a/InvenTree/templates/account/email_confirm.html
+++ b/InvenTree/templates/account/email_confirm.html
@@ -3,17 +3,17 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
+{% block head_title %}{% trans "Confirm Email Address" %}{% endblock %}
 
 
 {% block content %}
-<h1>{% trans "Confirm E-mail Address" %}</h1>
+<h1>{% trans "Confirm Email Address" %}</h1>
 
 {% if confirmation %}
 
 {% user_display confirmation.email_address.user as user_display %}
 
-<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
+<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an email address for user {{ user_display }}.{% endblocktrans %}</p>
 
 <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
 {% csrf_token %}
@@ -24,7 +24,7 @@
 
 {% url 'account_email' as email_url %}
 
-<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
+<p>{% blocktrans %}This email confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new email confirmation request</a>.{% endblocktrans %}</p>
 
 {% endif %}
 
diff --git a/InvenTree/templates/account/password_reset.html b/InvenTree/templates/account/password_reset.html
index 2cfb45a716..1eeb5c6179 100644
--- a/InvenTree/templates/account/password_reset.html
+++ b/InvenTree/templates/account/password_reset.html
@@ -15,7 +15,7 @@
     {% endif %}
 
     {% if mail_conf and enable_pwd_forgot %}
-    <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+    <p>{% trans "Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it." %}</p>
 
     <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
         {% csrf_token %}