Update "e-mail" to "email" in text on pages and email text

[clash99]

Based on form updating project, noticed different uses of "e-mail" and "email". This issue is to update to standardized "email" and track page inventory.

[clash99]

Didn't make any changes to translated text.

[ian-ross]

Do you mean that you didn't update any of the translations, or you didn't update any text that gets translated (i.e. strings within _(...) in Python code or {% trans ... %} in templates)? If it's the former, that's the right thing to do: some languages have settled on one or the other of "email" or "e-mail" as the standard, so there isn't the same wiggle room as in English. For instance, as far as I can tell, Portuguese uses "e-mail" more or less exclusively (http://www.wordreference.com/enpt/email). German also seems to prefer "E-mail" over "Email" (because "Email" is the German word for enamel). And French is weird, because everyone says "email" or "e-mail" informally, but the "real" word is "mél"...

[ian-ross]

Never mind, I see your PR. Let me take a look there...

[clash99]

@ian-ross - I only touched the English versions since the purpose is to standardize what Cadasta uses in its English communication.

[clash99]

Updating Transifex source language will take care of most of these changes. I will include other small changes in my form branch.

[clash99]

I'm suggesting pushing this off to next sprint since its a low priority.

[clash99]

Pages and email text updated so that "email" does not contain a hyphen:

• email_confirmation_message.txt
• email_confirmation_subject.txt
• password_reset_key_message.txt
• password_reset_key_subject.txt
• email_confirm.html
• cannot_delete_primary_email.txt
• email_confirmation_sent.txt
• email_deleted.txt
• primary_email_set.txt
• unverified_primary_email.txt
• password_reset_done.html
• verification_sent.html
• verified_email_required.html

Email.html will be updated in #322.

I'm going to file a separate related issue to address this update in transifex text.