diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index fed6d2cb06..6337d919eb 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -929,10 +929,7 @@ class Column: self.warnings.append( { "col": self.column_number, - "message": _( - "Date format could not be determined from the values in" - " this column. Defaulting to yyyy-mm-dd." - ), + "message": _("Date format could not be determined from the values in this column. Defaulting to yyyy-mm-dd."), "type": "info", } ) diff --git a/frappe/utils/bot.py b/frappe/utils/bot.py index 68f49c47ed..33ec139b64 100644 --- a/frappe/utils/bot.py +++ b/frappe/utils/bot.py @@ -40,7 +40,7 @@ class BotParser(object): def format_list(self, data): '''Format list as markdown''' - return _('I found these: ') + ', '.join(' [{title}](/app/Form/{doctype}/{name})'.format( + return _('I found these:') + ' ' + ', '.join(' [{title}](/app/Form/{doctype}/{name})'.format( title = d.title or d.name, doctype=self.get_doctype(), name=d.name) for d in data) diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py index 8eedca5335..906d557326 100644 --- a/frappe/utils/jinja_globals.py +++ b/frappe/utils/jinja_globals.py @@ -38,13 +38,13 @@ def web_block(template, values=None, **kwargs): def web_blocks(blocks): - from frappe import throw, _dict + from frappe import throw, _dict, _ from frappe.website.doctype.web_page.web_page import get_web_blocks_html web_blocks = [] for block in blocks: if not block.get("template"): - throw("Web Template is not specified") + throw(_("Web Template is not specified")) doc = _dict( {