Add language filter to sync-ingredients management command.

wger/core/management/commands/add-user-rest.py

@@ -32,14 +32,14 @@ def handle(self, *args, **options):
                 user.userprofile.can_add_user = False
                 self.stdout.write(
                     self.style.SUCCESS(
-                        f"{options['name']} is now DISABLED from adding users via the API"
+                        f'{options["name"]} is now DISABLED from adding users via the API'
                     )
                 )
 
             else:
                 user.userprofile.can_add_user = True
                 self.stdout.write(
-                    self.style.SUCCESS(f"{options['name']} is now ALLOWED to add users via the API")
+                    self.style.SUCCESS(f'{options["name"]} is now ALLOWED to add users via the API')
                 )
             user.userprofile.save()
 

wger/core/management/commands/dummy-generator-users.py

@@ -65,7 +65,7 @@ def add_arguments(self, parser):
     def handle(self, **options):
         faker = Faker()
 
-        self.stdout.write(f"** Generating {options['number_users']} users")
+        self.stdout.write(f'** Generating {options["number_users"]} users')
 
         match options['add_to_gym']:
             case 'auto':
@@ -80,7 +80,7 @@ def handle(self, **options):
             first_name = faker.first_name()
             last_name = faker.last_name()
 
-            username = slugify(f"{first_name}, {last_name} - {str(uid).split('-')[1]}")
+            username = slugify(f'{first_name}, {last_name} - {str(uid).split("-")[1]}')
             email = f'{username}@example.com'
             password = username
 

wger/core/models/profile.py

@@ -116,7 +116,7 @@ class UserProfile(models.Model):
 
     show_comments = models.BooleanField(
         verbose_name=_('Show exercise comments'),
-        help_text=_('Check to show exercise comments on the ' 'workout view'),
+        help_text=_('Check to show exercise comments on the workout view'),
         default=True,
     )
     """
@@ -149,7 +149,7 @@ class UserProfile(models.Model):
 
     workout_reminder = IntegerField(
         verbose_name=_('Remind before expiration'),
-        help_text=_('The number of days you want to be reminded ' 'before a workout expires.'),
+        help_text=_('The number of days you want to be reminded before a workout expires.'),
         default=14,
         validators=[MinValueValidator(1), MaxValueValidator(30)],
     )
@@ -349,8 +349,8 @@ def is_trustworthy(self) -> bool:
     """Allow anonymous read-only access"""
 
     num_days_weight_reminder = models.IntegerField(
-        verbose_name=_('Automatic reminders for weight ' 'entries'),
-        help_text=_('Number of days after the last ' 'weight entry (enter 0 to ' 'deactivate)'),
+        verbose_name=_('Automatic reminders for weight entries'),
+        help_text=_('Number of days after the last weight entry (enter 0 to deactivate)'),
         validators=[MinValueValidator(0), MaxValueValidator(30)],
         default=0,
     )

wger/exercises/api/serializers.py

@@ -374,7 +374,7 @@ def validate(self, value):
                     ~Q(id=self.instance.pk), language=value['language']
                 ).exists():
                     raise serializers.ValidationError(
-                        f"There is already a translation for this exercise in {value['language']}"
+                        f'There is already a translation for this exercise in {value["language"]}'
                     )
             # Creating a new object
             # -> Check if the language already exists
@@ -383,7 +383,7 @@ def validate(self, value):
                     exercise_base=value['exercise_base'], language=value['language']
                 ).exists():
                     raise serializers.ValidationError(
-                        f"There is already a translation for this exercise in {value['language']}"
+                        f'There is already a translation for this exercise in {value["language"]}'
                     )
 
         return super().validate(value)

wger/exercises/management/commands/download-exercise-videos.py

@@ -44,7 +44,7 @@ def add_arguments(self, parser):
             action='store',
             dest='remote_url',
             default='https://wger.de',
-            help='Remote URL to fetch the exercises from (default: ' 'https://wger.de)',
+            help='Remote URL to fetch the exercises from (default: https://wger.de)',
         )
 
     def handle(self, **options):

wger/exercises/sync.py

@@ -88,7 +88,7 @@ def sync_exercises(
             uuid=uuid,
             defaults={'category_id': category_id, 'created': created},
         )
-        print_fn(f"{'created' if base_created else 'updated'} exercise {uuid}")
+        print_fn(f'{"created" if base_created else "updated"} exercise {uuid}')
 
         base.muscles.set(muscles)
         base.muscles_secondary.set(muscles_sec)
@@ -113,8 +113,8 @@ def sync_exercises(
                 },
             )
             out = (
-                f"- {'created' if translation_created else 'updated'} translation "
-                f"{translation.language.short_name} {trans_uuid} - {name}"
+                f'- {"created" if translation_created else "updated"} translation '
+                f'{translation.language.short_name} {trans_uuid} - {name}'
             )
             print_fn(out)
 
@@ -344,7 +344,7 @@ def print_fn(_):
             try:
                 obj = Exercise.objects.get(uuid=uuid)
                 obj.delete()
-                print_fn(f"Deleted translation {uuid} ({data['comment']})")
+                print_fn(f'Deleted translation {uuid} ({data["comment"]})')
             except Exercise.DoesNotExist:
                 pass
 

wger/exercises/tests/test_categories.py

@@ -46,7 +46,8 @@ class CategoryOverviewTestCase(WgerAccessTestCase):
     user_success = 'admin'
     user_fail = (
         'manager1',
-        'manager2' 'general_manager1',
+        'manager2',
+        'general_manager1',
         'manager3',
         'manager4',
         'test',

wger/exercises/tests/test_exercise_translation.py

@@ -118,7 +118,7 @@ def test_render_main_muscles(self):
         """
 
         context = Context({'muscles': Muscle.objects.get(pk=2)})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/main/muscle-2.svg', rendered_template)
         self.assertNotIn('images/muscles/secondary/', rendered_template)
