Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Output correct weight unit for plan in mobile

Roland Geider4d5c799d7ab4
diff --git a/wger/nutrition/templates/mobile/plan/view.html b/wger/nutrition/templates/mobile/plan/view.html
index a47b24743..afcdc5601 100644
--- a/wger/nutrition/templates/mobile/plan/view.html
+++ b/wger/nutrition/templates/mobile/plan/view.html
@@ -106,15 +106,15 @@ $(document).ready(function() {
</tr>
<tr>
<td>{% trans "Protein" %}</td>
- <td class="align-right">{{item.get_nutritional_values.protein|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{item.get_nutritional_values.protein|floatformat}} {% trans_weight_unit 'g' user %}</td>
</tr>
<tr>
<td>{% trans "Carbohydrates" %}</td>
- <td class="align-right">{{item.get_nutritional_values.carbohydrates|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{item.get_nutritional_values.carbohydrates|floatformat}} {% trans_weight_unit 'g' user %}</td>
</tr>
<tr>
<td>{% trans "Fat" %}</td>
- <td class="align-right">{{item.get_nutritional_values.fat|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{item.get_nutritional_values.fat|floatformat}} {% trans_weight_unit 'g' user %}</td>
</tr>
</tbody>
</table>
@@ -273,31 +273,31 @@ $(document).ready(function() {
</tr>
<tr>
<td>{% trans "Protein" %}</td>
- <td class="align-right">{{nutritional_data.total.protein|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.protein|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td class="align-right">{{nutritional_data.percent.protein|floatformat}} %</td>
<td class="align-right">{{nutritional_data.per_kg.protein|floatformat}}</td>
</tr>
<tr>
<td>{% trans "Carbohydrates" %}</td>
- <td class="align-right">{{nutritional_data.total.carbohydrates|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.carbohydrates|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td class="align-right">{{nutritional_data.percent.carbohydrates|floatformat}} %</td>
<td class="align-right">{{nutritional_data.per_kg.carbohydrates|floatformat}}</td>
</tr>
<tr>
<td style="padding-left: 2em;">{% trans "Sugar content in carbohydrates" %}</td>
- <td class="align-right">{{nutritional_data.total.carbohydrates_sugar|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.carbohydrates_sugar|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td></td>
<td></td>
</tr>
<tr>
<td>{% trans "Fat" %}</td>
- <td class="align-right">{{nutritional_data.total.fat|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.fat|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td class="align-right">{{nutritional_data.percent.fat|floatformat}} %</td>
<td class="align-right">{{nutritional_data.per_kg.fat|floatformat}}</td>
</tr>
<tr>
<td style="padding-left: 2em;">{% trans "Saturated fat content in fats" %}</td>
- <td class="align-right">{{nutritional_data.total.fat_saturated|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.fat_saturated|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td></td>
<td></td>
</tr>
@@ -308,13 +308,13 @@ $(document).ready(function() {
</tr>
<tr>
<td>{% trans "Fibres" %}</td>
- <td class="align-right">{{nutritional_data.total.fibres|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.fibres|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td></td>
<td></td>
</tr>
<tr>
<td>{% trans "Sodium" %}</td>
- <td class="align-right">{{nutritional_data.total.sodium|floatformat}} {% trans "g" context "weight unit, i.e. grams" %}</td>
+ <td class="align-right">{{nutritional_data.total.sodium|floatformat}} {% trans_weight_unit 'g' user %}</td>
<td></td>
<td></td>
</tr>