diff --git a/localized_fields/widgets.py b/localized_fields/widgets.py index 3b75bc9..451a724 100644 --- a/localized_fields/widgets.py +++ b/localized_fields/widgets.py @@ -23,9 +23,9 @@ class LocalizedFieldWidget(forms.MultiWidget): super().__init__(initial_widgets, *args, **kwargs) - for ((lc, ln), w) in zip(settings.LANGUAGES, self.widgets): - w.attrs['lang_code'] = lc - w.attrs['lang_name'] = ln + for ((lang_code, lang_name), widget) in zip(settings.LANGUAGES, self.widgets): + widget.attrs['lang_code'] = lang_code + widget.attrs['lang_name'] = lang_name def decompress(self, value: LocalizedValue) -> List[str]: """Decompresses the specified value so @@ -68,13 +68,16 @@ class AdminLocalizedFieldWidget(LocalizedFieldWidget): if self.is_localized: for widget in self.widgets: widget.is_localized = self.is_localized + # value is a list of values, each corresponding to a widget # in self.widgets. if not isinstance(value, list): value = self.decompress(value) + output = [] final_attrs = self.build_attrs(attrs) id_ = final_attrs.get('id') + for i, widget in enumerate(self.widgets): try: widget_value = value[i] @@ -82,22 +85,27 @@ class AdminLocalizedFieldWidget(LocalizedFieldWidget): widget_value = None if id_: final_attrs = dict(final_attrs, id='%s_%s' % (id_, i)) + widget_attrs = self.build_widget_attrs(widget, widget_value, final_attrs) output.append(widget.render(name + '_%s' % i, widget_value, widget_attrs)) + context = { 'id': final_attrs.get('id'), 'name': name, 'widgets': zip([code for code, lang in settings.LANGUAGES], output), 'available_languages': settings.LANGUAGES } + return render_to_string(self.template, context) @staticmethod def build_widget_attrs(widget, value, attrs): attrs = dict(attrs) # Copy attrs to avoid modifying the argument. + if (not widget.use_required_attribute(value) or not widget.is_required) \ and 'required' in attrs: del attrs['required'] + return attrs