spelling: use "email" consistently

The common English spelling is "email", not "e-mail" (and was indeed
also the most common, but not only, variant in the Kallithea UI).

http://grammarist.com/style/e-mail-email/

development.ini

@@ -16,29 +16,29 b' debug = true'
 pdebug = false
 
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
 
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <[e-mail]>
 #app_email_from = [e-mail]
 
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
 
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
@@ -47,7 +47,7 b' pdebug = false'
 #email_to = [e-mail]
 #email_to = [e-mail] [e-mail]
 
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = [e-mail]
 ## Examples:

docs/contributing.rst

@@ -105,7 +105,7 b' bug fixes, put "(Issue #123)" at the end'
 
 Contributions will be accepted in most formats - such as pull requests on
 bitbucket, something hosted on your own Kallithea instance, or patches sent by
-mail to the kallithea-general mailing list.
+email to the kallithea-general mailing list.
 
 Make sure to test your changes both manually and with the automatic tests
 before posting.

docs/index.rst

@@ -37,7 +37,7 b' Kallithea Documentation'
 .. toctree::
    :maxdepth: 1
 
-   usage/e-mail
+   usage/email
    usage/performance
    usage/backup
    usage/debugging

docs/setup.rst

@@ -199,7 +199,7 b" Here's a typical LDAP setup::"
  Login Attribute      = uid
  First Name Attribute = firstName
  Last Name Attribute  = lastName
- E-mail Attribute     = mail
+ Email Attribute      = mail
 
 If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs::
 
@@ -364,7 +364,7 b' Directory ::'
  Login Attribute      = sAMAccountName
  First Name Attribute = givenName
  Last Name Attribute  = sn
- E-mail Attribute     = mail
+ Email Attribute     = mail
 
 All other LDAP settings will likely be site-specific and should be
 appropriately configured.
@@ -509,7 +509,7 b' Celery configuration'
 --------------------
 
 Kallithea can use the distributed task queue system Celery_ to run tasks like
-cloning repositories or sending mails.
+cloning repositories or sending emails.
 
 Kallithea will in most setups work perfectly fine out of the box (without
 Celery), executing all tasks in the web server process. Some tasks can however

docs/usage/email.rst

@@ -1,24 +1,24 b''
 .. _email:
 
-===============
-E-mail settings
-===============
+==============
+Email settings
+==============
 
-The Kallithea configuration file has several e-mail related settings. When
-these contain correct values, Kallithea will send e-mail in the situations
-described below. If the e-mail configuration is not correct so that e-mails
+The Kallithea configuration file has several email related settings. When
+these contain correct values, Kallithea will send email in the situations
+described below. If the email configuration is not correct so that emails
 cannot be sent, all mails will show up in the log output.
 
-Before any e-mail can be sent, an SMTP server has to be configured using the
+Before any email can be sent, an SMTP server has to be configured using the
 configuration file setting ``smtp_server``. If required for that server, specify
 a username (``smtp_username``) and password (``smtp_password``), a non-standard
 port (``smtp_port``), encryption settings (``smtp_use_tls`` or ``smtp_use_ssl``)
 and/or specific authentication parameters (``smtp_auth``).
 
-Application e-mails
--------------------
+Application emails
+------------------
 
-Kallithea sends an e-mail to `users` on several occasions:
+Kallithea sends an email to `users` on several occasions:
 
 - when comments are given on one of their changesets
 - when comments are given on changesets they are reviewer on or on which they
@@ -26,34 +26,34 b' Kallithea sends an e-mail to `users` on '
 - when they are invited as reviewer in pull requests
 - when they request a password reset
 
-Kallithea sends an e-mail to all `administrators` upon new account registration.
+Kallithea sends an email to all `administrators` upon new account registration.
 Administrators are users with the ``Admin`` flag set in the ``Admin->Users``
 section.
 
-When Kallithea wants to send an e-mail but due to an error cannot correctly
+When Kallithea wants to send an email but due to an error cannot correctly
 determine the intended recipients, the administrators and the addresses
 specified in ``email_to`` in the configuration file are used as fallback.
 
-Recipients will see these e-mails originating from the sender specified in the
+Recipients will see these emails originating from the sender specified in the
 ``app_email_from`` setting in the configuration file. This setting can either
-contain only an e-mail address, like `[e-mail]`, or both
+contain only an email address, like `[e-mail]`, or both
 a name and an address in the following format: `Kallithea
-<[e-mail]>`. The subject of these e-mails can
+<[e-mail]>`. The subject of these emails can
 optionally be prefixed with the value of ``email_prefix`` in the configuration
 file.
 
-Error e-mails
--------------
+Error emails
+------------
 
 When an exception occurs in Kallithea -- and unless interactive debugging is
 enabled using ``set debug = true`` in the ``[app:main]`` section of the
-configuration file -- an e-mail with exception details is sent by WebError_'s
+configuration file -- an email with exception details is sent by WebError_'s
 ``ErrorMiddleware`` to the addresses specified in ``email_to`` in the
 configuration file.
 
-Recipients will see these e-mails originating from the sender specified in the
+Recipients will see these emails originating from the sender specified in the
 ``error_email_from`` setting in the configuration file. This setting can either
-contain only an e-mail address, like `[e-mail]`, or both
+contain only an email address, like `[e-mail]`, or both
 a name and an address in the following format: `Kallithea Errors
 <[e-mail]>`.
 

docs/usage/general.rst

@@ -97,14 +97,14 b' In the example, the repository could als'
 The ID of a given repository can be shown from the repository ``Summary`` page,
 by selecting the ``Show by ID`` button next to ``Clone URL``.
 
-E-mail notifications
---------------------
+Email notifications
+-------------------
 
-When the administrator correctly specified the e-mail settings in the Kallithea
-configuration file, Kallithea will send e-mails on user registration and when
+When the administrator correctly specified the email settings in the Kallithea
+configuration file, Kallithea will send emails on user registration and when
 errors occur.
 
-Mails are also sent for comments on changesets. In this case, an e-mail is sent
+Emails are also sent for comments on changesets. In this case, an email is sent
 to the committer of the changeset (if known to Kallithea), to all reviewers of
 the pull request (if applicable) and to all people mentioned in the comment
 using @mention notation.

kallithea/bin/template.ini.mako

@@ -10,29 +10,29 b' debug = true'
 pdebug = false
 
 <%text>################################################################################</%text>
-<%text>## E-mail settings                                                            ##</%text>
+<%text>## Email settings                                                             ##</%text>
 <%text>##                                                                            ##</%text>
-<%text>## Refer to the documentation ("E-mail settings") for more details.           ##</%text>
+<%text>## Refer to the documentation ("Email settings") for more details.            ##</%text>
 <%text>##                                                                            ##</%text>
 <%text>## It is recommended to use a valid sender address that passes access         ##</%text>
 <%text>## validation and spam filtering in mail servers.                             ##</%text>
 <%text>################################################################################</%text>
 
-<%text>## 'From' header for application e-mails. You can optionally add a name.</%text>
+<%text>## 'From' header for application emails. You can optionally add a name.</%text>
 <%text>## Default:</%text>
 #app_email_from = Kallithea
 <%text>## Examples:</%text>
 #app_email_from = Kallithea <[e-mail]>
 #app_email_from = [e-mail]
 
-<%text>## Subject prefix for application e-mails.</%text>
+<%text>## Subject prefix for application emails.</%text>
 <%text>## A space between this prefix and the real subject is automatically added.</%text>
 <%text>## Default:</%text>
 #email_prefix =
 <%text>## Example:</%text>
 #email_prefix = [Kallithea]
 
-<%text>## Recipients for error e-mails and fallback recipients of application mails.</%text>
+<%text>## Recipients for error emails and fallback recipients of application mails.</%text>
 <%text>## Multiple addresses can be specified, space-separated.</%text>
 <%text>## Only addresses are allowed, do not add any name part.</%text>
 <%text>## Default:</%text>
@@ -41,7 +41,7 b' pdebug = false'
 #email_to = [e-mail]
 #email_to = [e-mail] [e-mail]
 
-<%text>## 'From' header for error e-mails. You can optionally add a name.</%text>
+<%text>## 'From' header for error emails. You can optionally add a name.</%text>
 <%text>## Default:</%text>
 #error_email_from = [e-mail]
 <%text>## Examples:</%text>

kallithea/config/deployment.ini_tmpl

@@ -11,29 +11,29 b' debug = true'
 pdebug = false
 
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
 
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <[e-mail]>
 #app_email_from = [e-mail]
 
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
 
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
@@ -42,7 +42,7 b' pdebug = false'
 #email_to = [e-mail]
 #email_to = [e-mail] [e-mail]
 
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = [e-mail]
 ## Examples:

kallithea/i18n/be/LC_MESSAGES/kallithea.po

@@ -2019,12 +2019,12 b' msgid "This is not a valid path"'
 msgstr "Гэты шлях хібны"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Гэты E-mail ужо заняты"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "\"%(email)s\" не існуе."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

@@ -1985,12 +1985,12 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/i18n/de/LC_MESSAGES/kallithea.po

@@ -2043,12 +2043,12 b' msgid "This is not a valid path"'
 msgstr "Dies ist ein Ungültiger Pfad"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Diese E-Mailaddresse ist bereits in Benutzung"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "E-MailAddresse \"%(email)s\" existiert nicht."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

@@ -2042,12 +2042,12 b' msgid "This is not a valid path"'
 msgstr "Ceci n’est pas un chemin valide"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

@@ -1978,12 +1978,12 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

@@ -1991,12 +1991,12 b' msgid "This is not a valid path"'
 msgstr "不正なパスです"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
 #: kallithea/model/validators.py:772

kallithea/i18n/kallithea.pot

@@ -2087,12 +2087,12 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

@@ -1981,12 +1981,12 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

@@ -2024,12 +2024,12 b' msgid "This is not a valid path"'
 msgstr "To nie jest prawidłowa ścieżka"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Ten adres e-mail jest już zajęty"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "e-mail \"%(email)s\" nie istnieje."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

@@ -2014,12 +2014,12 b' msgid "This is not a valid path"'
 msgstr "Esse não é um caminho válido"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Esse endereço de e-mail já está tomado"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "o e-mail \"%(email)s\" não existe."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

@@ -2030,12 +2030,12 b' msgid "This is not a valid path"'
 msgstr "Этот путь ошибочен"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Этот E-mail уже занят"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "\"%(email)s\" не существует."
 
 #: kallithea/model/validators.py:772

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

@@ -1984,12 +1984,12 b' msgid "This is not a valid path"'
 msgstr ""
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

@@ -1984,12 +1984,12 b' msgid "This is not a valid path"'
 msgstr "不是一个合法的路径"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "该邮件地址已被使用"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "邮件地址\"%(email)s\"不存在"
 
 #: kallithea/model/validators.py:772

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

@@ -1975,12 +1975,12 b' msgid "This is not a valid path"'
 msgstr "不是一個有效的路徑"
 
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "這個郵件位址已經使用了"
 
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 
 #: kallithea/model/validators.py:772

kallithea/model/validators.py

@@ -702,7 +702,7 b' def ValidPath():'
 def UniqSystemEmail(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'email_taken': _('This e-mail address is already in use')
+            'email_taken': _('This email address is already in use')
         }
 
         def _to_python(self, value, state):
@@ -722,7 +722,7 b' def UniqSystemEmail(old_data={}):'
 def ValidSystemEmail():
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'non_existing_email': _('E-mail address "%(email)s" not found')
+            'non_existing_email': _('Email address "%(email)s" not found')
         }
 
         def _to_python(self, value, state):

kallithea/tests/functional/test_admin_users.py

@@ -568,7 +568,7 b' class TestAdminUsersControllerForDefault'
         response = self.app.post(url('edit_user_perms', id=user.user_id),
                  {'_method': 'put', '_authentication_token': self.authentication_token()}, status=404)
 
-    # E-mails
+    # Emails
     def test_edit_emails_default_user(self):
         self.log_user()
         user = User.get_default_user()

kallithea/tests/functional/test_my_account.py

@@ -51,7 +51,7 b' class TestMyAccountController(TestContro'
         response.mustcontain('No additional emails specified')
         response = self.app.post(url('my_account_emails'),
                                  {'new_email': TEST_USER_REGULAR_EMAIL, '_authentication_token': self.authentication_token()})
-        self.checkSessionFlash(response, 'This e-mail address is already in use')
+        self.checkSessionFlash(response, 'This email address is already in use')
 
     def test_my_account_my_emails_add_mising_email_in_form(self):
         self.log_user()
@@ -161,7 +161,7 b' class TestMyAccountController(TestContro'
                                     _authentication_token=self.authentication_token())
                                 )
 
-        response.mustcontain('This e-mail address is already in use')
+        response.mustcontain('This email address is already in use')
 
     def test_my_account_update_err(self):
         self.log_user(TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS)

test.ini

@@ -15,29 +15,29 b' debug = true'
 pdebug = false
 
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
 
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <[e-mail]>
 #app_email_from = [e-mail]
 
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
 
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
@@ -46,7 +46,7 b' pdebug = false'
 #email_to = [e-mail]
 #email_to = [e-mail] [e-mail]
 
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = [e-mail]
 ## Examples: