Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Bump server versions

Roland Geider4aacaad532b5
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 1d4805d5f..578aeeaba 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -235,7 +235,7 @@ class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):
if detected_language_code != language.short_name.lower():
raise serializers.ValidationError(
{
- 'language': f'The detected language of the comment is "{detected_language.name.capitalize()}"'
+ 'language': f'The detected language of the comment is "{detected_language.name.capitalize()}" '
f'({detected_language_code}), which does not match your selected language: '
f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '
f'this is incorrect, try adding more content or rephrasing your text, as '
@@ -411,6 +411,7 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):
detector = (
LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()
)
+
language = data.get('language')
description = data.get('description')
@@ -420,11 +421,12 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):
if detected_language_code != language.short_name.lower():
raise serializers.ValidationError(
{
- 'language': f'The detected language of the description is "{detected_language.name.capitalize()}"'
- f'({detected_language_code}), which does not match your selected language: '
- f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '
- f'this is incorrect, try adding more content or rephrasing your text, as '
- f'language detection works better with longer or more complete sentences.'
+ 'language':
+ f'The detected language of the description is "{detected_language.name.capitalize()}" '
+ f'({detected_language_code}), which does not match your selected language: '
+ f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '
+ f'this is incorrect, try adding more content or rephrasing your text, as '
+ f'language detection works better with longer or more complete sentences.'
}
)
@@ -450,6 +452,7 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):
for alias_data in aliases_data:
alias_serializer = self.fields['aliases'].child
alias_serializer.create(validated_data=alias_data, translation=translation)
+
# Create the individual comments
for comment_data in comments_data:
comment_serializer = self.fields['comments'].child
@@ -592,23 +595,21 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
translations = ExerciseTranslationSubmissionSerializer(many=True)
class Meta:
- model = Exercise
fields = [
'id',
'category',
'muscles',
'muscles_secondary',
'equipment',
+ 'variation',
'license',
'license_author',
'translations',
- 'variation',
]
+ model = Exercise
@transaction.atomic
def create(self, validated_data):
- translations_data = validated_data.pop('translations')
-
# Create the Exercise object first
exercise = Exercise.objects.create(
category=validated_data.pop('category'),
@@ -621,8 +622,8 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
exercise.equipment.set(validated_data.pop('equipment'))
# Create the individual translations
- for translation_data in translations_data:
- translation_serializer = self.fields['translations'].child
- translation_serializer.create(validated_data=translation_data, exercise=exercise)
+ for translation in validated_data.pop('translations', []):
+ serializer: ExerciseTranslationSubmissionSerializer = self.fields['translations'].child
+ serializer.create(validated_data=translation, exercise=exercise)
return exercise
diff --git a/wger/urls.py b/wger/urls.py
index 54017be90..6f1aae6a0 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -287,7 +287,6 @@ urlpatterns = i18n_patterns(
urlpatterns += [
path('robots.txt', TextTemplateView.as_view(template_name='robots.txt'), name='robots'),
# API
- path('api/v2/', include(router.urls)),
path('api/v2/exercise/search/', exercises_api_views.search, name='exercise-search'),
path(
'api/v2/exercise-submission/',
@@ -296,6 +295,7 @@ urlpatterns += [
),
path('api/v2/ingredient/search/', nutrition_api_views.search, name='ingredient-search'),
path('api/v2/check-language/', core_api_views.check_language, name='check-language'),
+ path('api/v2/', include(router.urls)),
# The api user login
path(
'api/v2/login/', core_api_views.UserAPILoginView.as_view({'post': 'post'}), name='api_user'
diff --git a/wger/version.py b/wger/version.py
index 51167f343..bedc56d73 100644
--- a/wger/version.py
+++ b/wger/version.py
@@ -18,7 +18,6 @@ import logging
# Third Party
from packaging.version import Version
-
logger = logging.getLogger(__name__)
# For more details and possibilities, see:
@@ -31,10 +30,10 @@ Minimum version of the mobile app required to access this server.
Always use versions in the x.y.z format, without any suffixes like "beta1" or such.
"""
-MIN_SERVER_VERSION = Version('2.3.0-beta2')
+MIN_SERVER_VERSION = Version('2.4.0-beta1')
"""Minimum version of the server required to run sync commands on this server"""
-VERSION = Version('2.4.0-alpha1')
+VERSION = Version('2.4.0-alpha2')
"""Current version of the app"""