wbwriter 1.46.14__tar.gz → 1.47.1__tar.gz

{wbwriter-1.46.14 → wbwriter-1.47.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbwriter
-Version: 1.46.14
+Version: 1.47.1
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: pillow==9.1.*
 Requires-Dist: reportlab==3.*

wbwriter-1.47.1/wbwriter/migrations/0012_i18n.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.0.12 on 2025-03-03 10:28
+
+import modeltrans.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbwriter', '0011_auto_20240103_0953'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='i18n',
+            field=modeltrans.fields.TranslationField(fields=['title', 'content', 'slug'], required_languages=(), virtual_fields=True),
+        ),
+        migrations.AddField(
+            model_name='publication',
+            name='i18n',
+            field=modeltrans.fields.TranslationField(fields=['title', 'slug', 'content'], required_languages=(), virtual_fields=True),
+        ),
+    ]

{wbwriter-1.46.14 → wbwriter-1.47.1}/wbwriter/models/article.py

@@ -2,6 +2,7 @@ import datetime
 import json
 import re
 from contextlib import suppress
+from copy import deepcopy
 from datetime import date, timedelta
 
 from celery import shared_task
@@ -14,10 +15,12 @@ from django.db.models import Count, Max, OuterRef, Subquery
 from django.db.models.functions import Coalesce
 from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
+from modeltrans.fields import TranslationField
 from rest_framework.reverse import reverse
 from slugify import slugify
 from wbcore.contrib.directory.models import Person
 from wbcore.contrib.documents.models import Document, DocumentType
+from wbcore.contrib.i18n.translation import translate_string
 from wbcore.contrib.icons import WBIcon
 from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.contrib.notifications.utils import create_notification_type
@@ -418,6 +421,17 @@ class Article(TagModelMixin, PublishableMixin, WBModel):
         null=False,
     )
 
+    i18n = TranslationField(fields=["title", "content", "slug"])
+
+    def _translate_content(self, to_language: str) -> dict:
+        new_content = deepcopy(self.content)
+        for section_key in new_content.get("sections", {}):
+            for content_key, content_value in new_content["sections"][section_key]["content"].items():
+                new_content["sections"][section_key]["content"][content_key] = translate_string(
+                    content_value, to_language
+                )
+        return new_content
+
     type = models.ForeignKey(
         "wbwriter.ArticleType",
         related_name="article",
@@ -1074,7 +1088,7 @@ class Article(TagModelMixin, PublishableMixin, WBModel):
                             template_context["content"] = f"""
                             <p>To generate the PDF, please correct the following errors:</p>
                             <ul>
-                            {''.join([f'<li>{error}</li>' for error in parser.errors])}
+                            {"".join([f"<li>{error}</li>" for error in parser.errors])}
                             </ul>
                             """
             html = template.Template(empty_template).render(template_context)

{wbwriter-1.46.14 → wbwriter-1.47.1}/wbwriter/models/publication_models.py

@@ -5,6 +5,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.functional import cached_property
+from modeltrans.fields import TranslationField
 from rest_framework.reverse import reverse
 from slugify import slugify
 from wbcore.contrib.tags.models import TagModelMixin
@@ -62,6 +63,8 @@ class Publication(TagModelMixin, models.Model):
         null=True,
     )
 
+    i18n = TranslationField(fields=["title", "slug", "content"])
+
     parser = models.ForeignKey(
         "wbwriter.PublicationParser",
         related_name="parsed_publication",

{wbwriter-1.46.14 → wbwriter-1.47.1}/wbwriter/serializers/article.py

@@ -58,7 +58,10 @@ class DependantArticleModelSerializer(ModelSerializer):
         )
 
 
-class ArticleModelSerializer(TagSerializerMixin, ModelSerializer):
+from wbcore.contrib.i18n.serializers.mixins import ModelTranslateSerializerMixin
+
+
+class ArticleModelSerializer(ModelTranslateSerializerMixin, TagSerializerMixin, ModelSerializer):
     """Serializes a subset of the fields of of the Article model to minimize
     workload on serializing lists of instances.
     """
@@ -81,7 +84,7 @@ class ArticleModelSerializer(TagSerializerMixin, ModelSerializer):
     @register_resource()
     def metainformationinstance(self, instance, request, user):
         return {
-            "metainformationinstance": f'{reverse("wbwriter:metainformationinstancearticle-list", args=[instance.id], request=request)}',
+            "metainformationinstance": f"{reverse('wbwriter:metainformationinstancearticle-list', args=[instance.id], request=request)}",
         }
 
     @register_resource()
@@ -162,6 +165,7 @@ class ArticleModelSerializer(TagSerializerMixin, ModelSerializer):
             "tags",
             "_tags",
             "_additional_resources",
+            "_i18n",
         )
 
 
@@ -357,4 +361,5 @@ class ArticleFullModelSerializer(ArticleModelSerializer):
             "tags",
             "_tags",
             "_additional_resources",
+            "_i18n",
         )

{wbwriter-1.46.14 → wbwriter-1.47.1}/wbwriter/tests/test_model.py

@@ -556,7 +556,11 @@ class TestArticleCloning:
         del article_clone_dict["teaser_image"]
         article_dict["name"] += "_clone"
         article_dict["slug"] += "-clone"
+        article_dict["slug_en_us"] += "-clone"
+        article_dict["slug_i18n"] += "-clone"
         article_dict["title"] += " (Clone)"
+        article_dict["title_i18n"] += " (Clone)"
+        article_dict["title_en_us"] += " (Clone)"
         article_dict["author"] = user.profile.id
         assert article_dict == article_clone_dict
         assert Article.objects.count() == 4

{wbwriter-1.46.14 → wbwriter-1.47.1}/wbwriter/viewsets/article.py

@@ -8,6 +8,7 @@ from rest_framework.response import Response
 from reversion.views import RevisionMixin
 from wbcore.contrib.authentication.authentication import JWTCookieAuthentication
 from wbcore.contrib.directory.models import Person
+from wbcore.contrib.i18n.viewsets import ModelTranslateMixin
 from wbcore.utils.views import CloneMixin
 from wbcore.viewsets import ModelViewSet, RepresentationViewSet
 
@@ -99,7 +100,9 @@ class ArticleInstancePermissionMixin:
         return False
 
 
-class ArticleModelViewSet(ArticleInstancePermissionMixin, CloneMixin, RevisionMixin, ModelViewSet):
+class ArticleModelViewSet(
+    ModelTranslateMixin, ArticleInstancePermissionMixin, CloneMixin, RevisionMixin, ModelViewSet
+):
     # LIST_DOCUMENTATION = "wbwriter/viewsets/documentation/article.md"
 
     serializer_class = ArticleFullModelSerializer