phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/last_fallback_translation_fix' into develop

Browse Source
This commit is contained in:
Kuroshini 2019-11-12 17:09:45 +03:00
commit 896da284a9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/search_indexes/utils.py
View File

@ -230,12 +230,14 @@ def get_translated_value(value):
return None return None
elif not isinstance(value, dict): elif not isinstance(value, dict):
field_dict = value.to_dict() field_dict = value.to_dict()
elif isinstance(value, dict): else:
field_dict = value field_dict = value
value = field_dict.get(get_current_locale()) field_dict = {k: v for k, v in field_dict.items() if v is not None}
result = field_dict.get(get_current_locale(), None)
# fallback # fallback
if value is None: if result is None:
value = field_dict.get(get_default_locale()) result = field_dict.get(get_default_locale(), None)
if value is None: if result is None:
value = field_dict.get(next(iter(field_dict.keys()), None)) values = list(field_dict.values())
return value result = values[0] if values else None
return result