@@ -130,7 +130,7 @@ def test_render_main_muscles_empty_secondary(self):
         """
 
         context = Context({'muscles': Muscle.objects.get(pk=2), 'muscles_sec': []})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles muscles_sec %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/main/muscle-2.svg', rendered_template)
         self.assertNotIn('images/muscles/secondary/', rendered_template)
@@ -142,7 +142,7 @@ def test_render_secondary_muscles(self):
         """
 
         context = Context({'muscles': Muscle.objects.get(pk=1)})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles_sec=muscles %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles_sec=muscles %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
         self.assertNotIn('images/muscles/main/', rendered_template)
@@ -154,7 +154,7 @@ def test_render_secondary_muscles_empty_primary(self):
         """
 
         context = Context({'muscles_sec': Muscle.objects.get(pk=1), 'muscles': []})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles muscles_sec %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
         self.assertNotIn('images/muscles/main/', rendered_template)
@@ -166,7 +166,7 @@ def test_render_secondary_muscles_list(self):
         """
 
         context = Context({'muscles_sec': Muscle.objects.filter(is_front=True), 'muscles': []})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles muscles_sec %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
         self.assertNotIn('images/muscles/secondary/muscle-2.svg', rendered_template)
@@ -185,7 +185,7 @@ def test_render_muscle_list(self):
                 'muscles': Muscle.objects.filter(id__in=[1, 4]),
             }
         )
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles muscles_sec %}')
         rendered_template = template.render(context)
         self.assertIn('images/muscles/main/muscle-1.svg', rendered_template)
         self.assertNotIn('images/muscles/main/muscle-2.svg', rendered_template)
@@ -202,7 +202,7 @@ def test_render_empty(self):
         """
 
         context = Context({'muscles': [], 'muscles_sec': []})
-        template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
+        template = Template('{% load wger_extras %}{% render_muscles muscles muscles_sec %}')
         rendered_template = template.render(context)
         self.assertEqual(rendered_template, '\n\n')
 
@@ -211,7 +211,7 @@ def test_render_no_parameters(self):
         Test that the tag works when given no parameters
         """
 
-        template = Template('{% load wger_extras %}' '{% render_muscles %}')
+        template = Template('{% load wger_extras %}{% render_muscles %}')
         rendered_template = template.render(Context({}))
         self.assertEqual(rendered_template, '\n\n')
 

