Merge branch 'master' of https://github.com/inventree/InvenTree into price-history

InvenTree/part/templates/part/category_delete.html

@@ -5,7 +5,7 @@
 {% trans 'Are you sure you want to delete category' %} <strong>{{ category.name }}</strong>?
 
 {% if category.children.all|length > 0 %}
-<p>{% trans 'This category contains' %} {{ category.children.all|length }} {% trans 'child categories' %}.<br>
+<p>{% blocktrans with count=category.children.all|length%}This category contains {{count}} child categories{% endblocktrans %}.<br>
 {% trans 'If this category is deleted, these child categories will be moved to the' %}
 {% if category.parent %}
  <strong>{{ category.parent.name }}</strong> {% trans 'category' %}.
@@ -22,9 +22,9 @@
 {% endif %}
 
 {% if category.parts.all|length > 0 %}
-<p>{% trans 'This category contains' %} {{ category.parts.all|length }} {% trans 'parts' %}.<br>
+<p>{% blocktrans with count=category.parts.all|length %}This category contains {{count}} parts{% endblocktrans %}.<br>
     {% if category.parent %}
-    {% trans 'If this category is deleted, these parts will be moved to the parent category' %} {{ category.parent.pathstring }}
+    {% blocktrans with path=category.parent.pathstring %}If this category is deleted, these parts will be moved to the parent category {{path}}{% endblocktrans %}
     {% else %}
     {% trans 'If this category is deleted, these parts will be moved to the top-level category Teile' %}
     {% endif %}

InvenTree/part/templates/part/copy_part.html

@@ -7,7 +7,7 @@
 
 <div class='alert alert-info alert-block'>
     <strong>{% trans 'Duplicate Part' %}</strong><br>
-    {% trans 'Make a copy of part' %} '{{ part.full_name }}'.
+    {% blocktrans with full_name=part.full_name %}Make a copy of part '{{full_name}}'.{% endblocktrans %}
 </div>
 
 {% if matches %}

InvenTree/part/templates/part/create_part.html

@@ -13,7 +13,8 @@
     <ul class='list-group'>
     {% for match in matches %}
     <li class='list-group-item list-group-item-condensed'>
-        {{ match.part.full_name }} - <i>{{ match.part.description }}</i> ({% decimal match.ratio %}% {% trans "match" %})
+        {% decimal match.ratio as match_per %}
+        {% blocktrans with full_name=match.part.full_name desc=match.part.description %}{{full_name}} - <i>{{desc}}</i> ({{match_per}}% match){% endblocktrans %}
     </li>
     {% endfor %}
 </ul>

InvenTree/part/templates/part/part_base.html

@@ -14,7 +14,8 @@
 
 {% if part.variant_of %}
 <div class='alert alert-info alert-block'>
-    {% trans "This part is a variant of" %} <strong><a href="{% url 'part-variants' part.variant_of.id %}">{{ part.variant_of.full_name }}</a></strong>
+    {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
+    {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
 </div>
 {% endif %}
 

InvenTree/part/templates/part/part_pricing.html

@@ -4,8 +4,7 @@
 {% block pre_form_content %}
 
 <div class='alert alert-info alert-block'>
-{% trans 'Pricing information for:' %}<br>
-{{ part }}.
+{% blocktrans %}Pricing information for:<br>{{part}}.{% endblocktrans %}
 </div>
 
 <h4>{% trans 'Quantity' %}</h4>

InvenTree/part/templates/part/partial_delete.html

@@ -4,12 +4,12 @@
 {% block pre_form_content %}
 
 <div class='alert alert-block alert-danger'>
-    {% trans "Are you sure you want to delete part" %} '<b>{{ part.full_name }}</b>'?
+    {% blocktrans with full_name=part.full_name %}Are you sure you want to delete part '<b>{{full_name}}</b>'?{% endblocktrans %}
 </div>
 
 {% if part.used_in_count %}
 <hr>
-<p>{% trans "This part is used in BOMs for" %} {{ part.used_in_count }} {% trans "other parts. If you delete this part, the BOMs for the following parts will be updated" %}:
+<p>{% blocktrans with count=part.used_in_count %}This part is used in BOMs for {{count}} other parts. If you delete this part, the BOMs for the following parts will be updated{% endblocktrans %}:
 <ul class="list-group">
     {% for child in part.used_in.all %}
     <li class='list-group-item'>{{ child.part.full_name }} - {{ child.part.description }}</li>
@@ -19,7 +19,7 @@
 
 {% if part.stock_items.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.stock_items.all|length }} {% trans "stock entries defined for this part. If you delete this part, the following stock entries will also be deleted" %}:
+<p>{% blocktrans with count=part.stock_items.all|length %}There are {{count}} stock entries defined for this part. If you delete this part, the following stock entries will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for stock in part.stock_items.all %}
         <li class='list-group-item'>{{ stock }}</li>
