*: make email naming consistent

passbook/stages/email/forms.py

@@ -6,13 +6,13 @@ from passbook.stages.email.models import EmailStage
 
 
 class EmailStageSendForm(forms.Form):
-    """Form used when sending the e-mail to prevent multiple emails being sent"""
+    """Form used when sending the email to prevent multiple emails being sent"""
 
     invalid = forms.CharField(widget=forms.HiddenInput, required=True)
 
 
 class EmailStageForm(forms.ModelForm):
-    """Form to create/edit E-Mail Stage"""
+    """Form to create/edit Email Stage"""
 
     class Meta:
 

passbook/stages/email/models.py

@@ -8,7 +8,7 @@ from passbook.flows.models import Stage
 
 
 class EmailTemplates(models.TextChoices):
-    """Templates used for rendering the E-Mail"""
+    """Templates used for rendering the Email"""
 
     PASSWORD_RESET = (
         "stages/email/for_email/password_reset.html",

passbook/stages/email/stage.py

@@ -22,7 +22,7 @@ QS_KEY_TOKEN = "token"
 
 
 class EmailStageView(FormView, StageView):
-    """E-Mail stage which sends E-Mail for verification"""
+    """Email stage which sends Email for verification"""
 
     form_class = EmailStageSendForm
     template_name = "stages/email/waiting_message.html"
@@ -41,7 +41,7 @@ class EmailStageView(FormView, StageView):
             token = get_object_or_404(Token, pk=request.GET[QS_KEY_TOKEN])
             self.executor.plan.context[PLAN_CONTEXT_PENDING_USER] = token.user
             token.delete()
-            messages.success(request, _("Successfully verified E-Mail."))
+            messages.success(request, _("Successfully verified Email."))
             return self.executor.stage_ok()
         return super().get(request, *args, **kwargs)
 

passbook/stages/email/tasks.py

@@ -27,7 +27,7 @@ def send_mails(stage: EmailStage, *messages: List[EmailMultiAlternatives]):
 )
 # pylint: disable=unused-argument
 def _send_mail_task(self, email_stage_pk: int, message: Dict[Any, Any]):
-    """Send E-Mail according to EmailStage parameters from background worker.
+    """Send Email according to EmailStage parameters from background worker.
     Automatically retries if message couldn't be sent."""
     stage: EmailStage = EmailStage.objects.get(pk=email_stage_pk)
     backend = stage.backend

passbook/stages/email/templates/stages/email/for_email/password_reset.html

@@ -33,7 +33,7 @@
   </table>
   <p>
     {% blocktrans with expires=expires|naturaltime %}
-    If you did not request a password change, please ignore this E-Mail. The link above is valid for {{ expires }}.
+    If you did not request a password change, please ignore this Email. The link above is valid for {{ expires }}.
     {% endblocktrans %}
   </p>
 </td>

passbook/stages/email/templates/stages/email/waiting_message.html

@@ -7,7 +7,7 @@
 <form method="POST" class="pf-c-form">
     <p>
         {% blocktrans %}
-        Check your E-Mails for a password reset link.
+        Check your Emails for a password reset link.
         {% endblocktrans %}
     </p>
     {% csrf_token %}
@@ -15,7 +15,7 @@
     {% block beneath_form %}
     {% endblock %}
     <div class="pf-c-form__group pf-m-action">
-        <button class="pf-c-button pf-m-primary pf-m-block" type="submit">{% trans "Send Recovery E-Mail." %}</button>
+        <button class="pf-c-button pf-m-primary pf-m-block" type="submit">{% trans "Send Recovery Email." %}</button>
     </div>
 </form>
 {% endblock %}