wger/exercises/tests/test_muscles.py

@@ -52,7 +52,8 @@ class MuscleAdminOverviewTest(WgerAccessTestCase):
     user_success = 'admin'
     user_fail = (
         'manager1',
-        'manager2' 'general_manager1',
+        'manager2',
+        'general_manager1',
         'manager3',
         'manager4',
         'test',

wger/gym/forms.py

@@ -95,9 +95,9 @@ class Meta:
         label=_('Username'),
         max_length=30,
         regex=r'^[\w.@+-]+$',
-        help_text=_('Required. 30 characters or fewer. Letters, digits and ' '@/./+/-/_ only.'),
+        help_text=_('Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.'),
         error_messages={
-            'invalid': _('This value may contain only letters, numbers and ' '@/.//-/_ characters.')
+            'invalid': _('This value may contain only letters, numbers and @/.//-/_ characters.')
         },
     )
 

wger/gym/management/commands/dummy-generator-gyms.py

@@ -92,7 +92,7 @@ def handle(self, **options):
         faker.add_provider(gym_names_1)
         faker.add_provider(gym_names_2)
 
-        self.stdout.write(f"** Generating {options['number_gyms']} gyms")
+        self.stdout.write(f'** Generating {options["number_gyms"]} gyms')
 
         gym_list = []
         for i in range(options['number_gyms']):

wger/gym/models/user_config.py

@@ -90,7 +90,7 @@ class Meta:
 
     include_inactive = m.BooleanField(
         verbose_name=_('Include in inactive overview'),
-        help_text=_('Include this user in the email list with ' 'inactive members'),
+        help_text=_('Include this user in the email list with inactive members'),
         default=True,
     )
     """

wger/manager/management/commands/dummy-generator-workout-diary.py

@@ -78,7 +78,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, **options):
-        self.stdout.write(f"** Generating {options['nr_diary_entries']} dummy diary entries")
+        self.stdout.write(f'** Generating {options["nr_diary_entries"]} dummy diary entries')
 
         users = (
             [User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()

wger/manager/management/commands/dummy-generator-workout-plans.py

@@ -61,7 +61,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, **options):
-        self.stdout.write(f"** Generating {options['nr_plans']} dummy workout plan(s) per user")
+        self.stdout.write(f'** Generating {options["nr_plans"]} dummy workout plan(s) per user')
 
         users = (
             [User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()

wger/manager/models/schedule.py

@@ -54,7 +54,7 @@ class Schedule(models.Model):
     name = models.CharField(
         verbose_name=_('Name'),
         max_length=100,
-        help_text=_('Name or short description of the schedule. ' "For example 'Program XYZ'."),
+        help_text=_("Name or short description of the schedule. For example 'Program XYZ'."),
     )
     """Name or short description of the schedule."""
 

wger/manager/models/session.py

@@ -73,7 +73,7 @@ class WorkoutSession(models.Model):
         verbose_name=_('Notes'),
         null=True,
         blank=True,
-        help_text=_('Any notes you might want to save about this workout ' 'session.'),
+        help_text=_('Any notes you might want to save about this workout session.'),
     )
     """
     User notes about the workout
