Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Replace mention of kg in templates

Roland Geidere71674bc627a
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 8ceb7d0dc..8b22e36b8 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -130,7 +130,15 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
{% endif %}
{% if weight %}
<p>
- {% trans "Your current weight is: "%} <strong>{{weight.weight|floatformat}} {% trans "kg" %}</strong>
+ {% trans "Your current weight is: "%}
+ <strong>
+ {{weight.weight|floatformat}}
+ {% if user.userprofile.weight_unit == 'kg' %}
+ {% trans "kg" %}
+ {% else %}
+ {% trans "lb" %}
+ {% endif %}
+ </strong>
</p>
{% endif %}
</div>
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 1a4ab7e96..66db8ae6e 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -71,7 +71,15 @@
{% if weight %}
<p>
- {% trans "Your current weight is: "%} <strong>{{weight.weight|floatformat}} {% trans "kg" %}</strong>
+ {% trans "Your current weight is: "%}
+ <strong>
+ {{weight.weight|floatformat}}
+ {% if user.userprofile.weight_unit == 'kg' %}
+ {% trans "kg" %}
+ {% else %}
+ {% trans "lb" %}
+ {% endif %}
+ </strong>
</p>
{% endif %}
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index 53578def6..04e10d2ec 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -51,7 +51,13 @@ $(document).ready(function () {
<tr>
{% for form in value.forms %}
<td>{% trans "Reps" %}</td>
- <td>{% trans "kg" %}</td>
+ <td>
+ {% if user.userprofile.weight_unit == 'kg' %}
+ {% trans "kg" %}
+ {% else %}
+ {% trans "lb" %}
+ {% endif %}
+ </td>
{% endfor %}
</tr>
</table>
diff --git a/wger/manager/templates/tags/render_weight_log.html b/wger/manager/templates/tags/render_weight_log.html
index 4a5f52524..d76c4b6f9 100644
--- a/wger/manager/templates/tags/render_weight_log.html
+++ b/wger/manager/templates/tags/render_weight_log.html
@@ -23,7 +23,13 @@
<tr>
<td style="text-align:right;">{% trans "Reps" %}</td>
<td></td>
- <td style="padding:0px;">{% trans "kg" %}</td>
+ <td style="padding:0px;">
+ {% if user.userprofile.weight_unit == 'kg' %}
+ {% trans "kg" %}
+ {% else %}
+ {% trans "lb" %}
+ {% endif %}
+ </td>
</tr>
{% for entry in entry_list %}
<tr>
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index 803108cb6..9e2cad416 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -320,7 +320,13 @@ $(document).ready(function() {
<div class="sub_header">
<h2>
{% if step.weight %}
- {{step.reps}} × {{step.weight}} {% trans "kg" %}.
+ {{step.reps}} × {{step.weight}}
+ {% if user.userprofile.weight_unit == 'kg' %}
+ {% trans "kg" %}
+ {% else %}
+ {% trans "lb" %}
+ {% endif %}
+ .
{% else %}
{% if step.reps == 99 %}∞{% else %}{{step.reps}}{% endif %} {% trans "reps" %}
{% endif %}