diff --git a/frappe/__init__.py b/frappe/__init__.py index eeb5645836..425eee7b8d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -385,7 +385,7 @@ def sendmail(recipients=[], sender="", subject="No Subject", message="No Message :param unsubscribe_method: Unsubscribe url with options email, doctype, name. e.g. `/api/method/unsubscribe` :param unsubscribe_params: Unsubscribe paramaters to be loaded on the unsubscribe_method [optional] (dict). :param attachments: List of attachments. - :param reply_to: Reply-To email id. + :param reply_to: Reply-To Email Address. :param message_id: Used for threading. If a reply is received to this email, Message-Id is sent back as In-Reply-To in received email. :param in_reply_to: Used to send the Message-Id of a received email back as In-Reply-To. :param send_after: Send after the given datetime. diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 6a419d2232..0421ce2a49 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -26,7 +26,7 @@ class User(Document): self.flags.ignore_save_passwords = True def autoname(self): - """set name as email id""" + """set name as Email Address""" if self.get("is_admin") or self.get("is_guest"): self.name = self.first_name else: diff --git a/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md b/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md index d76c673eff..022320384d 100644 --- a/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md +++ b/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md @@ -13,7 +13,7 @@ We should edit `frappe\core\doctype\user\user.js` frappe.ui.form.on('User', { refresh: function(frm) { ... - frm.add_custom_button(__('Get User Email ID'), function(){ + frm.add_custom_button(__('Get User Email Address'), function(){ frappe.msgprint(frm.doc.email); }, __("Utilities")); ... diff --git a/frappe/docs/user/en/guides/deployment/how-to-enable-social-logins.md b/frappe/docs/user/en/guides/deployment/how-to-enable-social-logins.md index 4a58a4c551..22e1aee163 100755 --- a/frappe/docs/user/en/guides/deployment/how-to-enable-social-logins.md +++ b/frappe/docs/user/en/guides/deployment/how-to-enable-social-logins.md @@ -1,6 +1,6 @@ Use Facebook, Google or GitHub authentication to login to Frappe, and your users will be spared from remembering another password. -The system uses the **Email ID** supplied by these services to **match with an existing user** in Frappe. If no such user is found, **a new user is created** of the default type **Website User**, if Signup is not disabled in Website Settings. Any System Manager can later change the user type from **Website User** to **System User**, so that the user can access the Desktop. +The system uses the **Email Address** supplied by these services to **match with an existing user** in Frappe. If no such user is found, **a new user is created** of the default type **Website User**, if Signup is not disabled in Website Settings. Any System Manager can later change the user type from **Website User** to **System User**, so that the user can access the Desktop.
Doctype Saved diff --git a/frappe/docs/user/fr/tutorial/naming-and-linking.md b/frappe/docs/user/fr/tutorial/naming-and-linking.md index a5f6c5df47..28ef965efa 100644 --- a/frappe/docs/user/fr/tutorial/naming-and-linking.md +++ b/frappe/docs/user/fr/tutorial/naming-and-linking.md @@ -2,7 +2,7 @@ Définissons un nouveau **DocType**: -1. Library Member (First Name, Last Name, Email ID, Phone, Address) +1. Library Member (First Name, Last Name, Email Address, Phone, Address) Doctype Saved diff --git a/frappe/docs/user/pt/tutorial/naming-and-linking.md b/frappe/docs/user/pt/tutorial/naming-and-linking.md index 3a36e9f457..1d72cd55c3 100755 --- a/frappe/docs/user/pt/tutorial/naming-and-linking.md +++ b/frappe/docs/user/pt/tutorial/naming-and-linking.md @@ -2,7 +2,7 @@ Em seguida, vamos criar outro DocType e salva-lo também: -1. Library Member (First Name, Last Name, Email ID, Phone, Address) +1. Library Member (First Name, Last Name, Email Address, Phone, Address) Doctype Saved diff --git a/frappe/email/doctype/email_account/email_account.json b/frappe/email/doctype/email_account/email_account.json index 53766b79b2..ad6d0641f9 100644 --- a/frappe/email/doctype/email_account/email_account.json +++ b/frappe/email/doctype/email_account/email_account.json @@ -82,7 +82,7 @@ "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Email Id", + "label": "Email Address", "length": 0, "no_copy": 0, "options": "Email", @@ -542,7 +542,7 @@ "collapsible": 0, "columns": 0, "depends_on": "notify_if_unreplied", - "description": "Email Ids", + "description": "Email Addresses", "fieldname": "send_notification_to", "fieldtype": "Small Text", "hidden": 0, @@ -749,7 +749,7 @@ "collapsible": 0, "columns": 0, "depends_on": "enable_outgoing", - "description": "Uses the Email ID mentioned in this Account as the Sender for all emails sent using this Account. ", + "description": "Uses the Email Address mentioned in this Account as the Sender for all emails sent using this Account. ", "fieldname": "always_use_account_email_id_as_sender", "fieldtype": "Check", "hidden": 0, @@ -758,7 +758,7 @@ "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Always use Account's Email ID as Sender", + "label": "Always use Account's Email Address as Sender", "length": 0, "no_copy": 0, "permlevel": 0, diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 7e04c8f609..e6915cfb18 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -26,7 +26,7 @@ class SentEmailInInbox(Exception): pass class EmailAccount(Document): def autoname(self): - """Set name as `email_account_name` or make title from email id.""" + """Set name as `email_account_name` or make title from Email Address.""" if not self.email_account_name: self.email_account_name = self.email_id.split("@", 1)[0]\ .replace("_", " ").replace(".", " ").replace("-", " ").title() @@ -37,7 +37,7 @@ class EmailAccount(Document): self.name = self.email_account_name def validate(self): - """Validate email id and check POP3/IMAP and SMTP connections is enabled.""" + """Validate Email Address and check POP3/IMAP and SMTP connections is enabled.""" if self.email_id: validate_email_add(self.email_id, True) diff --git a/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json index b81c1a9b67..9d13968212 100644 --- a/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json +++ b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json @@ -39,7 +39,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "description": "Optional: Always send to these ids. Each email id on a new row", + "description": "Optional: Always send to these ids. Each Email Address on a new row", "fieldname": "cc", "fieldtype": "Code", "hidden": 0, diff --git a/frappe/email/doctype/email_group/email_group.js b/frappe/email/doctype/email_group/email_group.js index e2190a1b25..df4691c427 100644 --- a/frappe/email/doctype/email_group/email_group.js +++ b/frappe/email/doctype/email_group/email_group.js @@ -26,7 +26,7 @@ frappe.ui.form.on("Email Group", "refresh", function(frm) { frm.add_custom_button(__("Add Subscribers"), function() { frappe.prompt({fieldtype:"Text", - label:__("Email Ids"), fieldname:"email_list", reqd:1}, function(data) { + label:__("Email Addresses"), fieldname:"email_list", reqd:1}, function(data) { frappe.call({ method: "frappe.email.doctype.email_group.email_group.add_subscribers", args: { diff --git a/frappe/email/doctype/email_group/email_group.py b/frappe/email/doctype/email_group/email_group.py index 734e49da55..8551c2e33d 100755 --- a/frappe/email/doctype/email_group/email_group.py +++ b/frappe/email/doctype/email_group/email_group.py @@ -17,7 +17,7 @@ class EmailGroup(Document): if d.parent not in singles] def import_from(self, doctype): - """Extract email ids from given doctype and add them to the current list""" + """Extract Email Addresses from given doctype and add them to the current list""" meta = frappe.get_meta(doctype) email_field = [d.fieldname for d in meta.fields if d.fieldtype in ("Data", "Small Text", "Text", "Code") and d.options=="Email"][0] @@ -84,7 +84,7 @@ def add_subscribers(name, email_list): else: pass else: - frappe.msgprint(_("{0} is not a valid email id").format(email)) + frappe.msgprint(_("{0} is not a valid Email Address").format(email)) frappe.msgprint(_("{0} subscribers added").format(count)) diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json index 12a8ce49e5..4a1fed3e07 100644 --- a/frappe/email/doctype/newsletter/newsletter.json +++ b/frappe/email/doctype/newsletter/newsletter.json @@ -211,7 +211,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "description": "A Lead with this email id should exist", + "description": "A Lead with this Email Address should exist", "fieldname": "test_email_id", "fieldtype": "Data", "hidden": 0, @@ -220,7 +220,7 @@ "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Test Email Id", + "label": "Test Email Address", "length": 0, "no_copy": 0, "permlevel": 0, diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 1fa4b3ead7..30ee05432a 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -128,7 +128,7 @@ def subscribe(email): messages = ( _("Thank you for your interest in subscribing to our updates"), - _("Please verify your email id"), + _("Please verify your Email Address"), url, _("Click here to verify") ) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 3f7fce0c31..6223470ceb 100644 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -159,7 +159,7 @@ class EMail: self.add_attachment(name, get_pdf(html, options), 'application/octet-stream') def validate(self): - """validate the email ids""" + """validate the Email Addresses""" from frappe.utils import validate_email_add if not self.sender: diff --git a/frappe/email/queue.py b/frappe/email/queue.py index aed9ae8b0f..ae4ce06687 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -112,7 +112,7 @@ def add(recipients, sender, subject, formatted, text_content=None, e.sender = mail.sender except frappe.InvalidEmailAddressError: - # bad email id - don't add to queue + # bad Email Address - don't add to queue return e.set("recipient", []) diff --git a/frappe/templates/includes/comments/comments.html b/frappe/templates/includes/comments/comments.html index d9e269ea24..eee1be462d 100644 --- a/frappe/templates/includes/comments/comments.html +++ b/frappe/templates/includes/comments/comments.html @@ -35,7 +35,7 @@
+ placeholder="{{ _("Your Email Address") }}" type="email">