From 876c4aa4db3f3f6cd8a48f56bc40869f7fd60269 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 23 Aug 2019 12:15:05 +0530 Subject: [PATCH] fix: fix string translation and rename function --- .../ui/toolbar/energy_points_notifications.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js b/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js index 83cfe492a3..5b12f52322 100644 --- a/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js +++ b/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js @@ -53,10 +53,10 @@ frappe.ui.EnergyPointsNotifications = class { insert_into_dropdown() { let new_item = this.dropdown_items[0]; let new_item_html = this.get_dropdown_item_html(new_item); - let new_item_date_range = this.get_energy_points_date_range(new_item.creation); - let current_date_range = this.get_energy_points_date_range(this.dropdown_items[1].creation); + let new_item_date_range = this.get_date_range_title(new_item.creation); + let current_date_range = this.get_date_range_title(this.dropdown_items[1].creation); if (current_date_range !== new_item_date_range) { - let $date_range = $(`
  • ${__(new_item_date_range)}
  • `); + let $date_range = $(`
  • ${new_item_date_range}
  • `); $date_range.insertAfter(this.$dropdown_list.find('.points-updates-header')); $(new_item_html).insertAfter($date_range); } else { @@ -69,18 +69,18 @@ frappe.ui.EnergyPointsNotifications = class { frappe.call('frappe.social.doctype.energy_point_log.energy_point_log.set_notification_as_seen', {point_logs: unseen_logs}); } - get_energy_points_date_range(date) { + get_date_range_title(date) { let current_date = frappe.datetime.now_date(); let prev_week = frappe.datetime.add_days(current_date, -7); let prev_month = frappe.datetime.add_months(frappe.datetime.now_date(), -1); if (date >= current_date) { - return 'Today'; + return __('Today'); } else if (date > prev_week) { - return 'Last 7 days'; + return __('Last 7 days'); } else if (date > prev_month) { - return 'Last 30 days'; + return __('Last 30 days'); } else { - return 'Older'; + return __('Older'); } } @@ -109,12 +109,12 @@ frappe.ui.EnergyPointsNotifications = class { let view_full_log_html = ''; if (this.dropdown_items.length) { - let date_range = this.get_energy_points_date_range(this.dropdown_items[0].creation); - body_html += `
  • ${__(date_range)}
  • `; + let date_range = this.get_date_range_title(this.dropdown_items[0].creation); + body_html += `
  • ${date_range}
  • `; this.dropdown_items.forEach(field => { - let current_field_date_range = this.get_energy_points_date_range(field.creation); + let current_field_date_range = this.get_date_range_title(field.creation); if (date_range !== current_field_date_range) { - body_html += `
  • ${__(current_field_date_range)}
  • `; + body_html += `
  • ${current_field_date_range}
  • `; date_range = current_field_date_range; } let item_html = this.get_dropdown_item_html(field);