Hopiu/django-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/django-modeltranslation.git synced 2026-05-09 22:04:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Sergey Tereschenko 2019-04-18 00:58:34 +03:00
commit 4f18363104
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modeltranslation/admin.py
View file

@ -270,8 +270,9 @@ class TranslationAdmin(TranslationBaseModelAdmin, admin.ModelAdmin):
flattened_fieldsets = flatten_fieldsets(fieldsets)
# Create a fieldset to group each translated field's localized fields
fields = sorted((f for f in self.opts.get_fields() if f.concrete))
untranslated_fields = [
f.name for f in self.opts.fields if (
f.name for f in fields if (
# Exclude the primary key field
f is not self.opts.auto_field and
# Exclude non-editable fields
@ -359,8 +360,8 @@ class TabbedDjangoJqueryTranslationAdmin(TranslationAdmin):
class Media:
js = (
'modeltranslation/js/force_jquery.js',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js',
mt_settings.JQUERY_UI_URL,
mt_settings.JQUERY_MB_BROWSER_URL,
'modeltranslation/js/tabbed_translation_fields.js',
)
css = {
@ -375,9 +376,9 @@ class TabbedExternalJqueryTranslationAdmin(TranslationAdmin):
"""
class Media:
js = (
'//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js',
mt_settings.JQUERY_URL,
mt_settings.JQUERY_UI_URL,
mt_settings.JQUERY_MB_BROWSER_URL,
'modeltranslation/js/tabbed_translation_fields.js',
)
css = {

7
modeltranslation/settings.py
View file

@ -54,3 +54,10 @@ for key, value in FALLBACK_LANGUAGES.items():
ENABLE_FALLBACKS = getattr(settings, 'MODELTRANSLATION_ENABLE_FALLBACKS', True)
LOADDATA_RETAIN_LOCALE = getattr(settings, 'MODELTRANSLATION_LOADDATA_RETAIN_LOCALE', True)
JQUERY_URL = getattr(settings, 'JQUERY_URL',
'//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js')
JQUERY_UI_URL = getattr(settings, 'JQUERY_UI_URL',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js')
JQUERY_MB_BROWSER_URL = getattr(settings, 'JQUERY_MB_BROWSER_URL',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js')