fix: Outputs deen as default across XML and MD API
This commit is contained in:
parent
5a349822d7
commit
be028b841a
4 changed files with 13 additions and 8 deletions
|
|
@ -66,10 +66,15 @@ Development setup
|
||||||
Changelog
|
Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
1.1.1
|
||||||
|
~~~~~
|
||||||
|
|
||||||
|
- ``<language>`` defaults to ``deen`` across XML and Markdown outputs.
|
||||||
|
|
||||||
1.1.0
|
1.1.0
|
||||||
~~~~~
|
~~~~~
|
||||||
|
|
||||||
- Add subevent-level "Language" field and use it to emit ``<language>`` per subevent (defaults to ``none``).
|
- Add subevent-level "Language" field and use it to emit ``<language>`` per subevent (defaults to ``deen``).
|
||||||
|
|
||||||
1.0.0
|
1.0.0
|
||||||
~~~~~
|
~~~~~
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
__version__ = "1.1.0"
|
__version__ = "1.1.1"
|
||||||
|
|
|
||||||
|
|
@ -196,21 +196,21 @@ class CongressScheduleView(views.APIView):
|
||||||
.values_list('value', flat=True)
|
.values_list('value', flat=True)
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
return (v or 'none').strip() or 'none'
|
return (v or 'deen').strip() or 'deen'
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
# Fallbacks for environments without pretix DB access
|
# Fallbacks for environments without pretix DB access
|
||||||
md = getattr(subevent, 'meta_data', None) or {}
|
md = getattr(subevent, 'meta_data', None) or {}
|
||||||
if isinstance(md, dict) and 'congressschedule_language' in md:
|
if isinstance(md, dict) and 'congressschedule_language' in md:
|
||||||
return (md.get('congressschedule_language') or 'none')
|
return (md.get('congressschedule_language') or 'deen')
|
||||||
se_settings = getattr(subevent, 'settings', None)
|
se_settings = getattr(subevent, 'settings', None)
|
||||||
try:
|
try:
|
||||||
return se_settings.get('congressschedule_language', 'none') if se_settings is not None else 'none'
|
return se_settings.get('congressschedule_language', 'deen') if se_settings is not None else 'deen'
|
||||||
except Exception:
|
except Exception:
|
||||||
return 'none'
|
return 'deen'
|
||||||
|
|
||||||
lang = _get_lang(se)
|
lang = _get_lang(se)
|
||||||
ET.SubElement(ev_el, 'language').text = str(lang or 'none')
|
ET.SubElement(ev_el, 'language').text = str(lang or 'deen')
|
||||||
|
|
||||||
# Leave optional complex children (persons, recording, links, attachments) empty for now
|
# Leave optional complex children (persons, recording, links, attachments) empty for now
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ class SubEventLanguageForm(forms.Form):
|
||||||
def save(self):
|
def save(self):
|
||||||
if not self.subevent:
|
if not self.subevent:
|
||||||
return
|
return
|
||||||
val = (self.cleaned_data.get('language') or '').strip() or 'none'
|
val = (self.cleaned_data.get('language') or '').strip() or 'deen'
|
||||||
# Persist as real subevent meta value so it's scoped per subevent
|
# Persist as real subevent meta value so it's scoped per subevent
|
||||||
from pretix.base.models import EventMetaProperty
|
from pretix.base.models import EventMetaProperty
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue