inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-01 13:06:45 +00:00
Code

Standardize spelling of email / e-mail

Browse Source 
(Spoiler: I chose "email")
This commit is contained in:
Oliver 2021-10-15 11:52:13 +11:00
parent a3ef64ef12
commit 8e4deaa8c8
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/forms.py
View File

@ -224,11 +224,11 @@ class CustomSignupForm(SignupForm):
# check for two mail fields # check for two mail fields
if InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_TWICE'): if InvenTreeSetting.get_setting('LOGIN_SIGNUP_MAIL_TWICE'):
self.fields["email2"] = forms.EmailField( self.fields["email2"] = forms.EmailField(
label=_("E-mail (again)"), label=_("Email (again)"),
widget=forms.TextInput( widget=forms.TextInput(
attrs={ attrs={
"type": "email", "type": "email",
"placeholder": _("E-mail address confirmation"), "placeholder": _("Email address confirmation"),
} }
), ),
) )

2
InvenTree/common/models.py
View File

@ -822,7 +822,7 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'validator': bool, 'validator': bool,
}, },
'LOGIN_MAIL_REQUIRED': { 'LOGIN_MAIL_REQUIRED': {
'name': _('E-Mail required'), 'name': _('Email required'),
'description': _('Require user to supply mail on signup'), 'description': _('Require user to supply mail on signup'),
'default': False, 'default': False,
'validator': bool, 'validator': bool,

12
InvenTree/templates/InvenTree/settings/user.html
View File

@ -39,12 +39,12 @@
</table> </table>
<div class='panel-heading'> <div class='panel-heading'>
<h4>{% trans "E-Mail" %}</h4> <h4>{% trans "Email" %}</h4>
</div> </div>
<div> <div>
{% if user.emailaddress_set.all %} {% 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"> <form action="{% url 'account_email' %}" class="email_list" method="post">
{% csrf_token %} {% csrf_token %}
@ -78,19 +78,19 @@
{% else %} {% else %}
<p><strong>{% trans 'Warning:'%}</strong> <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> </p>
{% endif %} {% endif %}
{% if can_add_email %} {% if can_add_email %}
<br> <br>
<h4>{% trans "Add E-mail Address" %}</h4> <h4>{% trans "Add Email Address" %}</h4>
<form method="post" action="{% url 'account_email' %}" class="add_email"> <form method="post" action="{% url 'account_email' %}" class="add_email">
{% csrf_token %} {% csrf_token %}
{{ add_email_form|crispy }} {{ 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> </form>
{% endif %} {% endif %}
<br> <br>
@ -220,7 +220,7 @@
{% block js_ready %} {% block js_ready %}
(function() { (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'); var actions = document.getElementsByName('action_remove');
if (actions.length) { if (actions.length) {
actions[0].addEventListener("click", function(e) { actions[0].addEventListener("click", function(e) {

8
InvenTree/templates/account/email_confirm.html
View File

@ -3,17 +3,17 @@
{% load i18n %} {% load i18n %}
{% load account %} {% load account %}
{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} {% block head_title %}{% trans "Confirm Email Address" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Confirm E-mail Address" %}</h1> <h1>{% trans "Confirm Email Address" %}</h1>
{% if confirmation %} {% if confirmation %}
{% user_display confirmation.email_address.user as user_display %} {% 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 %}"> <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %} {% csrf_token %}
@ -24,7 +24,7 @@
{% url 'account_email' as email_url %} {% 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 %} {% endif %}

2
InvenTree/templates/account/password_reset.html
View File

@ -15,7 +15,7 @@
{% endif %} {% endif %}
{% if mail_conf and enable_pwd_forgot %} {% 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"> <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
{% csrf_token %} {% csrf_token %}