diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index 244bf67050..ed9b7c27dd 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -29,8 +29,7 @@ frappe.search.AwesomeBar = Class.extend({
},
item: function(item, term) {
var d = this.get_item(item.value);
- var name = d.prefix ? __(d.prefix + ' ' + (d.label || d.value)) :
- __(d.label || d.value);
+ var name = __(d.label || d.value);
var html = '' + name + '';
if(d.description && d.value!==d.description) {
html += '
' + __(d.description) + '';
@@ -123,8 +122,7 @@ frappe.search.AwesomeBar = Class.extend({
add_help: function() {
this.options.push({
- label: __("Help on Search"),
- value: "Help on Search",
+ value: __("Help on Search"),
index: -10,
default: "Help",
onclick: function() {
@@ -140,7 +138,7 @@ frappe.search.AwesomeBar = Class.extend({
'+__("Calculate")+' | '+
__("e.g. (55 + 434) / 4 or =Math.sin(Math.PI/2)...")+' |
\
'
- msgprint(txt, "Search Help");
+ msgprint(txt, __("Search Help"));
}
});
},
@@ -208,8 +206,8 @@ frappe.search.AwesomeBar = Class.extend({
make_global_search: function(txt) {
var me = this;
this.options.push({
- label: __("Search for '" + txt.bold() + "'"),
- value: __("Search for '" + txt + "'"),
+ label: __("Search for '{0}'", [txt.bold()]),
+ value: __("Search for '{0}'", [txt]),
match: txt,
index: 100,
default: "Search",
diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js
index a771ce9122..2148a88ed9 100644
--- a/frappe/public/js/frappe/ui/toolbar/search_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js
@@ -87,8 +87,7 @@ frappe.search.utils = {
if(level) {
out.push({
type: "In List",
- prefix: __("Find {0} in ", [__(parts[0]).bold()]),
- label: me.bolden_match_part(__(item), parts[1]),
+ label: __('Find {0} in {1}', [__(parts[0]), me.bolden_match_part(__(item), parts[1])]),
value: __('Find {0} in {1}', [__(parts[0]), __(item)]),
route_options: {"name": ["like", "%" + parts[0] + "%"]},
index: 1 + level,
@@ -110,8 +109,7 @@ frappe.search.utils = {
if(level) {
out.push({
type: "New",
- prefix: "New ",
- label: me.bolden_match_part(__(item), keywords.substr(4)),
+ label: __("New {0}", [me.bolden_match_part(__(item), keywords.substr(4))]),
value: __("New {0}", [__(item)]),
index: 1 + level,
match: item,
@@ -131,8 +129,8 @@ frappe.search.utils = {
var option = function(type, route, order) {
return {
type: type,
- label: __("{0}" + " " + type, [me.bolden_match_part(__(target), keywords)]),
- value: __(__(target) + " " + type),
+ label: me.bolden_match_part(__(target), keywords) + " " + __(type),
+ value: __(target) + " " + __(type),
index: level + order,
match: target,
route: route,
@@ -191,8 +189,7 @@ frappe.search.utils = {
route = ["query-report", item];
out.push({
type: "Report",
- prefix: "Report ",
- label: me.bolden_match_part(__(item), keywords),
+ label: __("Report {0}" , [me.bolden_match_part(__(item), keywords)]),
value: __("Report {0}" , [__(item)]),
index: level,
route: route
@@ -216,8 +213,7 @@ frappe.search.utils = {
var page = me.pages[item];
out.push({
type: "Page",
- prefix: "Open ",
- label: me.bolden_match_part(__(item), keywords),
+ label: __("Open {0}", [me.bolden_match_part(__(item), keywords)]),
value: __("Open {0}", [__(item)]),
match: item,
index: level,
@@ -229,8 +225,6 @@ frappe.search.utils = {
if(__('calendar').indexOf(keywords.toLowerCase()) === 0) {
out.push({
type: "Calendar",
- prefix: "Open ",
- label: __('Calendar'),
value: __("Open {0}", [__(target)]),
index: me.fuzzy_search(keywords, 'Calendar'),
match: target,
@@ -240,8 +234,6 @@ frappe.search.utils = {
if(__('email inbox').indexOf(keywords.toLowerCase()) === 0) {
out.push({
type: "Inbox",
- prefix: "Open ",
- label: __('Email Inbox'),
value: __("Open {0}", [__('Email Inbox')]),
index: me.fuzzy_search(keywords, 'email inbox'),
match: target,
@@ -261,8 +253,7 @@ frappe.search.utils = {
if(module._doctype) return;
ret = {
type: "Module",
- prefix: "Open ",
- label: me.bolden_match_part(__(item), keywords),
+ label: __("Open {0}", [me.bolden_match_part(__(item), keywords)]),
value: __("Open {0}", [__(item)]),
index: level,
}
@@ -575,6 +566,5 @@ frappe.search.utils = {
return rendered;
}
- }
-
-}
\ No newline at end of file
+ },
+}