CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve LazyI18nString logic

Browse Source
This commit is contained in:
Raphael Michel
2017-01-01 20:32:35 +01:00
parent e6f731ad77
commit 1c54ca7b74
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pretix/base/i18n.py
View File

@@ -69,14 +69,16 @@ class LazyI18nString:
if isinstance(self.data, dict): if isinstance(self.data, dict):
firstpart = lng.split('-')[0] firstpart = lng.split('-')[0]
similar = [l for l in self.data.keys() if l.startswith(firstpart + "-") or firstpart == l] similar = [l for l in self.data.keys() if (l.startswith(firstpart + "-") or firstpart == l) and l != lng]
if lng in self.data and self.data[lng]: if self.data.get(lng):
return self.data[lng] return self.data[lng]
elif firstpart in self.data: elif self.data.get(firstpart):
return self.data[firstpart] return self.data[firstpart]
elif similar: elif similar and any([self.data.get(s) for s in similar]):
return self.data[similar[0]] for s in similar:
elif settings.LANGUAGE_CODE in self.data and self.data[settings.LANGUAGE_CODE]: if self.data.get(s):
return self.data.get(s)
elif self.data.get(settings.LANGUAGE_CODE):
return self.data[settings.LANGUAGE_CODE] return self.data[settings.LANGUAGE_CODE]
elif len(self.data): elif len(self.data):
return list(self.data.items())[0][1] return list(self.data.items())[0][1]
@@ -145,6 +147,7 @@ class I18nWidget(forms.MultiWidget):
data = [] data = []
first_enabled = None first_enabled = None
any_filled = False any_filled = False
any_enabled_filled = False
if not isinstance(value, LazyI18nString): if not isinstance(value, LazyI18nString):
value = LazyI18nString(value) value = LazyI18nString(value)
for i, lng in enumerate(self.langcodes): for i, lng in enumerate(self.langcodes):
@@ -158,9 +161,13 @@ class I18nWidget(forms.MultiWidget):
any_filled = any_filled or (lng in self.enabled_langcodes and dataline) any_filled = any_filled or (lng in self.enabled_langcodes and dataline)
if not first_enabled and lng in self.enabled_langcodes: if not first_enabled and lng in self.enabled_langcodes:
first_enabled = i first_enabled = i
if dataline:
any_enabled_filled = True
data.append(dataline) data.append(dataline)
if value and not isinstance(value.data, dict): if value and not isinstance(value.data, dict):
data[first_enabled] = value.data data[first_enabled] = value.data
elif value and not any_enabled_filled:
data[first_enabled] = value.localize(self.enabled_langcodes[0])
return data return data
def render(self, name, value, attrs=None): def render(self, name, value, attrs=None):