diff --git a/frappe/core/doctype/access_log/access_log.json b/frappe/core/doctype/access_log/access_log.json
index 044ba9c90a..bee48969b3 100644
--- a/frappe/core/doctype/access_log/access_log.json
+++ b/frappe/core/doctype/access_log/access_log.json
@@ -37,7 +37,7 @@
"fieldtype": "Link",
"in_list_view": 1,
"in_standard_filter": 1,
- "label": "User ",
+ "label": "User",
"options": "User",
"read_only": 1
},
diff --git a/frappe/core/doctype/document_naming_settings/document_naming_settings.json b/frappe/core/doctype/document_naming_settings/document_naming_settings.json
index c7f913aca5..5319bb9816 100644
--- a/frappe/core/doctype/document_naming_settings/document_naming_settings.json
+++ b/frappe/core/doctype/document_naming_settings/document_naming_settings.json
@@ -55,7 +55,7 @@
},
{
"collapsible": 1,
- "description": "Change the starting / current sequence number of an existing series.
\n\nWarning: Incorrectly updating counters can prevent documents from getting created. ",
+ "description": "Change the starting / current sequence number of an existing series.
\n\nWarning: Incorrectly updating counters can prevent documents from getting created.",
"fieldname": "update_series",
"fieldtype": "Section Break",
"label": "Update Series Counter"
diff --git a/frappe/core/doctype/rq_job/rq_job.js b/frappe/core/doctype/rq_job/rq_job.js
index 0f1f88af9d..75834a961a 100644
--- a/frappe/core/doctype/rq_job/rq_job.js
+++ b/frappe/core/doctype/rq_job/rq_job.js
@@ -13,7 +13,7 @@ frappe.ui.form.on("RQ Job", {
frm.add_custom_button(__("Force Stop job"), () => {
frappe.confirm(
__(
- "This will terminate the job immediately and might be dangerous, are you sure? "
+ "This will terminate the job immediately and might be dangerous, are you sure?"
),
() => {
frappe
diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 992564b43e..2a8084cd1a 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -304,7 +304,7 @@
"default": "10",
"fieldname": "allow_consecutive_login_attempts",
"fieldtype": "Int",
- "label": "Allow Consecutive Login Attempts "
+ "label": "Allow Consecutive Login Attempts"
},
{
"fieldname": "column_break_34",
@@ -706,7 +706,7 @@
},
{
"default": "100000",
- "description": "This value specifies the max number of rows that can be rendered in report view. ",
+ "description": "This value specifies the max number of rows that can be rendered in report view.",
"fieldname": "max_report_rows",
"fieldtype": "Int",
"label": "Max Report Rows"
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
index 676b8da9dd..5f9a6a5283 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.js
+++ b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -231,7 +231,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
? frappe.last_response.setup_wizard_failure_message
: __("Failed to complete setup");
- this.update_setup_message(__("Could not start up: ") + fail_msg);
+ this.update_setup_message(__("Could not start up:") + " " + fail_msg);
this.$working_state.find(".title").html(__("Setup failed"));
diff --git a/frappe/email/doctype/email_account/email_account.json b/frappe/email/doctype/email_account/email_account.json
index bc1eb69324..a48e6d9a05 100644
--- a/frappe/email/doctype/email_account/email_account.json
+++ b/frappe/email/doctype/email_account/email_account.json
@@ -257,7 +257,7 @@
{
"default": "250",
"depends_on": "use_imap",
- "description": "Total number of emails to sync in initial sync process ",
+ "description": "Total number of emails to sync in initial sync process",
"fieldname": "initial_sync_count",
"fieldtype": "Select",
"hide_days": 1,
diff --git a/frappe/email/doctype/email_template/email_template.json b/frappe/email/doctype/email_template/email_template.json
index ccce3961cf..e92f677f02 100644
--- a/frappe/email/doctype/email_template/email_template.json
+++ b/frappe/email/doctype/email_template/email_template.json
@@ -51,7 +51,7 @@
"depends_on": "eval:doc.use_html",
"fieldname": "response_html",
"fieldtype": "Code",
- "label": "Response ",
+ "label": "Response",
"options": "Jinja"
}
],
diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.json b/frappe/integrations/doctype/ldap_settings/ldap_settings.json
index 3c5d65a1fe..1777cedd2b 100644
--- a/frappe/integrations/doctype/ldap_settings/ldap_settings.json
+++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.json
@@ -295,7 +295,7 @@
"description": "Do not create new user if user with email does not exist in the system",
"fieldname": "do_not_create_new_user",
"fieldtype": "Check",
- "label": "Do Not Create New User "
+ "label": "Do Not Create New User"
}
],
"in_create": 1,
diff --git a/frappe/integrations/doctype/push_notification_settings/push_notification_settings.json b/frappe/integrations/doctype/push_notification_settings/push_notification_settings.json
index 2d045070ec..075726236c 100644
--- a/frappe/integrations/doctype/push_notification_settings/push_notification_settings.json
+++ b/frappe/integrations/doctype/push_notification_settings/push_notification_settings.json
@@ -37,7 +37,7 @@
"label": "API Secret"
},
{
- "description": "Enabling this will register your site on a central relay server to send push notifications for all installed apps through Firebase Cloud Messaging. This server only stores user tokens and error logs, and no messages are saved. ",
+ "description": "Enabling this will register your site on a central relay server to send push notifications for all installed apps through Firebase Cloud Messaging. This server only stores user tokens and error logs, and no messages are saved.",
"fieldname": "section_break_qgjr",
"fieldtype": "Section Break",
"label": "Relay Settings"
diff --git a/frappe/model/document.py b/frappe/model/document.py
index d9327dc85f..21700acab7 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1791,9 +1791,12 @@ class Document(BaseDocument):
if date_diff(to_date, from_date) < 0:
table_row = ""
if self.meta.istable:
- table_row = _("{0} row #{1}: ").format(
- _(frappe.unscrub(self.parentfield)),
- self.idx,
+ table_row = (
+ _("{0} row #{1}:").format(
+ _(frappe.unscrub(self.parentfield)),
+ self.idx,
+ )
+ + " "
)
frappe.throw(
diff --git a/frappe/public/js/frappe/form/print_utils.js b/frappe/public/js/frappe/form/print_utils.js
index 03cf82902f..5543803a8f 100644
--- a/frappe/public/js/frappe/form/print_utils.js
+++ b/frappe/public/js/frappe/form/print_utils.js
@@ -216,7 +216,7 @@ frappe.ui.form.qz_fail = function (e) {
// notify qz errors
frappe.show_alert(
{
- message: __("QZ Tray Failed: ") + e.toString(),
+ message: __("QZ Tray Failed:") + " " + e.toString(),
indicator: "red",
},
20
diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js
index d0b5513f11..cd12a23c96 100644
--- a/frappe/public/js/frappe/widgets/links_widget.js
+++ b/frappe/public/js/frappe/widgets/links_widget.js
@@ -65,7 +65,7 @@ export default class LinksWidget extends Widget {
- {{_("You can also copy-paste this ")}} {{_("Download Link")}}{{_(" to your browser")}} + {{_("You can also copy-paste this")}} {{_("Download Link")}} {{_("to your browser")}}
\ No newline at end of file diff --git a/frappe/templates/emails/new_message.html b/frappe/templates/emails/new_message.html index bbcfc9c23b..790b5b0d48 100644 --- a/frappe/templates/emails/new_message.html +++ b/frappe/templates/emails/new_message.html @@ -1,4 +1,4 @@ -{{ _("You have a new message from: ") }}{{ from }}
+{{ _("You have a new message from:") }} {{ from }}
{{ message }}
{{ _("No comments yet. ") }} +
{{ _("No comments yet.") }} {{ _("Login to start a new discussion") }} diff --git a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json index c6acceb763..27636a9d71 100644 --- a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json +++ b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json @@ -40,7 +40,7 @@ { "fieldname": "deletion_steps", "fieldtype": "Table", - "label": "Deletion Steps ", + "label": "Deletion Steps", "options": "Personal Data Deletion Step" } ], diff --git a/frappe/www/qrcode.html b/frappe/www/qrcode.html index 7bab29a040..a47b2991a7 100644 --- a/frappe/www/qrcode.html +++ b/frappe/www/qrcode.html @@ -16,7 +16,7 @@
-
{{ _("Authentication Apps you can use are: ") }} +
{{ _("Authentication Apps you can use are:") }} FreeOTP, Google Authenticator, Lastpass Authenticator, Authy and Duo Mobile.