fix: Translation related issues (#11932)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

frappe/custom/doctype/custom_script/custom_script.js

@@ -33,6 +33,7 @@ frappe.ui.form.on('Custom Script', {
 						}
 					],
 					primary_action: ({ cdt }) => {
+						cdt = d.get_field('cdt').value;
 						frm.events.add_script_for_doctype(frm, cdt);
 						d.hide();
 					}

frappe/desk/page/leaderboard/leaderboard.js

@@ -145,7 +145,7 @@ class Leaderboard {
 			df: {
 				fieldtype: 'DateRange',
 				fieldname: 'selected_date_range',
-				placeholder: "Date Range",
+				placeholder: __("Date Range"),
 				default: [frappe.datetime.month_start(), frappe.datetime.now_date()],
 				input_class: 'input-sm',
 				reqd: 1,
@@ -193,7 +193,7 @@ class Leaderboard {
 
 		this.$search_box =
 			$(`<div class="leaderboard-search form-group col-md-3">
-				<input type="text" placeholder="Search" data-element="search" class="form-control leaderboard-search-input input-sm">
+				<input type="text" placeholder=${ __("Search") } data-element="search" class="form-control leaderboard-search-input input-sm">
 			</div>`);
 
 		$(this.parent).find(".page-form").append(this.$search_box);
@@ -292,7 +292,7 @@ class Leaderboard {
 			.map(i => frappe.model.unscrub(i));
 		const fields = ["rank", "name", this.options.selected_filter_item];
 		const filters = fields.map(filter => {
-			const col = frappe.model.unscrub(filter);
+			const col = __(frappe.model.unscrub(filter));
 			return (
 				`<div class="leaderboard-item list-item_content ellipsis text-muted list-item__content--flex-2
 					header-btn-base ${filter}

frappe/public/js/frappe/file_uploader/index.js

@@ -63,7 +63,7 @@ export default class FileUploader {
 
 	make_dialog() {
 		this.dialog = new frappe.ui.Dialog({
-			title: 'Upload',
+			title: __('Upload'),
 			fields: [
 				{
 					fieldtype: 'HTML',

frappe/public/js/frappe/form/controls/html.js

@@ -9,6 +9,7 @@ frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({
 	},
 	get_content: function() {
 		var content = this.df.options || "";
+		content = __(content);
 		try {
 			return frappe.render(content, this);
 		} catch (e) {

frappe/public/js/frappe/form/form.js

@@ -941,7 +941,7 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	add_web_link(path, label) {
-		label = label || "See on Website";
+		label = __(label) || __("See on Website");
 		this.web_link = this.sidebar.add_user_action(__(label),
 			function() {}).attr("href", path || this.doc.route).attr("target", "_blank");
 	}

frappe/public/js/frappe/form/multi_select_dialog.js

@@ -42,7 +42,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
 			fields: fields,
 			primary_action_label: this.primary_action_label || __("Get Items"),
-			secondary_action_label: __("Make {0}", [me.doctype]),
+			secondary_action_label: __("Make {0}", [__(me.doctype)]),
 			primary_action: function () {
 				let filters_data = me.get_custom_filters();
 				me.action(me.get_checked_values(), cur_dialog.get_values(), me.args, filters_data);
@@ -356,4 +356,4 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			}
 		});
 	}
-};
+};

frappe/public/js/frappe/form/success_action.js

@@ -37,7 +37,7 @@ frappe.ui.form.SuccessAction = class SuccessAction {
 					setting.message;
 
 				const $buttons = this.get_actions().map(action => {
-					const $btn = $(`<button class="next-action"><span>${action.label}</span></button>`);
+					const $btn = $(`<button class="next-action"><span>${__(action.label)}</span></button>`);
 					$btn.click(() => action.action(this.form));
 					return $btn;
 				});

frappe/public/js/frappe/list/list_sidebar.html

@@ -10,7 +10,7 @@
 </ul>
 <ul class="list-unstyled sidebar-menu standard-actions">
 	{% if frappe.model.can_get_report(doctype) %}
-	<li class="list-sidebar-label">Views</li>
+	<li class="list-sidebar-label">{{__('Views')}}</li>
 	<li class="divider visible-sm visible-xs"></li>
 	<li class="list-link">
 		<div class="btn-group">
@@ -73,7 +73,7 @@
 			</a>
 			<ul class="dropdown-menu list-stats-dropdown" role="menu">
 				<div class="dropdown-search">
-					<input type="text" placeholder="Search" data-element="search" class="form-control input-xs">
+					<input type="text" placeholder=${ __("Search") } data-element="search" class="form-control input-xs">
 				</div>
 			</ul>
 		</div>

frappe/public/js/frappe/list/list_sidebar_group_by.js

@@ -23,7 +23,7 @@ frappe.views.ListGroupBy = class ListGroupBy {
 			fields: this.get_group_by_dropdown_fields()
 		});
 
-		d.set_primary_action("Save", ({ group_by_fields }) => {
+		d.set_primary_action(__("Save"), ({ group_by_fields }) => {
 			frappe.model.user_settings.save(this.doctype, 'group_by_fields', group_by_fields || null);
 			this.group_by_fields = group_by_fields ? ['assigned_to', 'owner', ...group_by_fields] : ['assigned_to', 'owner'];
 			this.render_group_by_items();

frappe/public/js/frappe/translate.js

@@ -12,7 +12,7 @@ frappe._ = function(txt, replace, context = null) {
 
 	let translated_text = '';
 
-	let key = txt.replace(/\n/g, "");
+	let key = txt;    // txt.replace(/\n/g, "");
 	if (context) {
 		translated_text = frappe._messages[`${key}:${context}`];
 	}

frappe/public/js/frappe/ui/alt_keyboard_shortcuts.js

@@ -128,6 +128,7 @@ frappe.ui.keys.AltShortcutGroup = class AltShortcutGroup {
 			return !this.is_taken(letter) && is_valid_char;
 		});
 		if (!shortcut_letter) {
+			$text_el.attr('data-label', text_content);
 			return;
 		}
 		for (let key in this.shortcuts_dict) {

frappe/public/js/frappe/ui/group_by/group_by.html

@@ -9,14 +9,14 @@
 						<option 
 							data-doctype="{{parent_doctype}}"
 							value="{{groupby_conditions[parent_doctype][val].fieldname}}">
-							{{ groupby_conditions[parent_doctype][val].label }}
-							({{ parent_doctype }})
+							{{ __(groupby_conditions[parent_doctype][val].label) }}
+							({{ __(parent_doctype) }})
 						</option>
 						{% } else { %}
 						<option 
 							data-doctype="{{parent_doctype}}"
-							value="{{groupby_conditions[parent_doctype][val].fieldname}}">
-							{{ groupby_conditions[parent_doctype][val].label }}
+							value="{{ groupby_conditions[parent_doctype][val].fieldname }}">
+							{{ __(groupby_conditions[parent_doctype][val].label) }}
 						</option>
 						{% } %}
 					{% } %}
@@ -26,7 +26,7 @@
 		<div class="col-sm-2 form-group">
 			<select class="aggregate-function form-control">
 				{% for condition in aggregate_function_conditions %}
-				<option value="{{condition.name}}">{{ condition.label }}</option>
+				<option value="{{condition.name}}">{{ __(condition.label) }}</option>
 				{% endfor %}
 			</select>
 		</div>

frappe/public/js/frappe/ui/group_by/group_by.js

@@ -12,9 +12,9 @@ frappe.ui.GroupBy = class {
 	setup_group_by_area() {
 		this.make_group_by_button();
 		let sql_aggregate_function = [
-			{name:'count', label: 'Count'},
-			{name:'sum', label: 'Sum'},
-			{name:'avg', label:'Average'}
+			{name: 'count', label: __('Count')},
+			{name: 'sum', label: __('Sum')},
+			{name: 'avg', label: __('Average')}
 		];
 		this.groupby_edit_area = $(frappe.render_template("group_by", {
 			doctype: this.doctype,
@@ -64,9 +64,9 @@ frappe.ui.GroupBy = class {
 						if (frappe.model.is_numeric_field(field.fieldtype)) {
 							let option_text = doctype == this.doctype
 								? field.label
-								: `${field.label} (${doctype})`;
+								: `${__(field.label)} (${__(doctype)})`;
 							this.aggregate_on_html+= `<option data-doctype="${doctype}"
-								value="${field.fieldname}">${option_text}</option>`;
+								value="${field.fieldname}">${__(option_text)}</option>`;
 						}
 					});
 				}

frappe/public/js/frappe/ui/link_preview.js

@@ -190,7 +190,7 @@ frappe.ui.LinkPreview = class {
 				let label = key;
 				content_html += `
 					<div class="preview-field">
-						<div class='small preview-label text-muted bold'>${label}</div>
+						<div class='small preview-label text-muted bold'>${__(label)}</div>
 						<div class="small preview-value">${value}</div>
 					</div>
 				`;
@@ -202,8 +202,8 @@ frappe.ui.LinkPreview = class {
 			<div class="preview-popover-header">${image_html}
 				<div class="preview-header">
 					<div class="preview-main">
-						<a class="preview-name bold" href=${this.href}>${preview_data.preview_title}</a>
-						<span class="text-muted small">${this.doctype} ${id_html}</span>
+						<a class="preview-name bold" href=${this.href}>${__(preview_data.preview_title)}</a>
+						<span class="text-muted small">${__(this.doctype)} ${id_html}</span>
 					</div>
 				</div>
 			</div>

frappe/public/js/frappe/ui/notifications/notifications.js

@@ -148,8 +148,8 @@ frappe.ui.Notifications = class Notifications {
 
 	add_open_document_html(name, value, doc_dt, target = false) {
 		let label = this.open_docs_config[name]
-			? this.open_docs_config[name].label
-			: name;
+			? __(this.open_docs_config[name].label)
+			: __(name);
 		let title = target ? `title="${__('Your Target')}"` : '';
 		let $list_item = !target
 			? $(`<li><a class="badge-hover" data-action="route_to_document_type" data-doctype="${name}" ${title}>

frappe/public/js/frappe/ui/toolbar/search.js

@@ -212,21 +212,21 @@ frappe.search.SearchDialog = Class.extend({
 		var $search_results = $(frappe.render_template("search")).addClass('hide');
 		var $sidebar = $search_results.find(".search-sidebar").empty();
 		var sidebar_item_html = '<li class="module-sidebar-item list-link" data-category="{0}">' +
-			'<a><span class="ellipsis">{0}</span><i class="octicon octicon-chevron-right"' +
+			'<a><span class="ellipsis">{1}</span><i class="octicon octicon-chevron-right"' +
 			'></a></li>';
 
 		this.modal_state = 0;
 		this.full_lists = {	'All Results': $('<div class="module-body results-summary"></div>') };
 		this.nav_lists = {};
 
 		result_sets.forEach(function(set) {
-			$sidebar.append($(__(sidebar_item_html, [set.title])));
+			$sidebar.append($(__(sidebar_item_html, [set.title, __(set.title)])));
 			me.add_section_to_summary(set.title, set.results);
 			me.full_lists[set.title] = me.render_full_list(set.title, set.results, set.fetch_type);
 		});
 
 		if(result_sets.length > 1) {
-			$sidebar.prepend($(__(sidebar_item_html, ["All Results"])));
+			$sidebar.prepend($(__(sidebar_item_html, ['All Results', __('All Results')])));
 		}
 
 		this.update($search_results.clone());
@@ -237,8 +237,8 @@ frappe.search.SearchDialog = Class.extend({
 		var me = this, max_length = 20;
 		var $results_list = $(' <div class="module-body"><div class="row module-section full-list '+
 			type+'-section">'+'<div class="col-sm-12 module-section-column">' +
-			'<div class="back-link"><a class="all-results-link small"> All Results</a></div>' +
-			'<div class="h4 section-head">'+type+'</div>' +
+			'<div class="back-link"><a class="all-results-link small">' + __("All Results") + '</a></div>' +
+			'<div class="h4 section-head">'+__(type)+'</div>' +
 			'<div class="section-body"></div></div></div></div>');
 
 		var $results_col = $results_list.find('.module-section-column');
@@ -273,7 +273,7 @@ frappe.search.SearchDialog = Class.extend({
 			this.full_lists['All Results'].append($('<div class="row module-section"></div>'));
 		}
 		var $results_col = $(`<div class="col-sm-${col_width} module-section-column" data-type="${type}">
-			<div class="h4 section-head">${type}</div>
+			<div class="h4 section-head">${ __(type) }</div>
 			<div class="section-body"></div>
 			</div>`);
 		results.slice(0, section_length).forEach(function(result) {
@@ -424,4 +424,4 @@ frappe.search.SearchDialog = Class.extend({
 		},
 	},
 
-});
+});

frappe/public/js/frappe/ui/toolbar/search_header.html

@@ -7,6 +7,6 @@
 	</a>
 	<a type="button" class="btn btn-default btn-sm btn-modal-close" data-dismiss="modal" aria-hidden="true">
 		<i class="octicon octicon-x visible-xs" style="padding: 1px 0px;"></i>
-		<span class="hidden-xs">Close</span>
+		<span class="hidden-xs">{{ __("Close") }}</span>
 	</a>
-</div>
+</div>

frappe/public/js/frappe/ui/toolbar/search_utils.js

@@ -481,47 +481,47 @@ frappe.search.utils = {
 		});
 		var in_keyword = keywords.split(" in ")[0];
 		return [{
-			title: "Recents",
+			title: __("Recents"),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_recent_pages(keywords))
 		},
 		{
-			title: "Create a new ...",
+			title: __("Create a new ..."),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_creatables(keywords))
 		},
 		{
-			title: "Lists",
+			title: __("Lists"),
 			fetch_type: "Nav",
 			results: lists
 		},
 		{
-			title: "Reports",
+			title: __("Reports"),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_reports(keywords))
 		},
 		{
-			title: "Administration",
+			title: __("Administration"),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_pages(keywords))
 		},
 		{
-			title: "Workspace",
+			title: __("Workspace"),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_workspaces(keywords))
 		},
 		{
-			title: "Dashboard",
+			title: __("Dashboard"),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_dashboards(keywords))
 		},
 		{
-			title: "Setup",
+			title: __("Setup"),
 			fetch_type: "Nav",
 			results: setup
 		},
 		{
-			title: "Find '" + in_keyword + "' in ... ",
+			title: __("Find '{0}' in ...", [in_keyword]),
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_search_in_list(keywords))
 		}];

frappe/public/js/frappe/widgets/onboarding_widget.js

@@ -30,7 +30,7 @@ export default class OnboardingWidget extends Widget {
 
 		let $step = $(`<div class="onboarding-step ${status}">
 				<i class="fa ${icon_class}" aria-hidden="true" title="${status}"></i>
-				<span id="title">${step.title}</span>
+				<span id="title">${__(step.title)}</span>
 			</div>`);
 
 		step.$step = $step;
@@ -435,7 +435,7 @@ export default class OnboardingWidget extends Widget {
 		super.set_title(title);
 		if (this.subtitle) {
 			let subtitle = $(
-				`<div class="widget-subtitle">${this.subtitle}</div>`
+				`<div class="widget-subtitle">${__(this.subtitle)}</div>`
 			);
 			subtitle.appendTo(this.title_field);
 		}

frappe/public/js/frappe/widgets/shortcut_widget.js

@@ -81,7 +81,7 @@ export default class ShortcutWidget extends Widget {
 	set_count(count) {
 		const get_label = () => {
 			if (this.format) {
-				return this.format.replace(/{}/g, count);
+				return __(this.format).replace(/{}/g, count);
 			}
 			return count;
 		};

frappe/translate.py

@@ -118,6 +118,8 @@ def get_dict(fortype, name=None):
 			messages += frappe.db.sql("select 'DocType:', name from tabDocType")
 			messages += frappe.db.sql("select 'Role:', name from tabRole")
 			messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
+			messages += frappe.db.sql("select '', format from `tabDesk Shortcut` where format is not null")
+			messages += frappe.db.sql("select '', title from `tabOnboarding Step`")
 
 		message_dict = make_dict_from_messages(messages, load_user_translation=False)
 		message_dict.update(get_dict_from_hooks(fortype, name))
@@ -336,7 +338,9 @@ def get_messages_from_doctype(name):
 			options = d.options.split('\n')
 			if not "icon" in options[0]:
 				messages.extend(options)
-
+		if d.fieldtype=='HTML' and d.options:
+			messages.append(d.options)
+
 	# translations of roles
 	for d in meta.get("permissions"):
 		if d.role: