Hopiu/django-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/django-modeltranslation.git synced 2026-03-16 22:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(flake8): Fix linter errors.

Browse source
This commit is contained in:
Sergey Tereschenko 2020-07-10 09:19:01 +03:00
parent 4812749121
commit 7a8a96ba18
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modeltranslation/settings.py
View file

@ -6,7 +6,7 @@ from django.core.exceptions import ImproperlyConfigured
TRANSLATION_FILES = tuple(getattr(settings, 'MODELTRANSLATION_TRANSLATION_FILES', ()))
AVAILABLE_LANGUAGES = list(getattr(settings, 'MODELTRANSLATION_LANGUAGES',
(l[0] for l in settings.LANGUAGES)))
(val for val, label in settings.LANGUAGES)))
DEFAULT_LANGUAGE = getattr(settings, 'MODELTRANSLATION_DEFAULT_LANGUAGE', None)
if DEFAULT_LANGUAGE and DEFAULT_LANGUAGE not in AVAILABLE_LANGUAGES:
raise ImproperlyConfigured('MODELTRANSLATION_DEFAULT_LANGUAGE not in LANGUAGES setting.')

2
modeltranslation/tests/tests.py
View file

@ -288,7 +288,7 @@ class TestAutodiscover(ModeltranslationTestBase):
class ModeltranslationTest(ModeltranslationTestBase):
"""Basic tests for the modeltranslation application."""
def test_registration(self):
langs = tuple(l[0] for l in django_settings.LANGUAGES)
langs = tuple(val for val, label in django_settings.LANGUAGES)
self.assertEqual(langs, tuple(mt_settings.AVAILABLE_LANGUAGES))
self.assertEqual(2, len(langs))
self.assertTrue('de' in langs)

8
modeltranslation/translator.py
View file

@ -94,7 +94,7 @@ class TranslationOptions(with_metaclass(FieldsAggregationMetaClass, object)):
def _check_languages(self, languages, extra=()):
correct = list(mt_settings.AVAILABLE_LANGUAGES) + list(extra)
if any(l not in correct for l in languages):
if any(lang not in correct for lang in languages):
raise ImproperlyConfigured(
'Language in required_languages which is not in AVAILABLE_LANGUAGES.')
@ -144,12 +144,12 @@ def add_translation_fields(model, opts):
model_empty_values = getattr(opts, 'empty_values', NONE)
for field_name in opts.local_fields.keys():
field_empty_value = parse_field(model_empty_values, field_name, NONE)
for l in mt_settings.AVAILABLE_LANGUAGES:
for lang in mt_settings.AVAILABLE_LANGUAGES:
# Create a dynamic translation field
translation_field = create_translation_field(
model=model, field_name=field_name, lang=l, empty_value=field_empty_value)
model=model, field_name=field_name, lang=lang, empty_value=field_empty_value)
# Construct the name for the localized field
localized_field_name = build_localized_fieldname(field_name, l)
localized_field_name = build_localized_fieldname(field_name, lang)
# Check if the model already has a field by that name
if hasattr(model, localized_field_name):

2
modeltranslation/utils.py
View file

@ -37,7 +37,7 @@ def get_translation_fields(field):
"""
Returns a list of localized fieldnames for a given field.
"""
return [build_localized_fieldname(field, l) for l in settings.AVAILABLE_LANGUAGES]
return [build_localized_fieldname(field, lang) for lang in settings.AVAILABLE_LANGUAGES]
def build_localized_fieldname(field_name, lang):