diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index 83cef5bd44..a8e5e53377 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -164,7 +164,7 @@ src="{% static 'img/blank_image.png' %}" launchModalForm("{% url 'build-cancel' build.id %}", { reload: true, - submit_text: "Cancel Build", + submit_text: '{% trans "Cancel Build" %}', }); }); @@ -173,7 +173,7 @@ src="{% static 'img/blank_image.png' %}" "{% url 'build-complete' build.id %}", { reload: true, - submit_text: "Complete Build", + submit_text: '{% trans "Complete Build" %}', } ); }); diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html index 9331e5d895..236cc58981 100644 --- a/InvenTree/company/templates/company/company_base.html +++ b/InvenTree/company/templates/company/company_base.html @@ -43,17 +43,17 @@ InvenTree | {% trans "Company" %} - {{ company.name }}

{{ company.description }}

{% if company.is_supplier and roles.purchase_order.add %} - {% endif %} {% if perms.company.change_company %} - {% endif %} {% if perms.company.delete_company %} - {% endif %} diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html index ae4b025b11..f01bfa68d1 100644 --- a/InvenTree/company/templates/company/supplier_part_orders.html +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -14,7 +14,7 @@ {% if roles.purchase_order.add %}
-
diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index c93e26e363..21e23266bb 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -66,7 +66,7 @@
- diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html index 3c322410ca..616e618deb 100644 --- a/InvenTree/order/templates/order/order_wizard/select_pos.html +++ b/InvenTree/order/templates/order/order_wizard/select_pos.html @@ -42,7 +42,7 @@ diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index ac4ebcf2bc..dfab8d1ae7 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -49,7 +49,7 @@ src="{% static 'img/blank_image.png' %}" {% if roles.sales_order.change %} - {% if order.status == SalesOrderStatus.PENDING %} diff --git a/InvenTree/part/templates/part/bom_upload/select_fields.html b/InvenTree/part/templates/part/bom_upload/select_fields.html index 5e44cee2b9..e82223da88 100644 --- a/InvenTree/part/templates/part/bom_upload/select_fields.html +++ b/InvenTree/part/templates/part/bom_upload/select_fields.html @@ -44,7 +44,7 @@
{{ col.name }} -
@@ -73,7 +73,7 @@ {% for row in bom_rows %} - diff --git a/InvenTree/part/templates/part/params.html b/InvenTree/part/templates/part/params.html index 52b32d0643..b8cb1ae563 100644 --- a/InvenTree/part/templates/part/params.html +++ b/InvenTree/part/templates/part/params.html @@ -65,8 +65,8 @@ reload: true, secondary: [{ field: 'template', - label: 'New Template', - title: 'Create New Parameter Template', + label: '{% trans "New Template" %}', + title: '{% trans "Create New Parameter Template" %}', url: "{% url 'part-param-template-create' %}" }], }); diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 96c9636c88..f11fe879ce 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -246,7 +246,7 @@ launchModalForm( "{% url 'part-pricing' part.id %}", { - submit_text: 'Calculate', + submit_text: '{% trans "Calculate" %}', hideErrorMessage: true, } ); diff --git a/InvenTree/part/templates/part/part_pricing.html b/InvenTree/part/templates/part/part_pricing.html index c0b23ffbd7..7865bb2fbe 100644 --- a/InvenTree/part/templates/part/part_pricing.html +++ b/InvenTree/part/templates/part/part_pricing.html @@ -1,35 +1,37 @@ {% extends "modal_form.html" %} +{% load i18n %} + {% block pre_form_content %}
-Pricing information for:
+{% trans 'Pricing information for:' %}
{{ part }}.
-

Quantity

+

{% trans 'Quantity' %}

- + - +
Part{% trans 'Part' %} {{ part }}
Quantity{% trans 'Quantity' %} {{ quantity }}
{% if part.supplier_count > 0 %} -

Supplier Pricing

+

{% trans 'Supplier Pricing' %}

{% if min_total_buy_price %} - + {% if quantity > 1 %} - + @@ -37,7 +39,7 @@ Pricing information for:
{% else %} {% endif %} @@ -45,17 +47,17 @@ Pricing information for:
{% endif %} {% if part.bom_count > 0 %} -

BOM Pricing

+

{% trans 'BOM Pricing' %}

