From 8fdb69cc752df7cd74b412a47642db53f992444c Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Sun, 2 May 2021 22:04:16 -0600 Subject: [PATCH] fix: Make strings translatable (#13046) Co-authored-by: Mohammad Hasnain Mohsin Rajan Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> (cherry picked from commit b0af8886d54ed940111d4eeddca44564db237f56) --- frappe/core/page/recorder/recorder.js | 2 +- frappe/desk/page/backups/backups.js | 2 +- .../page/translation_tool/translation_tool.js | 2 +- .../desk/page/user_profile/user_profile.html | 8 +-- frappe/public/js/frappe/form/toolbar.js | 4 +- .../public/js/frappe/list/list_view_select.js | 6 +- .../js/frappe/recorder/RecorderDetail.vue | 36 ++++++------ .../js/frappe/recorder/RequestDetail.vue | 56 +++++++++---------- .../frappe/ui/notifications/notifications.js | 4 +- .../frappe/views/dashboard/dashboard_view.js | 4 +- .../js/frappe/views/reports/query_report.js | 10 ++-- 11 files changed, 67 insertions(+), 67 deletions(-) diff --git a/frappe/core/page/recorder/recorder.js b/frappe/core/page/recorder/recorder.js index b75ea6a41c..fdca93e8b9 100644 --- a/frappe/core/page/recorder/recorder.js +++ b/frappe/core/page/recorder/recorder.js @@ -1,7 +1,7 @@ frappe.pages['recorder'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, - title: 'Recorder', + title: __('Recorder'), single_column: true, card_layout: true }); diff --git a/frappe/desk/page/backups/backups.js b/frappe/desk/page/backups/backups.js index c82407c6bd..337ad33f43 100644 --- a/frappe/desk/page/backups/backups.js +++ b/frappe/desk/page/backups/backups.js @@ -1,7 +1,7 @@ frappe.pages['backups'].on_page_load = function(wrapper) { var page = frappe.ui.make_app_page({ parent: wrapper, - title: 'Download Backups', + title: __('Download Backups'), single_column: true }); diff --git a/frappe/desk/page/translation_tool/translation_tool.js b/frappe/desk/page/translation_tool/translation_tool.js index b3f0c032e3..13f68e647a 100644 --- a/frappe/desk/page/translation_tool/translation_tool.js +++ b/frappe/desk/page/translation_tool/translation_tool.js @@ -1,7 +1,7 @@ frappe.pages['translation-tool'].on_page_load = function(wrapper) { var page = frappe.ui.make_app_page({ parent: wrapper, - title: 'Translation Tool', + title: __('Translation Tool'), single_column: true, card_layout: true, }); diff --git a/frappe/desk/page/user_profile/user_profile.html b/frappe/desk/page/user_profile/user_profile.html index 911ccc702d..f134441b74 100644 --- a/frappe/desk/page/user_profile/user_profile.html +++ b/frappe/desk/page/user_profile/user_profile.html @@ -8,7 +8,7 @@
- No Data to Show + {%=__("No Data to Show") %}
@@ -19,7 +19,7 @@
- No Data to Show + {%=__("No Data to Show") %}
@@ -30,7 +30,7 @@
- No Data to Show + {%=__("No Data to Show") %}
@@ -41,4 +41,4 @@
- \ No newline at end of file + diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 22787b70c1..c93466e024 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -32,7 +32,7 @@ frappe.ui.form.Toolbar = class Toolbar { } set_title() { if (this.frm.is_new()) { - var title = __('New {0}', [this.frm.meta.name]); + var title = __('New {0}', [__(this.frm.meta.name)]); } else if (this.frm.meta.title_field) { let title_field = (this.frm.doc[this.frm.meta.title_field] || "").toString().trim(); var title = strip_html(title_field || this.frm.docname); @@ -551,7 +551,7 @@ frappe.ui.form.Toolbar = class Toolbar { let fields = this.frm.fields .filter(visible_fields_filter) - .map(f => ({ label: f.df.label, value: f.df.fieldname })); + .map(f => ({ label: __(f.df.label), value: f.df.fieldname })); let dialog = new frappe.ui.Dialog({ title: __('Jump to field'), diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js index 9607be6e90..c89815d200 100644 --- a/frappe/public/js/frappe/list/list_view_select.js +++ b/frappe/public/js/frappe/list/list_view_select.js @@ -150,13 +150,13 @@ frappe.views.ListViewSelect = class ListViewSelect { const views_wrapper = this.sidebar.sidebar.find(".views-section"); views_wrapper.find(".sidebar-label").html(`${__(view)}`); const $dropdown = views_wrapper.find(".views-dropdown"); - - let placeholder = `Select ${view}`; + + let placeholder = `${__("Select {0}", [__(view)])}`; let html = ``; if (!items || !items.length) { html = `
- ${__("No {} Found", [view])} + ${__("No {0} Found", [__(view)])}
`; } else { const page_name = this.get_page_name(); diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue index 57e63a0233..5d934d7e1e 100644 --- a/frappe/public/js/frappe/recorder/RecorderDetail.vue +++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue @@ -5,7 +5,7 @@
@@ -71,12 +71,12 @@
-

Recorder is Inactive

-

+

{{ __("Recorder is Inactive") }}

+

-

No Requests found

-

Go make some noise

+

{{ __("No Requests found") }}

+

{{ __("Go make some noise") }}

@@ -108,12 +108,12 @@ export default { return { requests: [], columns: [ - {label: "Path", slug: "path"}, - {label: "Duration (ms)", slug: "duration", sortable: true, number: true}, - {label: "Time in Queries (ms)", slug: "time_queries", sortable: true, number: true}, - {label: "Queries", slug: "queries", sortable: true, number: true}, - {label: "Method", slug: "method"}, - {label: "Time", slug: "time", sortable: true}, + {label: __("Path"), slug: "path"}, + {label: __("Duration (ms)"), slug: "duration", sortable: true, number: true}, + {label: __("Time in Queries (ms)"), slug: "time_queries", sortable: true, number: true}, + {label: __("Queries"), slug: "queries", sortable: true, number: true}, + {label: __("Method"), slug: "method"}, + {label: __("Time"), slug: "time", sortable: true}, ], query: { sort: "duration", @@ -140,7 +140,7 @@ export default { mounted() { this.fetch_status(); this.refresh(); - this.$root.page.set_secondary_action("Clear", () => { + this.$root.page.set_secondary_action(__("Clear"), () => { frappe.set_route("recorder"); this.clear(); }); @@ -151,11 +151,11 @@ export default { const current_page = this.query.pagination.page; const total_pages = this.query.pagination.total; return [{ - label: "First", + label: __("First"), number: 1, status: (current_page == 1) ? "disabled" : "", },{ - label: "Previous", + label: __("Previous)", number: Math.max(current_page - 1, 1), status: (current_page == 1) ? "disabled" : "", }, { @@ -163,11 +163,11 @@ export default { number: current_page, status: "btn-info", }, { - label: "Next", + label: __("Next"), number: Math.min(current_page + 1, total_pages), status: (current_page == total_pages) ? "disabled" : "", }, { - label: "Last", + label: __("Last"), number: total_pages, status: (current_page == total_pages) ? "disabled" : "", }]; @@ -230,11 +230,11 @@ export default { }, update_buttons: function() { if(this.status.status == "Active") { - this.$root.page.set_primary_action("Stop", () => { + this.$root.page.set_primary_action(__("Stop"), () => { this.stop(); }); } else { - this.$root.page.set_primary_action("Start", () => { + this.$root.page.set_primary_action(__("Start"), () => { this.start(); }); } diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue index cc056686d5..2e995bca39 100644 --- a/frappe/public/js/frappe/recorder/RequestDetail.vue +++ b/frappe/public/js/frappe/recorder/RequestDetail.vue @@ -16,7 +16,7 @@
-
SQL Queries
+
{{ __("SQL Queries") }}
@@ -37,7 +37,7 @@
@@ -48,15 +48,15 @@
- Index
+ {{ __("Index") }}
-
Query
+
{{ __("Query") }}
-
Duration (ms)
+
{{ __("Duration (ms)") }}
-
Exact Copies
+
{{ __("Exact Copies") }}
@@ -82,7 +82,7 @@
- SQL Query #{{ call.index }} + {{ __("SQL Query") }} #{{ call.index }}
@@ -98,25 +98,25 @@
-
+
-
+
-
+
-
+