@@ -30,7 +30,7 @@
 
 {% if part.manufacturer_parts.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.manufacturer_parts.all|length }} {% trans "manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted" %}:
+<p>{% blocktrans with count=part.manufacturer_parts.all|length %}There are {{count}} manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.manufacturer_parts.all %}
         <li class='list-group-item'>{{ spart.manufacturer.name }} - {{ spart.MPN }}</li>
@@ -41,7 +41,7 @@
 
 {% if part.supplier_parts.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.supplier_parts.all|length }} {% trans "suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted" %}:
+<p>{% blocktrans with count=part.supplier_parts.all|length %}There are {{count}} suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.supplier_parts.all %}
         <li class='list-group-item'>{{ spart.supplier.name }} - {{ spart.SKU }}</li>
@@ -52,7 +52,7 @@
 
 {% if part.serials.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.serials.all|length }} {% trans "unique parts tracked for" %} '{{ part.full_name }}'. {% trans "Deleting this part will permanently remove this tracking information" %}.</p>
+<p>{% blocktrans with count=part.serials.all|length full_name=part.full_name  %}There are {{count}} unique parts tracked for '{{full_name}}'. Deleting this part will permanently remove this tracking information.{% endblocktrans %}</p>
 {% endif %}
 
 {% endblock %}

InvenTree/part/templates/part/stock.html

@@ -13,7 +13,7 @@
 {% block details %}
 {% if part.is_template %}
 <div class='alert alert-info alert-block'>
-    {% trans 'Showing stock for all variants of' %} <i>{{ part.full_name }}</i>
+    {% blocktrans with full_name=part.full_name%}Showing stock for all variants of <i>{{full_name}}</i>{% endblocktrans %}
 </div>
 {% endif %}
 

InvenTree/part/templates/part/variant_part.html

@@ -7,7 +7,7 @@
 
 <div class='alert alert-info alert-block'>
     <b>{% trans "Create new part variant" %}</b><br>
-    {% trans "Create a new variant of template" %} <i>'{{ part.full_name }}'</i>.
+    {% blocktrans with full_name=part.full_name %}Create a new variant of template <i>'{{full_name}}'</i>.{% endblocktrans %}
 </div>
 
 {% endblock %}

InvenTree/part/templatetags/inventree_extras.py

@@ -4,6 +4,8 @@ over and above the built-in Django tags.
 import os
 
 from django import template
+from django.urls import reverse
+from django.utils.safestring import mark_safe
 from InvenTree import version, settings
 
 import InvenTree.helpers
@@ -164,3 +166,11 @@ def authorized_owners(group):
         pass
     
     return owners
+
+
+@register.simple_tag()
+def object_link(url_name, pk, ref):
+    """ Return highlighted link to object """
+
+    ref_url = reverse(url_name, kwargs={'pk': pk})
+    return mark_safe('<b><a href="{}">{}</a></b>'.format(ref_url, ref))