Self hosted FLOSS fitness/workout, nutrition and weight tracker
Clean up and simplify some translated strings
Roland Geider5f3eda54f714
diff --git a/wger/config/models.py b/wger/config/models.pyindex b727c6d18..34c16939d 100644--- a/wger/config/models.py+++ b/wger/config/models.py@@ -46,11 +46,9 @@ class LanguageConfig(models.Model):)language = models.ForeignKey(Language,- verbose_name=_('Language'),related_name='language_source',editable=False)language_target = models.ForeignKey(Language,- verbose_name=_('Language to configure'),related_name='language_target',editable=False)item = models.CharField(max_length=2,diff --git a/wger/config/views/languages.py b/wger/config/views/languages.pyindex 46adf1467..7b53c0e38 100644--- a/wger/config/views/languages.py+++ b/wger/config/views/languages.py@@ -71,11 +71,13 @@ class LanguageDeleteView(WgerDeleteMixin, DeleteView):model = Languagesuccess_url = reverse_lazy('config:language:overview')- messages = ugettext_lazy('Language successfully deleted')+ messages = ugettext_lazy('Successfully deleted')permission_required = 'core.delete_language'- # Send some additional data to the templatedef get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''context = super(LanguageDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object.full_name)@@ -90,6 +92,13 @@ class LanguageEditView(WgerFormMixin, UpdateView):'''model = Language- title = ugettext_lazy('Edit')form_action_urlname = 'config:language:edit'permission_required = 'core.change_language'++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(LanguageEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object.full_name)+ return contextdiff --git a/wger/core/views/license.py b/wger/core/views/license.pyindex 710c8b6ab..377186e09 100644--- a/wger/core/views/license.py+++ b/wger/core/views/license.py@@ -51,7 +51,7 @@ class LicenseAddView(WgerFormMixin, CreateView, WgerPermissionMixin):model = Licensesuccess_url = reverse_lazy('core:license:list')- title = ugettext_lazy('Add license')+ title = ugettext_lazy('Add new license')form_action = reverse_lazy('core:license:add')permission_required = 'core.add_license'@@ -62,7 +62,6 @@ class LicenseUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = License- title = ugettext_lazy('Edit license')success_url = reverse_lazy('core:license:list')permission_required = 'core.change_license'diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.pyindex 91fd43c38..e7a28ad67 100644--- a/wger/exercises/views/categories.py+++ b/wger/exercises/views/categories.py@@ -49,7 +49,6 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):success_url = reverse_lazy('exercise:exercise:overview')title = ugettext_lazy('Add category')form_action = reverse_lazy('exercise:category:add')- messages = ugettext_lazy('Category was successfully created')permission_required = 'exercises.add_exercisecategory'def form_valid(self, form):@@ -64,7 +63,6 @@ class ExerciseCategoryUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin)model = ExerciseCategorysuccess_url = reverse_lazy('exercise:exercise:overview')- messages = ugettext_lazy('Category successfully edited')permission_required = 'exercises.change_exercisecategory'# Send some additional data to the template@@ -89,7 +87,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMiximodel = ExerciseCategorysuccess_url = reverse_lazy('exercise:exercise:overview')delete_message = ugettext_lazy('This will also delete all exercises in this category.')- messages = ugettext_lazy('Category successfully deleted')+ messages = ugettext_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 6986096f4..d1a208cd9 100644--- a/wger/exercises/views/comments.py+++ b/wger/exercises/views/comments.py@@ -47,7 +47,7 @@ class ExerciseCommentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):model = ExerciseCommentform_class = CommentForm- title = ugettext_lazy('Edit exercise comment')+ title = ugettext_lazy('Edit')permission_required = 'exercises.change_exercisecomment'def get_success_url(self):diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex cb3e0b57c..b73c9398b 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -60,13 +60,13 @@ class EquipmentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = Equipment- title = ugettext_lazy('Edit equipment')permission_required = 'exercises.change_equipment'success_url = reverse_lazy('exercise:equipment:list')# Send some additional data to the templatedef get_context_data(self, **kwargs):context = super(EquipmentEditView, self).get_context_data(**kwargs)+ context['title'] = _('Edit {0}').format(self.object)context['form_action'] = reverse('exercise:equipment:edit',kwargs={'pk': self.object.id})@@ -79,7 +79,7 @@ class EquipmentAddView(WgerFormMixin, CreateView, WgerPermissionMixin):'''model = Equipment- title = ugettext_lazy('Add equipment')+ title = ugettext_lazy('Add new equipment')permission_required = 'exercises.add_equipment'success_url = reverse_lazy('exercise:equipment:list')diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex b0feec6d5..86e573f7c 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -230,7 +230,7 @@ class ExerciseDeleteView(WgerDeleteMixin, DeleteView):model = Exercisesuccess_url = reverse_lazy('exercise:exercise:overview')delete_message = ugettext_lazy('This will delete the exercise from all workouts.')- messages = ugettext_lazy('Exercise successfully deleted')+ messages = ugettext_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 f8e2eb198..d0904adc5 100644--- a/wger/exercises/views/images.py+++ b/wger/exercises/views/images.py@@ -71,7 +71,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):'''model = ExerciseImage- title = ugettext_lazy('Add exercise image')+ title = ugettext_lazy('Add new image')permission_required = 'exercises.add_exerciseimage'form_class = ExerciseImageFormdiff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.pyindex 1e118141a..08d330631 100644--- a/wger/exercises/views/muscles.py+++ b/wger/exercises/views/muscles.py@@ -72,7 +72,6 @@ class MuscleUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = Muscle- title = ugettext_lazy('Edit muscle')success_url = reverse_lazy('exercise:muscle:overview')permission_required = 'exercises.change_muscle'@@ -94,6 +93,7 @@ class MuscleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = Musclesuccess_url = reverse_lazy('exercise:muscle:overview')permission_required = 'exercises.delete_muscle'+ messages = ugettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):'''diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.pyindex 882bffcbe..938468c8c 100644--- a/wger/gym/views/admin_notes.py+++ b/wger/gym/views/admin_notes.py@@ -155,7 +155,7 @@ class UpdateView(WgerFormMixin, UpdateView):'''context = super(UpdateView, self).get_context_data(**kwargs)context['form_action'] = reverse('gym:admin_note:edit', kwargs={'pk': self.object.id})- context['title'] = _(u'Edit {0}'.format(self.object))+ context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --git a/wger/gym/views/document.py b/wger/gym/views/document.pyindex fd70c445a..1f1f8c549 100644--- a/wger/gym/views/document.py+++ b/wger/gym/views/document.py@@ -158,7 +158,7 @@ class UpdateView(WgerFormMixin, UpdateView):'''context = super(UpdateView, self).get_context_data(**kwargs)context['form_action'] = reverse('gym:document:edit', kwargs={'pk': self.object.id})- context['title'] = _(u'Edit {0}'.format(self.object))+ context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex a88244efc..962f7a824 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -358,7 +358,7 @@ class GymUpdateView(WgerFormMixin, UpdateView):'''context = super(GymUpdateView, self).get_context_data(**kwargs)context['form_action'] = reverse('gym:gym:edit', kwargs={'pk': self.object.id})- context['title'] = _(u'Edit {0}'.format(self.object))+ context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --git a/wger/manager/models.py b/wger/manager/models.pyindex 185dc9395..011d84d3d 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -222,6 +222,12 @@ class Schedule(models.Model):"in a loop (i.e. A, B, C, A, B, C, and so on)"))'''A flag indicating whether the schedule should act as a loop'''+ def __unicode__(self):+ '''+ Return a more human-readable representation+ '''+ return self.name+def get_absolute_url(self):return reverse('manager:schedule:view', kwargs={'pk': self.id})@@ -317,7 +323,7 @@ class ScheduleStep(models.Model):'''Return a more human-readable representation'''- return u"ID: {0}".format(self.id)+ return self.workout.commentclass Day(models.Model):@@ -338,7 +344,7 @@ class Day(models.Model):'''Return a more human-readable representation'''- return u"{0} for TP {1}".format(self.description, six.text_type(self.training))+ return self.descriptiondef get_owner_object(self):'''diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.htmlindex e9c8f631e..a6662054d 100644--- a/wger/manager/templates/mobile/workout/view.html+++ b/wger/manager/templates/mobile/workout/view.html@@ -77,7 +77,7 @@ $(document).ready(function() {<ol><li>{% trans "Add training days" %}</li>- <li>{% trans "Add working sets to days" %}</li>+ <li>{% trans "Add workout sets to days" %}</li><li>{% trans "Set the repetitions for each set" %}({% trans "use '99' for 'all repetitions you can do'" %})diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex b3b69929f..ee1243da1 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -70,7 +70,7 @@ $(document).ready(function() {<ol><li>{% trans "Add training days" %}</li>- <li>{% trans "Add working sets to days" %}</li>+ <li>{% trans "Add workout sets to days" %}</li><li>{% trans "Set the repetitions for each set" %}({% trans "use '99' for 'all repetitions you can do'" %})diff --git a/wger/manager/views/day.py b/wger/manager/views/day.pyindex a26228349..9736e9ac9 100644--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@ -22,6 +22,7 @@ from django.http import HttpResponseRedirectfrom django.http import HttpResponseForbiddenfrom django.core.urlresolvers import reversefrom django.utils.translation import ugettext_lazy+from django.utils.translation import ugettext as _from django.contrib.auth.decorators import login_requiredfrom django.views.generic import CreateViewfrom django.views.generic import UpdateView@@ -82,9 +83,14 @@ class DayEditView(DayView, UpdateView):Generic view to update an existing exercise day'''- title = ugettext_lazy('Edit workout day')form_action_urlname = 'manager:day:edit'+ # Send some additional data to the template+ def get_context_data(self, **kwargs):+ context = super(DayEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return context+class DayCreateView(DayView, CreateView):'''diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.pyindex 042d228f7..299b59144 100644--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@ -18,8 +18,9 @@ import loggingfrom django.shortcuts import renderfrom django.shortcuts import get_object_or_404-from django.core.urlresolvers import reverse_lazy+from django.core.urlresolvers import reverse_lazy, reversefrom django.utils.translation import ugettext_lazy+from django.utils.translation import ugettext as _from django.contrib.auth.decorators import login_requiredfrom django.views.generic import CreateViewfrom django.views.generic import DeleteView@@ -99,11 +100,18 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = Schedulesuccess_url = reverse_lazy('manager:schedule:overview')- title = ugettext_lazy('Delete schedule')form_action_urlname = 'manager:schedule:delete'- messages = ugettext_lazy('Schedule was successfully deleted')+ messages = ugettext_lazy('Successfully deleted')login_required = True+ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(ScheduleDeleteView, self).get_context_data(**kwargs)+ context['title'] = _(u'Delete {0}?').format(self.object)+ return context+class ScheduleEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''@@ -111,6 +119,13 @@ class ScheduleEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = Schedule- title = ugettext_lazy('Edit schedule')form_action_urlname = 'manager:schedule:edit'login_required = True++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(ScheduleEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return contextdiff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.pyindex 976a12151..a5fecea3e 100644--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@ -18,6 +18,7 @@ import loggingfrom django.core.urlresolvers import reversefrom django.utils.translation import ugettext_lazy+from django.utils.translation import ugettext as _from django.db import modelsfrom django.forms import ModelFormfrom django.forms import ModelChoiceField@@ -121,10 +122,18 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):'''model = ScheduleStep- title = ugettext_lazy('Delete workout')form_action_urlname = 'manager:step:delete'- messages = ugettext_lazy('Workout was successfully deleted')+ messages = ugettext_lazy('Successfully deleted')login_required = Truedef get_success_url(self):return reverse('manager:schedule:view', kwargs={'pk': self.object.schedule.id})++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(StepDeleteView, self).get_context_data(**kwargs)+ context['title'] = _(u'Delete {0}?').format(self.object)+ context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})+ return contextdiff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex eea29a037..171ac9b2c 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -196,13 +196,13 @@ class WorkoutDeleteView(WgerDeleteMixin, DeleteView):model = Workoutsuccess_url = reverse_lazy('manager:workout:overview')- title = ugettext_lazy('Delete workout')- messages = ugettext_lazy('Workout was successfully deleted')+ messages = ugettext_lazy('Successfully deleted')login_required = Truedef get_context_data(self, **kwargs):context = super(WorkoutDeleteView, self).get_context_data(**kwargs)context['form_action'] = reverse('manager:workout:delete', kwargs={'pk': self.object.id})+ context['title'] = _(u'Delete {0}?').format(self.object)return context@@ -214,10 +214,15 @@ class WorkoutEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):model = Workoutform_class = WorkoutForm- title = ugettext_lazy('Edit workout')form_action_urlname = 'manager:workout:edit'login_required = True+ def get_context_data(self, **kwargs):+ context = super(WorkoutEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)++ return context+class LastWeightHelper():'''diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 339bc8043..d1a4f7c75 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -444,7 +444,7 @@ class WeightUnit(models.Model):'''Return a more human-readable representation'''- return u"{0}".format(self.name)+ return self.namedef get_owner_object(self):'''diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.pyindex 39ece8788..18fa90f43 100644--- a/wger/nutrition/views/ingredient.py+++ b/wger/nutrition/views/ingredient.py@@ -94,14 +94,14 @@ class IngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = Ingredienttemplate_name = 'delete.html'success_url = reverse_lazy('nutrition:ingredient:list')- messages = ugettext_lazy('Ingredient successfully deleted')+ messages = ugettext_lazy('Successfully deleted')permission_required = 'nutrition.delete_ingredient'# Send some additional data to the templatedef get_context_data(self, **kwargs):context = super(IngredientDeleteView, self).get_context_data(**kwargs)- context['title'] = _(u'Delete {0}?').format(self.object.name)+ context['title'] = _(u'Delete {0}?').format(self.object)context['form_action'] = reverse('nutrition:ingredient:delete',kwargs={'pk': self.object.id})@@ -131,11 +131,17 @@ class IngredientEditView(IngredientMixin, UpdateView, WgerPermissionMixin):'''model = Ingredient- title = ugettext_lazy('Edit ingredient')form_action_urlname = 'nutrition:ingredient:edit'- messages = ugettext_lazy('Ingredient successfully updated')permission_required = 'nutrition.change_ingredient'+ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(IngredientEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return context+class IngredientCreateView(IngredientMixin, CreateView):'''diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex 8b3403c10..ee259d1e4 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -90,9 +90,16 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):model = NutritionPlansuccess_url = reverse_lazy('nutrition:plan:overview')- title = ugettext_lazy('Delete nutritional plan?')form_action_urlname = 'nutrition:plan:delete'- messages = ugettext_lazy('Nutritional plan was successfully deleted')+ messages = ugettext_lazy('Successfully deleted')++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(PlanDeleteView, self).get_context_data(**kwargs)+ context['title'] = _(u'Delete {0}?').format(self.object)+ return contextclass PlanEditView(WgerFormMixin, UpdateView):@@ -101,9 +108,16 @@ class PlanEditView(WgerFormMixin, UpdateView):'''model = NutritionPlan- title = ugettext_lazy('Edit nutritional plan')form_action_urlname = 'nutrition:plan:edit'+ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(PlanEditView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return context+@login_requireddef view(request, id):@@ -196,7 +210,7 @@ def export_pdf(request, id, uidb64=None, token=None):# Create the PDF object, using the response object as its "file."doc = SimpleDocTemplate(response,pagesize=A4,- title=_('Workout'),+ title=_('Nutrition plan'),author='wger Workout Manager',subject=_('Nutritional plan %s') % request.user.username)diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.pyindex fdc465cfb..51adcd10b 100644--- a/wger/nutrition/views/unit.py+++ b/wger/nutrition/views/unit.py@@ -18,6 +18,7 @@ import loggingfrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazyfrom django.utils.translation import ugettext_lazy+from django.utils.translation import ugettext as _from django.views.generic import DeleteViewfrom django.views.generic import CreateView@@ -81,9 +82,17 @@ class WeightUnitDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = WeightUnitsuccess_url = reverse_lazy('nutrition:weight_unit:list')- title = ugettext_lazy('Delete weight unit?')form_action_urlname = 'nutrition:weight_unit:delete'permission_required = 'nutrition.delete_ingredientweightunit'+ messages = ugettext_lazy('Successfully deleted')++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(WeightUnitDeleteView, self).get_context_data(**kwargs)+ context['title'] = _(u'Delete {0}?').format(self.object)+ return contextclass WeightUnitUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):@@ -92,9 +101,16 @@ class WeightUnitUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = WeightUnit- title = ugettext_lazy('Edit a weight unit')form_action_urlname = 'nutrition:weight_unit:edit'permission_required = 'nutrition.change_ingredientweightunit'def get_success_url(self):return reverse('nutrition:weight_unit:list')++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(WeightUnitUpdateView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return contextdiff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.pyindex 67e9d2d38..f16b3cde6 100644--- a/wger/nutrition/views/unit_ingredient.py+++ b/wger/nutrition/views/unit_ingredient.py@@ -114,7 +114,7 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermission'''model = IngredientWeightUnit- title = ugettext_lazy('Delete weight unit?')+ title = ugettext_lazy('Delete?')form_action_urlname = 'nutrition:unit_ingredient:delete'permission_required = 'nutrition.add_ingredientweightunit'