nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: strings for translation (backport #44816) (#44927)

Browse Source 
* fix: strings for translation

(cherry picked from commit 3be633f6f1)

# Conflicts:
#	erpnext/accounts/utils.py

* fix: resolved conflict

---------

Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
mergify[bot]
2024-12-27 11:33:09 +05:30
committed by GitHub
parent 5cc9e10923
commit 488d8080c8
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -318,7 +318,7 @@ def get_columns(additional_table_columns, filters):
"width": 100, "width": 100,
}, },
{ {
"label": _("Rate"), "label": _("Tax Rate"),
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Float", "fieldtype": "Float",
"options": "currency", "options": "currency",

2
erpnext/accounts/utils.py
View File

@@ -130,7 +130,7 @@ def get_fiscal_years(
else: else:
return ((fy.name, fy.year_start_date, fy.year_end_date),) return ((fy.name, fy.year_start_date, fy.year_end_date),)
error_msg = _("""{0} {1} is not in any active Fiscal Year""").format(label, formatdate(transaction_date)) error_msg = _("""{0} {1} is not in any active Fiscal Year""").format(_(label), formatdate(transaction_date))
if company: if company:
error_msg = _("""{0} for {1}""").format(error_msg, frappe.bold(company)) error_msg = _("""{0} for {1}""").format(error_msg, frappe.bold(company))

4
erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
View File

@@ -230,8 +230,8 @@ class ForecastingReport(ExponentialSmoothingForecast):
"data": { "data": {
"labels": labels, "labels": labels,
"datasets": [ "datasets": [
{"name": "Demand", "values": self.total_demand}, {"name": _("Demand"), "values": self.total_demand},
{"name": "Forecast", "values": self.total_forecast}, {"name": _("Forecast"), "values": self.total_forecast},
], ],
}, },
"type": "line", "type": "line",

2
erpnext/manufacturing/report/production_analytics/production_analytics.py
View File

@@ -106,7 +106,7 @@ def get_data(filters, columns):
for label in labels: for label in labels:
work = {} work = {}
work["Status"] = label work["Status"] = _(label)
for _dummy, end_date in ranges: for _dummy, end_date in ranges:
period = get_period(end_date, filters) period = get_period(end_date, filters)
if periodic_data.get(label).get(period): if periodic_data.get(label).get(period):

8
erpnext/public/js/bom_configurator/bom_configurator.bundle.js
View File

@@ -147,10 +147,10 @@ class BOMConfigurator {
if (!node.expanded) { if (!node.expanded) {
view.tree.load_children(node, true); view.tree.load_children(node, true);
$(node.parent[0]).find(".tree-children").show(); $(node.parent[0]).find(".tree-children").show();
node.$toolbar.find(".expand-all-btn").html("Collapse All"); node.$toolbar.find(".expand-all-btn").html(__("Collapse All"));
} else { } else {
node.$tree_link.trigger("click"); node.$tree_link.trigger("click");
node.$toolbar.find(".expand-all-btn").html("Expand All"); node.$toolbar.find(".expand-all-btn").html(__("Expand All"));
} }
}, },
condition: function (node) { condition: function (node) {
@@ -190,10 +190,10 @@ class BOMConfigurator {
if (!node.expanded) { if (!node.expanded) {
view.tree.load_children(node, true); view.tree.load_children(node, true);
$(node.parent[0]).find(".tree-children").show(); $(node.parent[0]).find(".tree-children").show();
node.$toolbar.find(".expand-all-btn").html("Collapse All"); node.$toolbar.find(".expand-all-btn").html(__("Collapse All"));
} else { } else {
node.$tree_link.trigger("click"); node.$tree_link.trigger("click");
node.$toolbar.find(".expand-all-btn").html("Expand All"); node.$toolbar.find(".expand-all-btn").html(__("Expand All"));
} }
}, },
condition: function (node) { condition: function (node) {

2
erpnext/stock/doctype/material_request/material_request.js
View File

@@ -322,7 +322,7 @@ frappe.ui.form.on("Material Request", {
default: 1, default: 1,
}, },
], ],
primary_action_label: "Get Items", primary_action_label: __("Get Items"),
primary_action(values) { primary_action(values) {
if (!values) return; if (!values) return;
values["company"] = frm.doc.company; values["company"] = frm.doc.company;

2
erpnext/templates/includes/footer/footer_extension.html
View File

@@ -17,7 +17,7 @@ frappe.ready(function() {
if($("#footer-subscribe-email").val() && validate_email($("#footer-subscribe-email").val())) { if($("#footer-subscribe-email").val() && validate_email($("#footer-subscribe-email").val())) {
$("#footer-subscribe-email").attr('disabled', true); $("#footer-subscribe-email").attr('disabled', true);
$("#footer-subscribe-button").html("Sending...") $("#footer-subscribe-button").html(__("Sending..."))
.attr("disabled", true); .attr("disabled", true);
erpnext.subscribe_to_newsletter({ erpnext.subscribe_to_newsletter({
email: $("#footer-subscribe-email").val(), email: $("#footer-subscribe-email").val(),