diff --git a/templates/custom.html b/templates/custom.html index ae43e48..9643803 100644 --- a/templates/custom.html +++ b/templates/custom.html @@ -3,7 +3,7 @@ {% block content %} -
+ {% include 'setup.html' %}

{%trans%}Simulated distance{%endtrans%} [m]

diff --git a/templates/ipsc.html b/templates/ipsc.html index 38c16df..4431ad0 100644 --- a/templates/ipsc.html +++ b/templates/ipsc.html @@ -3,7 +3,7 @@ {% block content %} - + {% include 'setup.html' %}

{%trans%}Select the stage{%endtrans%}

diff --git a/templates/pdf_template.html b/templates/pdf_template.html index 34d095f..7bebf43 100644 --- a/templates/pdf_template.html +++ b/templates/pdf_template.html @@ -94,6 +94,8 @@
+{% set ns = namespace(previous_position = 0) %} + {% for target in target_info %}
@@ -111,11 +113,16 @@ {% if target.target == 't1' %}
{%trans%}ZERO point{%endtrans%} ({{ stage.split('_') | map('capitalize') | join(' ') }})
{% else %} -
{{ target.position / 10 }}cm {%trans%}from ZERO point{%endtrans%} ({{ stage.split('_') | map('capitalize') | join(' ') }})
+
{{ target.position / 10 }}cm {%trans%}from ZERO point{%endtrans%} + {% if target.target != 't2' %} + {%trans%}or{%endtrans%} {{(target.position - ns.previous_position)/10}}cm {%trans%}from previous marker{%endtrans%} + {% endif %} + ({{ stage.split('_') | map('capitalize') | join(' ') }})
{% endif %}
+ {% set ns.previous_position = target.position %} {% endfor %} diff --git a/templates/sc.html b/templates/sc.html index c1607c0..017a0d6 100644 --- a/templates/sc.html +++ b/templates/sc.html @@ -2,7 +2,7 @@ {% block title %}Steel Challenge{% endblock %} {% block content %} - + {% include 'setup.html' %}
diff --git a/templates/shootoff.html b/templates/shootoff.html index 376d97e..66e1a1d 100644 --- a/templates/shootoff.html +++ b/templates/shootoff.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Shootoff{% endblock %} {% block content %} - + {% include 'setup.html' %}
diff --git a/translations/pl/LC_MESSAGES/messages.mo b/translations/pl/LC_MESSAGES/messages.mo index f3327d0..8f19a7b 100644 Binary files a/translations/pl/LC_MESSAGES/messages.mo and b/translations/pl/LC_MESSAGES/messages.mo differ diff --git a/translations/pl/LC_MESSAGES/messages.po b/translations/pl/LC_MESSAGES/messages.po index 7433629..75358c3 100644 --- a/translations/pl/LC_MESSAGES/messages.po +++ b/translations/pl/LC_MESSAGES/messages.po @@ -95,4 +95,13 @@ msgid "Simulated distance cannot be greater than actual distance" msgstr "Dystans symulowany nie może być większy niż dystans od ściany" msgid "Error" -msgstr "Błąd" \ No newline at end of file +msgstr "Błąd" + +msgid "or" +msgstr "lub" + +msgid "from previous marker" +msgstr "od poprzedniego znacznika" + +msgid "from ZERO point" +msgstr "od punktu ZERO" \ No newline at end of file