Merge branch 'finder' of github.com:django-cms/django-filer into finder

Author: jrief

demoapp/settings.py

@@ -13,6 +13,8 @@
 import os
 from pathlib import Path
 
+from django.utils.translation import gettext_lazy as _
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -104,6 +106,13 @@
 
 USE_I18N = True
 
+LANGUAGES = [
+    ('en', _("English")),
+    ('de', _("German")),
+]
+
+LANGUAGE_CODE = 'en'
+
 STATICFILES_DIRS = [
     ('node_modules', BASE_DIR / 'node_modules'),
 ]

finder/contrib/image/admin.py

@@ -1,4 +1,10 @@
+from functools import cached_property
+
+from django.utils.text import format_lazy
+
+from django.conf import settings
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
 
 from finder.admin.file import FileAdmin
 from finder.contrib.image.forms import ImageFileForm
@@ -7,7 +13,28 @@
 
 @admin.register(ImageFileModel)
 class ImageAdmin(FileAdmin):
-    form = ImageFileForm
+
+    @cached_property
+    def form(self):
+        attrs, extra_fields = {}, []
+        alt_text_field = ImageFileForm.declared_fields['alt_text']
+        meta_data_fields = list(ImageFileForm._meta.entangled_fields['meta_data'])
+        index = meta_data_fields.index('alt_text')
+        if settings.USE_I18N and len(settings.LANGUAGES) > 1:
+            for code, language in settings.LANGUAGES:
+                if code != settings.LANGUAGE_CODE:
+                    field_name = f'alt_text_{code}'
+                    label = format_lazy(_("{field} ({language})"), field=alt_text_field.label, language=language)
+                    attrs[field_name] = alt_text_field.__class__(**dict(alt_text_field.__dict__, label=label))
+                    extra_fields.append(field_name)
+                    index += 1
+                    meta_data_fields.insert(index, field_name)
+
+        attrs['Meta'] = type('Meta', (ImageFileForm.Meta,), {
+            'entangled_fields': {'meta_data': meta_data_fields},
+            'fields': ImageFileForm._meta.fields + extra_fields,
+        })
+        return type(ImageFileForm.__name__, ImageFileForm.__mro__, attrs)
 
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)

finder/contrib/image/forms.py

@@ -1,5 +1,6 @@
 from django.forms.fields import CharField, FloatField, IntegerField
 from django.forms.widgets import HiddenInput, TextInput
+from django.utils.translation import gettext_lazy as _
 
 from entangled.forms import EntangledModelFormMixin
 
@@ -27,11 +28,17 @@ class ImageFileForm(EntangledModelFormMixin, FileForm):
         required=False,
     )
     alt_text = CharField(
+        label=_("Alternative Text"),
+        widget=TextInput(attrs={'size': 100}),
+        required=False,
+    )
+    credit = CharField(
+        label=_("Image Credit"),
         widget=TextInput(attrs={'size': 100}),
         required=False,
     )
 
     class Meta:
         model = ImageFileModel
-        entangled_fields = {'meta_data': ['crop_x', 'crop_y', 'crop_size', 'gravity', 'alt_text']}
+        entangled_fields = {'meta_data': ['crop_x', 'crop_y', 'crop_size', 'gravity', 'alt_text', 'credit']}
         untangled_fields = ['name', 'labels', 'width', 'height']