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

Show name including saluation in some places (Z#23121817) (#3320)

Browse Source 
Co-authored-by: Richard Schreiber <schreiber@rami.io>
This commit is contained in:
Raphael Michel
2023-05-17 11:53:28 +02:00
committed by GitHub
parent 37ba5a983b
commit 8d6d0c5893
8 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pretix/base/settings.py
View File

@@ -3354,6 +3354,7 @@ PERSON_NAME_SCHEMES = OrderedDict([
('full_name', _('Full name'), 2),
),
'concatenation': lambda d: str(d.get('full_name', '')),
'concatenation_all_components': lambda d: str(d.get('full_name', '')) + " (\"" + d.get('calling_name', '') + "\")",
'sample': {
'full_name': pgettext_lazy('person_name_sample', 'John Doe'),
'calling_name': pgettext_lazy('person_name_sample', 'John'),
@@ -3366,6 +3367,7 @@ PERSON_NAME_SCHEMES = OrderedDict([
('latin_transcription', _('Latin transcription'), 2),
),
'concatenation': lambda d: str(d.get('full_name', '')),
'concatenation_all_components': lambda d: str(d.get('full_name', '')) + " (" + d.get('latin_transcription', '') + ")",
'sample': {
'full_name': '庄司',
'latin_transcription': 'Shōji',
@@ -3382,6 +3384,9 @@ PERSON_NAME_SCHEMES = OrderedDict([
str(p) for p in (d.get(key, '') for key in ["given_name", "family_name"]) if p
),
'concatenation_for_salutation': concatenation_for_salutation,
'concatenation_all_components': lambda d: ' '.join(
str(p) for p in (d.get(key, '') for key in ["salutation", "given_name", "family_name"]) if p
),
'sample': {
'salutation': pgettext_lazy('person_name_sample', 'Mr'),
'given_name': pgettext_lazy('person_name_sample', 'John'),
@@ -3400,6 +3405,9 @@ PERSON_NAME_SCHEMES = OrderedDict([
str(p) for p in (d.get(key, '') for key in ["title", "given_name", "family_name"]) if p
),
'concatenation_for_salutation': concatenation_for_salutation,
'concatenation_all_components': lambda d: ' '.join(
str(p) for p in (d.get(key, '') for key in ["salutation", "title", "given_name", "family_name"]) if p
),
'sample': {
'salutation': pgettext_lazy('person_name_sample', 'Mr'),
'title': pgettext_lazy('person_name_sample', 'Dr'),
@@ -3424,6 +3432,13 @@ PERSON_NAME_SCHEMES = OrderedDict([
str(d.get('degree', ''))
),
'concatenation_for_salutation': concatenation_for_salutation,
'concatenation_all_components': lambda d: (
' '.join(
str(p) for p in (d.get(key, '') for key in ["salutation", "title", "given_name", "family_name"]) if p
) +
str((', ' if d.get('degree') else '')) +
str(d.get('degree', ''))
),
'sample': {
'salutation': pgettext_lazy('person_name_sample', 'Mr'),
'title': pgettext_lazy('person_name_sample', 'Dr'),