mirror of
https://github.com/Hopiu/django-modeltranslation.git
synced 2026-04-30 17:54:42 +00:00
Reverted r123 as this leads to problems with inlines.
This commit is contained in:
parent
f2fd2eef59
commit
9ed4b2167e
3 changed files with 10 additions and 5 deletions
|
|
@ -1,7 +1,5 @@
|
|||
FIXED: Grouped fieldsets translation is not displayed.
|
||||
(resolves issue 52)
|
||||
FIXED: Tabs don't properly support two-part language codes.
|
||||
(resolves issue 63)
|
||||
|
||||
|
||||
v0.3.2
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ class TranslationAdminBase(object):
|
|||
field.widget = copy(orig_formfield.widget)
|
||||
css_classes = field.widget.attrs.get('class', '').split(' ')
|
||||
css_classes.append('modeltranslation')
|
||||
css_classes.append('modeltranslation-field-%s__%s' % (orig_fieldname,
|
||||
db_field.language))
|
||||
#css_classes.append('modeltranslation-field-%s__%s' % (orig_fieldname,
|
||||
#db_field.language))
|
||||
|
||||
if db_field.language == DEFAULT_LANGUAGE:
|
||||
# Add another css class to identify a default modeltranslation
|
||||
|
|
|
|||
|
|
@ -25,6 +25,10 @@ var google, django, gettext;
|
|||
grouped_translations = {};
|
||||
|
||||
translation_fields.each(function (i, el) {
|
||||
/*
|
||||
// FIXME: Fails if there's an inline which has the same field name as
|
||||
// the edited object.
|
||||
|
||||
// Extract fieldname and original language code from class attribute
|
||||
var css_lang_suffix = 'modeltranslation-field-';
|
||||
var name = '';
|
||||
|
|
@ -37,12 +41,15 @@ var google, django, gettext;
|
|||
lang = v[1];
|
||||
}
|
||||
});
|
||||
*/
|
||||
var name = $(el).attr('name').split('_'),
|
||||
lang = name.pop();
|
||||
name = name.join('_');
|
||||
if (!grouped_translations[name]) {
|
||||
grouped_translations[name] = {};
|
||||
}
|
||||
grouped_translations[name][lang] = el;
|
||||
});
|
||||
|
||||
return grouped_translations;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue