Self hosted FLOSS fitness/workout, nutrition and weight tracker
Replace renamed functions
Roland Geiderbde74027b9db
diff --git a/wger/config/models.py b/wger/config/models.pyindex cf6a30947..bad98a29b 100644--- a/wger/config/models.py+++ b/wger/config/models.py@@ -21,7 +21,7 @@ import logging# Djangofrom django.core.cache import cachefrom django.db import models-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import (diff --git a/wger/config/templates/language/overview.html b/wger/config/templates/language/overview.htmlindex e29dbd982..a5b9a0a4b 100644--- a/wger/config/templates/language/overview.html+++ b/wger/config/templates/language/overview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Languages" %}{% endblock %}+{% block title %}{% translate "Languages" %}{% endblock %}{% block content %}@@ -13,7 +13,7 @@</a>{% empty %}<a href="{% url 'core:language:add' %}" class="list-group-item">- {% trans "Nothing found." %}<br>{% trans "Add one now." %}+ {% translate "Nothing found." %}<br>{% translate "Add one now." %}</a>{% endfor %}</div>@@ -26,6 +26,6 @@{# #}{% block options %}<a href="{% url 'core:language:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endblock %}diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.htmlindex 6059d90de..116ef8e2c 100644--- a/wger/config/templates/language/view.html+++ b/wger/config/templates/language/view.html@@ -18,8 +18,8 @@<table class="table"><thead><tr>- <th>{% trans "Language short name" %}</th>- <th>{% trans "Language full name" %}</th>+ <th>{% translate "Language short name" %}</th>+ <th>{% translate "Language full name" %}</th></tr></thead><tbody>@@ -31,17 +31,17 @@</table>-<h4>{% trans "Configuration" %}</h4>-<p>{% blocktrans %}Use the configuration to select in what languages the+<h4>{% translate "Configuration" %}</h4>+<p>{% blocktranslate %}Use the configuration to select in what languages theexercises and ingredients will be shown for the current language (for examplethe exercises should be shown in languages A, B and C; the ingredients only-in A).{% endblocktrans %}</p>+in A).{% endblocktranslate %}</p><table class="table"><thead><tr>- <th>{% trans "Language full name" %}</th>- <th>{% trans "Show" %}</th>+ <th>{% translate "Language full name" %}</th>+ <th>{% translate "Show" %}</th></tr></thead><tbody>@@ -88,17 +88,17 @@ in A).{% endblocktrans %}</p><div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'core:language:edit' view_language.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit" %}+ {% translate "Edit" %}</a><div role="separator" class="dropdown-divider"></div><a href="{% url 'core:language:delete' view_language.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a></div></div>diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.pyindex d737ce4a2..6796cf42e 100644--- a/wger/config/views/gym_config.py+++ b/wger/config/views/gym_config.py@@ -19,7 +19,7 @@ import logging# Djangofrom django.urls import reverse_lazy-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import UpdateView# wger@@ -38,7 +38,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):fields = ['default_gym']permission_required = 'config.change_gymconfig'success_url = reverse_lazy('gym:gym:list')- title = ugettext_lazy('Edit')+ title = gettext_lazy('Edit')def get_object(self):"""diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.pyindex 73276d24e..f05b18961 100644--- a/wger/config/views/language_config.py+++ b/wger/config/views/language_config.py@@ -23,7 +23,7 @@ from django.contrib.auth.mixins import (PermissionRequiredMixin)from django.urls import reverse_lazy-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import UpdateView# wger@@ -44,7 +44,7 @@ class LanguageConfigUpdateView(WgerFormMixin,model = LanguageConfigfields = ['show']permission_required = 'config.change_languageconfig'- title = ugettext_lazy('Edit')+ title = gettext_lazy('Edit')def get_success_url(self):"""diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 7fcecb944..b0a4dacb2 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -23,7 +23,7 @@ import uuid# Djangofrom django.contrib.auth import authenticatefrom django.contrib.auth.models import User-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# wgerfrom wger.core.models import DaysOfWeekdiff --git a/wger/core/forms.py b/wger/core/forms.pyindex 497011c81..fe4b9df73 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -29,7 +29,7 @@ from django.forms import (PasswordInput,widgets)-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom captcha.fields import ReCaptchaFielddiff --git a/wger/core/models.py b/wger/core/models.pyindex 168ffff2a..f45c6d3d4 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -28,7 +28,7 @@ from django.core.validators import (from django.db import modelsfrom django.db.models import IntegerFieldfrom django.urls import reverse-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.gym.models import Gymdiff --git a/wger/core/templates/403.html b/wger/core/templates/403.htmlindex 49f6a69db..ab4262f2a 100644--- a/wger/core/templates/403.html+++ b/wger/core/templates/403.html@@ -1,8 +1,8 @@{% extends "template_no_context.html" %}{% load i18n static %}-{% block title %}{% trans "Forbidden!" %}{% endblock %}+{% block title %}{% translate "Forbidden!" %}{% endblock %}{% block content %}-<p>{% trans "Something happened that is not allowed." %}</p>+<p>{% translate "Something happened that is not allowed." %}</p>{% endblock %}diff --git a/wger/core/templates/404.html b/wger/core/templates/404.htmlindex 064275198..8860e4bb0 100644--- a/wger/core/templates/404.html+++ b/wger/core/templates/404.html@@ -1,8 +1,8 @@{% extends "template_no_context.html" %}{% load i18n static %}-{% block title %}{% trans "Page not found" %}{% endblock %}+{% block title %}{% translate "Page not found" %}{% endblock %}{% block content %}-<p>{% trans "The page you requested does not exist." %}</p>+<p>{% translate "The page you requested does not exist." %}</p>{% endblock %}diff --git a/wger/core/templates/500.html b/wger/core/templates/500.htmlindex 85e7f53a6..a9c3e4539 100644--- a/wger/core/templates/500.html+++ b/wger/core/templates/500.html@@ -1,8 +1,8 @@{% extends "template_no_context.html" %}{% load i18n static %}-{% block title %}{% trans "An error occurred" %}{% endblock %}+{% block title %}{% translate "An error occurred" %}{% endblock %}{% block content %}-<p>{% trans "Something happened that caused an error." %}</p>+<p>{% translate "Something happened that caused an error." %}</p>{% endblock %}diff --git a/wger/core/templates/base.html b/wger/core/templates/base.htmlindex 5b32fc8b4..1f622e0c2 100644--- a/wger/core/templates/base.html+++ b/wger/core/templates/base.html@@ -9,11 +9,11 @@{% if trainer_identity %}<div class="alert alert-info" style="margin-top: 1em;">- {% blocktrans with current_user=user|format_username %}You are+ {% blocktranslate with current_user=user|format_username %}You arebrowsing the site as the user "{{current_user}}", all actions are performed on their data.- {% endblocktrans %}+ {% endblocktranslate %}<a href="{% url 'core:user:trainer-login' trainer_identity %}" class="alert-link">- {% blocktrans with target=user.userprofile.gym.name %}Back to "{{ target }}"{% endblocktrans %}+ {% blocktranslate with target=user.userprofile.gym.name %}Back to "{{ target }}"{% endblocktranslate %}</a></div>{% endif %}diff --git a/wger/core/templates/base_wide.html b/wger/core/templates/base_wide.htmlindex df98d0ee5..0db45ea3c 100644--- a/wger/core/templates/base_wide.html+++ b/wger/core/templates/base_wide.html@@ -7,11 +7,11 @@{% if trainer_identity %}<div class="alert alert-info" style="margin-top: 1em;">- {% blocktrans with current_user=user|format_username %}You are+ {% blocktranslate with current_user=user|format_username %}You arebrowsing the site as the user "{{current_user}}", all actions are performed on their data.- {% endblocktrans %}+ {% endblocktranslate %}<a href="{% url 'core:user:trainer-login' trainer_identity %}" class="alert-link">- {% blocktrans with target=user.userprofile.gym.name %}Back to "{{ target }}"{% endblocktrans %}+ {% blocktranslate with target=user.userprofile.gym.name %}Back to "{{ target }}"{% endblocktranslate %}</a></div>{% endif %}diff --git a/wger/core/templates/delete.html b/wger/core/templates/delete.htmlindex 596f8ed46..dca8d784b 100644--- a/wger/core/templates/delete.html+++ b/wger/core/templates/delete.html@@ -12,7 +12,7 @@-->{% block content %}<div class="wger-form">- <p>{% trans "Are you sure you want to delete this? This action cannot be undone." %}</p>+ <p>{% translate "Are you sure you want to delete this? This action cannot be undone." %}</p>{% if delete_message %}<p>{{ delete_message }}</p>{% endif %}diff --git a/wger/core/templates/index.html b/wger/core/templates/index.htmlindex cc25f5d27..b45295560 100644--- a/wger/core/templates/index.html+++ b/wger/core/templates/index.html@@ -1,7 +1,7 @@{% extends "base_wide.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Dashboard" %}{% endblock %}+{% block title %}{% translate "Dashboard" %}{% endblock %}{# #}{# Header #}@@ -26,19 +26,19 @@ $(document).ready(function () {<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans 'Add log to day' %}</h4>+ <h4 class="modal-title">{% translate 'Add log to day' %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">- <p>{% blocktrans %}Click to add weight logs to a training-day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</strong></p>+ <p>{% blocktranslate %}Click to add weight logs to a training+day in your current workout:{% endblocktranslate %} <strong>{{current_workout}}</strong></p>{% for day in current_workout.day_set.all %}<a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-light">{{day.description}}</a>{% endfor %}</div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -49,20 +49,20 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans 'Add new diary entry' %}</h4>+ <h4 class="modal-title">{% translate 'Add new diary entry' %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body"><p>- {% blocktrans trimmed %}Click to add an entry to your nutrition diary for+ {% blocktranslate trimmed %}Click to add an entry to your nutrition diary fortoday. You can either log a meal as you defined it, or entry any number of- custom entries.{% endblocktrans %}+ custom entries.{% endblocktranslate %}</p>{% for meal in plan.meal_set.all %}<a href="{% url 'nutrition:log:log_meal' meal.pk %}" class="btn btn-block btn-light">{{meal.time}}- - {{meal.get_nutritional_values.energy|floatformat:0}}{% trans "kcal" %}+ - {{meal.get_nutritional_values.energy|floatformat:0}}{% translate "kcal" %}<br><small>{% for item in meal.mealitem_set.select_related %}@@ -74,11 +74,11 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% endfor %}<a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-block btn-light">- {% trans "Add custom diary entry" %}+ {% translate "Add custom diary entry" %}</a></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -89,7 +89,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="card-deck"><div class="card"><div class="card-body">- <h5 class="card-title">{% trans "Workout"%}</h5>+ <h5 class="card-title">{% translate "Workout"%}</h5><div class="card-text">{% if current_workout %}<p>@@ -97,7 +97,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% if current_workout.comment %}{{ current_workout.comment }}{% else %}- {% trans "Workout" %}+ {% translate "Workout" %}{% endif %}</a></p>@@ -123,13 +123,13 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% if schedule %}<p>- → {% trans "This workout is part of a schedule:" %}+ → {% translate "This workout is part of a schedule:" %}<a href="{{schedule.get_absolute_url}}">{{schedule.name}}</a></p>{% endif %}<p><em>- {% blocktrans trimmed %}The current workout is selected from your active- schedule or, if you don't have one, simply by date.{% endblocktrans %}+ {% blocktranslate trimmed %}The current workout is selected from your active+ schedule or, if you don't have one, simply by date.{% endblocktranslate %}</em></p></div></div>@@ -137,12 +137,12 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% if current_workout %}{% if current_workout.day_set.all %}<a href="#" id="logging-popup-link" data-toggle="modal" data-target="#calendar-day-select-popup" class="btn btn-success btn-sm btn-block">- {% trans "Add new log" %}+ {% translate "Add new log" %}</a>{% endif %}{% else %}<a href="{% url 'manager:workout:add' %}" class="btn btn-sm btn-block btn-success btn-block">- {% trans "No workouts found." %} {% trans "Add one now." %}+ {% translate "No workouts found." %} {% translate "Add one now." %}</a>{% endif %}</div>@@ -152,7 +152,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="card"><div class="card-body">- <h5 class="card-title">{% trans "Nutrition plan"%}</h5>+ <h5 class="card-title">{% translate "Nutrition plan"%}</h5><div class="card-text">{% if plan %}<p>@@ -164,25 +164,25 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% endif %}<table class="table table-hover table-sm"><tr>- <td>{% trans "Energy" %}</td>+ <td>{% translate "Energy" %}</td><td>- {{nutritional_info.total.energy|floatformat|default:"-/-"}} {% trans "kcal" %}+ {{nutritional_info.total.energy|floatformat|default:"-/-"}} {% translate "kcal" %}</td></tr><tr>- <td>{% trans "Protein" %}</td>+ <td>{% translate "Protein" %}</td><td>{{nutritional_info.total.protein|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}</td></tr><tr>- <td>{% trans "Carbohydrates" %}</td>+ <td>{% translate "Carbohydrates" %}</td><td>{{nutritional_info.total.carbohydrates|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}</td></tr><tr>- <td>{% trans "Fat" %}</td>+ <td>{% translate "Fat" %}</td><td>{{nutritional_info.total.fat|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}</td>@@ -194,11 +194,11 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="card-footer">{% if not plan %}<a href="{% url 'nutrition:plan:add' %}" class="btn btn-sm btn-block btn-success">- {% trans "No nutrition plans." %} {% trans "Add one now." %}+ {% translate "No nutrition plans." %} {% translate "Add one now." %}</a>{% else %}<a href="#" id="nutrition-diary-link" data-toggle="modal" data-target="#nutrition-diary-popup" class="btn btn-success btn-sm btn-block">- {% trans "Add new diary entry" %}+ {% translate "Add new diary entry" %}</a>{% endif %}</div>@@ -208,11 +208,11 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="card"><div class="card-body">- <h5 class="card-title">{% trans "Weight"%}</h5>+ <h5 class="card-title">{% translate "Weight"%}</h5><div class="card-text">{% if weight %}<p>- {% trans "Your current weight is: "%}+ {% translate "Your current weight is: "%}{{weight.weight|floatformat}} {% trans_weight_unit 'kg' user %}</p><table class="table table-hover table-sm">@@ -245,7 +245,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str</div><div class="card-footer"><a href="{% url 'weight:add' %}" class="btn btn-success btn-block btn-sm wger-modal-dialog">- {% trans "Add weight entry" %}+ {% translate "Add weight entry" %}</a></div></div>diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.htmlindex 3604058c8..d19b383c2 100644--- a/wger/core/templates/license/list.html+++ b/wger/core/templates/license/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "License list" %}{% endblock %}+{% block title %}{% translate "License list" %}{% endblock %}{% block content %}@@ -13,15 +13,15 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'core:license:edit' license.id %}" class="dropdown-item wger-modal-dialog">{% trans 'Edit' %}</a>- <a href="{% url 'core:license:delete' license.id %}" class="dropdown-item wger-modal-dialog">{% trans 'Delete' %}</a>+ <a href="{% url 'core:license:edit' license.id %}" class="dropdown-item wger-modal-dialog">{% translate 'Edit' %}</a>+ <a href="{% url 'core:license:delete' license.id %}" class="dropdown-item wger-modal-dialog">{% translate 'Delete' %}</a></div></div>{{license}}</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -35,7 +35,7 @@{% block options %}{% if perms.core.add_license %}<a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/core/templates/misc/about.html b/wger/core/templates/misc/about.htmlindex 666af4790..b3dc102bf 100644--- a/wger/core/templates/misc/about.html+++ b/wger/core/templates/misc/about.html@@ -1,11 +1,11 @@{% extends "base.html" %}{% load i18n static %}-{% block title %}{% trans "About us" %}{% endblock %}+{% block title %}{% translate "About us" %}{% endblock %}{% block content %}<!---<p>{% trans "Responsible for the content of this site as per German law §5 TMG:" %}</p>+<p>{% translate "Responsible for the content of this site as per German law §5 TMG:" %}</p>--><p>Your name<br>diff --git a/wger/core/templates/misc/contact.html b/wger/core/templates/misc/contact.htmlindex 75a26555e..f14790ee6 100644--- a/wger/core/templates/misc/contact.html+++ b/wger/core/templates/misc/contact.html@@ -1,24 +1,24 @@{% extends "base_wide.html" %}{% load i18n wger_extras %}-{% block title%}{% trans "Get in touch" %}{% endblock %}+{% block title%}{% translate "Get in touch" %}{% endblock %}{% block content %}<div class="row"><div class="col-sm-6">-<p>{% blocktrans %}Thank you for your interest. Feel free to use any of the+<p>{% blocktranslate %}Thank you for your interest. Feel free to use any of theways below to send feedback you have about any aspect of the site. Forsupport, say hi<a href="{{discord}}">on the discord channel</a>, to reporta bug, consider doing it through the <a href="{{issues}}">issue tracker</a>-.{% endblocktrans %}</p>+.{% endblocktranslate %}</p></div><div class="col-sm-6"><div class="alert alert-block alert-wger-green">- {% blocktrans %}If you want to further help and improve this project,-you might also be interested <a href="{{contribute}}">in contributing</a>.{% endblocktrans %}+ {% blocktranslate %}If you want to further help and improve this project,+you might also be interested <a href="{{contribute}}">in contributing</a>.{% endblocktranslate %}</div></div>@@ -26,34 +26,34 @@ you might also be interested <a href="{{contribute}}">in contributing</a>.{% end<div class="row"><div class="col-md-4">- <h4>{% trans "Feedback form" %}</h4>- <p>{% blocktrans %}A simple contact form. Remember that-if you want an answer, you need to include some way to contact you.{% endblocktrans %}</p>+ <h4>{% translate "Feedback form" %}</h4>+ <p>{% blocktranslate %}A simple contact form. Remember that+if you want an answer, you need to include some way to contact you.{% endblocktranslate %}</p></div><div class="col-md-4">- <h4>{% trans "Twitter" %}</h4>- <p>{% blocktrans %}We are also on twitter. Write us and tell us what-you think! Except patches, don't send patches via twitter.{% endblocktrans %}</p>+ <h4>{% translate "Twitter" %}</h4>+ <p>{% blocktranslate %}We are also on twitter. Write us and tell us what+you think! Except patches, don't send patches via twitter.{% endblocktranslate %}</p></div><div class="col-md-4">- <h4>{% trans "Discord" %}</h4>- <p>{% blocktrans %}Use the public group to get support for your+ <h4>{% translate "Discord" %}</h4>+ <p>{% blocktranslate %}Use the public group to get support for yourlocal wger installation, discuss issues or your new idea, etc.-(no registration needed){% endblocktrans %}</p>+(no registration needed){% endblocktranslate %}</p></div><div class="col-md-4">- <a class="btn btn-light btn-block" href="{{feedback}}">{% trans "Open feedback form" %}</a>+ <a class="btn btn-light btn-block" href="{{feedback}}">{% translate "Open feedback form" %}</a></div><div class="col-md-4"><a href="https://twitter.com/wger_project"- class="btn btn-light btn-block twitter-mention-button">{% trans "tweet to @wger_project" %}</a>+ class="btn btn-light btn-block twitter-mention-button">{% translate "tweet to @wger_project" %}</a></div><div class="col-md-4">- <a href="{{discord}}" class="btn btn-light btn-block">{% trans "Go to the discord server" %}</a>+ <a href="{{discord}}" class="btn btn-light btn-block">{% translate "Go to the discord server" %}</a></div></div>diff --git a/wger/core/templates/misc/fragments/shariff_modal.html b/wger/core/templates/misc/fragments/shariff_modal.htmlindex 1ff2f6392..f408aacda 100644--- a/wger/core/templates/misc/fragments/shariff_modal.html+++ b/wger/core/templates/misc/fragments/shariff_modal.html@@ -3,7 +3,7 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans "Share this page" %}</h4>+ <h4 class="modal-title">{% translate "Share this page" %}</h4><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button></div><div class="modal-body">@@ -15,18 +15,18 @@{% if owner_user %}<div class="noRoAccess {% if user.is_authenticated and is_owner and owner_user.userprofile.ro_access %}d-none{% endif %}">- <p>{% blocktrans %}Before you share links on social media you need to allow external access.{% endblocktrans %}</p>+ <p>{% blocktranslate %}Before you share links on social media you need to allow external access.{% endblocktranslate %}</p><p><a href="{% url 'core:user:preferences' %}" id="toggle-ro-access" class="btn btn-success btn-sm"><span class="{% fa_class 'check' %}"></span>- {% trans "That's done here" %}+ {% translate "That's done here" %}</a></p></div>{% endif %}</div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>diff --git a/wger/core/templates/misc/license/list.html b/wger/core/templates/misc/license/list.htmlindex fc594d06c..8416acc2f 100644--- a/wger/core/templates/misc/license/list.html+++ b/wger/core/templates/misc/license/list.html@@ -1,7 +1,7 @@% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "License list" %}{% endblock %}+{% block title %}{% translate "License list" %}{% endblock %}{% block content %}@@ -14,10 +14,10 @@</button><ul class="dropdown-menu" role="menu"><li>- <a href="{% url 'core:license:edit' license.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>+ <a href="{% url 'core:license:edit' license.id %}" class="wger-modal-dialog">{% translate 'Edit' %}</a></li><li>- <a href="{% url 'core:license:delete' license.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a>+ <a href="{% url 'core:license:delete' license.id %}" class="wger-modal-dialog">{% translate 'Delete' %}</a></li></ul></div>@@ -25,7 +25,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -38,11 +38,11 @@{% if perms.core.add_license %}<p><a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a></p>-<p>{% blocktrans %}If a license has been localized, e.g. the Creative Commons-licenses for the different countries, add them as separate entries here.{% endblocktrans %}</p>+<p>{% blocktranslate %}If a license has been localized, e.g. the Creative Commons+licenses for the different countries, add them as separate entries here.{% endblocktranslate %}</p>{% endif %}{% endblock %}diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 21dfc50e5..aa92bc8b0 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -19,42 +19,42 @@<a href="{% url 'manager:workout:overview' %}"rel="nofollow"class="dropdown-toggle nav-link"- data-toggle="dropdown">{% trans "Training" %} <b class="caret"></b></a>+ data-toggle="dropdown">{% translate "Training" %} <b class="caret"></b></a><ul class="dropdown-menu"><li><a class="dropdown-item" href="{% url 'manager:workout:overview' %}" rel="nofollow">{% if not user.is_authenticated %}<span class="{% fa_class 'lock' %}"></span>{% endif %}- {% trans "Workouts" %}+ {% translate "Workouts" %}</a></li><li><a class="dropdown-item" href="{% url 'manager:schedule:overview' %}" rel="nofollow">{% if not user.is_authenticated %}<span class="{% fa_class 'lock' %}"></span>{% endif %}- {% trans "Workouts schedules" %}+ {% translate "Workouts schedules" %}</a></li>{% if user.is_authenticated %}- <li><a class="dropdown-item" href="{% url 'manager:workout:calendar' user.username %}" rel="nofollow">{% trans "Calendar" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'manager:workout:calendar' user.username %}" rel="nofollow">{% translate "Calendar" %}</a></li>{% endif %}<li class="dropdown-divider"></li>- <li class="dropdown-header">{% trans "Exercises" %}</li>- <li><a class="dropdown-item" href="{% url 'exercise:exercise:overview' %}">{% trans "by category" context "as in sorted by category" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:muscle:overview' %}">{% trans "by muscle" context "as in sorted by muscle" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:equipment:overview' %}">{% trans "by equipment" context "as in sorted by equipment" %}</a></li>+ <li class="dropdown-header">{% translate "Exercises" %}</li>+ <li><a class="dropdown-item" href="{% url 'exercise:exercise:overview' %}">{% translate "by category" context "as in sorted by category" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'exercise:muscle:overview' %}">{% translate "by muscle" context "as in sorted by muscle" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'exercise:equipment:overview' %}">{% translate "by equipment" context "as in sorted by equipment" %}</a></li>{% if user.is_authenticated and not user.userprofile.is_temporary and not trainer_identity %}<li class="dropdown-divider"></li>- <li><a class="dropdown-item" href="{% url 'exercise:exercise:add' %}">{% trans "Add new exercise" %}</a><li>+ <li><a class="dropdown-item" href="{% url 'exercise:exercise:add' %}">{% translate "Add new exercise" %}</a><li>{% endif %}{% if perms.exercises %}<li class="dropdown-divider"></li>- <li class="dropdown-header">{% trans "Administration" %}</li>- <li><a class="dropdown-item" href="{% url 'exercise:exercise:pending' %}">{% trans "Exercises pending review" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:equipment:list' %}">{% trans "Equipment" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:muscle:admin-list' %}">{% trans "Muscles" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:category:list' %}">{% trans "Categories" %}</a></li>+ <li class="dropdown-header">{% translate "Administration" %}</li>+ <li><a class="dropdown-item" href="{% url 'exercise:exercise:pending' %}">{% translate "Exercises pending review" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'exercise:equipment:list' %}">{% translate "Equipment" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'exercise:muscle:admin-list' %}">{% translate "Muscles" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'exercise:category:list' %}">{% translate "Categories" %}</a></li>{% endif %}</ul></li>@@ -69,10 +69,10 @@<a href="{% url 'weight:overview' user.username %}"class="dropdown-toggle nav-link"data-toggle="dropdown"- rel="nofollow">{% trans "Body weight" %} <b class="caret"></b></a>+ rel="nofollow">{% translate "Body weight" %} <b class="caret"></b></a><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{% url 'weight:overview' user.username %}" rel="nofollow">{% trans "Weight overview" %}</a></li>- <li><a class="dropdown-item" href="{% url 'weight:add' %}" rel="nofollow">{% trans "Add weight entry" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'weight:overview' user.username %}" rel="nofollow">{% translate "Weight overview" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'weight:add' %}" rel="nofollow">{% translate "Add weight entry" %}</a></li></ul></li>{% endif %}@@ -86,32 +86,32 @@<a href="{% url 'nutrition:plan:overview' %}"class="dropdown-toggle nav-link"data-toggle="dropdown"- rel="nofollow">{% trans "Nutrition" %} <b class="caret"></b></a>+ rel="nofollow">{% translate "Nutrition" %} <b class="caret"></b></a><ul class="dropdown-menu"><li><a class="dropdown-item" href="{% url 'nutrition:plan:overview' %}" rel="nofollow">{% if not user.is_authenticated %}<span class="{% fa_class 'lock' %}"></span>{% endif %}- {% trans "Nutrition plans" %}+ {% translate "Nutrition plans" %}</a></li><li><a class="dropdown-item" href="{% url 'nutrition:bmi:view' %}" rel="nofollow">{% if not user.is_authenticated %}<span class="{% fa_class 'lock' %}"></span>{% endif %}- {% trans "BMI calculator" %}+ {% translate "BMI calculator" %}</a></li><li><a class="dropdown-item" href="{% url 'nutrition:calories:view' %}" rel="nofollow">{% if not user.is_authenticated %}<span class="{% fa_class 'lock' %}"></span>{% endif %}- {% trans "Daily calories calculator" %}+ {% translate "Daily calories calculator" %}</a></li>- <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">{% trans "Ingredient overview" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">{% translate "Ingredient overview" %}</a></li>{% if perms.nutrition %}<li class="dropdown-divider"></li>- <li class="dropdown-header">{% trans "Administration" %}</li>- <li><a class="dropdown-item" href="{% url 'nutrition:weight_unit:list' %}">{% trans "Ingredient weight units" %}</a></li>- <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:pending' %}">{% trans "Ingredients pending review" %}</a></li>+ <li class="dropdown-header">{% translate "Administration" %}</li>+ <li><a class="dropdown-item" href="{% url 'nutrition:weight_unit:list' %}">{% translate "Ingredient weight units" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:pending' %}">{% translate "Ingredients pending review" %}</a></li>{% endif %}</ul></li>@@ -124,30 +124,30 @@<li class="nav-item dropdown {% if active_tab == 'software' %}active{% endif %}"><a href=""class="dropdown-toggle nav-link"- data-toggle="dropdown">{% trans "About this software" %} <b class="caret"></b></a>+ data-toggle="dropdown">{% translate "About this software" %} <b class="caret"></b></a><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{% url 'software:contribute' %}">{% trans "Contribute!" %} </a></li>- <li><a class="dropdown-item" href="{% url 'software:issues' %}">{% trans "Problems and wishes" %} </a></li>- <li><a class="dropdown-item" href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'software:contribute' %}">{% translate "Contribute!" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'software:issues' %}">{% translate "Problems and wishes" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:contact' %}">{% translate "Get in touch" %}</a></li><li class="dropdown-divider"></li>- <li><a class="dropdown-item" href="{% url 'software:api' %}">{% trans "REST API" %} </a></li>- <li><a class="dropdown-item" href="{% url 'software:license' %}">{% trans "License" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'software:api' %}">{% translate "REST API" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'software:license' %}">{% translate "License" %} </a></li><li><a class="dropdown-item" href="https://wger.readthedocs.io/"><span class="{% fa_class 'external-link-alt' %}"></span>- {% trans "Developer documentation" %}+ {% translate "Developer documentation" %}</a></li><li><a class="dropdown-item" href="https://github.com/wger-project/wger"><span class="{% fa_class 'external-link-alt' %}"></span>- {% trans "Get the code" %} (Github)+ {% translate "Get the code" %} (Github)</a></li><li><a class="dropdown-item" href="https://www.transifex.com/rge/wger-workout-manager/"><span class="{% fa_class 'external-link-alt' %}"></span>- {% trans "Translate with Transifex" %}+ {% translate "Translate with Transifex" %}</a></li></ul>@@ -162,13 +162,13 @@<ul class="navbar-nav my-2 my-lg-0"><li class="dropdown nav-item"><a href="#" class="dropdown-toggle nav-link" data-toggle="dropdown">- {% trans "Login" %} / {% trans "Register" %}+ {% translate "Login" %} / {% translate "Register" %}<span class="caret"></span></a><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{% url 'core:user:login' %}">{% trans "Login" %}</a></li>- <li><a class="dropdown-item" href="{% url 'core:user:registration' %}">{% trans "Register" %}</a></li>- <li><a class="dropdown-item" href="{% url 'core:user:password_reset' %}">{% trans "Reset password" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'core:user:login' %}">{% translate "Login" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'core:user:registration' %}">{% translate "Register" %}</a></li>+ <li><a class="dropdown-item" href="{% url 'core:user:password_reset' %}">{% translate "Reset password" %}</a></li></ul></li></ul>@@ -181,14 +181,14 @@</a><ul class="dropdown-menu dropdown-menu-right"><li>- <a class="dropdown-item" href="{% url 'core:user:preferences' %}">{% trans "My preferences" %}</a>+ <a class="dropdown-item" href="{% url 'core:user:preferences' %}">{% translate "My preferences" %}</a></li>{% if not trainer_identity %}<li class="dropdown-divider"></li><li><a class="dropdown-item" href="{% url 'core:user:logout' %}"><span class="{% fa_class 'sign-out-alt' %}"></span>- {% trans "Logout" %}+ {% translate "Logout" %}</a></li>{% endif %}@@ -198,22 +198,22 @@{# #}{% if perms.exercises or perms.gym.manage_gyms or perms.gym.manage_gym or perms.gym.gym_trainer %}<li class="dropdown-divider"></li>- <li class="dropdown-header">{% trans "Administration" %}</li>+ <li class="dropdown-header">{% translate "Administration" %}</li>{% if perms.core.change_language %}- <li><a class="dropdown-item" href="{% url 'core:language:overview' %}">{% trans "Languages" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:language:overview' %}">{% translate "Languages" %} </a></li>{% endif %}{% if perms.core.change_license %}- <li><a class="dropdown-item" href="{% url 'core:license:list' %}">{% trans "Licenses" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:license:list' %}">{% translate "Licenses" %} </a></li>{% endif %}{% if perms.core.change_repetitionunit %}- <li><a class="dropdown-item" href="{% url 'core:repetition-unit:list' %}">{% trans "Repetition units" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:repetition-unit:list' %}">{% translate "Repetition units" %} </a></li>{% endif %}{% if perms.core.change_weightunit %}- <li><a class="dropdown-item" href="{% url 'core:weight-unit:list' %}">{% trans "Weight units" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:weight-unit:list' %}">{% translate "Weight units" %} </a></li>{% endif %}{% if perms.gym.manage_gyms %}- <li><a class="dropdown-item" href="{% url 'core:user:list' %}">{% trans "User list" %} </a></li>- <li><a class="dropdown-item" href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'core:user:list' %}">{% translate "User list" %} </a></li>+ <li><a class="dropdown-item" href="{% url 'gym:gym:list' %}">{% translate "Gyms" %} </a></li>{% endif %}{# it's not possible to group expressions '(a or b) and c' #}diff --git a/wger/core/templates/registration/password_reset_complete.html b/wger/core/templates/registration/password_reset_complete.htmlindex db6a23a22..44cfbd312 100644--- a/wger/core/templates/registration/password_reset_complete.html+++ b/wger/core/templates/registration/password_reset_complete.html@@ -1,12 +1,12 @@{% extends "base.html" %}{% load i18n %}-{% block title %}{% trans "Password reset complete" %}{% endblock %}+{% block title %}{% translate "Password reset complete" %}{% endblock %}{% block content %}-<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>+<p>{% translate "Your password has been set. You may go ahead and log in now." %}</p>-<p><a href="{% url 'core:user:login' %}">{% trans 'Log in' %}</a></p>+<p><a href="{% url 'core:user:login' %}">{% translate 'Log in' %}</a></p>{% endblock %}diff --git a/wger/core/templates/registration/password_reset_done.html b/wger/core/templates/registration/password_reset_done.htmlindex f48e8bf59..5c1767685 100644--- a/wger/core/templates/registration/password_reset_done.html+++ b/wger/core/templates/registration/password_reset_done.html@@ -1,10 +1,10 @@{% extends "base.html" %}{% load i18n %}-{% block title %}{% trans "Password reset successful" %}{% endblock %}+{% block title %}{% translate "Password reset successful" %}{% endblock %}{% block content %}-<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>+<p>{% translate "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>{% endblock %}diff --git a/wger/core/templates/registration/password_reset_email.html b/wger/core/templates/registration/password_reset_email.htmlindex 6c26c4975..4a90d7995 100644--- a/wger/core/templates/registration/password_reset_email.html+++ b/wger/core/templates/registration/password_reset_email.html@@ -1,15 +1,15 @@{% load i18n %}{% autoescape off %}-{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}+{% blocktranslate %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %}-{% trans "Please go to the following page and choose a new password:" %}+{% translate "Please go to the following page and choose a new password:" %}{% block reset_link %}{{ protocol }}://{{ domain }}{% url 'core:user:password_reset_confirm' uidb64=uid token=token %}{% endblock %}-{% trans "Your username, in case you've forgotten:" %} {{ user.username }}+{% translate "Your username, in case you've forgotten:" %} {{ user.username }}-{% trans "Thanks for using our site!" %}+{% translate "Thanks for using our site!" %}-{% blocktrans %}The {{ site_name }} team{% endblocktrans %}+{% blocktranslate %}The {{ site_name }} team{% endblocktranslate %}{% endautoescape %}diff --git a/wger/core/templates/repetition_unit/list.html b/wger/core/templates/repetition_unit/list.htmlindex d2ca03e58..4358603de 100644--- a/wger/core/templates/repetition_unit/list.html+++ b/wger/core/templates/repetition_unit/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Repetition units" %}{% endblock %}+{% block title %}{% translate "Repetition units" %}{% endblock %}{% block content %}@@ -14,8 +14,8 @@<span class="{% fa_class 'cog' %}"></span></button><ul class="dropdown-menu" role="menu">- <a href="{% url 'core:repetition-unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'core:repetition-unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'core:repetition-unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'core:repetition-unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></ul></div>{% endif %}@@ -23,7 +23,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -38,7 +38,7 @@{% block options %}{% if perms.core.add_license %}<a href="{% url 'core:repetition-unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/core/templates/tags/language_select.html b/wger/core/templates/tags/language_select.htmlindex 19a4003fa..913fb0e53 100644--- a/wger/core/templates/tags/language_select.html+++ b/wger/core/templates/tags/language_select.html@@ -4,7 +4,7 @@<img src="{% static path %}"width="18"height="11"- alt="{% trans language_name %}"- title="{% trans language_name %}">- {% trans language_name %}+ alt="{% translate language_name %}"+ title="{% translate language_name %}">+ {% translate language_name %}</a>diff --git a/wger/core/templates/tags/license-sidebar.html b/wger/core/templates/tags/license-sidebar.htmlindex 77c7a3870..010dcf82c 100644--- a/wger/core/templates/tags/license-sidebar.html+++ b/wger/core/templates/tags/license-sidebar.html@@ -1,8 +1,8 @@{% load i18n static %}-<h4>{% trans "Free license" %}</h4>+<h4>{% translate "Free license" %}</h4><p>- {% trans "This content is available under the following license:" %}+ {% translate "This content is available under the following license:" %}<strong>{{license}}</strong>{% if author %}– {{author}}@@ -10,6 +10,6 @@{% if license.url %}<br>- <a rel="license" href="{{license.url}}">{% trans "Click here for more information" %}</a>+ <a rel="license" href="{{license.url}}">{% translate "Click here for more information" %}</a>{% endif %}</p>diff --git a/wger/core/templates/tags/pagination.html b/wger/core/templates/tags/pagination.htmlindex 68e1dd814..819f8e70c 100644--- a/wger/core/templates/tags/pagination.html+++ b/wger/core/templates/tags/pagination.html@@ -4,11 +4,11 @@{% if page.has_previous %}<li class="page-item"><a href="?page={{ page.previous_page_number }}"- class="load-maincontent page-link">« {% trans "previous" %}</a>+ class="load-maincontent page-link">« {% translate "previous" %}</a></li>{% else %}<li class="page-item disabled">- <a href="#" class="page-link">« {% trans "previous" %}</a>+ <a href="#" class="page-link">« {% translate "previous" %}</a></li>{% endif %}diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.htmlindex 68583990c..6db06f8ee 100644--- a/wger/core/templates/tags/render_day.html+++ b/wger/core/templates/tags/render_day.html@@ -28,16 +28,16 @@ $(document).ready(function() {<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuDay{{day.obj.id}}"><a href="{% url 'manager:day:log' day.obj.id %}" class="dropdown-item"><span class="{% fa_class 'chart-line' %}"></span>- {% trans 'Add weight log' %}+ {% translate 'Add weight log' %}</a><a href="{% url 'manager:day:edit' day.obj.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'manager:day:delete' day.obj.id %}" class="dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div>@@ -60,12 +60,12 @@ $(document).ready(function() {<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuSet{{set.obj.id}}"><a href="{% url 'manager:set:edit' set.obj.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'manager:set:delete' set.obj.id %}" class="dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>@@ -94,7 +94,7 @@ $(document).ready(function() {{% else %}<img class="img-fluid"src="{% static 'images/icons/image-placeholder.svg' %}"- alt="{% trans 'Placeholder image for exercise' %}"+ alt="{% translate 'Placeholder image for exercise' %}"style="opacity: 0.4;">{% endif %}</a>@@ -109,9 +109,9 @@ $(document).ready(function() {{% if editable %}{% if not exercise.setting_obj_list %}<p>- {% trans "This exercise has no repetitions." %}<br>+ {% translate "This exercise has no repetitions." %}<br><a href="{% url 'manager:set:edit' set.obj.id %}" class="wger-modal-dialog">- {% trans "Edit them now."%}+ {% translate "Edit them now."%}</a></p>{% endif %}@@ -136,7 +136,7 @@ $(document).ready(function() {<tr><td colspan="2" class="py-0"><a href="{% url 'manager:set:add' day.obj.id %}"- class="wger-modal-dialog btn btn-link btn-block">{% trans "Add exercises to this workout day" %}</a>+ class="wger-modal-dialog btn btn-link btn-block">{% translate "Add exercises to this workout day" %}</a></td></tr>{% endif %}diff --git a/wger/core/templates/tags/render_weight_log.html b/wger/core/templates/tags/render_weight_log.htmlindex ac984906f..19595651e 100644--- a/wger/core/templates/tags/render_weight_log.html+++ b/wger/core/templates/tags/render_weight_log.html@@ -14,7 +14,7 @@</thead><tbody><tr>- <td class="text-right">{% trans "Reps" %}</td>+ <td class="text-right">{% translate "Reps" %}</td><td></td><td style="padding:0px;">{% trans_weight_unit 'kg' user %}@@ -27,7 +27,7 @@<td style="padding:0px;">{{entry.weight}}{% if entry.rir %}- {{ entry.rir }} {% trans "RiR" %}+ {{ entry.rir }} {% translate "RiR" %}{% endif %}</td></tr>diff --git a/wger/core/templates/template.html b/wger/core/templates/template.htmlindex 4987584a5..604644ce9 100644--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@ -121,7 +121,7 @@<div class="modal-body" id="ajax-info-content"></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -136,17 +136,17 @@{# {% if not user.is_authenticated or user.userprofile.is_temporary %} #}{% if user.is_authenticated and user.userprofile.is_temporary %}<div class="alert alert-warning text-center" role="alert">- {% trans "You are using a guest account, data entered will be deleted after a week." %}+ {% translate "You are using a guest account, data entered will be deleted after a week." %}{% if not has_demo_data %}<br><a href="{% url 'core:user:demo-entries' %}" rel="nofollow" class="btn btn-link btn-sm">- {% trans "Create some demo entries" %}+ {% translate "Create some demo entries" %}<span class="glyphicon glyphicon-chevron-right"></span></a>{% else %}<br><a href="{% url 'core:user:registration' %}" class="btn btn-link btn-sm">- {% trans "Register" %}+ {% translate "Register" %}<span class="glyphicon glyphicon-chevron-right"></span></a>{% endif %}@@ -176,8 +176,8 @@<img src="{% static flagname %}"width="18"height="11"- alt="{% trans language.full_name %}"- title="{% trans language.full_name %}"+ alt="{% translate language.full_name %}"+ title="{% translate language.full_name %}"style="">{{language.full_name}} <span class="caret"></span>{% endwith %}@@ -189,7 +189,7 @@<div class="dropdown-divider"></div><a href="https://www.transifex.com/rge/wger-workout-manager/" class="dropdown-item" target="_blank"><span class="{% fa_class 'plus' %}"></span>- {% trans "Translate" %}+ {% translate "Translate" %}</a></div></div>@@ -197,16 +197,16 @@{% endif %}<ul class="list-unstyled mb-0 pt-2">- <li><a href="{% url 'core:about' %}" class="text-muted small">{% trans "About" %}</a></li>- <li><a href="{% url 'software:tos' %}" class="text-muted small">{% trans "Terms of service" %}</a></li>+ <li><a href="{% url 'core:about' %}" class="text-muted small">{% translate "About" %}</a></li>+ <li><a href="{% url 'software:tos' %}" class="text-muted small">{% translate "Terms of service" %}</a></li></ul><!--<a href="https://github.com/wger-project/wger" class="no-hover"><img src="{% static 'images/agpl-v3.svg' %}"width="57"height="20"- alt="{% trans 'Released under the Affero GPL' %}"- title="{% trans 'Released under the Affero GPL' %}"></a>+ alt="{% translate 'Released under the Affero GPL' %}"+ title="{% translate 'Released under the Affero GPL' %}"></a><em class="text-muted small">{{version}}</em> --></div>diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.htmlindex 509ab1587..938957db9 100644--- a/wger/core/templates/template_features.html+++ b/wger/core/templates/template_features.html@@ -59,7 +59,7 @@<script src="{% static 'yarn/bootstrap/dist/js/bootstrap.min.js' %}"></script>{% endcompress %}- <title>wger Workout Manager - {% trans "Features" %}</title>+ <title>wger Workout Manager - {% translate "Features" %}</title></head><body id="page-top" class="index">@@ -80,10 +80,10 @@<div class="col-md-4"><ul class="list-inline quicklinks"><li class="list-inline-item">- <a href="{% url 'software:contribute' %}" class="text-muted small">{% trans "Contribute!" %}</a>+ <a href="{% url 'software:contribute' %}" class="text-muted small">{% translate "Contribute!" %}</a></li><li class="list-inline-item">- <a href="{% url 'core:contact' %}" class="text-muted small">{% trans "Get in touch" %}</a>+ <a href="{% url 'core:contact' %}" class="text-muted small">{% translate "Get in touch" %}</a></li></ul></div>@@ -100,7 +100,7 @@</a></li><li class="list-inline-item">- <a href="https://www.transifex.com/rge/wger-workout-manager/" title="{% trans 'Translate' %}">+ <a href="https://www.transifex.com/rge/wger-workout-manager/" title="{% translate 'Translate' %}"><span class="{% fa_class 'globe' %}"></span></a></li>@@ -118,11 +118,11 @@<div class="col-md-4 text-lg-right"><ul class="list-inline quicklinks"><li class="list-inline-item">- <a href="{% url 'core:about' %}" class="text-muted small">{% trans "About" %}</a>+ <a href="{% url 'core:about' %}" class="text-muted small">{% translate "About" %}</a></li><li class="list-inline-item">- <a href="{% url 'software:tos' %}" class="text-muted small">{% trans "Terms of service" %}</a>+ <a href="{% url 'software:tos' %}" class="text-muted small">{% translate "Terms of service" %}</a></li></ul></div>diff --git a/wger/core/templates/template_no_context.html b/wger/core/templates/template_no_context.htmlindex 69807f876..22cb6603c 100644--- a/wger/core/templates/template_no_context.html+++ b/wger/core/templates/template_no_context.html@@ -33,7 +33,7 @@{% block header %}{% endblock %}- <title>{% trans "An error occurred" %}</title>+ <title>{% translate "An error occurred" %}</title></head><body>@@ -85,8 +85,8 @@<div class="row"><div class="col-md-8"><ul class="list-unstyled mb-0 pt-2">- <li><a href="{% url 'core:about' %}" class="text-muted small">{% trans "About" %}</a></li>- <li><a href="{% url 'software:tos' %}" class="text-muted small">{% trans "Terms of service" %}</a></li>+ <li><a href="{% url 'core:about' %}" class="text-muted small">{% translate "About" %}</a></li>+ <li><a href="{% url 'software:tos' %}" class="text-muted small">{% translate "Terms of service" %}</a></li></ul></div></div>diff --git a/wger/core/templates/user/api_key.html b/wger/core/templates/user/api_key.htmlindex cbe715d44..7edfe8fa0 100644--- a/wger/core/templates/user/api_key.html+++ b/wger/core/templates/user/api_key.html@@ -1,27 +1,27 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "API key" %}{% endblock %}+{% block title %}{% translate "API key" %}{% endblock %}{% block content %}{% with url='/api/v2/' %}-<p>{% blocktrans %}Generate an API key if you want to interact with wger via+<p>{% blocktranslate %}Generate an API key if you want to interact with wger viathe <a href="{{url}}" rel="nofollow">REST API</a> it provides (forpublic resources such as the exercises or ingredients, you don't need to provide-anything). You must pass this information in the header in the format shown below.{% endblocktrans %}+anything). You must pass this information in the header in the format shown below.{% endblocktranslate %}{% endwith %}-<p>{% blocktrans %}For security reasons, you should only access the API via HTTPS.{% endblocktrans %}</p>+<p>{% blocktranslate %}For security reasons, you should only access the API via HTTPS.{% endblocktranslate %}</p><div class="card mb-4 {% if token %}text-white bg-success{% else %}bg-light{% endif %}" ><div class="card-header">- {% trans "Your API key" %}+ {% translate "Your API key" %}</div><div class="card-body">{% if token %}<strong>{{token.key}}</strong>{% else %}- <em>{% trans "You have no API key yet" %}</em>+ <em>{% translate "You have no API key yet" %}</em>{% endif %}</div></div>@@ -41,17 +41,17 @@ curl -X GET https://wger.de/api/v2/workout/ \{% block sidebar %}-<h4>{% trans "Options" %}</h4>+<h4>{% translate "Options" %}</h4><p>{% if token %}- <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-light">{% trans 'Delete current API key and generate new one' %}</a>+ <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-light">{% translate 'Delete current API key and generate new one' %}</a>{% else %}- <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-light">{% trans 'Generate new API key' %}</a>+ <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-light">{% translate 'Generate new API key' %}</a>{% endif %}</p><p>- <a href="{% url 'software:api' %}" class="btn btn-block btn-light">{% trans 'Documentation' %}</a>+ <a href="{% url 'software:api' %}" class="btn btn-block btn-light">{% translate 'Documentation' %}</a></p>{% endblock %}diff --git a/wger/core/templates/user/delete_account.html b/wger/core/templates/user/delete_account.htmlindex b3bcff532..af6a5ebd7 100644--- a/wger/core/templates/user/delete_account.html+++ b/wger/core/templates/user/delete_account.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras crispy_forms_tags %}-{% block title %}{% trans "Delete account" %}{% endblock %}+{% block title %}{% translate "Delete account" %}{% endblock %}{% block header %}@@ -14,14 +14,14 @@<div class="card-header"><h4 class="card-title"><span class="fa fa-exclamation-triangle" aria-hidden="true"></span>- {% trans "Are you sure?" %}+ {% translate "Are you sure?" %}</h4></div><div class="card-body">{% with username=user_delete|format_username %}- <p class="card-text">{% blocktrans %}This action will delete the user account "{{username}}".+ <p class="card-text">{% blocktranslate %}This action will delete the user account "{{username}}".It will also irrevocably remove all the data associated with it (workouts, logs, etc.)-and can't be undone. {% endblocktrans %}{% endwith %}</p>+and can't be undone. {% endblocktranslate %}{% endwith %}</p></div></div><div class="mt-2"></div>diff --git a/wger/core/templates/user/list.html b/wger/core/templates/user/list.htmlindex 72559a90a..e95e28dd7 100644--- a/wger/core/templates/user/list.html+++ b/wger/core/templates/user/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "User list" %}{% endblock %}+{% block title %}{% translate "User list" %}{% endblock %}{% block content %}diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.htmlindex a37556ee1..d4b7e17a1 100644--- a/wger/core/templates/user/login.html+++ b/wger/core/templates/user/login.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras crispy_forms_tags %}-{% block title %}{% trans "Login" %}{% endblock %}+{% block title %}{% translate "Login" %}{% endblock %}{% block header %}@@ -13,19 +13,19 @@{% block sidebar %}-<h4>{% trans "No account?" %}</h4>+<h4>{% translate "No account?" %}</h4><p><a href="{% url 'core:user:registration' %}"><span class="{% fa_class 'sign-in-alt' %}"></span>- {% trans "Register" %}+ {% translate "Register" %}</a></p>-<h4>{% trans "Forgot password?" %}</h4>+<h4>{% translate "Forgot password?" %}</h4><p><a href="{% url 'core:user:password_reset' %}" ><span class="{% fa_class 'key' %}"></span>- {% trans "Reset password" %}+ {% translate "Reset password" %}</a></p>{% endblock %}diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 49cffbe08..8c94f29a4 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -22,19 +22,19 @@{% if perms.gym.gym_trainer %}-<h4>{% trans "Workouts" %} <small>({% blocktrans with number=10 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Workouts" %} <small>({% blocktranslate with number=10 %}last {{ number }}{% endblocktranslate %})</small></h4>{% if perms.gym.gym_trainer %}-<a href="{{trainer_login}}?next={% url 'manager:workout:overview' %}" class="btn btn-light btn-sm">{% trans "Overview" %}</a>-<a href="{{trainer_login}}?next={% url 'manager:workout:add' %}" class="btn btn-light btn-sm">{% trans "Add workout" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:workout:overview' %}" class="btn btn-light btn-sm">{% translate "Overview" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:workout:add' %}" class="btn btn-light btn-sm">{% translate "Add workout" %}</a>{% endif %}<table class="table"><thead><tr>- <th style="width: 25%;">{% trans "Date" %}</th>- <th>{% trans "Description" %}</th>- <th>{% trans "Number of logs (days)" %}</th>- <th>{% trans "Last activity" %}</th>+ <th style="width: 25%;">{% translate "Date" %}</th>+ <th>{% translate "Description" %}</th>+ <th>{% translate "Number of logs (days)" %}</th>+ <th>{% translate "Last activity" %}</th></tr></thead><tbody>@@ -55,7 +55,7 @@</tr>{% empty %}<tr>- <td colspan="2">{% trans "No workouts found." %}</td>+ <td colspan="2">{% translate "No workouts found." %}</td></tr>{% endfor %}</tbody>@@ -65,18 +65,18 @@-<h4>{% trans "Log" %} <small>({% blocktrans with number=10 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Log" %} <small>({% blocktranslate with number=10 %}last {{ number }}{% endblocktranslate %})</small></h4>{% if perms.gym.gym_trainer %}-<a href="{{trainer_login}}?next={% url 'manager:workout:calendar' %}" class="btn btn-light btn-sm">{% trans "Calendar" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:workout:calendar' %}" class="btn btn-light btn-sm">{% translate "Calendar" %}</a>{% endif %}<table class="table"><thead><tr>- <th style="width: 25%;">{% trans "Date" %}</th>- <th>{% trans "General impression" %}</th>- <th>{% trans "Notes" %}</th>- <th>{% trans "Time" %}</th>+ <th style="width: 25%;">{% translate "Date" %}</th>+ <th>{% translate "General impression" %}</th>+ <th>{% translate "Notes" %}</th>+ <th>{% translate "Time" %}</th></tr></thead><tbody>@@ -101,7 +101,7 @@</tr>{% empty %}<tr>- <td colspan="3">{% trans "Nothing found" %}</td>+ <td colspan="3">{% translate "Nothing found" %}</td></tr>{% endfor %}</tbody>@@ -109,16 +109,16 @@-<h4>{% trans "Weight" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Weight" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4>{% if perms.gym.gym_trainer %}-<a href="{{trainer_login}}?next={% url 'weight:overview' current_user.username %}" class="btn btn-light btn-sm">{% trans "Weight overview" %}</a>+<a href="{{trainer_login}}?next={% url 'weight:overview' current_user.username %}" class="btn btn-light btn-sm">{% translate "Weight overview" %}</a>{% endif %}<table class="table"><thead><tr>- <th style="width: 25%;">{% trans "Date" %}</th>- <th>{% trans "Weight" %}</th>+ <th style="width: 25%;">{% translate "Date" %}</th>+ <th>{% translate "Weight" %}</th></tr></thead><tbody>@@ -133,7 +133,7 @@</tr>{% empty %}<tr>- <td colspan="3">{% trans "Nothing found" %}</td>+ <td colspan="3">{% translate "Nothing found" %}</td></tr>{% endfor %}</tbody>@@ -141,21 +141,21 @@-<h4>{% trans "Nutrition plans" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Nutrition plans" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4>{% if perms.gym.gym_trainer %}- <a href="{{trainer_login}}?next={% url 'nutrition:plan:overview' %}" class="btn btn-light btn-sm">{% trans "Overview" %}</a>- <a href="{{trainer_login}}?next={% url 'nutrition:plan:add' %}" class="btn btn-light btn-sm">{% trans "Add nutrition plan" %}</a>+ <a href="{{trainer_login}}?next={% url 'nutrition:plan:overview' %}" class="btn btn-light btn-sm">{% translate "Overview" %}</a>+ <a href="{{trainer_login}}?next={% url 'nutrition:plan:add' %}" class="btn btn-light btn-sm">{% translate "Add nutrition plan" %}</a>{% endif %}<table class="table"><thead><tr>- <th style="width: 25%;">{% trans "Date" %}</th>- <th>{% trans "Description" %}</th>- <th>{% trans "Energy" %}</th>- <th>{% trans "Protein" %}</th>- <th>{% trans "Carbohydrates" %}</th>- <th>{% trans "Fat" %}</th>+ <th style="width: 25%;">{% translate "Date" %}</th>+ <th>{% translate "Description" %}</th>+ <th>{% translate "Energy" %}</th>+ <th>{% translate "Protein" %}</th>+ <th>{% translate "Carbohydrates" %}</th>+ <th>{% translate "Fat" %}</th></tr></thead><tbody>@@ -168,7 +168,7 @@<a href="{{trainer_login}}?next={{ nutrition_plan.get_absolute_url }}">{{nutrition_plan}}</a></td><td>- {{nutrition_plan.get_nutritional_values.total.energy|floatformat}} {% trans "kcal" %}+ {{nutrition_plan.get_nutritional_values.total.energy|floatformat}} {% translate "kcal" %}</td><td>{{nutrition_plan.get_nutritional_values.total.protein|floatformat}} {% trans_weight_unit 'g' current_user %}@@ -183,7 +183,7 @@{% empty %}<tr><td colspan="6">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -199,23 +199,23 @@{% if perms.gym.manage_gyms or perms.gym.manage_gym %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'core:user:edit' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% trans "Edit"%}</a>+ <a href="{% url 'core:user:edit' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a><div class="dropdown-divider"></div>{% if current_user.is_active %}- <a href="{% url 'core:user:deactivate' current_user.pk %}" class="dropdown-item">{% trans "Deactivate user"%}</a>+ <a href="{% url 'core:user:deactivate' current_user.pk %}" class="dropdown-item">{% translate "Deactivate user"%}</a>{% else %}- <a href="{% url 'core:user:activate' current_user.pk %}" class="dropdown-item">{% trans "Activate user"%}</a>+ <a href="{% url 'core:user:activate' current_user.pk %}" class="dropdown-item">{% translate "Activate user"%}</a>{% endif %}- <a data-url="{% url 'gym:gym:reset-user-password' current_user.pk %}" data-toggle="modal" data-target="#confirmation-modal" class="dropdown-item">{% trans "Reset user password" %}</a>+ <a data-url="{% url 'gym:gym:reset-user-password' current_user.pk %}" data-toggle="modal" data-target="#confirmation-modal" class="dropdown-item">{% translate "Reset user password" %}</a>{% if perms.gym.manage_gym or perms.gym.manage_gyms %}{% if current_user.userprofile.gym %}- <a href="{% url 'gym:gym:edit-user-permission' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% trans "Roles"%}</a>+ <a href="{% url 'gym:gym:edit-user-permission' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Roles"%}</a>{% endif %}{% endif %}- <a href="{% url 'core:user:delete' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% trans "Delete"%}</a>+ <a href="{% url 'core:user:delete' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Delete"%}</a></div></div>@@ -223,15 +223,15 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans 'Password reset confirmation' %}</h4>+ <h4 class="modal-title">{% translate 'Password reset confirmation' %}</h4><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button></div><div class="modal-body">- <p>{% trans 'Do you really want to change this user's password?' %}</p>+ <p>{% translate 'Do you really want to change this user's password?' %}</p></div><div class="modal-footer">- <button type="button" class="btn btn-danger" data-dismiss="modal">{% trans 'No' %}</button>- <button type="button" class="btn btn-success">{% trans 'Yes' %}</button>+ <button type="button" class="btn btn-danger" data-dismiss="modal">{% translate 'No' %}</button>+ <button type="button" class="btn btn-success">{% translate 'Yes' %}</button></div></div></div>@@ -252,23 +252,23 @@</script>{% endif %}-<h4>{% trans "Details" %}</h4>+<h4>{% translate "Details" %}</h4><table class="table"><tr>- <td>{% trans "Nr." %}</td>+ <td>{% translate "Nr." %}</td><td>{{current_user.pk}}</td></tr><tr>- <td>{% trans "Name" %}</td>+ <td>{% translate "Name" %}</td><td>{{current_user.first_name}}</td></tr><tr>- <td>{% trans "Last name" %}</td>+ <td>{% translate "Last name" %}</td><td>{{current_user.last_name}}</td></tr><tr>- <td>{% trans "Email" %}</td>+ <td>{% translate "Email" %}</td><td>{% if current_user.email %}<a href="mailto:{{current_user.email}}">{{current_user.email}}</a>@@ -278,11 +278,11 @@</td></tr><tr>- <td>{% trans "Phone" %}</td>+ <td>{% translate "Phone" %}</td><td> {{ current_user.userprofile.address.phone|default:'-/-' }}</td></tr><tr>- <td>{% trans "Address" %}</td>+ <td>{% translate "Address" %}</td><td>{% if not current_user.userprofile.address.zip_code and not current_user.userprofile.address.city and not current_user.userprofile.address.street%}-/-@@ -293,21 +293,21 @@</td></tr><tr>- <td>{% trans "Registered" %}</td>+ <td>{% translate "Registered" %}</td><td>{{current_user.date_joined}}</td></tr><tr>- <td>{% trans "Last login" %}</td>+ <td>{% translate "Last login" %}</td><td>{{current_user.last_login}}</td></tr>{% if perms.gym.manage_gym or perms.gym.manage_gyms %}<tr {% if not current_user.is_active %}class="danger"{% endif%}>- <td>{% trans "Status" %}</td>+ <td>{% translate "Status" %}</td><td>{% if current_user.is_active %}- {% trans "Active" %}+ {% translate "Active" %}{% else %}- {% trans "Inactive" %}+ {% translate "Inactive" %}{% endif %}</td></tr>@@ -320,15 +320,15 @@{% if perms.gym.add_contract %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'gym:contract:list' current_user.id %}" class="dropdown-item">{% trans "Overview"%}</a>- <a href="{% url 'gym:contract:add' current_user.pk %}" class="dropdown-item">{% trans "Add"%}</a>+ <a href="{% url 'gym:contract:list' current_user.id %}" class="dropdown-item">{% translate "Overview"%}</a>+ <a href="{% url 'gym:contract:add' current_user.pk %}" class="dropdown-item">{% translate "Add"%}</a></div></div>-<h4>{% trans "Contracts" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Contracts" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4><table class="table">{% for contract in contracts %}<tr>@@ -345,7 +345,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -359,15 +359,15 @@{% if perms.gym.add_adminusernote %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'gym:admin_note:list' current_user.pk %}" class="dropdown-item">{% trans "Overview" %}</a>- <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% trans "Add"%}</a>+ <a href="{% url 'gym:admin_note:list' current_user.pk %}" class="dropdown-item">{% translate "Overview" %}</a>+ <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Add"%}</a></div></div>-<h4>{% trans "Notes" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Notes" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4><table class="table">{% for note in admin_notes %}<tr>@@ -381,7 +381,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -395,22 +395,22 @@{% if perms.gym.add_userdocument %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'gym:document:list' current_user.pk %}" class="dropdown-item">{% trans "Overview" %}</a>- <a href="{% url 'gym:document:add' current_user.pk %}" class="dropdown-item">{% trans "Add"%}</a>+ <a href="{% url 'gym:document:list' current_user.pk %}" class="dropdown-item">{% translate "Overview" %}</a>+ <a href="{% url 'gym:document:add' current_user.pk %}" class="dropdown-item">{% translate "Add"%}</a></div></div>-<h4>{% trans "Documents" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>+<h4>{% translate "Documents" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4><table class="table">{% for document in current_user.userdocument_member.all %}<tr><td><a href="{{ document.document.url }}"class="btn btn-light btn-sm"- title="{% trans 'Download' %}"+ title="{% translate 'Download' %}"download="{{ document.original_name }}"><span class="glyphicon glyphicon-download"></span></a>@@ -425,7 +425,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -440,18 +440,18 @@{% if perms.gym.change_gymuserconfig and current_user.gymuserconfig %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'gym:user_config:edit' current_user.gymuserconfig.pk %}" class="wger-modal-dialog dropdown-item">{% trans "Edit"%}</a>+ <a href="{% url 'gym:user_config:edit' current_user.gymuserconfig.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a></div></div>{% endif %}-<h4>{% trans "Configuration" %}</h4>+<h4>{% translate "Configuration" %}</h4><table class="table"><tr>- <td>{% trans 'Include in inactive overview' %}</td>+ <td>{% translate 'Include in inactive overview' %}</td><td style="text-align: right;">{% if current_user.gymuserconfig.include_inactive %}<span class="{% fa_class 'check' %}"></span>@@ -488,7 +488,7 @@class="btn btn-sm btn-secondary"{% endif %}>- {% trans "Log in as this user" %}+ {% translate "Log in as this user" %}</a>{% endif %}{% endblock %}diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.htmlindex be82e53dd..7c0127c77 100644--- a/wger/core/templates/user/preferences.html+++ b/wger/core/templates/user/preferences.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras crispy_forms_tags %}-{% block title %}{% trans "Preferences" %}{% endblock %}+{% block title %}{% translate "Preferences" %}{% endblock %}{% block header %}{% endblock %}@@ -25,21 +25,21 @@<div class="btn-group" role="group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'core:user:change-password' %}" class="dropdown-item"><span class="{% fa_class 'key' %}"></span>- {% trans "Change password" %}+ {% translate "Change password" %}</a><a href="{% url 'core:user:api-key' %}" class="dropdown-item"><span class="{% fa_class 'globe' %}"></span>- {% trans "API key" %}+ {% translate "API key" %}</a><div role="separator" class="dropdown-divider"></div><a href="{% url 'core:user:delete' %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete account" %}+ {% translate "Delete account" %}</a></div></div>diff --git a/wger/core/templates/weight_unit/list.html b/wger/core/templates/weight_unit/list.htmlindex 696668a93..481180288 100644--- a/wger/core/templates/weight_unit/list.html+++ b/wger/core/templates/weight_unit/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Weight units" %}{% endblock %}+{% block title %}{% translate "Weight units" %}{% endblock %}{% block content %}@@ -14,8 +14,8 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'core:weight-unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'core:weight-unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'core:weight-unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'core:weight-unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div>{% endif %}@@ -23,7 +23,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -38,7 +38,7 @@{% block options %}{% if perms.core.add_license %}<a href="{% url 'core:weight-unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.pyindex e1628a0bc..1a5a28371 100644--- a/wger/core/templatetags/wger_extras.py+++ b/wger/core/templatetags/wger_extras.py@@ -23,7 +23,7 @@ from django.utils.html import strip_spaces_between_tagsfrom django.utils.safestring import mark_safefrom django.utils.translation import (pgettext,- ugettext_lazy as _+ gettext_lazy as _)# wgerdiff --git a/wger/core/views/languages.py b/wger/core/views/languages.pyindex d1a963035..94b9ea94c 100644--- a/wger/core/views/languages.py+++ b/wger/core/views/languages.py@@ -24,8 +24,8 @@ from django.contrib.auth.mixins import ()from django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -70,7 +70,7 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMimodel = Languagefields = ['short_name', 'full_name']- title = ugettext_lazy('Add')+ title = gettext_lazy('Add')permission_required = 'core.add_language'@@ -82,7 +82,7 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredmodel = Languagefields = ['short_name', 'full_name']success_url = reverse_lazy('core:language:overview')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')permission_required = 'core.delete_language'def get_context_data(self, **kwargs):diff --git a/wger/core/views/license.py b/wger/core/views/license.pyindex 613578fb7..63bd330b5 100644--- a/wger/core/views/license.py+++ b/wger/core/views/license.py@@ -24,8 +24,8 @@ from django.contrib.auth.mixins import ()from django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -62,7 +62,7 @@ class LicenseAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,model = Licensefields = ['full_name', 'short_name', 'url']success_url = reverse_lazy('core:license:list')- title = ugettext_lazy('Add')+ title = gettext_lazy('Add')permission_required = 'core.add_license'diff --git a/wger/core/views/misc.py b/wger/core/views/misc.pyindex cc6ad8d2e..b5a80031d 100644--- a/wger/core/views/misc.py+++ b/wger/core/views/misc.py@@ -32,7 +32,7 @@ from django.urls import (reverse_lazy)from django.utils.text import slugify-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _from django.views.generic import TemplateViewfrom django.views.generic.edit import FormViewdiff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.pyindex 1d4bd8a23..b8b135c55 100644--- a/wger/core/views/repetition_units.py+++ b/wger/core/views/repetition_units.py@@ -25,8 +25,8 @@ from django.contrib.auth.mixins import (from django.http import HttpResponseForbiddenfrom django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = RepetitionUnitfields = ['name']- title = ugettext_lazy('Add')+ title = gettext_lazy('Add')success_url = reverse_lazy('core:repetition-unit:list')permission_required = 'core.add_repetitionunit'diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 0f0fbadff..6642f7bf6 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -53,8 +53,8 @@ from django.urls import ()from django.utils import translationfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (DetailView,@@ -413,7 +413,7 @@ class UserEditView(WgerFormMixin,"""model = User- title = ugettext_lazy('Edit user')+ title = gettext_lazy('Edit user')permission_required = ('gym.manage_gym', 'gym.manage_gyms')form_class = UserPersonalInformationForm@@ -568,7 +568,7 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):class WgerPasswordChangeView(PasswordChangeView):template_name = 'form.html'success_url = reverse_lazy('core:user:preferences')- title = ugettext_lazy("Change password")+ title = gettext_lazy("Change password")def get_form(self, form_class=None):form = super(WgerPasswordChangeView, self).get_form(form_class)diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.pyindex 5de816b9d..94eb4f2bc 100644--- a/wger/core/views/weight_units.py+++ b/wger/core/views/weight_units.py@@ -25,8 +25,8 @@ from django.contrib.auth.mixins import (from django.http import HttpResponseForbiddenfrom django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = WeightUnitfields = ['name']- title = ugettext_lazy('Add')+ title = gettext_lazy('Add')success_url = reverse_lazy('core:weight-unit:list')permission_required = 'core.add_weightunit'diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 5595ffa59..64cd61a6f 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -19,7 +19,7 @@import logging# Django-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom easy_thumbnails.alias import aliasesdiff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 246aca899..32e0fb273 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -31,7 +31,7 @@ from django.templatetags.static import staticfrom django.urls import reversefrom django.utils import translationfrom django.utils.text import slugify-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# Third Partyimport bleachdiff --git a/wger/exercises/templates/categories/admin-overview.html b/wger/exercises/templates/categories/admin-overview.htmlindex 76aa8b157..ae688cc7d 100644--- a/wger/exercises/templates/categories/admin-overview.html+++ b/wger/exercises/templates/categories/admin-overview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Categories" %}{% endblock %}+{% block title %}{% translate "Categories" %}{% endblock %}{% block content %}@@ -13,15 +13,15 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'exercise:category:edit' category.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'exercise:category:delete' category.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'exercise:category:edit' category.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'exercise:category:delete' category.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div>{{ category }}</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -33,7 +33,7 @@{% if perms.exercises.add_exercisecategory %}<p><a href="{% url 'exercise:category:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a></p>{% endif %}diff --git a/wger/exercises/templates/equipment/admin-overview.html b/wger/exercises/templates/equipment/admin-overview.htmlindex 56f220614..508ee700c 100644--- a/wger/exercises/templates/equipment/admin-overview.html+++ b/wger/exercises/templates/equipment/admin-overview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Equipment list" %}{% endblock %}+{% block title %}{% translate "Equipment list" %}{% endblock %}{% block content %}@@ -13,15 +13,15 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'exercise:equipment:edit' equipment.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'exercise:equipment:delete' equipment.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'exercise:equipment:edit' equipment.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'exercise:equipment:delete' equipment.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div>{{equipment.name}}</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -34,7 +34,7 @@{% if perms.exercises.add_equipment %}<p><a href="{% url 'exercise:equipment:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add new equipment" %}+ {% translate "Add new equipment" %}</a></p>{% endif %}diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.htmlindex e87b40a8a..a7e387d8e 100644--- a/wger/exercises/templates/equipment/overview.html+++ b/wger/exercises/templates/equipment/overview.html@@ -8,7 +8,7 @@<!--Title-->-{% block title %}{% trans "Equipment overview" %}{% endblock %}+{% block title %}{% translate "Equipment overview" %}{% endblock %}{% block header %}@@ -39,7 +39,7 @@ $(function() {<div class="card"><div class="card-header" id="header-{{equipment.pk}}"><button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#collapse-{{equipment.pk}}" aria-expanded="true" aria-controls="collapse-{{equipment.pk}}">- {% trans equipment.name %}+ {% translate equipment.name %}</button></div><div class="collapse" id="collapse-{{equipment.pk}}" data-parent="#equipmentAccordion">@@ -56,7 +56,7 @@ $(function() {style="width: 50px;"src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">{% else %}- <img alt="{% trans 'Placeholder image for exercise' %}"+ <img alt="{% translate 'Placeholder image for exercise' %}"class="mr-3"style="width: 50px;"src="{% static 'images/icons/image-placeholder.svg' %}">@@ -64,11 +64,11 @@ $(function() {<div class="media-body"><p class="media-heading h5">{{ exercise.name }}</p><span class="text-muted small">- {% trans exercise_base.category.name %}+ {% translate exercise_base.category.name %}<!--- {% trans "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}+ {% translate "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}<br>- {% trans "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}+ {% translate "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}--></span></div>@@ -76,7 +76,7 @@ $(function() {</a>{% endif %}{% empty %}- {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}+ {% translate "No exercises for this equipment. Add or edit an exercise and set the equipment." %}{% endfor %}{% endfor %}</div>@@ -93,12 +93,12 @@ $(function() {Side bar-->{% block sidebar %}-<h4>{% trans "Search" %}</h4>+<h4>{% translate "Search" %}</h4><input name="term"type="search"id="exercise-search"class="ajax-form-element form-control"- placeholder="{% trans 'exercise name' %}"+ placeholder="{% translate 'exercise name' %}"style="width:100%;">{% endblock %}@@ -106,13 +106,13 @@ $(function() {{% block options %}{% if user.is_authenticated and not user.userprofile.is_temporary %}<a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">- {% trans "Add new exercise" %}+ {% translate "Add new exercise" %}</a>{% else %}<a href="#" class="btn btn-success btn-sm disabled">- {% trans "Add new exercise" %}<br>+ {% translate "Add new exercise" %}<br><small>- {% trans "Only registered users can do this" %}+ {% translate "Only registered users can do this" %}</small></a>{% endif %}diff --git a/wger/exercises/templates/exercise/email_new.tpl b/wger/exercises/templates/exercise/email_new.tplindex 248b5633e..fb770efc1 100644--- a/wger/exercises/templates/exercise/email_new.tpl+++ b/wger/exercises/templates/exercise/email_new.tpl@@ -1,9 +1,9 @@-{% load i18n %}{% blocktrans %}Your exercise '{{exercise}}' was successfully added to the general-database.{% endblocktrans %}+{% load i18n %}{% blocktranslate %}Your exercise '{{exercise}}' was successfully added to the general+database.{% endblocktranslate %}-{% blocktrans %}It is now available on the exercise and muscle overview and can be-added to workouts. You can access it on this address:{% endblocktrans %}+{% blocktranslate %}It is now available on the exercise and muscle overview and can be+added to workouts. You can access it on this address:{% endblocktranslate %}{{url}}-{% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}-— {% blocktrans %}The {{ site }} team{% endblocktrans %}+{% blocktranslate %}Thank you for contributing and making this site better!{% endblocktranslate %}+— {% blocktranslate %}The {{ site }} team{% endblocktranslate %}diff --git a/wger/exercises/templates/exercise/form.html b/wger/exercises/templates/exercise/form.htmlindex 1e9566aa8..71ef447f8 100644--- a/wger/exercises/templates/exercise/form.html+++ b/wger/exercises/templates/exercise/form.html@@ -1,12 +1,12 @@{% load i18n %}{% if not perms.exercises %}-<h4>{% trans "Submitting an exercise" %}</h4>-<p><strong>{% blocktrans %}Thank you for submitting an exercise. This is much-appreciated!{% endblocktrans %}</strong></p>+<h4>{% translate "Submitting an exercise" %}</h4>+<p><strong>{% blocktranslate %}Thank you for submitting an exercise. This is much+appreciated!{% endblocktranslate %}</strong></p>-<p>{% blocktrans %}After you submit the form, the administrators will be notified.+<p>{% blocktranslate %}After you submit the form, the administrators will be notified.Once it is reviewed, it will be added to the database. Till this happens,it will not be visible in the overview or the search. In case you added your email-when you registered, you will get notified when the process is completed successfully.{% endblocktrans %}</p>-{% endif %}\ No newline at end of file+when you registered, you will get notified when the process is completed successfully.{% endblocktranslate %}</p>+{% endif %}diff --git a/wger/exercises/templates/exercise/form_correct.html b/wger/exercises/templates/exercise/form_correct.htmlindex 5385989a5..5bc3bff28 100644--- a/wger/exercises/templates/exercise/form_correct.html+++ b/wger/exercises/templates/exercise/form_correct.html@@ -1,10 +1,10 @@{% load i18n %}{% if not perms.exercises %}-<h4>{% trans "Correcting an exercise" %}</h4>-<p><strong>{% blocktrans %}Thank you for correcting and improving this exercise.-This is much appreciated!{% endblocktrans %}</strong></p>+<h4>{% translate "Correcting an exercise" %}</h4>+<p><strong>{% blocktranslate %}Thank you for correcting and improving this exercise.+This is much appreciated!{% endblocktranslate %}</strong></p>-<p>{% blocktrans %}After you submit the form, the administrators will be notified.-Once the changes are reviewed the exercise will be updated.{% endblocktrans %}</p>-{% endif %}\ No newline at end of file+<p>{% blocktranslate %}After you submit the form, the administrators will be notified.+Once the changes are reviewed the exercise will be updated.{% endblocktranslate %}</p>+{% endif %}diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.htmlindex 7ddaf4ecf..c7ab73873 100644--- a/wger/exercises/templates/exercise/overview.html+++ b/wger/exercises/templates/exercise/overview.html@@ -8,7 +8,7 @@<!--Title-->-{% block title %}{% trans "Exercises" %}{% endblock %}+{% block title %}{% translate "Exercises" %}{% endblock %}@@ -45,7 +45,7 @@ $(document).ready(function() {<div class="card"><div class="card-header" id="header-{{item.grouper.id}}"><button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#collapse-{{item.grouper.id}}" aria-expanded="true" aria-controls="collapse-{{equipment.pk}}">- {% trans item.grouper.name %}+ {% translate item.grouper.name %}</button></div><div class="collapse" id="collapse-{{item.grouper.id}}" data-parent="#exerciseAccordion">@@ -60,7 +60,7 @@ $(document).ready(function() {style="width: 50px;"src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">{% else %}- <img alt="{% trans 'Placeholder image for exercise' %}"+ <img alt="{% translate 'Placeholder image for exercise' %}"class="mr-3"style="width: 50px;"src="{% static 'images/icons/image-placeholder.svg' %}">@@ -71,9 +71,9 @@ $(document).ready(function() {{{ exercise.equipment.all|join:", " }}<!--- {% trans "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}+ {% translate "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}<br>- {% trans "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}+ {% translate "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}--></span></div>@@ -85,7 +85,7 @@ $(document).ready(function() {</div></div>{% empty %}- <p>{% trans "No categories." %} {% trans "Use link to create one" %}</p>+ <p>{% translate "No categories." %} {% translate "Use link to create one" %}</p>{% endfor %}</div>{% endcache %}@@ -96,12 +96,12 @@ $(document).ready(function() {Side bar-->{% block sidebar %}-<h4>{% trans "Search" %}</h4>+<h4>{% translate "Search" %}</h4><input name="term"type="search"id="exercise-search"class="ajax-form-element form-control"- placeholder="{% trans 'exercise name' %}">+ placeholder="{% translate 'exercise name' %}">{% endblock %}@@ -109,13 +109,13 @@ $(document).ready(function() {{% block options %}{% if user.is_authenticated and not user.userprofile.is_temporary %}<a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">- {% trans "Add new exercise" %}+ {% translate "Add new exercise" %}</a>{% else %}<a href="#" class="btn btn-success btn-sm disabled">- {% trans "Add new exercise" %}<br>+ {% translate "Add new exercise" %}<br><small>- {% trans "Only registered users can do this" %}+ {% translate "Only registered users can do this" %}</small></a>{% endif %}diff --git a/wger/exercises/templates/exercise/pending.html b/wger/exercises/templates/exercise/pending.htmlindex 0ce376166..8c8f73e74 100644--- a/wger/exercises/templates/exercise/pending.html+++ b/wger/exercises/templates/exercise/pending.html@@ -3,7 +3,7 @@{% load static %}{% load wger_extras %}-{% block title %}{% trans "Exercises pending review" %}{% endblock %}+{% block title %}{% translate "Exercises pending review" %}{% endblock %}{% block content %}@@ -11,9 +11,9 @@<table class="table"><thead><tr>- <th>{% trans "Submission date" %}</th>- <th>{% trans "Name" %}</th>- <th>{% trans "User" %}</th>+ <th>{% translate "Submission date" %}</th>+ <th>{% translate "Name" %}</th>+ <th>{% translate "User" %}</th></tr></thead><tbody>@@ -27,7 +27,7 @@</tr>{% empty %}<tr>- <td colspan="2">{% trans "Nothing found" %}</td>+ <td colspan="2">{% translate "Nothing found" %}</td></tr>{% endfor %}</tbody>diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 28e215932..0f3151f63 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -45,27 +45,27 @@ $(document).ready(function() {{% if exercise.status == exercise.STATUS_PENDING %}<div class="card text-white bg-dark mb-4"><div class="card-header">- {% trans "Exercise is pending review" %}+ {% translate "Exercise is pending review" %}</div><div class="card-body">- <p>{% blocktrans %}This user submitted exercise is pending a decision to be- included in the database.{% endblocktrans %}- {% trans "Till then, it will not be shown in the overview or the search." %}- {% if perms.exercises.add_exercise %}{% trans "Please select one of the options below." %}{% endif %}+ <p>{% blocktranslate %}This user submitted exercise is pending a decision to be+ included in the database.{% endblocktranslate %}+ {% translate "Till then, it will not be shown in the overview or the search." %}+ {% if perms.exercises.add_exercise %}{% translate "Please select one of the options below." %}{% endif %}</p>{% if perms.exercises.add_exercise %}<a href="{% url 'exercise:exercise:accept' exercise.id %}" class="btn btn-secondary"><span class="{% fa_class 'check' %}"></span>- {% trans "Accept" %}+ {% translate "Accept" %}</a><a href="{% url 'exercise:exercise:decline' exercise.id %}" class="btn btn-secondary"><span class="{% fa_class 'times' %}"></span>- {% trans "Decline" %}+ {% translate "Decline" %}</a><a href="{% url 'exercise:exercise:delete' exercise.id %}" class="wger-modal-dialog btn btn-secondary"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a>{% endif %} {# end check permissions #}</div>@@ -73,19 +73,19 @@ $(document).ready(function() {{% endif %} {# end exercise is pending review #}-<h5 class="mt-4">{% trans "Category" %}:</h5>-{% trans exercise.category.name %}+<h5 class="mt-4">{% translate "Category" %}:</h5>+{% translate exercise.category.name %}{% if exercise.equipment.all %}- <h5 class="mt-4">{% trans "Equipment" %}:</h5>+ <h5 class="mt-4">{% translate "Equipment" %}:</h5>{% for equipment in exercise.equipment.all %}- {% trans equipment.name %}+ {% translate equipment.name %}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}-<h5 class="mt-4">{% trans "Description" %}:</h5>+<h5 class="mt-4">{% translate "Description" %}:</h5>{{ exercise.description|safe }}@@ -93,7 +93,7 @@ $(document).ready(function() {{# Images #}{% with images=exercise.images.accepted %}{% if images or perms.exercises.change_exerciseimage %}- <h5 class="mt-4">{% trans "Images" %}:</h5>+ <h5 class="mt-4">{% translate "Images" %}:</h5><div class="row row-cols-2 row-cols-md-3">{% with other_images=images %}{% for image in other_images %}@@ -134,7 +134,7 @@ $(document).ready(function() {{% if perms.exercises.change_exerciseimage %}<p><a href="{% url 'exercise:image:add' exercise.id %}" >- {% trans "Add new image" %}+ {% translate "Add new image" %}</a></p>{% endif %}@@ -144,15 +144,15 @@ $(document).ready(function() {{% if perms.exercises.change_exerciseimage %}{% with images=exercise.images.pending %}{% if images %}-<h5 class="mt-4">{% trans "Images pending review" %}</h5>+<h5 class="mt-4">{% translate "Images pending review" %}</h5><div class="card-deck">{% for image in images %}<div class="card"><img class="card-img-top" src="{{ image.image|thumbnail_url:'small' }}"><div class="card-body">- <a href="{% url 'exercise:image:accept' image.pk %}" class="btn btn-light btn-sm">{% trans "Accept" %}</a>- <a href="{% url 'exercise:image:decline' image.pk %}" class="btn btn-light btn-sm">{% trans "Decline" %}</a>- <a href="{% url 'exercise:image:delete' exercise.pk image.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>+ <a href="{% url 'exercise:image:accept' image.pk %}" class="btn btn-light btn-sm">{% translate "Accept" %}</a>+ <a href="{% url 'exercise:image:decline' image.pk %}" class="btn btn-light btn-sm">{% translate "Decline" %}</a>+ <a href="{% url 'exercise:image:delete' exercise.pk image.pk %}" class="btn btn-danger btn-sm">{% translate "Delete" %}</a></div></div></div>@@ -166,7 +166,7 @@ $(document).ready(function() {{# Comments #}{% with comments=exercise.exercisecomment_set.all %}{% if comments or perms.exercises.change_exercisecomment %}- <h5 class="mt-4">{% trans "Comments for this exercise" %}:</h5>+ <h5 class="mt-4">{% translate "Comments for this exercise" %}:</h5><ul>{% for comment in comments %}<li>@@ -178,12 +178,12 @@ $(document).ready(function() {<div class="dropdown-menu"><a href="{% url 'exercise:comment:edit' comment.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'exercise:comment:delete' comment.id %}" class="dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></span>@@ -194,7 +194,7 @@ $(document).ready(function() {{% if perms.exercises.change_exercisecomment %}<p><a href="{% url 'exercise:comment:add' exercise.id %}" class="wger-modal-dialog">- {% trans "Add new comment" %}+ {% translate "Add new comment" %}</a></p>{% endif %}@@ -206,17 +206,17 @@ $(document).ready(function() {{% cache cache_timeout exercise-detail-muscles cache_vary_on %}{% if muscles_main_front or muscles_main_back %}- <h5 class="mt-4">{% trans "Muscles" %}:</h5>+ <h5 class="mt-4">{% translate "Muscles" %}:</h5><p>- {% trans "The diagram shows the most used muscles on this exercise" %}+ {% translate "The diagram shows the most used muscles on this exercise" %}</p><p><div style="width:1em;height:1em;background-color:#cc0000;float:left;margin-right:0.5em;"></div>- {% trans "Main muscles" %}+ {% translate "Main muscles" %}</p><p><div style="width:1em;height:1em;background-color:#f57900;float:left;margin-right:0.5em;"></div>- {% trans "Secondary muscles" %}+ {% translate "Secondary muscles" %}</p><div class="row ">@@ -249,12 +249,12 @@ $(document).ready(function() {{% endcache %}{% if logs %}- <h5 class="mt-4">{% trans "Weight log" %}:</h5>+ <h5 class="mt-4">{% translate "Weight log" %}:</h5>{% render_weight_log logs svg_uuid user %}{% endif %}{% if exercise.variations %}- <h5 class="mt-4">{% trans "Exercise Variations" %}:</h5>+ <h5 class="mt-4">{% translate "Exercise Variations" %}:</h5><ul>{% for variation in exercise.variations %}<li>@@ -271,11 +271,11 @@ $(document).ready(function() {{# #}{% block sidebar %}{% if user.is_authenticated and not user.userprofile.is_temporary and not perms.exercises %}-<h5>{% trans "Options" %}</h5>+<h5>{% translate "Options" %}</h5><p><a href="{% url 'exercise:exercise:correct' exercise.id %}"><span class="{% fa_class 'edit' %}"></span>- {% trans "Submit a correction" %}+ {% translate "Submit a correction" %}</a></p>{% endif %}@@ -294,17 +294,17 @@ $(document).ready(function() {<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'exercise:exercise:edit' exercise.id %}" class="dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit" %}+ {% translate "Edit" %}</a><div role="separator" class="dropdown-divider"></div><a href="{% url 'exercise:exercise:delete' exercise.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a></li></div>diff --git a/wger/exercises/templates/muscles/admin-overview.html b/wger/exercises/templates/muscles/admin-overview.htmlindex af93eaeea..4d7e86907 100644--- a/wger/exercises/templates/muscles/admin-overview.html+++ b/wger/exercises/templates/muscles/admin-overview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras %}-{% block title %}{% trans "Muscle overview" %}{% endblock %}+{% block title %}{% translate "Muscle overview" %}{% endblock %}{% block content %}@@ -13,15 +13,15 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'exercise:muscle:edit' muscle.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'exercise:muscle:delete' muscle.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'exercise:muscle:edit' muscle.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'exercise:muscle:delete' muscle.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div>{{ muscle }}</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -33,7 +33,7 @@{% block options %}{% if perms.exercises.add_equipment %}<a href="{% url 'exercise:muscle:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add muscle" %}+ {% translate "Add muscle" %}</a>{% endif %}{% endblock %}diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.htmlindex 05c5ee752..1ea88988e 100644--- a/wger/exercises/templates/muscles/overview.html+++ b/wger/exercises/templates/muscles/overview.html@@ -4,7 +4,7 @@<!--Title-->-{% block title %}{% trans "Muscle overview" %}{% endblock %}+{% block title %}{% translate "Muscle overview" %}{% endblock %}{% block header %}@@ -58,7 +58,7 @@style="width: 50px;"src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">{% else %}- <img alt="{% trans 'Placeholder image for exercise' %}"+ <img alt="{% translate 'Placeholder image for exercise' %}"class="mr-3"style="width: 50px;"src="{% static 'images/icons/image-placeholder.svg' %}">@@ -66,11 +66,11 @@<div class="media-body"><p class="media-heading h5">{{ exercise.name }}</p><span class="text-muted small">- {% trans exercise.category.name %}+ {% translate exercise.category.name %}<!--- {% trans "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}+ {% translate "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}<br>- {% trans "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}+ {% translate "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}--></span></div>@@ -78,7 +78,7 @@</a>{% endif %}{% empty %}- {% trans "No exercises for this muscle. Add or edit an exercise and set the muscle." %}+ {% translate "No exercises for this muscle. Add or edit an exercise and set the muscle." %}{% endfor %}{% endfor %}</div>@@ -105,13 +105,13 @@{% block options %}{% if user.is_authenticated and not user.userprofile.is_temporary %}<a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">- {% trans "Add new exercise" %}+ {% translate "Add new exercise" %}</a>{% else %}<a href="#" class="btn btn-success btn-sm disabled">- {% trans "Add new exercise" %}<br>+ {% translate "Add new exercise" %}<br><small>- {% trans "Only registered users can do this" %}+ {% translate "Only registered users can do this" %}</small></a>{% endif %}diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.pyindex 4b6b1c338..e19ddd341 100644--- a/wger/exercises/views/categories.py+++ b/wger/exercises/views/categories.py@@ -24,8 +24,8 @@ from django.contrib.auth.mixins import ()from django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -66,7 +66,7 @@ class ExerciseCategoryAddView(WgerFormMixin,model = ExerciseCategoryfields = ['name']success_url = reverse_lazy('exercise:category:list')- title = ugettext_lazy('Add category')+ title = gettext_lazy('Add category')permission_required = 'exercises.add_exercisecategory'def form_valid(self, form):@@ -111,8 +111,8 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin,model = ExerciseCategoryfields = ('name',)success_url = reverse_lazy('exercise:category:list')- delete_message_extra = ugettext_lazy('This will also delete all exercises in this category.')- messages = ugettext_lazy('Successfully deleted')+ delete_message_extra = gettext_lazy('This will also delete all exercises in this category.')+ messages = gettext_lazy('Successfully deleted')permission_required = 'exercises.delete_exercisecategory'# Send some additional data to the templatediff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.pyindex 91dae9d80..ae1cf37c8 100644--- a/wger/exercises/views/comments.py+++ b/wger/exercises/views/comments.py@@ -26,7 +26,7 @@ from django.contrib.auth.mixins import (from django.http import HttpResponseRedirectfrom django.shortcuts import get_object_or_404from django.urls import reverse-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import (CreateView,UpdateView@@ -59,7 +59,7 @@ class ExerciseCommentEditView(WgerFormMixin,model = ExerciseCommentform_class = CommentForm- title = ugettext_lazy('Edit')+ title = gettext_lazy('Edit')permission_required = 'exercises.change_exercisecomment'def get_success_url(self):@@ -76,7 +76,7 @@ class ExerciseCommentAddView(WgerFormMixin,model = ExerciseCommentform_class = CommentForm- title = ugettext_lazy('Add exercise comment')+ title = gettext_lazy('Add exercise comment')permission_required = 'exercises.add_exercisecomment'def form_valid(self, form):diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex a7886023b..b78a05602 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -27,8 +27,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -92,7 +92,7 @@ class EquipmentAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMiximodel = Equipmentfields = ['name']- title = ugettext_lazy('Add new equipment')+ title = gettext_lazy('Add new equipment')permission_required = 'exercises.add_equipment'success_url = reverse_lazy('exercise:equipment:list')@@ -104,8 +104,8 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiremodel = Equipmentfields = ('name',)- messages = ugettext_lazy('Successfully deleted')- title = ugettext_lazy('Delete equipment?')+ messages = gettext_lazy('Successfully deleted')+ title = gettext_lazy('Delete equipment?')permission_required = 'exercises.delete_equipment'success_url = reverse_lazy('exercise:equipment:list')diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 04acac5fc..876deb5ca 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -51,8 +51,8 @@ from django.urls import ()from django.utils.cache import patch_vary_headersfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -229,7 +229,7 @@ class ExercisesEditAddView(WgerFormMixin):"""model = Exercisesidebar = 'exercise/form.html'- title = ugettext_lazy('Add exercise')+ title = gettext_lazy('Add exercise')custom_js = 'wgerInitTinymce();'clean_html = ('description', )@@ -397,8 +397,8 @@ class ExerciseDeleteView(WgerDeleteMixin,fields = ('description','name_original')success_url = reverse_lazy('exercise:exercise:overview')- delete_message_extra = ugettext_lazy('This will delete the exercise from all workouts.')- messages = ugettext_lazy('Successfully deleted')+ delete_message_extra = gettext_lazy('This will delete the exercise from all workouts.')+ messages = gettext_lazy('Successfully deleted')permission_required = 'exercises.delete_exercise'def get_context_data(self, **kwargs):diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.pyindex b440233f7..59cadf11d 100644--- a/wger/exercises/views/images.py+++ b/wger/exercises/views/images.py@@ -27,8 +27,8 @@ from django.http import HttpResponseRedirectfrom django.shortcuts import get_object_or_404from django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -64,7 +64,7 @@ class ExerciseImageEditView(WgerFormMixin,"""model = ExerciseImage- title = ugettext_lazy('Edit exercise image')+ title = gettext_lazy('Edit exercise image')permission_required = 'exercises.change_exerciseimage'form_class = ExerciseImageForm@@ -87,7 +87,7 @@ class ExerciseImageAddView(WgerFormMixin,"""model = ExerciseImage- title = ugettext_lazy('Add new image')+ title = gettext_lazy('Add new image')permission_required = 'exercises.add_exerciseimage'form_class = ExerciseImageForm@@ -120,7 +120,7 @@ class ExerciseImageDeleteView(WgerDeleteMixin,model = ExerciseImagefields = ('image', 'is_main')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')permission_required = 'exercises.delete_exerciseimage'def get_success_url(self):diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.pyindex b7c1cb35b..35bd9518a 100644--- a/wger/exercises/views/muscles.py+++ b/wger/exercises/views/muscles.py@@ -24,8 +24,8 @@ from django.contrib.auth.mixins import ()from django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -83,7 +83,7 @@ class MuscleAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,model = Musclefields = ['name', 'is_front']success_url = reverse_lazy('exercise:muscle:admin-list')- title = ugettext_lazy('Add muscle')+ title = gettext_lazy('Add muscle')permission_required = 'exercises.add_muscle'@@ -115,7 +115,7 @@ class MuscleDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMifields = ('name', 'is_front')success_url = reverse_lazy('exercise:muscle:admin-list')permission_required = 'exercises.delete_muscle'- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):"""diff --git a/wger/gym/forms.py b/wger/gym/forms.pyindex 37abfc9e6..dcbfeb125 100644--- a/wger/gym/forms.py+++ b/wger/gym/forms.py@@ -17,7 +17,7 @@# Djangofrom django import formsfrom django.contrib.auth.models import User-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom crispy_forms.helper import FormHelperdiff --git a/wger/gym/management/commands/inactive-members.py b/wger/gym/management/commands/inactive-members.pyindex 5df5b6db2..8e062e53c 100644--- a/wger/gym/management/commands/inactive-members.py+++ b/wger/gym/management/commands/inactive-members.py@@ -23,7 +23,7 @@ from django.core import mailfrom django.core.management.base import BaseCommandfrom django.template.loader import render_to_stringfrom django.utils import translation-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# wgerfrom wger.gym.helpers import is_any_gym_admindiff --git a/wger/gym/models.py b/wger/gym/models.pyindex 028b40cea..351f7557d 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -23,8 +23,8 @@ from django.contrib.auth.models import Userfrom django.db import models as mfrom django.urls import reversefrom django.utils.translation import (- ugettext,- ugettext_lazy as _+ gettext,+ gettext_lazy as _)# wger@@ -139,7 +139,7 @@ class GymConfig(m.Model):"""Return a more human-readable representation"""- return ugettext('Configuration for {}'.format(self.gym.name))+ return gettext('Configuration for {}'.format(self.gym.name))def get_owner_object(self):"""diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.htmlindex 5bcc06fc7..6da13a17f 100644--- a/wger/gym/templates/admin_notes/list.html+++ b/wger/gym/templates/admin_notes/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "User notes" %}{% endblock %}+{% block title %}{% translate "User notes" %}{% endblock %}@@ -29,7 +29,7 @@{% if perms.gym.change_adminusernote %}<li><a href="{% url 'gym:admin_note:edit' note.pk %}" class="wger-modal-dialog">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a></li>{% endif %}@@ -37,7 +37,7 @@{% if perms.gym.delete_adminusernote %}<li><a href="{% url 'gym:admin_note:delete' note.pk %}" class="wger-modal-dialog">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a><li>{% endif %}@@ -49,7 +49,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -64,7 +64,7 @@{% block options %}{% if perms.gym.add_adminusernote %}<a href="{% url 'gym:admin_note:add' member.pk %}" class="wger-modal-dialog btn btn-success btn-sm">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/gym/templates/contract/list.html b/wger/gym/templates/contract/list.htmlindex 8f56bb308..30196589b 100644--- a/wger/gym/templates/contract/list.html+++ b/wger/gym/templates/contract/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "Contracts" %}{% endblock %}+{% block title %}{% translate "Contracts" %}{% endblock %}{% block breadcrumbs %}@@ -28,12 +28,12 @@{% if perms.gym.change_contract %}<li><a href="{% url 'gym:contract:edit' contract.pk %}">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a></li><li><a href="{% url 'gym:contract:view' contract.pk %}">- {% trans 'Show' %}+ {% translate 'Show' %}</a></li>{% endif %}@@ -57,7 +57,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</div>@@ -69,5 +69,5 @@{# Options #}{# #}{% block options %}- <a href="{% url 'gym:contract:add' member.pk %}" class="wger-modal-dialog btn btn-sm btn-success">{% trans "Add" %}</a>+ <a href="{% url 'gym:contract:add' member.pk %}" class="wger-modal-dialog btn btn-sm btn-success">{% translate "Add" %}</a>{% endblock %}diff --git a/wger/gym/templates/contract/view.html b/wger/gym/templates/contract/view.htmlindex 6d31f95ac..c9ea6aaab 100644--- a/wger/gym/templates/contract/view.html+++ b/wger/gym/templates/contract/view.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans 'Contract' %} {{ object }}{% endblock %}+{% block title %}{% translate 'Contract' %} {{ object }}{% endblock %}{% block breadcrumbs %}@@ -21,7 +21,7 @@<table class="table">{% if object.contract_type %}<tr>- <th style="width: 20%;">{% trans 'Contract is active' %}</th>+ <th style="width: 20%;">{% translate 'Contract is active' %}</th><td colspan="3">{% if object.is_active %}<span class="{% fa_class 'check' %}"></span>@@ -31,14 +31,14 @@</td></tr><tr>- <th>{% trans 'Contract type' %}</th>+ <th>{% translate 'Contract type' %}</th><td colspan="3">{{ object.contract_type.name|default:'-/-' }}</td></tr>{% endif %}{% if object.options.exists %}<tr>- <th>{% trans "Options" %}</th>+ <th>{% translate "Options" %}</th><td colspan="3">{% for option in object.options.all %}{{ option }}<br>@@ -47,34 +47,34 @@</tr>{% endif %}<tr>- <th>{% trans 'Name' %}</th>+ <th>{% translate 'Name' %}</th><td>{{ object.member.last_name }},{{ object.member.first_name }}</td>- <th>{% trans 'Username' %}</th>+ <th>{% translate 'Username' %}</th><td>{{ object.member }}</td></tr><tr>- <th>{% trans 'Amount' %}</th>+ <th>{% translate 'Amount' %}</th><td>{{ object.amount|default:'-/-' }}</td>- <th>{% trans 'Payment type' %}</th>+ <th>{% translate 'Payment type' %}</th><td>{{ object.get_payment_display }}</td></tr><tr>- <th>{% trans 'Start date' %}</th>+ <th>{% translate 'Start date' %}</th><td>{{ object.date_start|default:'-/-' }}</td>- <th>{% trans 'End date' %}</th>+ <th>{% translate 'End date' %}</th><td>{{ object.date_end|default:'-/-' }}</td></tr><tr>- <th>{% trans 'Phone' %}</th>+ <th>{% translate 'Phone' %}</th><td>{{ object.phone }}</td>- <th>{% trans 'Email' %}</th>+ <th>{% translate 'Email' %}</th><td>{% if object.email %}<a href="mailto:{{ object.email }}">{{ object.email }}</a>@@ -84,16 +84,16 @@</td></tr><tr>- <th>{% trans 'Address' %}</th>+ <th>{% translate 'Address' %}</th><td>{{object.zip_code}} {{object.city}}<br>{{object.street}}</td>- <th>{% trans 'Profession' %}</th>+ <th>{% translate 'Profession' %}</th><td>{{ object.profession }}</td></tr><tr>- <th>{% trans 'Note' %}</th>+ <th>{% translate 'Note' %}</th><td colspan="3" style="white-space: pre-line;">{{ object.note }}</td></tr></table>@@ -103,6 +103,6 @@{% block sidebar %}- <h4>{% trans 'Options' %}</h4>- <a href="{% url 'gym:contract:edit' object.pk %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>+ <h4>{% translate 'Options' %}</h4>+ <a href="{% url 'gym:contract:edit' object.pk %}" class="wger-modal-dialog">{% translate 'Edit' %}</a>{% endblock %}diff --git a/wger/gym/templates/contract_option/list.html b/wger/gym/templates/contract_option/list.htmlindex c6a913e35..6d563c27d 100644--- a/wger/gym/templates/contract_option/list.html+++ b/wger/gym/templates/contract_option/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "Contract options" %}{% endblock %}+{% block title %}{% translate "Contract options" %}{% endblock %}{% block breadcrumbs %}@@ -28,7 +28,7 @@{% if perms.gym.change_contracttype %}<li><a href="{% url 'gym:contract-option:edit' option.pk %}" class="wger-modal-dialog">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a></li>{% endif %}@@ -36,7 +36,7 @@{% if perms.gym.delete_contracttype %}<li><a href="{% url 'gym:contract-option:delete' option.pk %}" class="wger-modal-dialog">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></li>{% endif %}@@ -53,7 +53,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -67,6 +67,6 @@{# #}{% block options %}<a href="{% url 'gym:contract-option:add' gym.id %}" class="wger-modal-dialog btn btn-sm btn-success">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endblock %}diff --git a/wger/gym/templates/contract_type/list.html b/wger/gym/templates/contract_type/list.htmlindex c20c7834e..bb60e68ac 100644--- a/wger/gym/templates/contract_type/list.html+++ b/wger/gym/templates/contract_type/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "Contract types" %}{% endblock %}+{% block title %}{% translate "Contract types" %}{% endblock %}{% block breadcrumbs %}@@ -28,7 +28,7 @@{% if perms.gym.change_contracttype %}<li><a href="{% url 'gym:contract_type:edit' contract_type.pk %}" class="wger-modal-dialog">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a></li>{% endif %}@@ -36,7 +36,7 @@{% if perms.gym.delete_contracttype %}<li><a href="{% url 'gym:contract_type:delete' contract_type.pk %}" class="wger-modal-dialog">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></li>{% endif %}@@ -53,7 +53,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -67,6 +67,6 @@{# #}{% block options %}<a href="{% url 'gym:contract_type:add' gym.id %}" class="wger-modal-dialog btn btn-sm btn-success">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endblock %}diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.htmlindex 4d44be446..5f8e4065e 100644--- a/wger/gym/templates/document/list.html+++ b/wger/gym/templates/document/list.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n static wger_extras django_bootstrap_breadcrumbs %}-{% block title %}{% trans "Documents" %}{% endblock %}+{% block title %}{% translate "Documents" %}{% endblock %}{% block breadcrumbs %}@@ -29,13 +29,13 @@<li><a href="{{ document.document.url }}" download="{{ document.original_name }}"><span class="glyphicon glyphicon-download"></span>- {% trans 'Download' %}+ {% translate 'Download' %}</a></li>{% if perms.gym.change_userdocument %}<li><a href="{% url 'gym:document:edit' document.pk %}">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a></li>{% endif %}@@ -43,7 +43,7 @@{% if perms.gym.delete_userdocument %}<li><a href="{% url 'gym:document:delete' document.pk %}" class="wger-modal-dialog">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></li>{% endif %}@@ -60,7 +60,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -75,7 +75,7 @@{% block options %}{% if perms.gym.add_userdocument %}<a href="{% url 'gym:document:add' member.pk %}" class="btn btn-sm btn-success">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/gym/templates/gym/email_inactive_members.html b/wger/gym/templates/gym/email_inactive_members.htmlindex be8d3368f..531dc660b 100644--- a/wger/gym/templates/gym/email_inactive_members.html+++ b/wger/gym/templates/gym/email_inactive_members.html@@ -1,7 +1,7 @@{% load i18n wger_extras %}-{% blocktrans %}The following users have not visited the gym in the last {{ weeks }} weeks{% endblocktrans %}+{% blocktranslate %}The following users have not visited the gym in the last {{ weeks }} weeks{% endblocktranslate %}-{% trans "User"|ljust:"25" %} {% trans "Last activity" %}+{% translate "User"|ljust:"25" %} {% translate "Last activity" %}---------------------------------------------------------{% for user in user_list|dictsort:"last_activity" %}{% spaceless %}{{ user.user|format_username|ljust:"25" }} {{ user.last_activity }} ({{user.last_activity|timesince}})@@ -10,4 +10,4 @@{% for user in user_list_no_activity %}{% spaceless %}{{ user.user|format_username|ljust:"25" }} -/-{% endspaceless %}-{% endfor %}\ No newline at end of file+{% endfor %}diff --git a/wger/gym/templates/gym/list.html b/wger/gym/templates/gym/list.htmlindex 5994c3310..f7dc525c1 100644--- a/wger/gym/templates/gym/list.html+++ b/wger/gym/templates/gym/list.html@@ -3,7 +3,7 @@{% load static %}{% load wger_extras %}-{% block title %}{% trans "Gym list" %}{% endblock %}+{% block title %}{% translate "Gym list" %}{% endblock %}{% block content %}@@ -16,15 +16,15 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'gym:gym:edit' gym.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'gym:gym:delete' gym.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'gym:gym:edit' gym.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'gym:gym:delete' gym.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div><a href="{% url 'gym:gym:user-list' gym.pk %}">{{gym}}</a></li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -37,17 +37,17 @@{% if perms.config.change_gymconfig %}<div class="btn-group float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu" role="menu">- <a href="{% url 'config:gym_config:edit' %}" class="wger-modal-dialog dropdown-item">{% trans "Edit"%}</a>+ <a href="{% url 'config:gym_config:edit' %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a></div></div>{% endif %}-<h4>{% trans "Global gym configuration" %}</h4>+<h4>{% translate "Global gym configuration" %}</h4><table class="table"><tr>- <th>{% trans "Default gym" %}</th>+ <th>{% translate "Default gym" %}</th><td>{{ global_gym_config.default_gym|default:"-/-" }}</td></tr></table>@@ -61,7 +61,7 @@{% block options %}{% if perms.gym.add_gym %}<a href="{% url 'gym:gym:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add new gym" %}+ {% translate "Add new gym" %}</a>{% endif %}{% endblock %}diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.htmlindex bf45a32c0..af36292ba 100644--- a/wger/gym/templates/gym/member_list.html+++ b/wger/gym/templates/gym/member_list.html@@ -19,15 +19,15 @@{% endif %}-<h4>{% trans "Administrators and trainers" %}</h4>+<h4>{% translate "Administrators and trainers" %}</h4><table class="table table-hover"><thead><tr>- <th style="width: 10%;">{% trans "ID" %}</th>- <th style="width: 40%;">{% trans "Username" %}</th>- <th>{% trans "Name" %}</th>+ <th style="width: 10%;">{% translate "ID" %}</th>+ <th style="width: 40%;">{% translate "Username" %}</th>+ <th>{% translate "Name" %}</th>{% if perms.gym.manage_gym or perms.gym.manage_gyms %}- <th style="text-align: right;">{% trans "Roles" %}</th>+ <th style="text-align: right;">{% translate "Roles" %}</th>{% endif %}</tr></thead>@@ -41,15 +41,15 @@{{current_user.obj}}{% if current_user.perms.gym_trainer %}- <span class="badge badge-primary">{% trans "Trainer" %}</span>+ <span class="badge badge-primary">{% translate "Trainer" %}</span>{% endif %}{% if current_user.perms.manage_gym %}- <span class="badge badge-primary">{% trans "Gym manager" %}</span>+ <span class="badge badge-primary">{% translate "Gym manager" %}</span>{% endif %}{% if current_user.perms.manage_gyms %}- <span class="badge badge-primary">{% trans "General manager" %}</span>+ <span class="badge badge-primary">{% translate "General manager" %}</span>{% endif %}</td><td>@@ -66,7 +66,7 @@</tr>{% empty %}<tr>- <td colspan="4">{% trans "This gym has no administrators or trainers" %}</td>+ <td colspan="4">{% translate "This gym has no administrators or trainers" %}</td></tr>{% endfor %}</tbody>@@ -81,27 +81,27 @@{% if perms.gym.change_gym %}<div class="dropdown float-right"><a type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></a><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'gym:gym:edit' gym.id %}" class="dropdown-item wger-modal-dialog">{% trans "Edit"%}</a>- <a href="{% url 'gym:export:users' gym.id %}" class="dropdown-item">{% trans "Export"%}</a>+ <a href="{% url 'gym:gym:edit' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Edit"%}</a>+ <a href="{% url 'gym:export:users' gym.id %}" class="dropdown-item">{% translate "Export"%}</a></div></div>{% endif %}-<h4>{% trans "Details" %}</h4>+<h4>{% translate "Details" %}</h4><table class="table"><tr>- <td>{% trans "Name" %}</td>+ <td>{% translate "Name" %}</td><td>{{gym.name}}</td></tr><tr>- <td>{% trans "Phone" %}</td>+ <td>{% translate "Phone" %}</td><td>{{gym.phone}}</td></tr><tr>- <td>{% trans "Email" %}</td>+ <td>{% translate "Email" %}</td><td>{% if gym.email %}<a href="mailto:{{gym.email}}">{{gym.email}}</a>@@ -111,18 +111,18 @@</td></tr><tr>- <td>{% trans "Owner" %}</td>+ <td>{% translate "Owner" %}</td><td>{{gym.owner}}</td></tr><tr>- <td>{% trans "Address" %}</td>+ <td>{% translate "Address" %}</td><td>{{gym.zip_code}} {{gym.city}}<br>{{gym.street}}</td></tr><tr>- <td>{% trans "Members" %}</td>+ <td>{% translate "Members" %}</td><td>{{user_count}}</td></tr></table>@@ -134,22 +134,22 @@{% if perms.gym.change_gymconfig %}<div class="dropdown float-right"><a role="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></a><div class="dropdown-menu dropdown-menu-right">- <a href="{% url 'gym:config:edit' gym.config.id %}" class="wger-modal-dialog dropdown-item">{% trans "Edit"%}</a>+ <a href="{% url 'gym:config:edit' gym.config.id %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a></div></div>{% endif %}-<h4>{% trans "Gym configuration" %}</h4>+<h4>{% translate "Gym configuration" %}</h4><table class="table"><tr>- <td>{% trans "Inactive members" %}</td>- <td style="text-align: right;">{{gym.config.weeks_inactive}} {% trans 'weeks' %}</td>+ <td>{% translate "Inactive members" %}</td>+ <td style="text-align: right;">{{gym.config.weeks_inactive}} {% translate 'weeks' %}</td></tr><tr>- <td>{% trans "Show name in header" %}</td>+ <td>{% translate "Show name in header" %}</td><td style="text-align: right;">{% if gym.config.show_name %}<span class="{% fa_class 'check' %}"></span>@@ -170,18 +170,18 @@<div class="dropdown float-right"><div class="btn-group "><a role="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></a><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'gym:admin_config:edit' user.gymadminconfig.id %}" class="dropdown-item wger-modal-dialog">{% trans "Edit"%}</a>+ <a href="{% url 'gym:admin_config:edit' user.gymadminconfig.id %}" class="dropdown-item wger-modal-dialog">{% translate "Edit"%}</a></div></div></div>-<h4>{% trans "My configuration" %}</h4>+<h4>{% translate "My configuration" %}</h4><table class="table"><tr>- <td>{% trans "Overview of inactive members" %}</td>+ <td>{% translate "Overview of inactive members" %}</td><td style="text-align: right;">{% if user.gymadminconfig.overview_inactive %}<span class="{% fa_class 'check' %}"></span>@@ -199,20 +199,20 @@{# Contract configuration #}{# #}{% if perms.gym.change_contracttype or perms.gym.change_contractoption %}- <h4>{% trans "Contracts" %}</h4>+ <h4>{% translate "Contracts" %}</h4>{% endif %}{% if perms.gym.change_contracttype %}<div class="dropdown float-right"><a role="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></a><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'gym:contract_type:list' gym.id %}" class="dropdown-item">{% trans "Overview" %}</a>- <a href="{% url 'gym:contract_type:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% trans "Add" %}</a>+ <a href="{% url 'gym:contract_type:list' gym.id %}" class="dropdown-item">{% translate "Overview" %}</a>+ <a href="{% url 'gym:contract_type:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Add" %}</a></div></div>-<h5>{% trans "Types" %}</h5>+<h5>{% translate "Types" %}</h5><table class="table">{% for contract_type in gym.contracttype_set.all %}<tr>@@ -226,7 +226,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -237,15 +237,15 @@{% if perms.gym.change_contractoption %}<div class="dropdown float-right"><button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'gym:contract-option:list' gym.id %}" class="dropdown-item">{% trans "Overview" %}</a>- <a href="{% url 'gym:contract-option:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% trans "Add" %}</a>+ <a href="{% url 'gym:contract-option:list' gym.id %}" class="dropdown-item">{% translate "Overview" %}</a>+ <a href="{% url 'gym:contract-option:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Add" %}</a></div></div>-<h5>{% trans "Options" %}</h5>+<h5>{% translate "Options" %}</h5><table class="table">{% for option in gym.contractoption_set.all %}<tr>@@ -259,7 +259,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -274,15 +274,15 @@{% if perms.mailer.change_log %}<div class="dropdown float-right"><a role="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown">- {% trans "Actions" %} <span class="caret"></span>+ {% translate "Actions" %} <span class="caret"></span></a><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'email:email:overview' gym.id %}" class="dropdown-item">{% trans "Overview"%}</a>- <a href="{% url 'email:email:add-gym' gym.id %}" class="dropdown-item">{% trans "Add"%}</a>+ <a href="{% url 'email:email:overview' gym.id %}" class="dropdown-item">{% translate "Overview"%}</a>+ <a href="{% url 'email:email:add-gym' gym.id %}" class="dropdown-item">{% translate "Add"%}</a></div></div>-<h4>{% trans "Emails" %}</h4>+<h4>{% translate "Emails" %}</h4><table class="table">{% for email in gym.email_log.all %}<tr>@@ -296,7 +296,7 @@{% empty %}<tr><td>- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</td></tr>{% endfor %}@@ -312,7 +312,7 @@{% block options %}{% if perms.gym.manage_gym or perms.gym.manage_gyms %}<a href="{% url 'gym:gym:add-user' gym.pk %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add member" %}+ {% translate "Add member" %}</a>{% endif %}{% endblock %}diff --git a/wger/gym/templates/gym/new_user.html b/wger/gym/templates/gym/new_user.htmlindex 472d3e198..8b6912a8b 100644--- a/wger/gym/templates/gym/new_user.html+++ b/wger/gym/templates/gym/new_user.html@@ -19,23 +19,23 @@{% block content %}<table class="table"><tr>- <th>{% trans "User" %}</th>+ <th>{% translate "User" %}</th><td>{{new_user.get_full_name}} ({{new_user}})</td></tr><tr>- <th>{% trans "Password" %}</th>+ <th>{% translate "Password" %}</th><td>{{password}}</td></tr><tr>- <th>{% trans "Email" %}</th>+ <th>{% translate "Email" %}</th><td>{{new_user.email|default:'-/-'}}</td></tr><tr>- <th>{% trans "Gym" %}</th>+ <th>{% translate "Gym" %}</th><td>{{new_user.userprofile.gym}}</td></tr><tr>- <th>{% trans "Date of Birth" %}</th>+ <th>{% translate "Date of Birth" %}</th><td>{{new_user.userprofile.birthdate}}</td></tr></table>@@ -45,16 +45,16 @@{% block sidebar %}-<h4>{% trans "Info" %}</h4>+<h4>{% translate "Info" %}</h4><p>- {% blocktrans %}Please write down the user password or save the exported+ {% blocktranslate %}Please write down the user password or save the exportedfile, which contains all the user data, and keep it in a safe place. The password-cannot be recovered later.{% endblocktrans %}+cannot be recovered later.{% endblocktranslate %}</p><p><a href="{% url 'gym:gym:new-user-data-export' %}">- {% trans "Export user data" %}+ {% translate "Export user data" %}</a></p>{% endblock %}diff --git a/wger/gym/templates/gym/reset_user_password.html b/wger/gym/templates/gym/reset_user_password.htmlindex 82ec186aa..84f073efc 100644--- a/wger/gym/templates/gym/reset_user_password.html+++ b/wger/gym/templates/gym/reset_user_password.html@@ -17,11 +17,11 @@{% block content %}<table class="table"><tr>- <th>{% trans "User" %}</th>+ <th>{% translate "User" %}</th><td>{{mod_user.get_full_name}} ({{mod_user}})</td></tr><tr>- <th>{% trans "Password" %}</th>+ <th>{% translate "Password" %}</th><td>{{password}}</td></tr></table>@@ -29,6 +29,6 @@{% block sidebar %}<p>- {% blocktrans %}This user's password has been reset. Please notify the user of their new password.{% endblocktrans %}+ {% blocktranslate %}This user's password has been reset. Please notify the user of their new password.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.pyindex 7b8558d55..f871b2a8d 100644--- a/wger/gym/views/admin_config.py+++ b/wger/gym/views/admin_config.py@@ -20,8 +20,8 @@ import logging# Djangofrom django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import UpdateView@@ -41,7 +41,7 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):model = GymAdminConfigfields = ['overview_inactive']permission_required = 'gym.change_gymadminconfig'- title = ugettext_lazy('Configuration')+ title = gettext_lazy('Configuration')def get_success_url(self):"""diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.pyindex e98b15e53..ed5ce9b6d 100644--- a/wger/gym/views/admin_notes.py+++ b/wger/gym/views/admin_notes.py@@ -26,8 +26,8 @@ from django.contrib.auth.models import Userfrom django.http.response import HttpResponseForbiddenfrom django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -91,7 +91,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = AdminUserNotefields = ['note']- title = ugettext_lazy('Add note')+ title = gettext_lazy('Add note')permission_required = 'gym.add_adminusernote'member = Nonediff --git a/wger/gym/views/config.py b/wger/gym/views/config.pyindex d2882f70e..134bcca05 100644--- a/wger/gym/views/config.py+++ b/wger/gym/views/config.py@@ -24,7 +24,7 @@ from django.contrib.auth.mixins import ()from django.http.response import HttpResponseForbiddenfrom django.urls import reverse-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _from django.views.generic import UpdateView# wgerdiff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.pyindex 587a84574..f6faffd0a 100644--- a/wger/gym/views/contract.py+++ b/wger/gym/views/contract.py@@ -26,8 +26,8 @@ from django.contrib.auth.models import Userfrom django.http.response import HttpResponseForbiddenfrom django.shortcuts import get_object_or_404from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -53,7 +53,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createfields = ['contract_type', 'options', 'amount', 'payment', 'is_active','date_start', 'date_end', 'email', 'zip_code', 'city', 'street','phone', 'profession', 'note']- title = ugettext_lazy('Add contract')+ title = gettext_lazy('Add contract')permission_required = 'gym.add_contract'member = Nonediff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.pyindex 1c48f5813..ef7bed253 100644--- a/wger/gym/views/contract_option.py+++ b/wger/gym/views/contract_option.py@@ -26,8 +26,8 @@ from django.http.response import HttpResponseForbiddenfrom django.shortcuts import get_object_or_404from django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -57,7 +57,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = ContractOptionfields = ('name', 'description')- title = ugettext_lazy('Add option')+ title = gettext_lazy('Add option')permission_required = 'gym.add_contractoption'member = Nonediff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.pyindex 8b84b1ffe..3ebe25291 100644--- a/wger/gym/views/contract_type.py+++ b/wger/gym/views/contract_type.py@@ -26,8 +26,8 @@ from django.http.response import HttpResponseForbiddenfrom django.shortcuts import get_object_or_404from django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -57,7 +57,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = ContractTypefields = ('name', 'description')- title = ugettext_lazy('Add contract type')+ title = gettext_lazy('Add contract type')permission_required = 'gym.add_contracttype'member = Nonediff --git a/wger/gym/views/document.py b/wger/gym/views/document.pyindex 34b044726..6f3092d69 100644--- a/wger/gym/views/document.py+++ b/wger/gym/views/document.py@@ -26,8 +26,8 @@ from django.contrib.auth.models import Userfrom django.http.response import HttpResponseForbiddenfrom django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -91,7 +91,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Createmodel = UserDocumentfields = ['document', 'name', 'note']- title = ugettext_lazy('Add note')+ title = gettext_lazy('Add note')permission_required = 'gym.add_userdocument'member = Nonediff --git a/wger/gym/views/export.py b/wger/gym/views/export.pyindex 2f9bb1b8c..14128e4e5 100644--- a/wger/gym/views/export.py+++ b/wger/gym/views/export.py@@ -26,7 +26,7 @@ from django.http.response import (HttpResponseForbidden)from django.shortcuts import get_object_or_404-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# wgerfrom wger.gym.models import Gymdiff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex 0701e4303..eef08fc4f 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -44,8 +44,8 @@ from django.urls import ()from django.utils.text import slugifyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -161,7 +161,7 @@ class GymAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Cremodel = Gymfields = ['name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']- title = ugettext_lazy('Add new gym')+ title = gettext_lazy('Add new gym')permission_required = 'gym.add_gym'@@ -329,7 +329,7 @@ class GymAddUserView(WgerFormMixin,"""model = User- title = ugettext_lazy('Add user to gym')+ title = gettext_lazy('Add user to gym')success_url = reverse_lazy('gym:gym:new-user-data')permission_required = ('gym.manage_gym', 'gym.manage_gyms')form_class = GymUserAddForm@@ -425,7 +425,7 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,model = Gymfields = ['name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']- title = ugettext_lazy('Edit gym')+ title = gettext_lazy('Edit gym')permission_required = 'gym.change_gym'def dispatch(self, request, *args, **kwargs):diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.pyindex e08c7bd46..bc84674be 100644--- a/wger/gym/views/user_config.py+++ b/wger/gym/views/user_config.py@@ -24,7 +24,7 @@ from django.contrib.auth.mixins import ()from django.http import HttpResponseForbiddenfrom django.urls import reverse-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import UpdateView# wger@@ -43,7 +43,7 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMiximodel = GymUserConfigfields = ['include_inactive']permission_required = 'gym.change_gymuserconfig'- title = ugettext_lazy('Configuration')+ title = gettext_lazy('Configuration')def dispatch(self, request, *args, **kwargs):"""diff --git a/wger/mailer/templates/mailer/gym/form.html b/wger/mailer/templates/mailer/gym/form.htmlindex 39c96aba8..b90b7ce5b 100644--- a/wger/mailer/templates/mailer/gym/form.html+++ b/wger/mailer/templates/mailer/gym/form.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n django_bootstrap_breadcrumbs crispy_forms_tags %}-{% block title %}{% trans 'Email' %} - {{ gym }}{% endblock %}+{% block title %}{% translate 'Email' %} - {{ gym }}{% endblock %}{% block breadcrumbs %}{{ block.super }}@@ -20,15 +20,15 @@method="post"class="wger-form">{% crispy form %}- <input type="submit" name="submit" value="{% trans 'Generate preview' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Generate preview' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></form>{% endblock %}{% block sidebar %}- <h4>{% trans "Steps" %}</h4>+ <h4>{% translate "Steps" %}</h4><ol>- <li>{% trans "Fill in the form" %}</li>- <li>{% trans "You will receive a preview email for you to review" %}</li>- <li>{% trans "You can update and correct the content as often as you need before sending the emails" %}</li>+ <li>{% translate "Fill in the form" %}</li>+ <li>{% translate "You will receive a preview email for you to review" %}</li>+ <li>{% translate "You can update and correct the content as often as you need before sending the emails" %}</li></ol>{% endblock %}diff --git a/wger/mailer/templates/mailer/gym/overview.html b/wger/mailer/templates/mailer/gym/overview.htmlindex 9b6523a86..41f7c77e9 100644--- a/wger/mailer/templates/mailer/gym/overview.html+++ b/wger/mailer/templates/mailer/gym/overview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load wger_extras i18n django_bootstrap_breadcrumbs %}-{% block title %}{% trans "Email" %}{% endblock %}+{% block title %}{% translate "Email" %}{% endblock %}{% block breadcrumbs %}{{ block.super }}@@ -27,7 +27,7 @@</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -40,6 +40,6 @@{# #}{% block options %}<a href="{% url 'email:email:add-gym' gym.pk %}" class="btn btn-sm btn-success">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endblock %}diff --git a/wger/mailer/templates/mailer/gym/preview.html b/wger/mailer/templates/mailer/gym/preview.htmlindex 1f6497bd6..f2e45c70e 100644--- a/wger/mailer/templates/mailer/gym/preview.html+++ b/wger/mailer/templates/mailer/gym/preview.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n django_bootstrap_breadcrumbs crispy_forms_tags %}-{% block title %}{% trans 'Email' %} - {{ gym }}{% endblock %}+{% block title %}{% translate 'Email' %} - {{ gym }}{% endblock %}{% block breadcrumbs %}@@ -19,7 +19,7 @@{% block content %}-<h3>{% trans 'Current version' %}</h3>+<h3>{% translate 'Current version' %}</h3><form action="{{ request.get_full_path }}" method="post">{% csrf_token %}<input type="hidden" name="{{ stage_field }}" value="2" />@@ -29,7 +29,7 @@<div class="row"><div class="col-md-3 text-right">- {% trans 'Subject' context 'As in "email subject"' %}+ {% translate 'Subject' context 'As in "email subject"' %}</div><div class="col-md-9">{{ form.cleaned_data.subject }}@@ -37,32 +37,32 @@</div><div class="row"><div class="col-md-3 text-right" style="white-space: pre-line;">- {% trans 'Content' context 'As in "content of an email"' %}+ {% translate 'Content' context 'As in "content of an email"' %}</div><div class="col-md-9" style="white-space: pre-line;">{{ form.cleaned_data.body }}</div></div><div class="row" style="margin-top: 1em;">- <input type="submit" name="submit" value="{% trans 'Send emails' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Send emails' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></div></form>-<h3>{% trans 'Correction' %}</h3>+<h3>{% translate 'Correction' %}</h3><form action="{{ request.get_full_path }}"method="post"class="wger-form">{% crispy form %}- <input type="submit" name="submit" value="{% trans 'Correction' %}" class="btn btn-primary btn-success btn-block" id="submit-id-correction">+ <input type="submit" name="submit" value="{% translate 'Correction' %}" class="btn btn-primary btn-success btn-block" id="submit-id-correction"></form>{% endblock %}{% block sidebar %}-<h4>{% trans "Steps" %}</h4>+<h4>{% translate "Steps" %}</h4><ol>- <li>{% trans "Fill in the form" %}</li>- <li>{% trans "You will receive a preview email for you to review" %}</li>- <li>{% trans "You can update and correct the content as often as you need before sending the emails" %}</li>+ <li>{% translate "Fill in the form" %}</li>+ <li>{% translate "You will receive a preview email for you to review" %}</li>+ <li>{% translate "You can update and correct the content as often as you need before sending the emails" %}</li></ol>{% endblock %}diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex 68540050c..ac205c9b3 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -32,8 +32,8 @@ from django.forms import (widgets)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)# Third Party@@ -221,13 +221,13 @@ class WorkoutScheduleDownloadForm(Form):Form for the workout schedule download"""pdf_type = ChoiceField(- label=ugettext_lazy("Type"),- choices=(("log", ugettext_lazy("Log")),- ("table", ugettext_lazy("Table")))+ label=gettext_lazy("Type"),+ choices=(("log", gettext_lazy("Log")),+ ("table", gettext_lazy("Table"))))- images = BooleanField(label=ugettext_lazy("with images"),+ images = BooleanField(label=gettext_lazy("with images"),required=False)- comments = BooleanField(label=ugettext_lazy("with comments"),+ comments = BooleanField(label=gettext_lazy("with comments"),required=False)def __init__(self):diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex e0a25c5ea..ce29d448b 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -21,7 +21,7 @@ from calendar import HTMLCalendar# Djangofrom django.urls import reverse-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom reportlab.lib import colorsdiff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.pyindex 81ae84dba..f763ce148 100644--- a/wger/manager/management/commands/email-reminders.py+++ b/wger/manager/management/commands/email-reminders.py@@ -24,7 +24,7 @@ from django.core import mailfrom django.core.management.base import BaseCommandfrom django.template import loaderfrom django.utils import translation-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import UserProfilediff --git a/wger/manager/models.py b/wger/manager/models.pyindex 168fe6e1b..6148130b6 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -33,7 +33,7 @@ from django.core.validators import ()from django.db import modelsfrom django.urls import reverse-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import (diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.htmlindex c56bb7273..075b52718 100644--- a/wger/manager/templates/calendar/day.html+++ b/wger/manager/templates/calendar/day.html@@ -6,10 +6,10 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Workout log' %}">+ <meta property="og:title" content="{% translate 'Workout log' %}">{% with username=owner_user.username %}- <meta property="og:description" content="{% blocktrans %}Workout log for {{username}} for {{date}}{% endblocktrans %}">+ <meta property="og:description" content="{% blocktranslate %}Workout log for {{username}} for {{date}}{% endblocktranslate %}">{% endwith %}{% endblock %}@@ -28,7 +28,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Workout log" %} – {{date}}{% endblock %}+{% block title %}{% translate "Workout log" %} – {{date}}{% endblock %}{# #}@@ -50,10 +50,10 @@<td>{{log.reps}}{% if not log.repetition_unit.is_repetition %}- {% trans log.repetition_unit.name %}+ {% translate log.repetition_unit.name %}{% endif %}×- {{log.weight}} {% trans log.weight_unit.name %}+ {{log.weight}} {% translate log.weight_unit.name %}{% if is_owner %}<span class="dropdown">@@ -62,11 +62,11 @@</button><div class="dropdown-menu"><a href="{% url 'manager:log:edit' log.pk %}" class="wger-modal-dialog dropdown-item">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'manager:log:delete' log.pk %}" class="wger-modal-dialog dropdown-item">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>@@ -80,7 +80,7 @@{% endfor %}{% endfor %}{% else %}- {% trans "Nothing found" %}+ {% translate "Nothing found" %}{% endif %}{% endblock %}diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.htmlindex d653c419e..21dc231ca 100644--- a/wger/manager/templates/calendar/month.html+++ b/wger/manager/templates/calendar/month.html@@ -7,10 +7,10 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Calendar' %}">+ <meta property="og:title" content="{% translate 'Calendar' %}">{% with username=owner_user.username %}- <meta property="og:description" content="{% blocktrans %}Calendar for {{username}}{% endblocktrans %}">+ <meta property="og:description" content="{% blocktranslate %}Calendar for {{username}}{% endblocktranslate %}">{% endwith %}{% endblock %}@@ -18,7 +18,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Calendar" %}{% endblock %}+{% block title %}{% translate "Calendar" %}{% endblock %}{# #}@@ -50,7 +50,7 @@ $(document).ready(function() {<h3>{{date}}<small>- <a href="{% url 'manager:workout:calendar-day' owner_user date.year date.month date.day %}">{% trans 'Detail page' %}</a>+ <a href="{% url 'manager:workout:calendar-day' owner_user date.year date.month date.day %}">{% translate 'Detail page' %}</a></small></h3>@@ -71,10 +71,10 @@ $(document).ready(function() {<li class="list-group-item">{{log.reps}}{% if not log.repetition_unit.is_repetition %}- {% trans log.repetition_unit.name %}+ {% translate log.repetition_unit.name %}{% endif %}×- {{log.weight}} {% trans log.weight_unit.name %}+ {{log.weight}} {% translate log.weight_unit.name %}{% if is_owner %}<div class="dropdown float-right">@@ -82,11 +82,11 @@ $(document).ready(function() {</button><div class="dropdown-menu dropdown-menu-right" role="menu"><a href="{% url 'manager:log:edit' log.pk %}" class="wger-modal-dialog dropdown-item">- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'manager:log:delete' log.pk %}" class="wger-modal-dialog dropdown-item">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>@@ -112,38 +112,38 @@ $(document).ready(function() {<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans 'Add log to day' %}</h4>+ <h4 class="modal-title">{% translate 'Add log to day' %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">{% if current_workout %}- <p>{% blocktrans %}Click to add weight logs to a training-day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</strong></p>+ <p>{% blocktranslate %}Click to add weight logs to a training+day in your current workout:{% endblocktranslate %} <strong>{{current_workout}}</strong></p>{% for day in current_workout.day_set.all %}<a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-light">{{day.description}}</a>{% endfor %}{% else %}- <p><em>{% trans "No workouts found." %}</em></p>+ <p><em>{% translate "No workouts found." %}</em></p><p><a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-light"><span class="{% fa_class 'plus' %}"></span>- {% trans "Add one now." %}+ {% translate "Add one now." %}</a></p>{% endif %}</div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div></div>-<h4>{% trans 'Info' %}</h4>-<p>{% blocktrans %}The coloured days in the calendar have weight logs,-you can click on them to see the details.{% endblocktrans %}</p>+<h4>{% translate 'Info' %}</h4>+<p>{% blocktranslate %}The coloured days in the calendar have weight logs,+you can click on them to see the details.{% endblocktranslate %}</p><p><span style="background-color: #C9302C; display: inline;"> </span> {{ impressions.0.1 }}<br>@@ -154,7 +154,7 @@ you can click on them to see the details.{% endblocktrans %}</p><p><a href="{% url 'manager:workout:calendar' owner_user %}"><span class="{% fa_class 'calendar' %}"></span>- {% trans "Go to current month" %}</a>+ {% translate "Go to current month" %}</a></p>@@ -185,7 +185,7 @@ you can click on them to see the details.{% endblocktrans %}</p>{% block options %}{% if is_owner %}<a href="#" id="calendar-day-select-link" data-toggle="modal" data-target="#ecalendar-day-select-popup" class="btn btn-success btn-sm">- {% trans "Add new log" %}+ {% translate "Add new log" %}</a>{% endif %}{% endblock %}diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.htmlindex 1746d26f0..4de9c0c86 100644--- a/wger/manager/templates/calendar/partial_overview_table.html+++ b/wger/manager/templates/calendar/partial_overview_table.html@@ -2,35 +2,35 @@<div class="btn-group btn-group-justified" role="group"><a href="{{value.workout.get_absolute_url}}" class="btn btn-link">{{ value.workout }}</a>- <a href="{% url 'manager:log:log' value.workout.id %}" class="btn btn-link">{% trans "Log overview" %}</a>+ <a href="{% url 'manager:log:log' value.workout.id %}" class="btn btn-link">{% translate "Log overview" %}</a>{% if is_owner %}{% if value.session %}<div class="btn-group"><div class="btn-group" role="group"><button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- {% trans "Workout session" %}+ {% translate "Workout session" %}<span class="caret"></span></button><div class="dropdown-menu"><a href="{% url 'manager:session:edit' value.session.pk %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit-o' %}"></span>- {% trans "Edit" %}+ {% translate "Edit" %}</a><div class="dropdown-divider"></div><a href="{% url 'manager:session:delete' value.session.pk %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a><a href="{% url 'manager:session:delete' value.session.pk 'logs' %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete with logs" %}+ {% translate "Delete with logs" %}</a></div></div></div>{% else %}- <a href="{% url 'manager:session:add' value.workout.id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-light btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ <a href="{% url 'manager:session:add' value.workout.id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-light btn-block wger-modal-dialog">{% translate "Add workout impression" %}</a>{% endif %}{% endif %}</div>@@ -39,7 +39,7 @@{% if value.session %}<table class="table" style="margin-top: 2em;"><tr>- <th style="width: 30%">{% trans "Time" %}</th>+ <th style="width: 30%">{% translate "Time" %}</th><td>{% if value.session.time_start %}{{value.session.time_start|time:"H:i"}} - {{value.session.time_end|time:"H:i"}}@@ -49,11 +49,11 @@</td></tr><tr>- <th>{% trans "General impression" %}</th>- <td>{% trans value.session.get_impression_display %}</td>+ <th>{% translate "General impression" %}</th>+ <td>{% translate value.session.get_impression_display %}</td></tr><tr>- <th>{% trans "Notes" %}</th>+ <th>{% translate "Notes" %}</th><td>{{value.session.notes|default:'-/-'}}</td></tr></table>diff --git a/wger/manager/templates/log/add.html b/wger/manager/templates/log/add.htmlindex d3a693769..4740a1b74 100644--- a/wger/manager/templates/log/add.html+++ b/wger/manager/templates/log/add.html@@ -17,7 +17,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "New weight log" %} – {{day.description}}{% endblock %}+{% block title %}{% translate "New weight log" %} – {{day.description}}{% endblock %}{# #}@@ -49,11 +49,11 @@ $(document).ready(function () {</label></div><div class="row">- <div class="col-2">{% trans "Amount" %}</div>- <div class="col-3">{% trans "Unit" %}</div>- <div class="col-2">{% trans "Weight" %}</div>- <div class="col-3">{% trans "Unit" %}</div>- <div class="col-2">{% trans "RiR" %}</div>+ <div class="col-2">{% translate "Amount" %}</div>+ <div class="col-3">{% translate "Unit" %}</div>+ <div class="col-2">{% translate "Weight" %}</div>+ <div class="col-3">{% translate "Unit" %}</div>+ <div class="col-2">{% translate "RiR" %}</div></div>{% for form in value.forms %}{% crispy form helper %}@@ -62,7 +62,7 @@ $(document).ready(function () {{% endfor %}{% endfor %}<div class="form-group">- <input type="submit" name="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Save' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></div></form>{% endblock %}@@ -72,8 +72,8 @@ $(document).ready(function () {{# Side bar #}{# #}{% block sidebar %}-<h4>{% trans "Info" %}</h4>-<p>{% blocktrans %}A new workout session (impression, notes, time) will+<h4>{% translate "Info" %}</h4>+<p>{% blocktranslate %}A new workout session (impression, notes, time) willbe created if there isn't already one for the selected date. If there is, it-will simply be edited. Weight entries are always added.{% endblocktrans %}</p>+will simply be edited. Weight entries are always added.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.htmlindex 222a7fcd8..10bddb9d5 100644--- a/wger/manager/templates/schedule/overview.html+++ b/wger/manager/templates/schedule/overview.html@@ -2,7 +2,7 @@{% load i18n %}{% load static %}-{% block title %}{% trans "Your schedules" %}{% endblock %}+{% block title %}{% translate "Your schedules" %}{% endblock %}{% block header %}@@ -16,7 +16,7 @@{% if schedule.is_active %}<span class="badge badge-pill badge-primary float-right">- {% trans "active" %}+ {% translate "active" %}</span>{% endif %}@@ -25,7 +25,7 @@</a>{% empty %}<a href="{% url 'manager:schedule:add' %}" class="list-group-item wger-modal-dialog">- {% trans "No schedules found." %}<br>{% trans "Add one now." %}+ {% translate "No schedules found." %}<br>{% translate "Add one now." %}</a>{% endfor %}</div>@@ -33,21 +33,21 @@{% block sidebar %}-<p>{% blocktrans %}Schedules are collections of workouts that you do in-succession.{% endblocktrans %}</p>+<p>{% blocktranslate %}Schedules are collections of workouts that you do in+succession.{% endblocktranslate %}</p>-<p>{% blocktrans %}You can indicate how long you want to do each workout+<p>{% blocktranslate %}You can indicate how long you want to do each workoutbefore jumping to the next. It is also possible to create a loop, so you-always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.{% endblocktrans %}</p>+always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.{% endblocktranslate %}</p>-<p>{% blocktrans %}The currently active schedule will remain active (and be+<p>{% blocktranslate %}The currently active schedule will remain active (and beshown e.g. in your dashboard) till it reaches the last workout or till you-deactivate it, if it is a loop.{% endblocktrans %}</p>+deactivate it, if it is a loop.{% endblocktranslate %}</p>{% endblock %}{% block options %}<a href="{% url 'manager:schedule:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add schedule" %}+ {% translate "Add schedule" %}</a>{% endblock %}diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.htmlindex 914d4b82a..b79c6b027 100644--- a/wger/manager/templates/schedule/view.html+++ b/wger/manager/templates/schedule/view.html@@ -7,7 +7,7 @@{# #}{% block opengraph %}{{ block.super }}-<meta property="og:title" content="{% trans 'Schedule' %}">+<meta property="og:title" content="{% translate 'Schedule' %}"><meta property="og:description" content="{{ schedule }} / {{owner_user.username}}">{% endblock %}@@ -67,11 +67,11 @@{% block content %}<table class="table"><tr>- <th style="width: 30%;">{% trans "Start date" %}</th>+ <th style="width: 30%;">{% translate "Start date" %}</th><td>{{schedule.start_date}}</td></tr><tr>- <th>{% trans "Schedule active" %}</th>+ <th>{% translate "Schedule active" %}</th><td>{% if schedule.is_active %}<span class="{% fa_class 'check' %}"></span>@@ -81,11 +81,11 @@</td></tr><tr>- <th>{% trans "Is a loop" %}</th>+ <th>{% translate "Is a loop" %}</th><td>{% if schedule.is_loop %}<span class="{% fa_class 'check' %}"></span>- <small>{% trans "This schedule is a loop and will go through the workouts above till you deactivate it" %}</small>+ <small>{% translate "This schedule is a loop and will go through the workouts above till you deactivate it" %}</small>{% else %}<span class="{% fa_class 'times' %}"></span>{% endif %}@@ -98,12 +98,12 @@<table id="schedule-table" class="table" data-schedule="{{schedule.id}}"><thead><tr>- <th>{% trans "Nr." %}</th>+ <th>{% translate "Nr." %}</th>{% if is_owner %}- <th>{% trans "Actions" %}</th>+ <th>{% translate "Actions" %}</th>{% endif %}- <th>{% trans "Workout" %}</th>- <th>{% trans "Weeks" %}</th>+ <th>{% translate "Workout" %}</th>+ <th>{% translate "Weeks" %}</th></tr></thead><tbody>@@ -115,14 +115,14 @@{% if is_owner %}<td style="min-width: 6em;"><span class="editoptions">- <span title="{% trans 'Move me' %}" class="dragndrop-handle {% fa_class 'bars' %}"></span>+ <span title="{% translate 'Move me' %}" class="dragndrop-handle {% fa_class 'bars' %}"></span><a href="{% url 'manager:step:edit' step.id %}"- title="{% trans 'Edit' %}"+ title="{% translate 'Edit' %}"class="wger-modal-dialog"><span class="{% fa_class 'edit' %}"></span></a><a href="{% url 'manager:step:delete' step.id %}"- title="{% trans 'Delete' %}"+ title="{% translate 'Delete' %}"class="wger-modal-dialog"><span class="{% fa_class 'trash' %}"></span></a></span>@@ -131,7 +131,7 @@<td><a href="{{ step.workout.get_absolute_url }}">{{ step.workout }}</a>{% if active_workout == step %}- <span class="badge badge-info">{% trans "active" %}</span>+ <span class="badge badge-info">{% translate "active" %}</span>{% endif %}</td><td>@@ -143,7 +143,7 @@<tr><td colspan="4"><a href="{% url 'manager:step:add' schedule.id %}" class="wger-modal-dialog btn btn-block btn-light">- {% trans "No workouts found." %} {% trans "Add one now." %}+ {% translate "No workouts found." %} {% translate "Add one now." %}</a></td></tr>@@ -155,13 +155,13 @@{% if not schedule.is_active %}<a href="{% url 'manager:schedule:start' schedule.pk %}" class="btn btn-success btn-sm"><span class="{% fa_class 'play' %}"></span>- {% trans "Start schedule" %}+ {% translate "Start schedule" %}</a>{% endif %}<a href="{% url 'manager:step:add' schedule.id %}" class="wger-modal-dialog btn btn-light btn-sm"><span class="{% fa_class 'plus' %}"></span>- {% trans "Add workout" %}+ {% translate "Add workout" %}</a></td><td colspan="2">@@ -180,14 +180,14 @@<div class="card"><div class="card-body"><h4 class="card-title">- {% blocktrans count weeks=step.duration %}{{ weeks }} Week+ {% blocktranslate count weeks=step.duration %}{{ weeks }} Week{% plural %}{{ weeks }} Weeks- {% endblocktrans %}+ {% endblocktranslate %}</h4><span class="card-text">{% if active_workout == step %}- <span class="badge badge-pill badge-primary">{% trans "active" %}</span><br>+ <span class="badge badge-pill badge-primary">{% translate "active" %}</span><br>{% endif %}<span>{{step_dates.0}} <br> {{step_dates.1}}</span></span>@@ -217,33 +217,33 @@{% block sidebar %}{% if is_owner %}-<h4>{% trans "Adding workouts" %}</h4>+<h4>{% translate "Adding workouts" %}</h4>-<p>{% blocktrans %}Add as many workouts to the schedule as you want. You can+<p>{% blocktranslate %}Add as many workouts to the schedule as you want. You canedit the order by dragging and dropping them. It's also possible to add one workout more-than once.{% endblocktrans %}</p>+than once.{% endblocktranslate %}</p>{% endif %}<div class="modal fade" id="export-ical-popup"><div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans "Export calendar file" %}</h4>+ <h4 class="modal-title">{% translate "Export calendar file" %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">- <p>{% trans "Export this schedule as a calendar file." %}</p>- <p>{% blocktrans %}You can then import the file it into your calendar+ <p>{% translate "Export this schedule as a calendar file." %}</p>+ <p>{% blocktranslate %}You can then import the file it into your calendarapplication for example google calendar, outlook or iCal. This will create-an appointment for each training day with the appropriate exercises.{% endblocktrans %}</p>+an appointment for each training day with the appropriate exercises.{% endblocktranslate %}</p><p><a href="{% url 'manager:schedule:ical' schedule.id uid token %}" class="btn btn-block btn-light">- {% trans "Export calendar file" %}+ {% translate "Export calendar file" %}</a></p></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -253,7 +253,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans "Download as PDF" %}</h4>+ <h4 class="modal-title">{% translate "Download as PDF" %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">@@ -263,7 +263,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt</form></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -278,26 +278,26 @@ an appointment for each training day with the appropriate exercises.{% endblockt<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="#" data-toggle="modal" data-target="#export-ical-popup" class="dropdown-item"><span class="{% fa_class 'calendar' %}"></span>- {% trans "Export calendar file" %}+ {% translate "Export calendar file" %}</a><a data-toggle="modal" data-target="#download-pdf-popup" class="dropdown-item"><span class="{% fa_class 'download' %}"></span>- {% trans "Download as PDF" %}+ {% translate "Download as PDF" %}</a>{% if is_owner %}<a href="{% url 'manager:schedule:edit' schedule.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit schedule" %}+ {% translate "Edit schedule" %}</a><div role="separator" class="dropdown-divider"></div><a href="{% url 'manager:schedule:delete' schedule.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete schedule" %}+ {% translate "Delete schedule" %}</a>{% endif %}</div>diff --git a/wger/manager/templates/set/add.html b/wger/manager/templates/set/add.htmlindex b086b573a..1ac7bc889 100644--- a/wger/manager/templates/set/add.html+++ b/wger/manager/templates/set/add.html@@ -6,7 +6,7 @@Title-->-{% block title %}{% with day_name=day.description %}{% blocktrans %}Add exercises to day "{{day_name}}"{% endblocktrans %}{% endwith %}{% endblock %}+{% block title %}{% with day_name=day.description %}{% blocktranslate %}Add exercises to day "{{day_name}}"{% endblocktranslate %}{% endwith %}{% endblock %}<!--@@ -49,11 +49,11 @@ function wgerCustomPageInit()<div class="form-group"><label class="control-label">- {% trans "Repetitions" %}+ {% translate "Repetitions" %}</label>- <span class="form-text">{% blocktrans %}If you do the same repetitions for all sets,+ <span class="form-text">{% blocktranslate %}If you do the same repetitions for all sets,you can just enter one value: e.g. for 4 sets just enter one "10" for the repetitions, this-automatically becomes "4 x 10".{% endblocktrans %}</span>+automatically becomes "4 x 10".{% endblocktranslate %}</span></div><div class="form-group"><div id="formsets">@@ -65,7 +65,7 @@ automatically becomes "4 x 10".{% endblocktrans %}</span><div class="form-group">- <input type="submit" class="btn btn-primary btn-success btn-block" value="{% trans 'Save' %}">+ <input type="submit" class="btn btn-primary btn-success btn-block" value="{% translate 'Save' %}"></div></form>{% endblock %}diff --git a/wger/manager/templates/set/edit.html b/wger/manager/templates/set/edit.htmlindex e038abde2..6281e26c8 100644--- a/wger/manager/templates/set/edit.html+++ b/wger/manager/templates/set/edit.html@@ -7,7 +7,7 @@Title-->-{% block title %}{% trans "Edit set" %}{% endblock %}+{% block title %}{% translate "Edit set" %}{% endblock %}<!--Main Content@@ -22,6 +22,6 @@{% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset helper=helper %}{% endfor %}- <input type="submit" class="btn btn-primary btn-success btn-block" value="{% trans 'Update' %}">+ <input type="submit" class="btn btn-primary btn-success btn-block" value="{% translate 'Update' %}"></form>{% endblock %}diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.htmlindex b3bf7273d..ef632dbd7 100644--- a/wger/manager/templates/set/formset.html+++ b/wger/manager/templates/set/formset.html@@ -7,11 +7,11 @@{{ formset.management_form }}<div class="row">- <div class="col-2">{% trans "Reps" %}</div>- <div class="col-3">{% trans "Unit" %}</div>- <div class="col-2">{% trans "Weight" %}</div>- <div class="col-3">{% trans "Unit" %}</div>- <div class="col-2">{% trans "RiR" %}</div>+ <div class="col-2">{% translate "Reps" %}</div>+ <div class="col-3">{% translate "Unit" %}</div>+ <div class="col-2">{% translate "Weight" %}</div>+ <div class="col-3">{% translate "Unit" %}</div>+ <div class="col-2">{% translate "RiR" %}</div></div>{% for field in formset %}{% crispy field helper %}diff --git a/wger/manager/templates/workout/email_reminder.tpl b/wger/manager/templates/workout/email_reminder.tplindex 1f0252331..bed528ae9 100644--- a/wger/manager/templates/workout/email_reminder.tpl+++ b/wger/manager/templates/workout/email_reminder.tpl@@ -1,18 +1,18 @@{% spaceless %}{% load i18n %}{% if expired %}- {% blocktrans %}Your current workout '{{workout}}' expired {{days}} days ago.{% endblocktrans %}+ {% blocktranslate %}Your current workout '{{workout}}' expired {{days}} days ago.{% endblocktranslate %}{% else %}- {% blocktrans %}Your current workout '{{workout}}' is about to expire in {{days}} days.{% endblocktrans %}+ {% blocktranslate %}Your current workout '{{workout}}' is about to expire in {{days}} days.{% endblocktranslate %}{% endif %}{% endspaceless %}-{% blocktrans %}You will regularly receive such reminders till you add a new workout.+{% blocktranslate %}You will regularly receive such reminders till you add a new workout.Alternatively you can add workouts to a loop schedule, such schedules-never produce reminders.{% endblocktrans %}-{% blocktrans %}If you don't want to ever receive email reminders, deactivate the-option in your settings.{% endblocktrans %}+never produce reminders.{% endblocktranslate %}+{% blocktranslate %}If you don't want to ever receive email reminders, deactivate the+option in your settings.{% endblocktranslate %}-— {% blocktrans %}The {{ site }} team{% endblocktrans %}+— {% blocktranslate %}The {{ site }} team{% endblocktranslate %}* https://{{site}}{{workout.get_absolute_url}}diff --git a/wger/manager/templates/workout/email_weight_reminder.tpl b/wger/manager/templates/workout/email_weight_reminder.tplindex 2364db66d..d4c800044 100644--- a/wger/manager/templates/workout/email_weight_reminder.tpl+++ b/wger/manager/templates/workout/email_weight_reminder.tpl@@ -1,15 +1,15 @@{% spaceless %}{% load i18n %}-{% blocktrans %}Your last weight entry is from {{date}} ({{days}} days ago).-Please click the link to access the application and enter a new one.{% endblocktrans %}+{% blocktranslate %}Your last weight entry is from {{date}} ({{days}} days ago).+Please click the link to access the application and enter a new one.{% endblocktranslate %}{% endspaceless %}-{% blocktrans %}You will regularly receive such reminders till you enter your current weight.{% endblocktrans %}-{% blocktrans %}If you don't want to ever receive email reminders, deactivate the-option in your settings.{% endblocktrans %}+{% blocktranslate %}You will regularly receive such reminders till you enter your current weight.{% endblocktranslate %}+{% blocktranslate %}If you don't want to ever receive email reminders, deactivate the+option in your settings.{% endblocktranslate %}-— {% blocktrans %}The {{ site }} team{% endblocktrans %}+— {% blocktranslate %}The {{ site }} team{% endblocktranslate %}* https://{{site}}{% url 'weight:overview' user.username %}diff --git a/wger/manager/templates/workout/log.html b/wger/manager/templates/workout/log.htmlindex 97bc12ef5..f84935e07 100644--- a/wger/manager/templates/workout/log.html+++ b/wger/manager/templates/workout/log.html@@ -7,8 +7,8 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Weight log' %}">- <meta property="og:description" content="{% trans 'Weight log' %} / {{ workout }} / {{ owner_user.username }}">+ <meta property="og:title" content="{% translate 'Weight log' %}">+ <meta property="og:description" content="{% translate 'Weight log' %} / {{ workout }} / {{ owner_user.username }}">{% endblock %}@@ -26,7 +26,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Weight log for workout" %}{% endblock %}+{% block title %}{% translate "Weight log for workout" %}{% endblock %}{# #}@@ -42,7 +42,7 @@{% block content %}{% if workout.comment %}<p>- <strong>{% trans "Goal" %}:</strong> {{workout.comment}}+ <strong>{% translate "Goal" %}:</strong> {{workout.comment}}</p>{% endif %}@@ -52,7 +52,7 @@{% if is_owner %}<p><a href="{% url 'manager:day:log' day.obj.id %}" class="btn btn-success btn-sm">- {% trans 'Add weight log to this day' %}+ {% translate 'Add weight log to this day' %}</a></p>{% endif %}@@ -78,7 +78,7 @@{% else %}- <p><em>{% trans "No weight entries here." %}</em></p>+ <p><em>{% translate "No weight entries here." %}</em></p>{% endif %}{% endwith %}@@ -86,7 +86,7 @@{% empty%}<p>- <em>{% trans "No exercises for this day." %}</em>+ <em>{% translate "No exercises for this day." %}</em></p>{% endfor %}{% endfor %}@@ -98,16 +98,16 @@{# Side bar #}{# #}{% block sidebar %}-<h4>{% trans "Notes" %}</h4>-<p>{% blocktrans %}This page shows the weight logs belonging to this workout+<h4>{% translate "Notes" %}</h4>+<p>{% blocktranslate %}This page shows the weight logs belonging to this workoutonly. Click on an exercise to see all the historical data for-it.{% endblocktrans %}</p>+it.{% endblocktranslate %}</p>-<p>{% blocktrans %}If on a single day there is more than one entry with the+<p>{% blocktranslate %}If on a single day there is more than one entry with thesame number of repetitions, but different weights, only the entry with the-higher weight is shown in the diagram.{% endblocktrans %}</p>+higher weight is shown in the diagram.{% endblocktranslate %}</p>-<p>{% blocktrans %}Note that only entries with a weight unit (kg or lb) and+<p>{% blocktranslate %}Note that only entries with a weight unit (kg or lb) andrepetitions are charted, other combinations such as time or until failure-are ignored here.{% endblocktrans %}</p>+are ignored here.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.htmlindex 00ae82df7..dc0754417 100644--- a/wger/manager/templates/workout/overview.html+++ b/wger/manager/templates/workout/overview.html@@ -2,7 +2,7 @@{% load i18n %}{% load static %}-{% block title %}{% trans "Your workouts" %}{% endblock %}+{% block title %}{% translate "Your workouts" %}{% endblock %}{% block content %}@@ -13,7 +13,7 @@{% if workout == current_workout %}<span class="badge badge-primary float-right">- <em>{% trans "active" %}</em>+ <em>{% translate "active" %}</em></span>{% endif %}@@ -22,7 +22,7 @@</a>{% empty %}<a href="{% url 'manager:workout:add' %}" class="list-group-item">- {% trans "No workouts found." %}<br>{% trans "Add one now." %}+ {% translate "No workouts found." %}<br>{% translate "Add one now." %}</a>{% endfor %}</div>@@ -31,6 +31,6 @@{% block options %}<a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">- {% trans "Add workout" %}+ {% translate "Add workout" %}</a>{% endblock %}diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex 6adcd02ff..cdff28b2a 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -257,7 +257,7 @@ $(document).ready(function () {<div id="timer-container" style="position: relative; margin:0px; padding: 0px;"><ul id="workout-timer"><li class="timer-step" id="div-warmup" data-number="0">- <h2>{% trans "Your workout today" %}</h2>+ <h2>{% translate "Your workout today" %}</h2><div class="filler_div">{% for set in canonical_day.set_list %}@@ -268,7 +268,7 @@ $(document).ready(function () {</div><a class="next bottom_button wide_link btn btn-primary"- href="#">{% trans "Start!" %}</a>+ href="#">{% translate "Start!" %}</a></li>{% for step in step_list %}@@ -299,20 +299,20 @@ $(document).ready(function () {type="hidden"><div class="row"><div class="col-xs-6">- <label for="id-reps-{{step.current_step}}">{% trans "Repetitions" %}:</label>+ <label for="id-reps-{{step.current_step}}">{% translate "Repetitions" %}:</label><input name="reps"id="id-reps-{{step.current_step}}"- placeholder="{% trans 'Repetitions' %}"+ placeholder="{% translate 'Repetitions' %}"value="{{step.reps}}"type="number"autocomplete="off"class="form-control"></div><div class="col-xs-6">- <label for="id-weight-{{step.current_step}}">{% trans "Weight" %}:</label>+ <label for="id-weight-{{step.current_step}}">{% translate "Weight" %}:</label><input name="weight"id="id-weight-{{step.current_step}}"- placeholder="{% trans 'Weight' %}"+ placeholder="{% translate 'Weight' %}"value="{{step.weight|unlocalize}}"type="number"autocomplete="off"@@ -324,7 +324,7 @@ $(document).ready(function () {<select name="repetition_unit" id="id-repetition-unit-{{step.current_step}}" class="form-control">{% for unit in repetition_units %}<option value="{{ unit.pk }}" {% if unit.pk == step.rep_unit.pk %}selected="selected"{% endif %}>- {% trans unit.name %}+ {% translate unit.name %}</option>{% endfor %}</select>@@ -333,7 +333,7 @@ $(document).ready(function () {<select name="weight_unit" id="id-weight-unit-{{step.current_step}}" class="form-control">{% for unit in weight_units %}<option value="{{ unit.pk }}" {% if unit.pk == step.weight_unit.pk %}selected="selected"{% endif %}>- {% trans unit.name %}+ {% translate unit.name %}</option>{% endfor %}</select>@@ -354,7 +354,7 @@ $(document).ready(function () {{% if step.unit.id != 1 %}{{ step.unit }}{% else %}- {% trans "reps" %}+ {% translate "reps" %}{% endif %}{% endif %}</h2>@@ -363,12 +363,12 @@ $(document).ready(function () {<div class="row bottom_buttons"><div class="col-xs-6"><a class="next wide_link btn btn-light"- href="#"><!-- {% trans "Skip" %}--> <span class="glyphicon glyphicon-forward"></span>+ href="#"><!-- {% translate "Skip" %}--> <span class="glyphicon glyphicon-forward"></span></a></div><div class="col-xs-6"><a class="next save_log wide_link btn btn-success"- href="#">{% trans "Save" %} <span class="glyphicon glyphicon-save"></span></a>+ href="#">{% translate "Save" %} <span class="glyphicon glyphicon-save"></span></a></div></div>@@ -387,7 +387,7 @@ $(document).ready(function () {data-time="{{step.time}}"data-step="{{step.current_step}}"data-number="{{step.step_nr}}">- <h2>{% trans "Pause!" %}</h2>+ <h2>{% translate "Pause!" %}</h2><div style="width: 96%; text-align: center;"><canvas id="canvas-div-{{step.current_step}}" width="150" height="150"></canvas>@@ -412,7 +412,7 @@ $(document).ready(function () {<a class="next bottom_button wide_link btn btn-light"- href="#">{% trans "Skip" %} <span class="glyphicon glyphicon-forward"></span></a>+ href="#">{% translate "Skip" %} <span class="glyphicon glyphicon-forward"></span></a><div id="progress-{{step.current_step}}" class="progress-bar"><span style="width: {{step.step_percent|stringformat:'f'}}%;"></span>@@ -425,7 +425,7 @@ $(document).ready(function () {{# last page #}{# #}<li class="timer-step" id="workout-complete">- <h2>{% trans "Workout complete!" %}</h2>+ <h2>{% translate "Workout complete!" %}</h2><div class="filler_div"><form action="{{ form_action }}" id="session-form">@@ -440,13 +440,13 @@ $(document).ready(function () {<div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>- <h4 class="modal-title">{% trans "Info" %}</h4>+ <h4 class="modal-title">{% translate "Info" %}</h4></div><div class="modal-body">- {% trans session_form.notes.help_text %}+ {% translate session_form.notes.help_text %}</div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -458,7 +458,7 @@ $(document).ready(function () {data-toggle="modal"><span class="glyphicon glyphicon-asterisk"></span></a>- {% trans session_form.notes.label %}+ {% translate session_form.notes.label %}</label>{{ session_form.notes|form_field_add_css:'form-control' }}@@ -467,13 +467,13 @@ $(document).ready(function () {<div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>- <h4 class="modal-title">{% trans "Info" %}</h4>+ <h4 class="modal-title">{% translate "Info" %}</h4></div><div class="modal-body">- {% trans session_form.impression.help_text %}+ {% translate session_form.impression.help_text %}</div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -484,7 +484,7 @@ $(document).ready(function () {data-toggle="modal"><span class="glyphicon glyphicon-asterisk"></span></a>- {% trans session_form.impression.label %}+ {% translate session_form.impression.label %}</label>{{ session_form.impression|form_field_add_css:'form-control' }}@@ -497,19 +497,19 @@ $(document).ready(function () {</div><div class="sub_header">- <h2><strong>{% trans "Time" %}:</strong> <span id="total_time">MM:SS</span></h2>+ <h2><strong>{% translate "Time" %}:</strong> <span id="total_time">MM:SS</span></h2></div><div class="row bottom_buttons"><div class="col-xs-6"><a href="{% url 'core:dashboard' %}"- class="wide_link btn btn-light">{% trans "Dashboard" %}</a>+ class="wide_link btn btn-light">{% translate "Dashboard" %}</a></div><div class="col-xs-6"><a href=""id="save_button_form"class="wide_link btn btn-success">- {% trans "Save" %}+ {% translate "Save" %}<span class="glyphicon glyphicon-save"></span></a></div>diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex 620e059c1..905c1f445 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -8,7 +8,7 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Workout' %}">+ <meta property="og:title" content="{% translate 'Workout' %}"><meta property="og:description" content="{{ workout }} / {{owner_user.username}}">{% endblock %}@@ -16,7 +16,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Workout" %} – {{ workout.creation_date }}{% endblock %}+{% block title %}{% translate "Workout" %} – {{ workout.creation_date }}{% endblock %}{# #}@@ -65,11 +65,11 @@ $(document).ready(function () {{% if is_owner %}<p>- <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog btn btn-link btn-block">{% trans "Add training day" %}</a>+ <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog btn btn-link btn-block">{% translate "Add training day" %}</a><!--|- <a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% trans "Show/Hide exercise comments" %}</a>+ <a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% translate "Show/Hide exercise comments" %}</a>--></p>{% endif %}@@ -81,19 +81,19 @@ $(document).ready(function () {{# Side bar #}{# #}{% block sidebar %}-<h4>{% trans "Steps" %}</h4>+<h4>{% translate "Steps" %}</h4><ol>- <li>{% trans "Add training days" %}</li>- <li>{% trans "Add workout sets to days" %}</li>- <li>{% trans "Set the repetitions for each set" %}</li>+ <li>{% translate "Add training days" %}</li>+ <li>{% translate "Add workout sets to days" %}</li>+ <li>{% translate "Set the repetitions for each set" %}</li></ol>-<h4>{% trans "Muscles trained" %}</h4>+<h4>{% translate "Muscles trained" %}</h4><p>- {% trans "Images show combined muscles as trained by the exercises on the workout." %}+ {% translate "Images show combined muscles as trained by the exercises on the workout." %}</p><div class="row">@@ -110,22 +110,22 @@ $(document).ready(function () {<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans "Export calendar file" %}</h4>+ <h4 class="modal-title">{% translate "Export calendar file" %}</h4><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">- <p>{% trans "Export this workout as a calendar file." %}</p>- <p>{% blocktrans %}You can then import the file it into your calendar+ <p>{% translate "Export this workout as a calendar file." %}</p>+ <p>{% blocktranslate %}You can then import the file it into your calendarapplication for example google calendar, outlook or iCal. This will create-an appointment for each training day with the appropriate exercises.{% endblocktrans %}</p>+an appointment for each training day with the appropriate exercises.{% endblocktranslate %}</p><p><a href="{% url 'manager:workout:ical' workout.id uid token %}" class="btn btn-block btn-light">- {% trans "Export calendar file" %}+ {% translate "Export calendar file" %}</a></p></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div>@@ -135,7 +135,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h4 class="modal-title">{% trans "Download as PDF" %}</h4>+ <h4 class="modal-title">{% translate "Download as PDF" %}</h4><button type="button" class="close float-right" data-dismiss="modal" aria-hidden="true">×</button></div><div class="modal-body">@@ -144,46 +144,46 @@ an appointment for each training day with the appropriate exercises.{% endblockt<div class="form-group form-check-inline"><input type="radio" name="pdf_type" class="form-check-input" id="id_type_log" value="log" checked><label class="form-check-label" for="id_type_log">- {% trans "Log" %}+ {% translate "Log" %}</label></div><div class="form-group form-check-inline"><input type="radio" name="pdf_type" id="id_type_table" class="form-check-input" value="table"><label class="form-check-label" for="id_type_table">- {% trans "Table" %}+ {% translate "Table" %}</label></div><div class="form-group form-check"><input type="checkbox" class="form-check-input" name="images" id="id_images" checked><label for="id_images" class="form-check-label">- {% trans "with images" %}+ {% translate "with images" %}</label></div><div class="form-group form-check"><input type="checkbox" class="form-check-input" name="comments" id="id_comments" checked><label for="id_comments" class="form-check-label">- {% trans "with comments" %}+ {% translate "with comments" %}</label></div></form><p><a href="" class="btn btn-block btn-light" id="download-pdf-button">- {% trans "Download" %}+ {% translate "Download" %}</a></p></div><div class="modal-footer">- <button type="button" class="btn btn-light" data-dismiss="modal">{% trans "Close" %}</button>+ <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button></div></div></div></div>{% if workout.canonical_representation.day_list %}-<h4>{% trans "Logs" %}</h4>+<h4>{% translate "Logs" %}</h4><p>- <a href="{% url 'manager:log:log' workout.id %}">{% trans 'View logs' %}</a>+ <a href="{% url 'manager:log:log' workout.id %}">{% translate 'View logs' %}</a></p>{% endif %}@@ -199,32 +199,32 @@ an appointment for each training day with the appropriate exercises.{% endblockt<div class="btn-group" role="group"><button id="btnGroupWorkout" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu" aria-labelledby="btnGroupWorkout">{% if is_owner %}<a href="{% url 'manager:workout:edit' workout.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit workout" %}+ {% translate "Edit workout" %}</a>{% endif %}<a class="dropdown-item" data-toggle="modal" data-target="#download-pdf-popup"><span class="{% fa_class 'download' %}"></span>- {% trans "Download as PDF" %}+ {% translate "Download as PDF" %}</a><a class="dropdown-item" data-toggle="modal" data-target="#export-ical-popup"><span class="{% fa_class 'calendar' %}"></span>- {% trans "Export calendar file" %}+ {% translate "Export calendar file" %}</a><a href="{% url 'manager:workout:copy' workout.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'clone' %}"></span>- {% trans "Make a copy of this workout" %}+ {% translate "Make a copy of this workout" %}</a>{% if is_owner %}<div class="dropdown-divider"></div><a href="{% url 'manager:workout:delete' workout.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a>{% endif %}</div>diff --git a/wger/manager/views/day.py b/wger/manager/views/day.pyindex ef6873f21..b0a762cf4 100644--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@ -27,8 +27,8 @@ from django.shortcuts import ()from django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -106,7 +106,7 @@ class DayCreateView(DayView, CreateView):Generic view to add a new exercise day"""- title = ugettext_lazy('Add workout day')+ title = gettext_lazy('Add workout day')owner_object = {'pk': 'workout_pk', 'class': Workout}def form_valid(self, form):diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 7356fea31..ba103060f 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -35,8 +35,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (DeleteView,@@ -106,7 +106,7 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):'weight','weight_unit')success_url = reverse_lazy('manager:workout:calendar')- title = ugettext_lazy('Delete workout log')+ title = gettext_lazy('Delete workout log')def add(request, pk):diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.pyindex f51ea284d..735868244 100644--- a/wger/manager/views/pdf.py+++ b/wger/manager/views/pdf.py@@ -23,7 +23,7 @@ from django.http import (HttpResponseForbidden)from django.shortcuts import get_object_or_404-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom reportlab.lib.pagesizes import A4diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.pyindex 477d6be9a..6aa728f2c 100644--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@ -35,8 +35,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -274,7 +274,7 @@ class ScheduleCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):model = Schedulefields = ('name', 'start_date', 'is_active', 'is_loop')success_url = reverse_lazy('manager:schedule:overview')- title = ugettext_lazy('Create schedule')+ title = gettext_lazy('Create schedule')def form_valid(self, form):"""set the submitter"""@@ -293,7 +293,7 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):model = Schedulefields = ('name', 'start_date', 'is_active', 'is_loop')success_url = reverse_lazy('manager:schedule:overview')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):"""diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.pyindex 3129ac455..63f7fe709 100644--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@ -26,8 +26,8 @@ from django.forms import ()from django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -57,7 +57,7 @@ class StepCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):model = ScheduleStepfields = ('schedule', 'workout', 'duration', 'order')- title = ugettext_lazy('Add workout')+ title = gettext_lazy('Add workout')def get_form_class(self):"""@@ -96,7 +96,7 @@ class StepEditView(WgerFormMixin, UpdateView, PermissionRequiredMixin):"""model = ScheduleStep- title = ugettext_lazy('Edit workout')+ title = gettext_lazy('Edit workout')def get_form_class(self):"""@@ -126,7 +126,7 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):model = ScheduleStepfields = ('workout', 'duration', 'order')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_success_url(self):return reverse('manager:schedule:view', kwargs={'pk': self.object.schedule.id})diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 26854d93f..fa8830090 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -38,8 +38,8 @@ from django.urls import ()from django.utils.text import slugifyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (DeleteView,@@ -219,7 +219,7 @@ class WorkoutDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):model = Workoutfields = ('comment',)success_url = reverse_lazy('manager:workout:overview')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):context = super(WorkoutDeleteView, self).get_context_data(**kwargs)diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pyindex ca376487e..f8fd30be5 100644--- a/wger/manager/views/workout_session.py+++ b/wger/manager/views/workout_session.py@@ -29,8 +29,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -137,7 +137,7 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):model = WorkoutSessionfields = ('date', 'notes', 'impression', 'time_start', 'time_end')success_url = reverse_lazy('manager:workout:overview')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def delete(self, request, *args, **kwargs):"""diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex ca8163364..ec1e6f7dd 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -21,8 +21,8 @@ import loggingfrom django import formsfrom django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)# Third Party@@ -55,11 +55,11 @@ class UnitChooserForm(forms.Form):A small form to select an amount and a unit for an ingredient"""amount = forms.DecimalField(decimal_places=2,- label=ugettext_lazy("Amount"),+ label=gettext_lazy("Amount"),max_digits=5,localize=True)unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),- label=ugettext_lazy("Unit"),+ label=gettext_lazy("Unit"),empty_label="g",required=False)@@ -214,7 +214,7 @@ class MealItemForm(forms.ModelForm):widget=forms.HiddenInput)ingredient_searchfield = forms.CharField(required=False,- label=ugettext_lazy("Ingredient"))+ label=gettext_lazy("Ingredient"))class Meta:model = MealItemdiff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 789e83145..b325df594 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -40,7 +40,7 @@ from django.utils import (translation)from django.utils.text import slugify-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import Languagediff --git a/wger/nutrition/templates/bmi/form.html b/wger/nutrition/templates/bmi/form.htmlindex fe8deb1d6..e928df423 100644--- a/wger/nutrition/templates/bmi/form.html+++ b/wger/nutrition/templates/bmi/form.html@@ -47,7 +47,7 @@ $(document).ready(function () {<!--Title-->-{% block title %}{% trans "BMI calculator" %}{% endblock %}+{% block title %}{% translate "BMI calculator" %}{% endblock %}<!--@@ -59,8 +59,8 @@ $(document).ready(function () {<div id="bmi-result-container" style="display:none;">- <h3>{% trans 'Results' %}</h3>- <p>{% trans 'Your BMI is: ' %} <strong><span id="bmi-result-value">{{user.userprofile.calculate_bmi|floatformat:1}}</span></strong></p>+ <h3>{% translate 'Results' %}</h3>+ <p>{% translate 'Your BMI is: ' %} <strong><span id="bmi-result-value">{{user.userprofile.calculate_bmi|floatformat:1}}</span></strong></p></div>@@ -68,39 +68,39 @@ $(document).ready(function () {<div id="bmi-chart"></div>-<h4>{% trans "Legend" %}</h4>+<h4>{% translate "Legend" %}</h4><div class="table"><div><div><div class="bmi-legend" style="background-color:#800000;"> </div></div>- <div>{% trans "Adipositas III" %}</div>+ <div>{% translate "Adipositas III" %}</div></div><div><div><div class="bmi-legend" style="background-color:#ff0000;"> </div></div>- <div>{% trans "Adipositas II" %}</div>+ <div>{% translate "Adipositas II" %}</div></div><div><div><div class="bmi-legend" style="background-color:#ff7f2a;"> </div></div>- <div>{% trans "Adipositas I" %}</div>+ <div>{% translate "Adipositas I" %}</div></div><div><div><div class="bmi-legend" style="background-color:#ffff00;"> </div></div>- <div>{% trans "Overweight" %}</div>+ <div>{% translate "Overweight" %}</div></div><div><div><div class="bmi-legend" style="background-color:#00ff00;"> </div></div>- <div>{% trans "Normal weight" %}</div>+ <div>{% translate "Normal weight" %}</div></div><div><div><div class="bmi-legend" style="background-color:#00ffff;"> </div></div>- <div>{% trans "Slight underweight" %}</div>+ <div>{% translate "Slight underweight" %}</div></div><div><div><div class="bmi-legend" style="background-color:#0000ff;"> </div></div>- <div>{% trans "Moderate underweight" %}</div>+ <div>{% translate "Moderate underweight" %}</div></div><div><div><div class="bmi-legend" style="background-color:#000080;"> </div></div>- <div>{% trans "Strong underweight" %}</div>+ <div>{% translate "Strong underweight" %}</div></div></div>@@ -114,9 +114,9 @@ $(document).ready(function () {{% block sidebar %}<h4>Info</h4><p>-{% blocktrans %}Use the form to calculate your BMI (Body Mass Index).+{% blocktranslate %}Use the form to calculate your BMI (Body Mass Index).If you have entered data in the weight section, the last entry willbe used automatically. Otherwise the weight you enter here will be saved-in a new entry.{% endblocktrans %}+in a new entry.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/nutrition/templates/ingredient/email_new.tpl b/wger/nutrition/templates/ingredient/email_new.tplindex 8e410f46f..4da0de338 100644--- a/wger/nutrition/templates/ingredient/email_new.tpl+++ b/wger/nutrition/templates/ingredient/email_new.tpl@@ -1,9 +1,9 @@-{% load i18n %}{% blocktrans %}Your ingredient '{{ingredient}}' was successfully added to the general-database.{% endblocktrans %}+{% load i18n %}{% blocktranslate %}Your ingredient '{{ingredient}}' was successfully added to the general+database.{% endblocktranslate %}-{% blocktrans %}It is now available on the ingredient overview and can be-added to nutrition plans. You can access it on this address:{% endblocktrans %}+{% blocktranslate %}It is now available on the ingredient overview and can be+added to nutrition plans. You can access it on this address:{% endblocktranslate %}{{url}}-{% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}-— {% blocktrans %}The {{ site }} team{% endblocktrans %}+{% blocktranslate %}Thank you for contributing and making this site better!{% endblocktranslate %}+— {% blocktranslate %}The {{ site }} team{% endblocktranslate %}diff --git a/wger/nutrition/templates/ingredient/form.html b/wger/nutrition/templates/ingredient/form.htmlindex cc1f008ae..79728ae06 100644--- a/wger/nutrition/templates/ingredient/form.html+++ b/wger/nutrition/templates/ingredient/form.html@@ -1,12 +1,12 @@{% load i18n %}{% if not perms.exercises %}-<h4>{% trans "Submitting an ingredient" %}</h4>-<p><strong>{% blocktrans %}Thank you for submitting an ingredient. This is much-appreciated!{% endblocktrans %}</strong></p>+<h4>{% translate "Submitting an ingredient" %}</h4>+<p><strong>{% blocktranslate %}Thank you for submitting an ingredient. This is much+appreciated!{% endblocktranslate %}</strong></p>-<p>{% blocktrans %}After you submit the form, the administrators will be notified.+<p>{% blocktranslate %}After you submit the form, the administrators will be notified.Once it is reviewed, it will be added to the database. Till this happens,it will not be visible in the overview or the search. In case you added your email-when you registered, you will get notified when the process is completed sucessfully.{% endblocktrans %}</p>-{% endif %}\ No newline at end of file+when you registered, you will get notified when the process is completed sucessfully.{% endblocktranslate %}</p>+{% endif %}diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.htmlindex 0eb0336d2..0bc2fd7cb 100644--- a/wger/nutrition/templates/ingredient/overview.html+++ b/wger/nutrition/templates/ingredient/overview.html@@ -26,7 +26,7 @@</script>{% endblock %}-{% block title %}{% trans "Ingredient overview" %}{% endblock %}+{% block title %}{% translate "Ingredient overview" %}{% endblock %}{% block content %}@@ -42,7 +42,7 @@<p><a href="{% url 'nutrition:ingredient:add' %}"class="btn btn-light btn-block">- {% trans "No ingredients." %} {% trans "Add one now." %}+ {% translate "No ingredients." %} {% translate "Add one now." %}</a></p>{% endif %}@@ -54,7 +54,7 @@{% block sidebar %}- <h4>{% trans "Search" %}</h4>+ <h4>{% translate "Search" %}</h4><form action="{% url 'ingredient-search' %}"method="get"id="search_form">@@ -63,7 +63,7 @@type="search"id="ingredient-search"class="ajax-form-element form-control"- placeholder="{% trans 'ingredient name' %}"+ placeholder="{% translate 'ingredient name' %}"style="width:100%;"></form>{% endblock %}@@ -76,13 +76,13 @@{% if user.is_authenticated and not user.userprofile.is_temporary %}<a href="{% url 'nutrition:ingredient:add' %}"class="btn btn-success btn-sm">- {% trans "Add ingredient" %}+ {% translate "Add ingredient" %}</a>{% else %}<a href="#" class="btn btn-success btn-sm disabled">- {% trans "Add ingredient" %}<br>+ {% translate "Add ingredient" %}<br><small>- {% trans "Only registered users can do this" %}+ {% translate "Only registered users can do this" %}</small></a>{% endif %}diff --git a/wger/nutrition/templates/ingredient/pending.html b/wger/nutrition/templates/ingredient/pending.htmlindex 652a294de..8ecff9708 100644--- a/wger/nutrition/templates/ingredient/pending.html+++ b/wger/nutrition/templates/ingredient/pending.html@@ -3,7 +3,7 @@{% load static %}{% load wger_extras %}-{% block title %}{% trans "Ingredients pending review" %}{% endblock %}+{% block title %}{% translate "Ingredients pending review" %}{% endblock %}{% block content %}@@ -11,9 +11,9 @@<table class="table"><thead><tr>- <th>{% trans "Submission date" %}</th>- <th>{% trans "Name" %}</th>- <th>{% trans "User" %}</th>+ <th>{% translate "Submission date" %}</th>+ <th>{% translate "Name" %}</th>+ <th>{% translate "User" %}</th></tr></thead><tbody>@@ -27,7 +27,7 @@</tr>{% empty %}<tr>- <td colspan="2">{% trans "Nothing found" %}</td>+ <td colspan="2">{% translate "Nothing found" %}</td></tr>{% endfor %}</tbody>diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.htmlindex 39e58afdd..2964a6737 100644--- a/wger/nutrition/templates/ingredient/view.html+++ b/wger/nutrition/templates/ingredient/view.html@@ -24,22 +24,22 @@ $(document).ready(function() {{% if ingredient.status == ingredient.STATUS_PENDING %}<div class="alert">-<h4>{% trans "Ingredient is pending review" %}</h4>-<p>{% blocktrans %}This user submitted ingredient is pending a decision to be+<h4>{% translate "Ingredient is pending review" %}</h4>+<p>{% blocktranslate %}This user submitted ingredient is pending a decision to beincluded in the database. Till then, it will not be shown in the overview or-the search.{% endblocktrans %}-{% if perms.nutrition.add_ingredient %}{% trans "Please select one of the options below." %}{% endif %}+the search.{% endblocktranslate %}+{% if perms.nutrition.add_ingredient %}{% translate "Please select one of the options below." %}{% endif %}</p>{% if perms.nutrition.add_ingredient %}<div class="btn-group btn-group-justified" role="group"><a href="{% url 'nutrition:ingredient:accept' ingredient.id %}" class="btn btn-light"><span class="{% fa_class 'check' %}"></span>- {% trans "Accept" %}+ {% translate "Accept" %}</a><a href="{% url 'nutrition:ingredient:decline' ingredient.id %}" class="btn btn-light"><span class="{% fa_class 'times' %}"></span>- {% trans "Decline" %}+ {% translate "Decline" %}</a></div>{% endif %} {# end check permissions #}@@ -68,53 +68,53 @@ the search.{% endblocktrans %}<thead><tr><th colspan="2">- {% trans "Macronutrients" %}+ {% translate "Macronutrients" %}</th></tr></thead><tbody><tr>- <td>{% trans "Energy" %}</td>+ <td>{% translate "Energy" %}</td><td itemprop="calories" class="text-right">- <span id="value-energy">{{ingredient.energy|floatformat:1}}</span> {% trans "kcal" %} /- <span id="value-energy-kjoule">{{ingredient.energy_kilojoule|floatformat:1}}</span> {% trans "kJ" %}+ <span id="value-energy">{{ingredient.energy|floatformat:1}}</span> {% translate "kcal" %} /+ <span id="value-energy-kjoule">{{ingredient.energy_kilojoule|floatformat:1}}</span> {% translate "kJ" %}</td></tr><tr>- <td>{% trans "Protein" %}</td>+ <td>{% translate "Protein" %}</td><td itemprop="proteinContent" class="text-right">- <span id="value-protein">{{ingredient.protein|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-protein">{{ingredient.protein|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}</td></tr><tr>- <td>{% trans "Carbohydrates" %}</td>+ <td>{% translate "Carbohydrates" %}</td><td itemprop="carbohydrateContent" class="text-right">- <span id="value-carbohydrates">{{ingredient.carbohydrates|floatformat}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-carbohydrates">{{ingredient.carbohydrates|floatformat}}</span> {% translate "g" context "weight unit, i.e. grams" %}</td></tr><tr>- <td class="pl-5">{% trans "Sugar content in carbohydrates" %}</td>+ <td class="pl-5">{% translate "Sugar content in carbohydrates" %}</td><td itemprop="sugarContent" class="text-right">{% if ingredient.carbohydrates_sugar %}- <span id="value-carbohydrates-sugar">{{ingredient.carbohydrates_sugar|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-carbohydrates-sugar">{{ingredient.carbohydrates_sugar|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}{% else %}- {% trans "n.A." %}+ {% translate "n.A." %}{% endif %}</td></tr><tr>- <td>{% trans "Fat" %}</td>+ <td>{% translate "Fat" %}</td><td itemprop="fatContent" class="text-right">- <span id="value-fat">{{ingredient.fat|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-fat">{{ingredient.fat|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}</td></tr><tr>- <td class="pl-5">{% trans "Saturated fat content in fats" %}</td>+ <td class="pl-5">{% translate "Saturated fat content in fats" %}</td><td itemprop="saturatedFatContent" class="text-right">{% if ingredient.fat_saturated %}- <span id="value-fat-saturated">{{ingredient.fat_saturated|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-fat-saturated">{{ingredient.fat_saturated|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}{% else %}- {% trans "n.A." %}+ {% translate "n.A." %}{% endif %}</td></tr>@@ -125,28 +125,28 @@ the search.{% endblocktrans %}<thead><tr><th colspan="2">- {% trans "Others" %}+ {% translate "Others" %}</th></tr></thead><tbody><tr>- <td>{% trans "Fibres" %}</td>+ <td>{% translate "Fibres" %}</td><td itemprop="fiberContent" class="text-right">{% if ingredient.fibres %}- <span id="value-fibres">{{ingredient.fibres|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-fibres">{{ingredient.fibres|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}{% else %}- {% trans "n.A." %}+ {% translate "n.A." %}{% endif %}</td></tr><tr>- <td>{% trans "Sodium" %}</td>+ <td>{% translate "Sodium" %}</td><td itemprop="sodiumContent" class="text-right">{% if ingredient.sodium %}- <span id="value-sodium">{{ingredient.sodium|floatformat:1}}</span> {% trans "g" context "weight unit, i.e. grams" %}+ <span id="value-sodium">{{ingredient.sodium|floatformat:1}}</span> {% translate "g" context "weight unit, i.e. grams" %}{% else %}- {% trans "n.A." %}+ {% translate "n.A." %}{% endif %}</td></tr>@@ -162,19 +162,19 @@ the search.{% endblocktrans %}{% if ingredient.status == ingredient.INGREDIENT_STATUS_ACCEPTED %}<div class="alert" style="margin-top:1em;">-<h4>{% trans "User submitted ingredient" %}</h4>+<h4>{% translate "User submitted ingredient" %}</h4>{% with username=ingredient.user.username %}-<p>{% blocktrans %}This exercise was submitted by <strong>{{username}}</strong>.{% endblocktrans %}+<p>{% blocktranslate %}This exercise was submitted by <strong>{{username}}</strong>.{% endblocktranslate %}{% endwith %}</div>{% endif %}{% if perms.nutrition.delete_ingredient %}-<h4>{% trans "Weight units" %}</h4>+<h4>{% translate "Weight units" %}</h4><p><a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add new weight unit" %}+ {% translate "Add new weight unit" %}</a></p>@@ -182,7 +182,7 @@ the search.{% endblocktrans %}<table class="table"><thead><tr>- <th>{% trans "Name" %}</th>+ <th>{% translate "Name" %}</th></tr></thead><tbody>@@ -195,8 +195,8 @@ the search.{% endblocktrans %}<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'nutrition:unit_ingredient:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>- <a href="{% url 'nutrition:unit_ingredient:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'nutrition:unit_ingredient:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>+ <a href="{% url 'nutrition:unit_ingredient:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div></td>@@ -223,20 +223,20 @@ the search.{% endblocktrans %}<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"- title="{% trans 'Edit ingredient' %}"+ title="{% translate 'Edit ingredient' %}"class="dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit ingredient' %}+ {% translate 'Edit ingredient' %}</a><div role="separator" class="dropdown-divider"></div><a href="{% url 'nutrition:ingredient:delete' ingredient.id %}"- title="{% trans 'Delete ingredient' %}" class="wger-modal-dialog dropdown-item" >+ title="{% translate 'Delete ingredient' %}" class="wger-modal-dialog dropdown-item" ><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>diff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.htmlindex be634772f..bd7795892 100644--- a/wger/nutrition/templates/log/detail.html+++ b/wger/nutrition/templates/log/detail.html@@ -4,7 +4,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Nutrition diary" %} - {{ date }}{% endblock %}+{% block title %}{% translate "Nutrition diary" %} - {{ date }}{% endblock %}@@ -28,17 +28,17 @@<table class="table table-condensed"><thead><tr>- <th>{% trans "Macronutrients" %}</th>- <th class="align-right">{% trans "Planned" %}</th>- <th class="align-right">{% trans "Logged" %}</th>- <th class="align-right">{% trans "Difference" %}</th>+ <th>{% translate "Macronutrients" %}</th>+ <th class="align-right">{% translate "Planned" %}</th>+ <th class="align-right">{% translate "Logged" %}</th>+ <th class="align-right">{% translate "Difference" %}</th></tr></thead><tbody><tr>- <td>{% trans "Energy" %}</td>- <td class="align-right">{{ nutritional_data.total.energy|floatformat:0 }} {% trans "kcal" %}</td>- <td class="align-right">{{ log_summary.energy|floatformat:0 }} {% trans "kcal" %}</td>+ <td>{% translate "Energy" %}</td>+ <td class="align-right">{{ nutritional_data.total.energy|floatformat:0 }} {% translate "kcal" %}</td>+ <td class="align-right">{{ log_summary.energy|floatformat:0 }} {% translate "kcal" %}</td><td class="align-right">{% with diff=nutritional_data.total.energy|minus:log_summary.energy %}{% if diff|is_positive %}@@ -49,7 +49,7 @@</td></tr><tr>- <td>{% trans "Protein" %}</td>+ <td>{% translate "Protein" %}</td><td class="align-right">{{ nutritional_data.total.protein|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.protein|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -62,7 +62,7 @@</td></tr><tr>- <td>{% trans "Carbohydrates" %}</td>+ <td>{% translate "Carbohydrates" %}</td><td class="align-right">{{ nutritional_data.total.carbohydrates|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.carbohydrates|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -75,7 +75,7 @@</td></tr><tr>- <td class="pl-4">{% trans "Sugar content in carbohydrates" %}</td>+ <td class="pl-4">{% translate "Sugar content in carbohydrates" %}</td><td class="align-right">{{ nutritional_data.total.carbohydrates_sugar|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.carbohydrates_sugar|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -88,7 +88,7 @@</td></tr><tr>- <td>{% trans "Fat" %}</td>+ <td>{% translate "Fat" %}</td><td class="align-right">{{ nutritional_data.total.fat|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.fat|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -101,7 +101,7 @@</td></tr><tr>- <td class="pl-4">{% trans "Saturated fat content in fats" %}</td>+ <td class="pl-4">{% translate "Saturated fat content in fats" %}</td><td class="align-right">{{ nutritional_data.total.fat_saturated|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.fat_saturated|floatformat:1 }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -116,10 +116,10 @@<tr>- <th colspan="4">{% trans "Others" %}</th>+ <th colspan="4">{% translate "Others" %}</th></tr><tr>- <td>{% trans "Fibres" %}</td>+ <td>{% translate "Fibres" %}</td><td class="align-right">{{ nutritional_data.total.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -132,7 +132,7 @@</td></tr><tr>- <td>{% trans "Sodium" %}</td>+ <td>{% translate "Sodium" %}</td><td class="align-right">{{ nutritional_data.total.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{ log_summary.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">@@ -147,13 +147,13 @@</tbody></table>-<h3>{% trans "Entries" %}</h3>+<h3>{% translate "Entries" %}</h3><table class="table table-condensed"><thead><tr>- <th>{% trans "Time" %}</th>- <th>{% trans "Ingredient" %}</th>- <th class="align-right">{% trans "Energy" %}</th>+ <th>{% translate "Time" %}</th>+ <th>{% translate "Ingredient" %}</th>+ <th class="align-right">{% translate "Energy" %}</th>{% if is_owner %}<th></th>{% endif %}@@ -167,24 +167,24 @@{% if entry.weight_unit %}{{ entry.amount|floatformat:"0" }} × {{ entry.weight_unit.unit.name }}{% else %}- {{ entry.amount|floatformat:"0" }}{% trans "g" %}+ {{ entry.amount|floatformat:"0" }}{% translate "g" %}{% endif %}{{ entry.ingredient }}<p class="small text-muted">- {% trans "Protein" %}: {{entry.get_nutritional_values.protein|floatformat:"1"}} <br>- {% trans "Carbohydrates" %}: {{entry.get_nutritional_values.carbohydrates|floatformat:"1"}} ({{entry.get_nutritional_values.carbohydrates_sugar|floatformat:"1"}})<br>- {% trans "Fat" %}: {{entry.get_nutritional_values.fat|floatformat:"1"}} ({{entry.get_nutritional_values.fat|floatformat:"1"}})<br>+ {% translate "Protein" %}: {{entry.get_nutritional_values.protein|floatformat:"1"}} <br>+ {% translate "Carbohydrates" %}: {{entry.get_nutritional_values.carbohydrates|floatformat:"1"}} ({{entry.get_nutritional_values.carbohydrates_sugar|floatformat:"1"}})<br>+ {% translate "Fat" %}: {{entry.get_nutritional_values.fat|floatformat:"1"}} ({{entry.get_nutritional_values.fat|floatformat:"1"}})<br>{% if entry.get_nutritional_values.fibres %}- {% trans "Fibres" %}: {{entry.get_nutritional_values.fibres|floatformat:"1"}}<br>+ {% translate "Fibres" %}: {{entry.get_nutritional_values.fibres|floatformat:"1"}}<br>{% endif %}{% if entry.get_nutritional_values.sodium %}- {% trans "Sodium" %}: {{entry.get_nutritional_values.sodium|floatformat:"1"}}<br>+ {% translate "Sodium" %}: {{entry.get_nutritional_values.sodium|floatformat:"1"}}<br>{% endif %}</p></td><td class="align-right">- {{ entry.get_nutritional_values.energy|floatformat:0 }} {% trans "kcal" %}+ {{ entry.get_nutritional_values.energy|floatformat:0 }} {% translate "kcal" %}</td>{% if is_owner %}<td>@@ -194,7 +194,7 @@<ul class="dropdown-menu dropdown-menu-right" role="menu"><li><a href="{% url 'nutrition:log:delete' entry.pk %}" class="wger-modal-dialog dropdown-item">- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></li></ul>diff --git a/wger/nutrition/templates/log/overview.html b/wger/nutrition/templates/log/overview.htmlindex 1c38128ed..4aab92c3e 100644--- a/wger/nutrition/templates/log/overview.html+++ b/wger/nutrition/templates/log/overview.html@@ -4,7 +4,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Nutrition diary" %} - {{ log_data.0.planned_calories|floatformat:0 }} {% trans "kcal" %}{% endblock %}+{% block title %}{% translate "Nutrition diary" %} - {{ log_data.0.planned_calories|floatformat:0 }} {% translate "kcal" %}{% endblock %}@@ -27,9 +27,9 @@<table class="table table-condensed"><thead><tr>- <th>{% trans "Date" %}</th>- <th class="align-right">{% trans "Logged" %}</th>- <th class="align-right">{% trans "Difference" %}</th>+ <th>{% translate "Date" %}</th>+ <th class="align-right">{% translate "Logged" %}</th>+ <th class="align-right">{% translate "Difference" %}</th></tr></thead><tbody>@@ -41,7 +41,7 @@</a></td><td class="align-right">- {{ entry.logged_calories|floatformat:0 }} {% trans "kcal" %}+ {{ entry.logged_calories|floatformat:0 }} {% translate "kcal" %}</td><td class="align-right">{{ entry.difference|floatformat:0 }}@@ -50,7 +50,7 @@{% empty %}<tr><td colspan="4">- <em>{% trans "nothing found" %}</em>+ <em>{% translate "nothing found" %}</em></td></tr>{% endfor %}diff --git a/wger/nutrition/templates/plan/overview.html b/wger/nutrition/templates/plan/overview.htmlindex 4c5389377..6685aa1ba 100644--- a/wger/nutrition/templates/plan/overview.html+++ b/wger/nutrition/templates/plan/overview.html@@ -2,7 +2,7 @@{% load i18n %}{% load static %}-{% block title %}{% trans "Your nutrition plans" %}{% endblock %}+{% block title %}{% translate "Your nutrition plans" %}{% endblock %}{% block content %}@@ -14,13 +14,13 @@<p class="list-group-item-heading h5">{{plan}}</p><p class="list-group-item-text">{{ plan.creation_date }} –- {{ plan.get_nutritional_values.total.energy|floatformat }} {% trans "kcal" %}+ {{ plan.get_nutritional_values.total.energy|floatformat }} {% translate "kcal" %}</p></a>{% empty %}<a href="{% url 'nutrition:plan:add' %}" class="list-group-item">- {% trans "No nutrition plans." %}<br>- {% trans "Add one now." %}+ {% translate "No nutrition plans." %}<br>+ {% translate "Add one now." %}</a>{% endfor %}</div>@@ -33,6 +33,6 @@{# #}{% block options %}<a href="{% url 'nutrition:plan:add' %}" class="btn btn-success btn-sm">- {% trans "Add nutrition plan" %}+ {% translate "Add nutrition plan" %}</a>{% endblock %}diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.htmlindex 42504241d..9fa511776 100644--- a/wger/nutrition/templates/plan/view.html+++ b/wger/nutrition/templates/plan/view.html@@ -8,7 +8,7 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Nutrition plan' %}">+ <meta property="og:title" content="{% translate 'Nutrition plan' %}"><meta property="og:description" content="{{ plan }} / {{owner_user.username}}">{% endblock %}@@ -16,7 +16,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Nutrition plan" %} – {{ plan.creation_date}}{% endblock %}+{% block title %}{% translate "Nutrition plan" %} – {{ plan.creation_date}}{% endblock %}{# #}@@ -50,18 +50,18 @@ function wgerCustomModalInit()<table class="table table-bordered"><thead><tr style="background: #E0E0E0;">- <th>{% trans "Meal" %}</th>- <th>{% trans "Contents" %}</th>- <th class="align-right">{% trans "Energy" %}</th>- <th class="align-right">{% trans "Protein" %}</th>- <th class="align-right">{% trans "Carbohydrates" %}</th>- <th class="align-right">{% trans "Fat" %}</th>+ <th>{% translate "Meal" %}</th>+ <th>{% translate "Contents" %}</th>+ <th class="align-right">{% translate "Energy" %}</th>+ <th class="align-right">{% translate "Protein" %}</th>+ <th class="align-right">{% translate "Carbohydrates" %}</th>+ <th class="align-right">{% translate "Fat" %}</th></tr></thead><tbody><tr><td colspan="2"></td>- <td class="align-right">{% trans 'kcal' %} / {% trans 'kJ' %}</td>+ <td class="align-right">{% translate 'kcal' %} / {% translate 'kJ' %}</td><td class="align-right">{% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{% trans_weight_unit 'g' owner_user %}</td>@@ -70,7 +70,7 @@ function wgerCustomModalInit()<tr><td {% if meal.mealitem_set.count %}rowspan="{{meal.mealitem_set.count|add:1}}"{% endif %}><strong>- {% trans "Nr."%} {{ forloop.counter }}+ {% translate "Nr."%} {{ forloop.counter }}{% if meal.time %} – {{meal.time|time:"H:i"}}{% endif %}</strong>@@ -80,20 +80,20 @@ function wgerCustomModalInit()<div class="dropdown-menu dropdown-menu-right" role="menu"><a href="{% url 'nutrition:log:log_meal' meal.id %}" class="dropdown-item"><span class="{% fa_class 'chart-line' %}"></span>- {% trans 'Log this meal' %}+ {% translate 'Log this meal' %}</a><a href="{% url 'nutrition:meal_item:add' meal.id %}" class="wger-modal-dialog edit-meal dropdown-item"><span class="{% fa_class 'plus' %}"></span>- {% trans 'Add ingredient to meal' %}+ {% translate 'Add ingredient to meal' %}</a><a href="{% url 'nutrition:meal:edit' meal.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'nutrition:meal:delete' meal.id %}" class="dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>@@ -113,12 +113,12 @@ function wgerCustomModalInit()<div class="dropdown-menu dropdown-menu-right" role="menu"><a href="{% url 'nutrition:meal_item:edit' item.id %}" class="wger-modal-dialog edit-meal edit-mealitem dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans 'Edit' %}+ {% translate 'Edit' %}</a><div class="dropdown-divider"></div><a href="{% url 'nutrition:meal_item:delete' item.id %}" class="delete-mealitem dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans 'Delete' %}+ {% translate 'Delete' %}</a></div></div>@@ -127,7 +127,7 @@ function wgerCustomModalInit()</span>{% endif %}</td>- <td class="align-right">{{item.get_nutritional_values.energy|floatformat:1}} /+ <td class="align-right">{{item.get_nutritional_values.energy|floatformat:1}} /{{item.get_nutritional_values.energy_kilojoule|floatformat:1}}</td><td class="align-right">{{item.get_nutritional_values.protein|floatformat:1}}</td><td class="align-right">{{item.get_nutritional_values.carbohydrates|floatformat:1}}</td>@@ -137,10 +137,10 @@ function wgerCustomModalInit(){% if is_owner %}<td colspan="6"><a href="{% url 'nutrition:meal_item:add' meal.id %}"- title="{% trans 'Add one now.' %}"+ title="{% translate 'Add one now.' %}"class="wger-modal-dialog edit-meal btn btn-link btn-block">- {% trans "No items for this meal." %}- {% trans "Add one now."%}+ {% translate "No items for this meal." %}+ {% translate "Add one now."%}</a></td>{% endif %}@@ -159,8 +159,8 @@ function wgerCustomModalInit()<tr><td colspan="6"><a href="{% url 'nutrition:meal:add' plan.id %}" class="wger-modal-dialog btn btn-link btn-block">- {% trans "No meals for this plan." %}- {% trans "Add one now." %}+ {% translate "No meals for this plan." %}+ {% translate "Add one now." %}</a></td></tr>@@ -170,13 +170,13 @@ function wgerCustomModalInit()<tr><td colspan="6" class="py-0"><a href="{% url 'nutrition:log:log_plan' plan.id %}"class="btn btn-link btn-block">- {% trans "Log this Plan" %}</a></td>+ {% translate "Log this Plan" %}</a></td></tr><tr><td colspan="6" class="py-0"><a href="{% url 'nutrition:meal:add' plan.id %}"class="wger-modal-dialog btn btn-link btn-block">- {% trans "Add a new meal" %}+ {% translate "Add a new meal" %}</a></td><tr>@@ -186,63 +186,63 @@ function wgerCustomModalInit()</div>-<h4>{% trans "Nutritional data" %}</h4>+<h4>{% translate "Nutritional data" %}</h4>{% if weight_entry %}<h6>- {% blocktrans with date=weight_entry.date weight=weight_entry.weight trimmed %}+ {% blocktranslate with date=weight_entry.date weight=weight_entry.weight trimmed %}Based on the weight entry dated {{date}} ({{weight}})- {% endblocktrans %}+ {% endblocktranslate %}</h6>{% endif %}<table class="table table-sm"><thead><tr>- <th>{% trans "Macronutrients" %}</th>- <th class="align-right">{% trans "Total" %}</th>- <th class="align-right">{% trans "Percent of energy" %}</th>+ <th>{% translate "Macronutrients" %}</th>+ <th class="align-right">{% translate "Total" %}</th>+ <th class="align-right">{% translate "Percent of energy" %}</th><th class="align-right">{% if owner_user.userprofile.use_metric %}- {% trans "g per body kg" %}+ {% translate "g per body kg" %}{% else %}- {% trans "oz per body lb" %}+ {% translate "oz per body lb" %}{% endif %}</th></tr></thead><tbody><tr>- <td>{% trans "Energy" %}</td>- <td class="align-right">{{nutritional_data.total.energy|floatformat:0}} {% trans "kcal" %} /- {{nutritional_data.total.energy_kilojoule|floatformat:0}} {% trans "kJ" %}</td>+ <td>{% translate "Energy" %}</td>+ <td class="align-right">{{nutritional_data.total.energy|floatformat:0}} {% translate "kcal" %} /+ {{nutritional_data.total.energy_kilojoule|floatformat:0}} {% translate "kJ" %}</td><td></td><td></td></tr><tr>- <td>{% trans "Protein" %}</td>+ <td>{% translate "Protein" %}</td><td class="align-right">{{nutritional_data.total.protein|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{nutritional_data.percent.protein|floatformat:1}} %</td><td class="align-right">{{nutritional_data.per_kg.protein|floatformat:2}}</td></tr><tr>- <td>{% trans "Carbohydrates" %}</td>+ <td>{% translate "Carbohydrates" %}</td><td class="align-right">{{nutritional_data.total.carbohydrates|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{nutritional_data.percent.carbohydrates|floatformat:1}} %</td><td class="align-right">{{nutritional_data.per_kg.carbohydrates|floatformat:2}}</td></tr><tr>- <td class="pl-4">{% trans "Sugar content in carbohydrates" %}</td>+ <td class="pl-4">{% translate "Sugar content in carbohydrates" %}</td><td class="align-right">{{nutritional_data.total.carbohydrates_sugar|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td><td></td><td></td></tr><tr>- <td>{% trans "Fat" %}</td>+ <td>{% translate "Fat" %}</td><td class="align-right">{{nutritional_data.total.fat|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td><td class="align-right">{{nutritional_data.percent.fat|floatformat:1}} %</td><td class="align-right">{{nutritional_data.per_kg.fat|floatformat:2}}</td></tr><tr>- <td class="pl-4">{% trans "Saturated fat content in fats" %}</td>+ <td class="pl-4">{% translate "Saturated fat content in fats" %}</td><td class="align-right">{{nutritional_data.total.fat_saturated|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td><td></td><td></td>@@ -250,16 +250,16 @@ function wgerCustomModalInit()<tr>- <th colspan="4">{% trans "Others" %}</th>+ <th colspan="4">{% translate "Others" %}</th></tr><tr>- <td>{% trans "Fibres" %}</td>+ <td>{% translate "Fibres" %}</td><td class="align-right">{{nutritional_data.total.fibres|floatformat}} {% trans_weight_unit 'g' owner_user %}</td><td></td><td></td></tr><tr>- <td>{% trans "Sodium" %}</td>+ <td>{% translate "Sodium" %}</td><td class="align-right">{{nutritional_data.total.sodium|floatformat}} {% trans_weight_unit 'g' owner_user %}</td><td></td><td></td>@@ -268,15 +268,15 @@ function wgerCustomModalInit()</table>-<h4>{% trans "Nutrition diary" %} - {{nutritional_data.total.energy|floatformat:0}}{% trans "kcal" %}</h4>+<h4>{% translate "Nutrition diary" %} - {{nutritional_data.total.energy|floatformat:0}}{% translate "kcal" %}</h4><div id="nutrition_diary_chart"></div><table class="table table-condensed"><thead><tr>- <th>{% trans "Date" %}</th>- <th class="align-right">{% trans "Logged" %}</th>- <th class="align-right">{% trans "Difference" %}</th>+ <th>{% translate "Date" %}</th>+ <th class="align-right">{% translate "Logged" %}</th>+ <th class="align-right">{% translate "Difference" %}</th></tr></thead><tbody>@@ -288,7 +288,7 @@ function wgerCustomModalInit()</a></td><td class="align-right">- {{ entry.logged_calories|floatformat:0 }} {% trans "kcal" %}+ {{ entry.logged_calories|floatformat:0 }} {% translate "kcal" %}</td><td class="align-right">{{ entry.difference|floatformat:0 }}@@ -297,14 +297,14 @@ function wgerCustomModalInit(){% empty %}<tr><td colspan="4">- <em>{% trans "nothing found" %}</em>+ <em>{% translate "nothing found" %}</em></td></tr>{% endfor %}{% if log_data %}<tr><td colspan="4">- <a href="{% url 'nutrition:log:overview' plan.pk %}" class="btn btn-link btn-block">{% trans "View complete nutrition log" %}</a>+ <a href="{% url 'nutrition:log:overview' plan.pk %}" class="btn btn-link btn-block">{% translate "View complete nutrition log" %}</a></td></tr>{% endif %}@@ -313,7 +313,7 @@ function wgerCustomModalInit(){% if is_owner %}<p>- <a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-success btn-sm wger-modal-dialog">{% trans "Add custom diary entry" %}</a>+ <a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-success btn-sm wger-modal-dialog">{% translate "Add custom diary entry" %}</a></p>{% endif %}{% endblock %}@@ -323,12 +323,12 @@ function wgerCustomModalInit(){# Side bar #}{# #}{% block sidebar %}-<h4>{% trans "Energy" %}</h4>+<h4>{% translate "Energy" %}</h4><table class="table table-sm" id="nutritional-data-energy"><thead><tr>- <th>{% trans "Energy" %}</th>- <th class="align-right">{{nutritional_data.total.energy|floatformat:0}} {% trans "kcal" %}</th>+ <th>{% translate "Energy" %}</th>+ <th class="align-right">{{nutritional_data.total.energy|floatformat:0}} {% translate "kcal" %}</th></tr></thead><tbody>@@ -336,9 +336,9 @@ function wgerCustomModalInit(){% if is_owner and owner_user.userprofile.calories and plan.has_goal_calories %}{% with total=plan.get_calories_approximation %}<tr class="table-{% if total == 1 %}default{% elif total == 2 %}success{% elif total == 3 %}warning{% elif total > 3 %}danger{% endif %}">- <td>{% trans "Goal" %}</td>+ <td>{% translate "Goal" %}</td><td class="align-right">- <strong>{{owner_user.userprofile.calories}} {% trans "kcal" %}</strong></td>+ <strong>{{owner_user.userprofile.calories}} {% translate "kcal" %}</strong></td></tr>{% endwith %}{% endif %}@@ -346,17 +346,17 @@ function wgerCustomModalInit()</table>{% if is_owner and plan.has_goal_calories %}- <p>{% blocktrans %}You have selected that this nutritional plan has a- goal amount of calories. Use the calculator or enter the value yourself.{% endblocktrans %}- <a href="{% url 'nutrition:calories:view' %}">{% trans "That's done here" %}</a>+ <p>{% blocktranslate %}You have selected that this nutritional plan has a+ goal amount of calories. Use the calculator or enter the value yourself.{% endblocktranslate %}+ <a href="{% url 'nutrition:calories:view' %}">{% translate "That's done here" %}</a></p>{% endif %}{% if language.short_name != 'en' and is_owner %}<p>- {% trans "If you find the ingredient list too short, you might want to activate the preference to also show English ingredients." %}- <a href="{% url 'core:user:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>.+ {% translate "If you find the ingredient list too short, you might want to activate the preference to also show English ingredients." %}+ <a href="{% url 'core:user:preferences' %}" id="ajax-english-ingredients">{% translate "That's done here" %}</a>.</p>{% endif %}{% endblock %}@@ -370,26 +370,26 @@ function wgerCustomModalInit()<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'nutrition:plan:export-pdf' plan.id uid token %}" target="_blank" class="dropdown-item"><span class="{% fa_class 'download' %}"></span>- {% trans "Download as PDF" %}+ {% translate "Download as PDF" %}</a>{% if is_owner %}<a href="{% url 'nutrition:plan:edit' plan.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit nutrition plan" %}+ {% translate "Edit nutrition plan" %}</a><a href="{% url 'nutrition:plan:copy' plan.id %}" class="dropdown-item"><span class="{% fa_class 'clone' %}"></span>- {% trans "Make a copy of this nutrition plan" %}+ {% translate "Make a copy of this nutrition plan" %}</a><div role="separator" class="divider"></div><a href="{% url 'nutrition:plan:delete' plan.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete nutrition plan" %}+ {% translate "Delete nutrition plan" %}</a>{% endif %}</div>diff --git a/wger/nutrition/templates/rate/form.html b/wger/nutrition/templates/rate/form.htmlindex 282e80b48..5fbb53eb0 100644--- a/wger/nutrition/templates/rate/form.html+++ b/wger/nutrition/templates/rate/form.html@@ -14,7 +14,7 @@ $(document).ready(function() {<!--Title-->-{% block title %}{% trans "Daily calories calculator" %}{% endblock %}+{% block title %}{% translate "Daily calories calculator" %}{% endblock %}<!--@@ -23,9 +23,9 @@ $(document).ready(function() {{% block content %}<h3>1 - {%trans "Basal metabolic rate" %}</h3>-<p>{% blocktrans %}The basal metabolic rate is the amount of energy expended daily+<p>{% blocktranslate %}The basal metabolic rate is the amount of energy expended dailyat rest. This is the minimum energy needed for the body to function, without any-additional physical activity.{% endblocktrans %}</p>+additional physical activity.{% endblocktranslate %}</p><form action="{% url 'nutrition:calories:bmr' %}"method="post"class="calories-autoform wger-form"@@ -34,7 +34,7 @@ additional physical activity.{% endblocktrans %}</p></form><div id="bmr-result-container" style="display:none;">- <p>{% trans 'Your basic metabolic rate is: ' %}+ <p>{% translate 'Your basic metabolic rate is: ' %}<strong><span id="bmr-result-value">{{user.userprofile.calculate_basal_metabolic_rate|floatformat:2}}</span></strong>@@ -45,9 +45,9 @@ additional physical activity.{% endblocktrans %}</p><h3>2 - {%trans "Physical activities" %}</h3>-<p>{% blocktrans %}The physical activity level (PAL) is a factor used to to express+<p>{% blocktranslate %}The physical activity level (PAL) is a factor used to to expressthe additional physical activity and is used to calculate the total energy-required per day.{% endblocktrans %}</p>+required per day.{% endblocktranslate %}</p><form action="{% url 'nutrition:calories:activities' %}"method="post"class="wger-form calories-autoform"@@ -56,16 +56,16 @@ required per day.{% endblocktrans %}</p></form><div id="activities-result-container" style="display:none;">- <p>{% trans 'Factor for daily activities: ' %} <strong><span id="activities-result-value">{{user.userprofile.calculate_activities|floatformat:2}}</span></strong></p>+ <p>{% translate 'Factor for daily activities: ' %} <strong><span id="activities-result-value">{{user.userprofile.calculate_activities|floatformat:2}}</span></strong></p></div>-<h3>3 - {% trans "Total daily calories" %}</h3>-<p>{% blocktrans %}The base caloric intake is the amount of calories your metabolism-needs based on your level of physical activity.{% endblocktrans %}</p>+<h3>3 - {% translate "Total daily calories" %}</h3>+<p>{% blocktranslate %}The base caloric intake is the amount of calories your metabolism+needs based on your level of physical activity.{% endblocktranslate %}</p><form action=""method="post"class="wger-form calories-autoform"@@ -73,21 +73,21 @@ needs based on your level of physical activity.{% endblocktrans %}</p>{% csrf_token %}<table class="table"><tr>- <td>{% trans "Basic caloric intake" %}</td>+ <td>{% translate "Basic caloric intake" %}</td><td><span id="id_base_calories"></span></td></tr><tr><td colspan="2">- <input type="submit" class="btn btn-light btn-block" value="{% trans 'Calculate basic caloric intake' %}" id="form-calculate-daily-calories">+ <input type="submit" class="btn btn-light btn-block" value="{% translate 'Calculate basic caloric intake' %}" id="form-calculate-daily-calories"></td></tr></table></form>-<p>{% blocktrans %}The total calories are the actual total calories per day. This+<p>{% blocktranslate %}The total calories are the actual total calories per day. Thismight include e.g. a surplus or deficit if you are bulking or cutting. Alternatively-you might just enter yourself the amount of calories if you know the value.{% endblocktrans %}+you might just enter yourself the amount of calories if you know the value.{% endblocktranslate %}</p><form action=""@@ -99,15 +99,15 @@ you might just enter yourself the amount of calories if you know the value.{% en{{ form_calories.calories|as_crispy_field }}<p>- <input type="submit" class="btn btn-light btn-block" value="{% trans 'Transfer basic intake to total daily calories' %}" id="form-transfer-calories">+ <input type="submit" class="btn btn-light btn-block" value="{% translate 'Transfer basic intake to total daily calories' %}" id="form-transfer-calories"></p><p>- <input type="submit" class="btn btn-light btn-block" value="{% trans 'Add additional calories to total daily calories' %}" id="add-calories-total">+ <input type="submit" class="btn btn-light btn-block" value="{% translate 'Add additional calories to total daily calories' %}" id="add-calories-total"></p><p>- <input type="submit" class="btn btn-light btn-block" value="{% trans 'Save total calories to profile' %}" id="form-update-calories">+ <input type="submit" class="btn btn-light btn-block" value="{% translate 'Save total calories to profile' %}" id="form-update-calories"></p></form>{% endblock %}@@ -117,8 +117,8 @@ you might just enter yourself the amount of calories if you know the value.{% en{# Side bar #}{# #}{% block sidebar %}-<h4>{% trans "Info" %}</h4>-<p>{% blocktrans %}Please note that these calculations can only be an+<h4>{% translate "Info" %}</h4>+<p>{% blocktranslate %}Please note that these calculations can only be anapproximation. If you base your nutrition plan on these values, observe-yourself for some weeks and change the total amount if needed.{% endblocktrans %}</p>+yourself for some weeks and change the total amount if needed.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.htmlindex 6d0a217b4..6a384ffb5 100644--- a/wger/nutrition/templates/units/list.html+++ b/wger/nutrition/templates/units/list.html@@ -3,7 +3,7 @@{% load static %}{% load wger_extras %}-{% block title %}{% trans "Ingredient weight units" %}{% endblock %}+{% block title %}{% translate "Ingredient weight units" %}{% endblock %}{% block content %}@@ -15,16 +15,16 @@<span class="{% fa_class 'cog' %}"></span></button><div class="dropdown-menu dropdown-menu-right" role="menu">- <a href="{% url 'nutrition:weight_unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>+ <a href="{% url 'nutrition:weight_unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a><div class="dropdown-divider"></div>- <a href="{% url 'nutrition:weight_unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ <a href="{% url 'nutrition:weight_unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a></div></div>{{unit.name}}</li>{% empty %}<li class="list-group-item">- {% trans "Nothing found" %}+ {% translate "Nothing found" %}</li>{% endfor %}</ul>@@ -41,6 +41,6 @@{# #}{% block options %}<a href="{% url 'nutrition:weight_unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add new weight unit" %}+ {% translate "Add new weight unit" %}</a>{% endblock %}diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.pyindex f55be50bb..a1fe023eb 100644--- a/wger/nutrition/views/ingredient.py+++ b/wger/nutrition/views/ingredient.py@@ -35,8 +35,8 @@ from django.shortcuts import ()from django.urls import reverse_lazyfrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -135,7 +135,7 @@ class IngredientDeleteView(WgerDeleteMixin,'sodium')template_name = 'delete.html'success_url = reverse_lazy('nutrition:ingredient:list')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')permission_required = 'nutrition.delete_ingredient'# Send some additional data to the template@@ -172,7 +172,7 @@ class IngredientCreateView(WgerFormMixin, CreateView):template_name = 'form.html'model = Ingredientform_class = IngredientForm- title = ugettext_lazy('Add a new ingredient')+ title = gettext_lazy('Add a new ingredient')def form_valid(self, form):diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex 03e67fd28..4128784f9 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -28,7 +28,7 @@ from django.shortcuts import (render)from django.urls import reverse-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import (CreateView,DeleteView@@ -209,7 +209,7 @@ class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):Delete a nutrition diary entry"""model = LogItem- title = ugettext_lazy('Delete?')+ title = gettext_lazy('Delete?')form_action_urlname = 'nutrition:log:delete'login_required = Truefields = ["comment", ]diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.pyindex c03094f0e..c667520a3 100644--- a/wger/nutrition/views/meal.py+++ b/wger/nutrition/views/meal.py@@ -24,7 +24,7 @@ from django.http import (HttpResponseRedirect)from django.shortcuts import get_object_or_404-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import (CreateView,UpdateView@@ -52,7 +52,7 @@ class MealCreateView(WgerFormMixin, CreateView):model = Mealfields = ['time']- title = ugettext_lazy('Add new meal')+ title = gettext_lazy('Add new meal')owner_object = {'pk': 'plan_pk', 'class': NutritionPlan}def form_valid(self, form):@@ -77,7 +77,7 @@ class MealEditView(WgerFormMixin, UpdateView):model = Mealfields = ['time']- title = ugettext_lazy('Edit meal')+ title = gettext_lazy('Edit meal')def get_success_url(self):return self.object.plan.get_absolute_url()diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.pyindex 1f2630a65..33c56d988 100644--- a/wger/nutrition/views/meal_item.py+++ b/wger/nutrition/views/meal_item.py@@ -25,7 +25,7 @@ from django.http import ()from django.shortcuts import get_object_or_404from django.urls import reverse-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import (CreateView,UpdateView@@ -109,7 +109,7 @@ class MealItemEditView(WgerFormMixin, UpdateView):model = MealItemform_class = MealItemFormcustom_js = 'wgerInitIngredientAutocompleter();'- title = ugettext_lazy('Edit meal item')+ title = gettext_lazy('Edit meal item')def get_success_url(self):return reverse('nutrition:plan:view', kwargs={'id': self.object.meal.plan.id})diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex 282a0e6b6..4ac88706e 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -34,8 +34,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (DeleteView,@@ -118,7 +118,7 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):model = NutritionPlanfields = ('description', 'has_goal_calories')success_url = reverse_lazy('nutrition:plan:overview')- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):"""diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.pyindex e8c73ceba..2e765c5ca 100644--- a/wger/nutrition/views/unit.py+++ b/wger/nutrition/views/unit.py@@ -27,8 +27,8 @@ from django.urls import (reverse_lazy)from django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -81,7 +81,7 @@ class WeightUnitCreateView(WgerFormMixin,model = WeightUnitfields = ['name']- title = ugettext_lazy('Add new weight unit')+ title = gettext_lazy('Add new weight unit')permission_required = 'nutrition.add_ingredientweightunit'def get_success_url(self):@@ -104,7 +104,7 @@ class WeightUnitDeleteView(WgerDeleteMixin,fields = ['name']success_url = reverse_lazy('nutrition:weight_unit:list')permission_required = 'nutrition.delete_ingredientweightunit'- messages = ugettext_lazy('Successfully deleted')+ messages = gettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):"""diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.pyindex 7d19888e1..9227cf9dc 100644--- a/wger/nutrition/views/unit_ingredient.py+++ b/wger/nutrition/views/unit_ingredient.py@@ -28,7 +28,7 @@ from django.forms import ()from django.shortcuts import get_object_or_404from django.urls import reverse-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import (CreateView,DeleteView,@@ -65,7 +65,7 @@ class WeightUnitIngredientCreateView(WgerFormMixin,"""model = IngredientWeightUnit- title = ugettext_lazy('Add a new weight unit')+ title = gettext_lazy('Add a new weight unit')permission_required = 'nutrition.add_ingredientweightunit'def get_success_url(self):@@ -100,7 +100,7 @@ class WeightUnitIngredientUpdateView(WgerFormMixin,"""model = IngredientWeightUnit- title = ugettext_lazy('Edit a weight unit to ingredient connection')+ title = gettext_lazy('Edit a weight unit to ingredient connection')permission_required = 'nutrition.add_ingredientweightunit'def get_success_url(self):@@ -131,7 +131,7 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin,model = IngredientWeightUnitfields = ('unit', 'gram', 'amount')- title = ugettext_lazy('Delete?')+ title = gettext_lazy('Delete?')permission_required = 'nutrition.add_ingredientweightunit'def get_success_url(self):diff --git a/wger/software/templates/contribute.html b/wger/software/templates/contribute.htmlindex 4e3e08eb7..917e54438 100644--- a/wger/software/templates/contribute.html+++ b/wger/software/templates/contribute.html@@ -3,73 +3,73 @@{% load i18n %}-{% block title %}{% trans "Contribute!" %}{% endblock %}+{% block title %}{% translate "Contribute!" %}{% endblock %}{% block content %}- <p>{% blocktrans %}wger Workout Manager is build by volunteers,+ <p>{% blocktranslate %}wger Workout Manager is build by volunteers,the development process is open and freely accessible to anybody interested.If you are new to the free software world, we recommend to take alook <a href="http://schlitt.info/opensource/blog/0541_10_golden_rules_for_starting_with_open_source.html">this-article</a> which summarizes they way open source projects work very well. {% endblocktrans %}</p>+article</a> which summarizes they way open source projects work very well. {% endblocktranslate %}</p>- <p>{% blocktrans %}Any kind of contribution is appreciated and welcome.+ <p>{% blocktranslate %}Any kind of contribution is appreciated and welcome.Use this opportunity and influence the direction of the-project. {% endblocktrans %}</p>+project. {% endblocktranslate %}</p>-<h5>{% trans "Use the site" %}</h5>-<p>{% blocktrans %}Simply use the site and tell your friends+<h5>{% translate "Use the site" %}</h5>+<p>{% blocktranslate %}Simply use the site and tell your friendshow useful it is! ;) . When you find something that you specially liked,could need some improvements or just doesn't work, tell us! This might not sound-like much, but is incredibly important!{% endblocktrans %}</p>-<a class="btn btn-light mb-4" href="{% url 'core:contact' %}">{% trans "Get in touch" %} »</a>+like much, but is incredibly important!{% endblocktranslate %}</p>+<a class="btn btn-light mb-4" href="{% url 'core:contact' %}">{% translate "Get in touch" %} »</a>-<h5>{% trans "Submit exercises" %}</h5>-<p>{% blocktrans %}Submit those cool exercises that you absolutely+<h5>{% translate "Submit exercises" %}</h5>+<p>{% blocktranslate %}Submit those cool exercises that you absolutelylove and do every week but are not in the list yet. If you think some description-is too short or some other detail is missing or could be improved, tell!{% endblocktrans %}</p>+is too short or some other detail is missing or could be improved, tell!{% endblocktranslate %}</p>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <a class="btn btn-light mb-4" href="{% url 'exercise:exercise:add' %}">{% trans "Add exercise" %} »</a>+ <a class="btn btn-light mb-4" href="{% url 'exercise:exercise:add' %}">{% translate "Add exercise" %} »</a>{% else %}- <a class="btn disabled btn-secondary mb-4" href="#">{% trans "Only registered users can do this" %} »</a>+ <a class="btn disabled btn-secondary mb-4" href="#">{% translate "Only registered users can do this" %} »</a>{% endif %}-<h5>{% trans "Translate" %}</h5>-<p>{% blocktrans %}Do you want to use wger in your own language?+<h5>{% translate "Translate" %}</h5>+<p>{% blocktranslate %}Do you want to use wger in your own language?Do you think the current translation could be improved?The translations are easily managed and edited online, if you are interested,go to the transifex site, request access and we will set everything-up. {% endblocktrans %}</p>+up. {% endblocktranslate %}</p><a class="btn btn-light mb-4"- href="https://www.transifex.com/rge/wger-workout-manager/">{% trans "Translate with Transifex" %} »</a>+ href="https://www.transifex.com/rge/wger-workout-manager/">{% translate "Translate with Transifex" %} »</a>-<h5>{% trans "Code" %}</h5>-<p>{% blocktrans %}Obviously, you are highly encouraged to clone the+<h5>{% translate "Code" %}</h5>+<p>{% blocktranslate %}Obviously, you are highly encouraged to clone therepo and start hacking! Once you are ready, send a pull request and wewill show the world. Take a look at the developer guide for more details-on this.{% endblocktrans %}</p>+on this.{% endblocktranslate %}</p>-<a class="btn btn-light" href="{% url 'software:code' %}">{% trans "Get the code" %} »</a>+<a class="btn btn-light" href="{% url 'software:code' %}">{% translate "Get the code" %} »</a>{% endblock %}{% block sidebar %}<div class="card text-white bg-wger-green mb-3"><div class="card-header">- {% trans "Our goal" %}+ {% translate "Our goal" %}</div><div class="card-body">- {% blocktrans %}The goal is to build an awesome+ {% blocktranslate %}The goal is to build an awesomeand flexible fitness manager, along with a comprehensive and complete list of exercises and-ingredients, all released under a free license.{% endblocktrans %}+ingredients, all released under a free license.{% endblocktranslate %}</div></div>{% endblock %}diff --git a/wger/software/templates/features.html b/wger/software/templates/features.htmlindex 9b2c805ad..8b1987b27 100644--- a/wger/software/templates/features.html+++ b/wger/software/templates/features.html@@ -6,10 +6,10 @@{# #}{% block opengraph %}{{ block.super }}- <meta property="og:title" content="{% trans 'Features' %} - wger">+ <meta property="og:title" content="{% translate 'Features' %} - wger">{% with username=owner_user.username %}- <meta property="og:description" content="{% blocktrans %}wger Workout Manager is a free, open source web application that manages your exercises and workouts. {% endblocktrans %}">+ <meta property="og:description" content="{% blocktranslate %}wger Workout Manager is a free, open source web application that manages your exercises and workouts. {% endblocktranslate %}">{% endwith %}{% endblock %}@@ -21,26 +21,26 @@<header><div class="container"><div class="intro-text">- <div class="intro-heading">{% trans "Welcome to wger" %}</div>- <div class="intro-lead-in">{% trans "Your body." %}</div>- <div class="intro-lead-in">{% trans "Your workouts." %}</div>- <div class="intro-lead-in">{% trans "Your data." %}</div>- <div class="intro-lead-in">{% trans "Your progress." %}</div>+ <div class="intro-heading">{% translate "Welcome to wger" %}</div>+ <div class="intro-lead-in">{% translate "Your body." %}</div>+ <div class="intro-lead-in">{% translate "Your workouts." %}</div>+ <div class="intro-lead-in">{% translate "Your data." %}</div>+ <div class="intro-lead-in">{% translate "Your progress." %}</div>{% if allow_guest_users and not user.is_authenticated %}<a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl" rel="nofollow" style="margin-top: 1em;">- {% trans "Try it now" %}+ {% translate "Try it now" %}</a>{% endif %}{% if not user.is_authenticated or user.userprofile.is_temporary %}{% if allow_registration %}<a href="{% url 'core:user:registration' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">- {% trans "Register" %}+ {% translate "Register" %}</a>{% endif %}<a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">- {% trans "Login" %}+ {% translate "Login" %}</a>{% endif %}</div>@@ -52,14 +52,14 @@<div class="container"><div class="row"><div class="col-lg-12 text-center">- <h2 class="section-heading text-light">{% trans "Your advantages" %}</h2>+ <h2 class="section-heading text-light">{% translate "Your advantages" %}</h2><h3 class="section-subheading text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}wger Workout Manager is a free, open source web application that managesyour exercises, workouts and nutrition. It started as a pet project ofmine to replace my growing collection of different spreadsheets, but ithas become something other people could also find useful.- {% endblocktrans %}+ {% endblocktranslate %}</h3></div></div>@@ -69,14 +69,14 @@<i class="{% fa_class 'circle' %} fa-stack-2x text-primary"></i><i class="{% fa_class 'user' %} fa-stack-1x fa-inverse"></i></span>- <h4 class="service-heading text-light">{% trans "Workouts" %}</h4>+ <h4 class="service-heading text-light">{% translate "Workouts" %}</h4><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}You can create and manage flexible workout routines for any goals youhave. Select exactly which exercises you'll do and how many repetitions,time or distance you want to do them. You can also combine differentworkouts into a schedule.- {% endblocktrans %}+ {% endblocktranslate %}</p></div><div class="col-md-4">@@ -84,14 +84,14 @@<i class="{% fa_class 'circle' %} fa-stack-2x text-primary"></i><i class="{% fa_class 'utensils' %} fa-stack-1x fa-inverse"></i></span>- <h4 class="service-heading text-light">{% trans "Nutrition" %}</h4>+ <h4 class="service-heading text-light">{% translate "Nutrition" %}</h4><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}Create your personal diet plan by creating as many meals with as manydifferent ingredients as you need. The application will calculate thenutritional values (total energy, protein, carbohydrates, and so on)about the whole plan as well as the indivual meals.- {% endblocktrans %}+ {% endblocktranslate %}</p></div><div class="col-md-4">@@ -99,14 +99,14 @@<i class="{% fa_class 'circle' %} fa-stack-2x text-primary"></i><i class="{% fa_class 'chart-line' %} fa-stack-1x fa-inverse"></i></span>- <h4 class="service-heading text-light">{% trans 'Diary' %}</h4>+ <h4 class="service-heading text-light">{% translate 'Diary' %}</h4><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}Enter the weights and repetitions you did for each exercise to generatediagrams that let you see at a glance how well you are doing. The rawnumbers are of course still accessible.- {% endblocktrans %}- {% trans "You can also enter notes and a general impression (great, neutral, etc.)" %}+ {% endblocktranslate %}+ {% translate "You can also enter notes and a general impression (great, neutral, etc.)" %}</p></div></div>@@ -117,8 +117,8 @@<div class="container"><div class="row"><div class="col-lg-12 text-center">- <h2 class="section-heading">{% trans "Features" %}</h2>- <h3 class="section-subheading text-muted">{% trans "Among many others" %}</h3>+ <h2 class="section-heading">{% translate "Features" %}</h2>+ <h3 class="section-subheading text-muted">{% translate "Among many others" %}</h3></div></div><div class="row">@@ -130,15 +130,15 @@</div><div class="timeline-panel"><div class="timeline-heading">- <h4>{% trans "Weight tracker" %}</h4>+ <h4>{% translate "Weight tracker" %}</h4></div><div class="timeline-body"><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}Keep track of your progress with the body weight chart. This makesit easy to see if you are reaching your goals or need to adjustsomething.- {% endblocktrans %}+ {% endblocktranslate %}</p></div></div>@@ -149,15 +149,15 @@</div><div class="timeline-panel"><div class="timeline-heading">- <h4>{% trans 'Calendar' %}</h4>+ <h4>{% translate 'Calendar' %}</h4></div><div class="timeline-body"><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}Get an overview of how and when you trained as well as how youpersonally felt you performed. Access all your individual diaryentries with one click.- {% endblocktrans %}+ {% endblocktranslate %}</p></div></div>@@ -168,15 +168,15 @@</div><div class="timeline-panel"><div class="timeline-heading">- <h4>{% trans 'Exercise database' %}</h4>+ <h4>{% translate 'Exercise database' %}</h4></div><div class="timeline-body"><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}The exercise database contains more than hundred exercises fromwhich you can choose when creating a workout. You can view them bycategory and equipment used or muscles trained.- {% endblocktrans %}+ {% endblocktranslate %}</p></div></div>@@ -187,15 +187,15 @@</div><div class="timeline-panel"><div class="timeline-heading">- <h4>{% trans 'Gym management' %}</h4>+ <h4>{% translate 'Gym management' %}</h4></div><div class="timeline-body"><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}Use the application for your gym to manage its members, theirworkouts and attendance. You can manage the members' contracts,keep notes and upload any files you might need.- {% endblocktrans %}+ {% endblocktranslate %}</p></div></div>@@ -206,23 +206,23 @@</div><div class="timeline-panel"><div class="timeline-heading">- <h4>{% trans "REST API" %}</h4>+ <h4>{% translate "REST API" %}</h4></div><div class="timeline-body"><p class="text-muted">- {% blocktrans trimmed %}+ {% blocktranslate trimmed %}wger provides a REST API with full read and write access to alldata so you can integrate your own application and tools.- {% endblocktrans %}+ {% endblocktranslate %}</p></div></div></li><li class="timeline"><div class="timeline-image">- <h4>{% blocktrans trimmed %}100% Free+ <h4>{% blocktranslate trimmed %}100% Free<br>and- <br>Open Source{% endblocktrans %}+ <br>Open Source{% endblocktranslate %}</h4></div></li>diff --git a/wger/software/templates/issues.html b/wger/software/templates/issues.htmlindex 7c4b8c070..ab2f5b3b8 100644--- a/wger/software/templates/issues.html+++ b/wger/software/templates/issues.html@@ -3,43 +3,43 @@{% load i18n %}-{% block title %}{% trans "Reporting a problem" %}{% endblock %}+{% block title %}{% translate "Reporting a problem" %}{% endblock %}{% block content %}-<p>{% blocktrans %}+<p>{% blocktranslate %}No software is perfect. For some severe errors, an email will be automatically sent, butnot always, so I depend on you reporting everything that didn't behave as expected.Please describe in as much detail as you can what you were doing when the errorhappened.-{% endblocktrans %}</p>+{% endblocktranslate %}</p><p><a class="btn btn-primary"- href="https://github.com/wger-project/wger/issues">{% trans "report problem to the issue tracker" %} »</a>+ href="https://github.com/wger-project/wger/issues">{% translate "report problem to the issue tracker" %} »</a></p>-<h3>{% trans "Enhancements" %}</h3>+<h3>{% translate "Enhancements" %}</h3>-<p>{% blocktrans %}+<p>{% blocktranslate %}The issue tracker can also be used to document enhancements to the software.If you have some suggestions or think a feature is missing, feelfree to open a ticket. This can be anything from a slight change to a wholenew section of the site. Please keep in mind that not all wishes can be-implemented.{% endblocktrans %}</p>+implemented.{% endblocktranslate %}</p><p><a class="btn btn-primary"- href="https://github.com/wger-project/wger/issues">{% trans "report wish to the issue tracker" %} »</a>+ href="https://github.com/wger-project/wger/issues">{% translate "report wish to the issue tracker" %} »</a></p>{% endblock %}{% block sidebar %}-<h4>{% trans "No Github account?" %}</h4>-<p>{% blocktrans %}Filing an issue requires a github account, if you don't+<h4>{% translate "No Github account?" %}</h4>+<p>{% blocktranslate %}Filing an issue requires a github account, if you don'thave one and don't want to register, you can also send it to-<a href="https://groups.google.com/group/wger">the mailing list</a>.{% endblocktrans %}</p>+<a href="https://groups.google.com/group/wger">the mailing list</a>.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/software/templates/license.html b/wger/software/templates/license.htmlindex f1f2c7a39..0519488b9 100644--- a/wger/software/templates/license.html+++ b/wger/software/templates/license.html@@ -4,30 +4,30 @@{% load wger_extras %}-{% block title %}{% trans "License" %}{% endblock %}+{% block title %}{% translate "License" %}{% endblock %}{% block content %}-<p>{% blocktrans %}wger Workout Manager is Free/Libre Open Source-Software (FLOSS).{% endblocktrans %}</p>+<p>{% blocktranslate %}wger Workout Manager is Free/Libre Open Source+Software (FLOSS).{% endblocktranslate %}</p><div class="row"><div class="col-md-2 text-center"><img src="{% static 'images/agpl-v3.svg' %}"width="88"height="31"- alt="{% trans 'Released under the Affero GPL' %}"- title="{% trans 'Released under the Affero GPL' %}">+ alt="{% translate 'Released under the Affero GPL' %}"+ title="{% translate 'Released under the Affero GPL' %}"></div><div class="col-md-10">- <p>{% blocktrans %}wger Workout Manager is released under the <strong>Affero GNU+ <p>{% blocktranslate %}wger Workout Manager is released under the <strong>Affero GNUGeneral Public License (AGPL) Version 3+</strong> and can (under the conditionsof the license) be used, modified and distributed (also with modifications)-without restrictions.{% endblocktrans %}</p>+without restrictions.{% endblocktranslate %}</p></div></div>-<p>{% blocktrans %}A copy the license text is contained in every wger Workout+<p>{% blocktranslate %}A copy the license text is contained in every wger WorkoutManager release (LICENSE.txt) and can be read online on the website of-<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>.{% endblocktrans %}</p>+<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/software/templates/tos.html b/wger/software/templates/tos.htmlindex eaa81ce68..6da56e4d1 100644--- a/wger/software/templates/tos.html+++ b/wger/software/templates/tos.html@@ -4,7 +4,7 @@{% load wger_extras %}-{% block title %}{% trans "Terms of service" %}{% endblock %}+{% block title %}{% translate "Terms of service" %}{% endblock %}{% block content %}Add your terms of service herediff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.pyindex fdb15a5a1..f5c24cb21 100644--- a/wger/utils/generic_views.py+++ b/wger/utils/generic_views.py@@ -26,7 +26,7 @@ from django.http import ()from django.urls import reverse_lazyfrom django.utils.text import slugify-from django.utils.translation import ugettext_lazy+from django.utils.translation import gettext_lazyfrom django.views.generic import TemplateViewfrom django.views.generic.edit import ModelFormMixin@@ -138,7 +138,7 @@ class WgerFormMixin(ModelFormMixin):the model doesn't provide a get_owner_object() method"""- submit_text = ugettext_lazy('Save')+ submit_text = gettext_lazy('Save')"""Text used in the submit button, default _('save')"""@@ -251,7 +251,7 @@ class WgerDeleteMixin(ModelFormMixin):form_action_urlname = ''title = ''delete_message_extra = ''- delete_message = ugettext_lazy('Yes, delete')+ delete_message = gettext_lazy('Yes, delete')template_name = 'delete.html'messages = ''diff --git a/wger/utils/models.py b/wger/utils/models.pyindex 196426af6..a9daab516 100644--- a/wger/utils/models.py+++ b/wger/utils/models.py@@ -16,7 +16,7 @@# Djangofrom django.db import models-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import Licensediff --git a/wger/utils/widgets.py b/wger/utils/widgets.pyindex 5b4492269..b1a630255 100644--- a/wger/utils/widgets.py+++ b/wger/utils/widgets.py@@ -36,7 +36,7 @@ from django.utils.html import (escape)from django.utils.safestring import mark_safe-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _logger = logging.getLogger(__name__)diff --git a/wger/weight/forms.py b/wger/weight/forms.pyindex f4e3eea82..1e7ff0f6e 100644--- a/wger/weight/forms.py+++ b/wger/weight/forms.py@@ -24,7 +24,7 @@ from django.forms import (Textarea,widgets)-from django.utils.translation import ugettext as _+from django.utils.translation import gettext as _# Third Partyfrom crispy_forms.helper import FormHelperdiff --git a/wger/weight/management/commands/email-weight-reminder.py b/wger/weight/management/commands/email-weight-reminder.pyindex d668d529a..cccf2ceba 100644--- a/wger/weight/management/commands/email-weight-reminder.py+++ b/wger/weight/management/commands/email-weight-reminder.py@@ -24,7 +24,7 @@ from django.core import mailfrom django.core.management.base import BaseCommandfrom django.template import loaderfrom django.utils import translation-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import UserProfilediff --git a/wger/weight/models.py b/wger/weight/models.pyindex 2d3214d25..dc1e9cd65 100644--- a/wger/weight/models.py+++ b/wger/weight/models.py@@ -22,7 +22,7 @@ from django.core.validators import (MinValueValidator)from django.db import models-from django.utils.translation import ugettext_lazy as _+from django.utils.translation import gettext_lazy as _class WeightEntry(models.Model):diff --git a/wger/weight/templates/import_csv_form.html b/wger/weight/templates/import_csv_form.htmlindex d7b3491ed..7b6081994 100644--- a/wger/weight/templates/import_csv_form.html+++ b/wger/weight/templates/import_csv_form.html@@ -1,27 +1,27 @@{% extends "base.html" %}{% load i18n crispy_forms_tags %}-{% block title %}{% trans "Import weight logs" %}{% endblock %}+{% block title %}{% translate "Import weight logs" %}{% endblock %}{% block content %}<form action="{{request.get_full_path}}" method="post">{% crispy form %}- <input type="submit" name="submit" value="{% trans 'Submit' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Submit' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></form>{% endblock %}{% block sidebar %}-<p>{% blocktrans %}Use this import field to import your weight logs into Workout-Manager.{% endblocktrans %}</p>+<p>{% blocktranslate %}Use this import field to import your weight logs into Workout+Manager.{% endblocktranslate %}</p>-<p>{% blocktrans %}You can copy and paste from your spreadsheet into the text input,+<p>{% blocktranslate %}You can copy and paste from your spreadsheet into the text input,the system will try to guess the format to import. The only things to consider isthat the first column is the <strong>date</strong>, the second the <strong>weight</strong>.All further columns are ignored. There is a 1000 row limit.-{% endblocktrans %}</p>+{% endblocktranslate %}</p>-<p>{% blocktrans %}If there are errors, you can correct or discard them in a-second step.{% endblocktrans %}</p>+<p>{% blocktranslate %}If there are errors, you can correct or discard them in a+second step.{% endblocktranslate %}</p>{% endblock %}diff --git a/wger/weight/templates/import_csv_preview.html b/wger/weight/templates/import_csv_preview.htmlindex 87564436f..9195f1085 100644--- a/wger/weight/templates/import_csv_preview.html+++ b/wger/weight/templates/import_csv_preview.html@@ -1,17 +1,17 @@{% extends "base.html" %}{% load i18n crispy_forms_tags %}-{% block title %}{% trans "Preview imported CSV entries" %}{% endblock %}+{% block title %}{% translate "Preview imported CSV entries" %}{% endblock %}{% block content %}-<h4>{% trans "Successfully converted values" %}</h4>-<div class="alert alert-success">{% trans "The following values could be converted." %}</div>+<h4>{% translate "Successfully converted values" %}</h4>+<div class="alert alert-success">{% translate "The following values could be converted." %}</div><table class="table"><tr>- <th>{% trans "Date" %}</th>- <th>{% trans "Weight" %}</th>+ <th>{% translate "Date" %}</th>+ <th>{% translate "Weight" %}</th></tr>{% for entry in weight_list %}<tr>@@ -23,24 +23,24 @@-<h4>{% trans "Errors" %}</h4>+<h4>{% translate "Errors" %}</h4>{% if error_list %}- <div class="alert alert-danger">{% trans "The following values could not be converted." %}</div>+ <div class="alert alert-danger">{% translate "The following values could not be converted." %}</div>- <p>{% blocktrans %}These values could not be converted to a weight log entry.+ <p>{% blocktranslate %}These values could not be converted to a weight log entry.The reasons for this could be anything from an unrecognised date or numberformat, a problem with the encoding or something else. Please check thatthere are no obvious errors in the list (and correct them if there are!)- and try to import the list again.{% endblocktrans %}</p>+ and try to import the list again.{% endblocktranslate %}</p>- <p>{% blocktrans %}Remember that the expected structure is <strong>date</strong>- on the first columns and <strong>weight</strong> on the second.{% endblocktrans %}</p>+ <p>{% blocktranslate %}Remember that the expected structure is <strong>date</strong>+ on the first columns and <strong>weight</strong> on the second.{% endblocktranslate %}</p><table class="table"><tr>- <th>{% trans "Date" %}</th>- <th>{% trans "Weight" %}</th>+ <th>{% translate "Date" %}</th>+ <th>{% translate "Weight" %}</th></tr>{% for entry in error_list %}<tr>@@ -51,30 +51,30 @@</table>{% else %}- <p>{% blocktrans %}There were no errors, all entries could be converted!{% endblocktrans %}</p>+ <p>{% blocktranslate %}There were no errors, all entries could be converted!{% endblocktranslate %}</p>{% endif %}-<h2>{% trans "Import all successfully converted entries" %}</h2>-<p>{% blocktrans %}Continue here if you want to import into your weight log all+<h2>{% translate "Import all successfully converted entries" %}</h2>+<p>{% blocktranslate %}Continue here if you want to import into your weight log allentries that were successfully converted. All entries that produced an errorwill simply be ignored. It's up to you to decide whether they are useful-(unrecognised entries) or not (e.g. headers, comments, etc.).{% endblocktrans %}</p>+(unrecognised entries) or not (e.g. headers, comments, etc.).{% endblocktranslate %}</p><form action="{{request.get_full_path}}" method="post"><input type="hidden" name="{{ stage_field }}" value="2" /><input type="hidden" name="{{ hash_field }}" value="{{ hash_value }}" />{% crispy form %}- <input type="submit" name="submit" value="{% trans 'Import' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Import' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></form>-<h2>{% trans "Or try it again" %}</h2>+<h2>{% translate "Or try it again" %}</h2>-<p>{% blocktrans %}You can correct the list here and re-submit it as often as-you want.{% endblocktrans %}</p>+<p>{% blocktranslate %}You can correct the list here and re-submit it as often as+you want.{% endblocktranslate %}</p><form action="{{request.get_full_path}}"method="post"@@ -82,7 +82,7 @@ you want.{% endblocktrans %}</p><input type="hidden" name="{{ stage_field }}" value="1" />{% crispy form %}- <input type="submit" name="submit" value="{% trans 'Re-Submit' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit">+ <input type="submit" name="submit" value="{% translate 'Re-Submit' %}" class="btn btn-primary btn-success btn-block" id="submit-id-submit"></form>{% endblock %}diff --git a/wger/weight/templates/overview.html b/wger/weight/templates/overview.htmlindex 54591880f..bd5f98eb0 100644--- a/wger/weight/templates/overview.html+++ b/wger/weight/templates/overview.html@@ -4,7 +4,7 @@{# #}{# Title #}{# #}-{% block title %}{% trans "Weight overview" %}{% endblock %}+{% block title %}{% translate "Weight overview" %}{% endblock %}{# #}{# Header #}@@ -24,20 +24,20 @@{% if not min_date %}<p>- {% trans "There is no chart here because there are no weight entries." %}- {% trans "Use link to add one." %}+ {% translate "There is no chart here because there are no weight entries." %}+ {% translate "Use link to add one." %}</p>{% endif %}<div id="weight_diagram"></div><br>-<input id="height" placeholder="{% trans "height in cm" %}" type="number">+<input id="height" placeholder="{% translate "height in cm" %}" type="number"><input id="enable_bmi" type="button" value="BMI"><div class="btn-group modify-time-period-controls float-right" role="group" aria-label="..." style="padding-bottom: 1em;">- <button type="button" class="btn btn-light" data-time_period="90">{% trans "Last 3 months" %}</button>- <button type="button" class="btn btn-light" data-time_period="365">{% trans "Last 12 months" %}</button>- <button type="button" class="btn btn-light active" data-time_period="all">{% trans "No filter" %}</button>+ <button type="button" class="btn btn-light" data-time_period="90">{% translate "Last 3 months" %}</button>+ <button type="button" class="btn btn-light" data-time_period="365">{% translate "Last 12 months" %}</button>+ <button type="button" class="btn btn-light active" data-time_period="all">{% translate "No filter" %}</button></div>@@ -45,10 +45,10 @@{% if last_five_weight_entries_details %}<table class="table"><tr>- <th>{% trans 'Date' %}</th>- <th>{% trans 'Weight' %}</th>- <th>{% trans 'Change' context "Noun, not verb" %}</th>- <th>{% trans 'Days' %}</th>+ <th>{% translate 'Date' %}</th>+ <th>{% translate 'Weight' %}</th>+ <th>{% translate 'Change' context "Noun, not verb" %}</th>+ <th>{% translate 'Days' %}</th></tr>{% for entry_detail in last_five_weight_entries_details %}<tr>@@ -80,12 +80,12 @@<div class="dropdown-menu dropdown-menu-right" aria-labelledby="btnGroupWorkout"><a href="{% url 'weight:edit' entry_detail.0.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'edit' %}"></span>- {% trans "Edit weight" %}+ {% translate "Edit weight" %}</a><div class="dropdown-divider"></div><a href="{% url 'weight:delete' entry_detail.0.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'trash' %}"></span>- {% trans "Delete" %}+ {% translate "Delete" %}</a></div></div>@@ -117,23 +117,23 @@<div class="btn-group" role="group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}+ {% translate "Options" %}</button><div class="dropdown-menu"><a href="{% url 'weight:export-csv' %}" target="_blank" class="dropdown-item"><span class="{% fa_class 'download' %}"></span>- {% trans "Export as CSV" %}+ {% translate "Export as CSV" %}</a><a href="{% url 'weight:import-csv' %}" class="dropdown-item"><span class="{% fa_class 'upload' %}"></span>- {% trans "Import from spreadsheet" %}+ {% translate "Import from spreadsheet" %}</a></div></div></div><a href="{% url 'weight:add' %}" class="btn btn-success btn-sm wger-modal-dialog">- {% trans "Add" %}+ {% translate "Add" %}</a>{% endif %}{% endblock %}diff --git a/wger/weight/views.py b/wger/weight/views.pyindex a136f04b5..6e0eb6cec 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -33,8 +33,8 @@ from django.http import (from django.shortcuts import renderfrom django.urls import reversefrom django.utils.translation import (- ugettext as _,- ugettext_lazy+ gettext as _,+ gettext_lazy)from django.views.generic import (CreateView,@@ -67,7 +67,7 @@ class WeightAddView(WgerFormMixin, CreateView):"""model = WeightEntryform_class = WeightForm- title = ugettext_lazy('Add weight entry')+ title = gettext_lazy('Add weight entry')def get_initial(self):"""@@ -121,7 +121,7 @@ class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):model = WeightEntryfields = ('weight',)- messages = ugettext_lazy('Successfully deleted.')+ messages = gettext_lazy('Successfully deleted.')def get_context_data(self, **kwargs):context = super(WeightDeleteView, self).get_context_data(**kwargs)