@@ -85,7 +85,7 @@ class WorkoutSession(models.Model):
         choices=IMPRESSION,
         default=IMPRESSION_NEUTRAL,
         help_text=_(
-            'Your impression about this workout session. ' 'Did you exercise as well as you could?'
+            'Your impression about this workout session. Did you exercise as well as you could?'
         ),
     )
     """

wger/manager/models/workout.py

@@ -72,7 +72,7 @@ class Meta:
     is_template = models.BooleanField(
         verbose_name=_('Workout template'),
         help_text=_(
-            'Marking a workout as a template will freeze it and allow you to ' 'make copies of it'
+            'Marking a workout as a template will freeze it and allow you to make copies of it'
         ),
         default=False,
         null=False,

wger/manager/tests/test_set.py

@@ -483,7 +483,7 @@ def test_smart_repr_custom_setting(self):
         setting_text = set_obj.reps_smart_text(ExerciseBase.objects.get(pk=1))
         self.assertEqual(
             setting_text,
-            '8 (90 kg, 3 RiR) – 10 (80 kg, 2.5 RiR) – ' '10 (80 kg, 2 RiR) – 12 (80 kg, 1 RiR)',
+            '8 (90 kg, 3 RiR) – 10 (80 kg, 2.5 RiR) – 10 (80 kg, 2 RiR) – 12 (80 kg, 1 RiR)',
         )
 
     def test_synthetic_settings(self):

wger/measurements/management/commands/dummy-generator-measurement-categories.py

@@ -67,7 +67,7 @@ def add_arguments(self, parser):
 
     def handle(self, **options):
         self.stdout.write(
-            f"** Generating {options['nr_categories']} dummy measurement categories per user"
+            f'** Generating {options["nr_categories"]} dummy measurement categories per user'
         )
 
         users = (

wger/measurements/management/commands/dummy-generator-measurements.py

@@ -63,7 +63,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, **options):
-        self.stdout.write(f"** Generating {options['nr_measurements']} dummy measurements per user")
+        self.stdout.write(f'** Generating {options["nr_measurements"]} dummy measurements per user')
 
         users = (
             [User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()

wger/nutrition/forms.py

@@ -206,16 +206,14 @@ class DailyCaloriesForm(forms.ModelForm):
 
     base_calories = forms.IntegerField(
         label=_('Basic caloric intake'),
-        help_text=_('Your basic caloric intake as calculated for ' 'your data'),
+        help_text=_('Your basic caloric intake as calculated for your data'),
         required=False,
         widget=Html5NumberInput(),
     )
     additional_calories = forms.IntegerField(
         label=_('Additional calories'),
         help_text=_(
-            'Additional calories to add to the base '
-            'rate (to substract, enter a negative '
-            'number)'
+            'Additional calories to add to the base rate (to substract, enter a negative number)'
         ),
         initial=0,
         required=False,

wger/nutrition/management/commands/dummy-generator-nutrition.py

@@ -80,7 +80,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, **options):
-        self.stdout.write(f"** Generating {options['nr_plans']} dummy nutritional plan(s) per user")
+        self.stdout.write(f'** Generating {options["nr_plans"]} dummy nutritional plan(s) per user')
 
         users = (
             [User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()
@@ -147,6 +147,6 @@ def handle(self, **options):
                         diary_entries.append(log)
 
                 if int(options['verbosity']) >= 2:
-                    self.stdout.write(f"  created {options['nr_diary_dates']} diary entries")
+                    self.stdout.write(f'  created {options["nr_diary_dates"]} diary entries')
 
             LogItem.objects.bulk_create(diary_entries)

wger/nutrition/management/commands/sync-ingredients.py

@@ -23,6 +23,7 @@
 
 # wger
 from wger.nutrition.sync import sync_ingredients
+from wger.utils.validators import validate_language_code
 
 
 class Command(BaseCommand):
@@ -43,15 +44,31 @@ def add_arguments(self, parser):
             help=f'Remote URL to fetch the ingredients from (default: WGER_SETTINGS'
             f'["WGER_INSTANCE"] - {settings.WGER_SETTINGS["WGER_INSTANCE"]})',
         )
+        parser.add_argument(
+            '-l',
+            '--languages',
+            action='store',
+            dest='languages',
+            default=None,
+            help='Specify a comma-separated subset of languages to sync. Example: en,fr,es',
+        )
 
     def handle(self, **options):
         remote_url = options['remote_url']
+        languages = options['languages']
 
         try:
             val = URLValidator()
             val(remote_url)
             self.remote_url = remote_url
         except ValidationError:
             raise CommandError('Please enter a valid URL')
+        try:
+            self.languages = languages
+            if self.languages is not None:
+                for language in self.languages.split(','):
+                    validate_language_code(language)
+        except ValidationError as e:
+            raise CommandError('\n'.join([str(arg) for arg in e.args if arg is not None]))
 
-        sync_ingredients(self.stdout.write, self.remote_url, self.style.SUCCESS)
+        sync_ingredients(self.stdout.write, self.remote_url, self.languages, self.style.SUCCESS)