From 70ca45c2937e6e07b72ac9a0f7a22d5ce451c0cb Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 8 Oct 2019 15:45:10 +0530 Subject: [PATCH] fix: translated strings --- frappe/core/doctype/comment/comment.py | 4 +-- frappe/desk/form/assign_to.py | 2 +- frappe/share.py | 3 +- .../energy_point_log/energy_point_log.py | 29 ++++++++++--------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/frappe/core/doctype/comment/comment.py b/frappe/core/doctype/comment/comment.py index 27951201a1..4ca30079ff 100644 --- a/frappe/core/doctype/comment/comment.py +++ b/frappe/core/doctype/comment/comment.py @@ -58,8 +58,8 @@ class Comment(Document): recipients = [frappe.db.get_value("User", {"enabled": 1, "name": name, "user_type": "System User", "allowed_in_mentions": 1}, "email") for name in mentions] - notification_message = _('''{0} mentioned you in a comment in {1} {2}''')\ - .format(sender_fullname, self.reference_doctype, title) + notification_message = _('''{0} mentioned you in a comment in {1} {2}''')\ + .format(frappe.bold(sender_fullname), frappe.bold(self.reference_doctype), frappe.bold(title)) notification_doc = { 'type': 'Mention', diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index 72cbcfb08f..32dbabc84f 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -166,7 +166,7 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', description_html = "

{0}

".format(description) if description else None if action=='CLOSE': - subject = _('Your assignment on {0} {1} has been removed').format(doc_type, title) + subject = _('Your assignment on {0} {1} has been removed').format(frappe.bold(doc_type), frappe.bold(title)) else: subject = '''{0} assigned a new task {1} {2} to you'''.format(user_name, doc_type, title) diff --git a/frappe/share.py b/frappe/share.py index 6c746e0bfa..b71f7f14fd 100644 --- a/frappe/share.py +++ b/frappe/share.py @@ -157,7 +157,8 @@ def notify_assignment(shared_by, doctype, doc_name, everyone, description=None, frappe.db.get_value(doctype, doc_name, title_field) reference_user = get_fullname(frappe.session.user) - notification_message = _('''{0} shared a document {1} {2} with you''').format(reference_user, doctype, title) + notification_message = _('''{0} shared a document {1} {2} with you''')\ + .format(frappe.bold(reference_user), frappe.bold(doctype), frappe.bold(title)) notification_doc = { 'type': 'Share', 'reference_doctype': doctype, diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py index 32226ecfe0..e5b98db78c 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/energy_point_log.py @@ -36,13 +36,13 @@ class EnergyPointLog(Document): 'type': 'Energy Point', 'reference_doctype': self.reference_doctype, 'reference_name': self.reference_name, - 'subject': get_notifications_message(self), + 'subject': get_notification_message(self), 'reference_user': reference_user } create_notification(self.user, notification_doc, self.reason) -def get_notifications_message(doc): +def get_notification_message(doc): owner_name = get_fullname(doc.owner) points = doc.points title_field = frappe.get_meta(doc.reference_doctype).get_title_field() @@ -50,30 +50,31 @@ def get_notifications_message(doc): frappe.db.get_value(doc.reference_doctype, doc.reference_name, title_field) if doc.type == 'Auto': + owner_name = frappe.bold('You') if points == 1: - message = _('You gained {0} point for {1} {2}') + message = _('{0} gained {1} point for {2} {3}') else: - message = _('You gained {0} points for {1} {2}') - message = message.format(points, doc.rule, title) + message = _('{0} gained {1} points for {2} {3}') + message = message.format(owner_name, frappe.bold(points), doc.rule, frappe.bold(title)) elif doc.type == 'Appreciation': if points == 1: - message = _('{0} appreciated your work on {1} with {2} point') + message = _('{0} appreciated your work on {1} with {2} point') else: - message = _('{0} appreciated your work on {1} with {2} points') - message = message.format(owner_name, title, points) + message = _('{0} appreciated your work on {1} with {2} points') + message = message.format(frappe.bold(owner_name), frappe.bold(title), frappe.bold(points)) elif doc.type == 'Criticism': if points == 1: - message = _('{0} criticized your work on {1} with {2} point') + message = _('{0} criticized your work on {1} with {2} point') else: - message = _('{0} criticized your work on {1} with {2} points') + message = _('{0} criticized your work on {1} with {2} points') - message = message.format(owner_name, title, points) + message = message.format(frappe.bold(owner_name), frappe.bold(title), frappe.bold(points)) elif doc.type == 'Revert': if points == 1: - message = _('{0} reverted your point on {1}') + message = _('{0} reverted your point on {1}') else: - message = _('{0} reverted your points on {1}') - message = message.format(owner_name, title) + message = _('{0} reverted your points on {1}') + message = message.format(frappe.bold(owner_name), frappe.bold(title)) return message