Unit Cost{% trans 'Unit Cost' %} Min: {% include "price.html" with price=min_unit_buy_price %} Max: {% include "price.html" with price=max_unit_buy_price %}
Total Cost{% trans 'Total Cost' %} Min: {% include "price.html" with price=min_total_buy_price %} Max: {% include "price.html" with price=max_total_buy_price %}
- No supplier pricing available + {% trans 'No supplier pricing available' %}
{% if min_total_bom_price %} - + {% if quantity > 1 %} - + @@ -63,14 +65,14 @@ Pricing information for:
{% if part.has_complete_bom_pricing == False %} {% endif %} {% else %} {% endif %} @@ -80,7 +82,7 @@ Pricing information for:
{% if min_unit_buy_price or min_unit_bom_price %} {% else %}
- No pricing information is available for this part. + {% trans 'No pricing information is available for this part.' %}
{% endif %} diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html index f5459dac27..a72b727f69 100644 --- a/InvenTree/stock/templates/stock/item_base.html +++ b/InvenTree/stock/templates/stock/item_base.html @@ -451,7 +451,7 @@ $("#stock-edit").click(function () { "{% url 'stock-item-edit' item.id %}", { reload: true, - submit_text: "Save", + submit_text: '{% trans "Save" %}', } ); }); diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html index 5c2b4e04db..74e43f88bb 100644 --- a/InvenTree/stock/templates/stock/location.html +++ b/InvenTree/stock/templates/stock/location.html @@ -160,7 +160,7 @@ $("#stock-export").click(function() { launchModalForm("{% url 'stock-export-options' %}", { - submit_text: "Export", + submit_text: '{% trans "Export" %}', success: function(response) { var url = "{% url 'stock-export' %}"; @@ -188,8 +188,8 @@ secondary: [ { field: 'parent', - label: 'New Location', - title: 'Create new location', + label: '{% trans "New Location" %}', + title: '{% trans "Create new location" %}', url: "{% url 'stock-location-create' %}", }, ] diff --git a/InvenTree/stock/templates/stock/stock_adjust.html b/InvenTree/stock/templates/stock/stock_adjust.html index a72407f735..5ba98231b0 100644 --- a/InvenTree/stock/templates/stock/stock_adjust.html +++ b/InvenTree/stock/templates/stock/stock_adjust.html @@ -40,7 +40,7 @@ {% endif %} - + {% endfor %}
Unit Cost{% trans 'Unit Cost' %} Min: {% include "price.html" with price=min_unit_bom_price %} Max: {% include "price.html" with price=max_unit_bom_price %}
Total Cost{% trans 'Total Cost' %} Min: {% include "price.html" with price=min_total_bom_price %} Max: {% include "price.html" with price=max_total_bom_price %}
- Note: BOM pricing is incomplete for this part + {% trans 'Note: BOM pricing is incomplete for this part' %}
- No BOM pricing available + {% trans 'No BOM pricing available' %}
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html index 5eb755dcb2..b65ec00c00 100644 --- a/InvenTree/templates/InvenTree/search.html +++ b/InvenTree/templates/InvenTree/search.html @@ -133,14 +133,14 @@ InvenTree | {% trans "Search Results" %} columns: [ { field: 'name', - title: 'Name', + title: '{% trans "Name" %}', formatter: function(value, row, index, field) { return renderLink(value, '/part/category/' + row.pk + '/'); }, }, { field: 'description', - title: 'Description', + title: '{% trans "Description" %}', }, ], }); @@ -270,14 +270,14 @@ InvenTree | {% trans "Search Results" %} columns: [ { field: 'name', - title: 'Name', + title: '{% trans "Name" %}', formatter: function(value, row, index, field) { return renderLink(row.pathstring, '/stock/location/' + row.pk + '/'); }, }, { field: 'description', - title: 'Description', + title: '{% trans "Description" %}', }, ], }); diff --git a/InvenTree/templates/js/modals.js b/InvenTree/templates/js/modals.js index 2c246d2a36..004e81c000 100644 --- a/InvenTree/templates/js/modals.js +++ b/InvenTree/templates/js/modals.js @@ -253,7 +253,7 @@ function loadingMessageContent() { */ // TODO - This can be made a lot better - return " Waiting for server..."; + return " {% trans 'Waiting for server...' %}"; } diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js index bfb539c3c5..02714810e3 100644 --- a/InvenTree/templates/js/stock.js +++ b/InvenTree/templates/js/stock.js @@ -976,8 +976,8 @@ function loadStockTrackingTable(table, options) { formatter: function(value, row, index, field) { // Manually created entries can be edited or deleted if (!row.system) { - var bEdit = ""; - var bDel = ""; + var bEdit = ""; + var bDel = ""; return "
" + bEdit + bDel + "
"; } else { diff --git a/InvenTree/templates/qr_button.html b/InvenTree/templates/qr_button.html index cc10e0cd26..5ed65d32ab 100644 --- a/InvenTree/templates/qr_button.html +++ b/InvenTree/templates/qr_button.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file