Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix translations

Roland Geider41d99ee688d7
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 2be40b2d2..49cffbe08 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -484,7 +484,7 @@
class="btn btn-sm btn-success"
{% else %}
href="#"
- title="{% trans 'Admin login is only available for users in' %} “{{gym_name}}”"
+ title="{% blocktranslate %}Admin login is only available for users in {{gym_name}}{% endblocktranslate %}"
class="btn btn-sm btn-secondary"
{% endif %}
>
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 31cc06588..789e83145 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -470,9 +470,11 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
if not ((energy_upper > energy_calculated) and (energy_calculated > energy_lower)):
raise ValidationError(
- _(f'The total energy ({self.energy}kcal) is not the approximate sum of the '
- f'energy provided by protein, carbohydrates and fat ({energy_calculated}kcal '
- f'+/-{self.ENERGY_APPROXIMATION}%)'))
+ _('The total energy ({energy}kcal) is not the approximate sum of the '
+ 'energy provided by protein, carbohydrates and fat ({energy_calculated}kcal '
+ '+/-{energy_approx}%)'.format(energy=self.energy,
+ energy_calculated=energy_calculated,
+ energy_approx=self.ENERGY_APPROXIMATION)))
def save(self, *args, **kwargs):
"""