Skip to content

Commit 8b537fc

Browse files
marcoagdependabot[bot]cweitatkhangonHieu Lam - TMA
authored
Merging development into main. (#8941)
* chore(deps): bump stripe from 3.0.0 to 5.4.0 (#8880) Bumps [stripe](https://github.com/stripe/stripe-python) from 3.0.0 to 5.4.0. - [Release notes](https://github.com/stripe/stripe-python/releases) - [Changelog](https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md) - [Commits](stripe/stripe-python@v3.0.0...v5.4.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cweitat <[email protected]> * feature-8832: Add option "Not sure yet" to attendee Form Yes/No questions (#8929) * feature-8800: Make custom form question translatable by the organizer (#8920) * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * feature-8800: Make custom form question translatable by the organizer * Feature-8830 Attendee Form: Implement scholarship question with dropdown (#8934) * feature-8830 Attendee Form: Implement scholarship question with dropdown * feature-8830 correct wikimania spelling * Feature-8829: Additional consent boxes in attendee form (#8933) * feature-8829: Additional consent boxes in attendee form * feature-8829: Additional consent boxes in attendee form * update revision for downgrade alembic * feature-8827: Make names part of the custom form area in attendee forms (#8936) * feature-8827: Make names part of the custom form area in attendee forms * feature-8827: Make names part of the custom form area in attendee forms * feat #8938: adjusting the server to gender option changes * remove "open" in gender --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cweitat <[email protected]> Co-authored-by: Khang On - TMA <[email protected]> Co-authored-by: Hieu Lam - TMA <[email protected]> Co-authored-by: Norbert Preining <[email protected]> Co-authored-by: Rebekka Rossberg <[email protected]>
1 parent f154ec4 commit 8b537fc

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎app/api/helpers/static.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,11 +563,13 @@
563563
]
564564

565565
GENDER_CHOICES = [
566-
'Male',
567-
'Female',
568-
'Other',
569-
'Diverse / Non-binary',
570-
'Prefer not to share',
566+
'Man',
567+
'Woman',
568+
'Transgender',
569+
'Non-binary',
570+
'Genderqueer',
571+
'An identity not listed here',
572+
'I prefer not to say',
571573
]
572574

573575
LEVEL_CHOICES = ['Beginner', 'Intermediate', 'Advanced', 'Expert']

‎docs/api/blueprint/speaker/speakers.apib

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Create a Speaker profile
7878
"email":"[email protected]",
7979
"website":"https://firstSpeaker.com",
8080
"city":"Delhi",
81-
"gender":"Male",
81+
"gender":"Man",
8282
"country":"India"
8383
}
8484
}
@@ -124,7 +124,7 @@ Create a Speaker profile
124124
"mobile": null,
125125
"github": null,
126126
"facebook": null,
127-
"gender": "Male",
127+
"gender": "Man",
128128
"position": null,
129129
"organisation": null,
130130
"deleted-at": null,
@@ -201,7 +201,7 @@ Get a single Speaker profile
201201
"mobile": null,
202202
"github": null,
203203
"facebook": null,
204-
"gender": "Male",
204+
"gender": "Man",
205205
"position": null,
206206
"deleted-at": null,
207207
"organisation": null,
@@ -241,7 +241,7 @@ Update a single speaker by `id`.
241241
"email":"[email protected]",
242242
"website":"https://firstSpeaker-Patched.com",
243243
"city":"Delhi",
244-
"gender":"Male",
244+
"gender":"Man",
245245
"country":"India"
246246
},
247247
"type": "speaker",
@@ -289,7 +289,7 @@ Update a single speaker by `id`.
289289
"mobile": null,
290290
"github": null,
291291
"facebook": null,
292-
"gender": "Male",
292+
"gender": "Man",
293293
"deleted-at": null,
294294
"position": null,
295295
"organisation": null,
@@ -396,7 +396,7 @@ Delete a single speaker by id.
396396
"mobile": null,
397397
"github": null,
398398
"facebook": null,
399-
"gender": "Male",
399+
"gender": "Man",
400400
"position": null,
401401
"deleted-at": null,
402402
"organisation": null,
@@ -483,7 +483,7 @@ Delete a single speaker by id.
483483
"mobile": null,
484484
"github": null,
485485
"facebook": null,
486-
"gender": "Male",
486+
"gender": "Man",
487487
"position": null,
488488
"deleted-at": null,
489489
"organisation": null,
@@ -568,7 +568,7 @@ Delete a single speaker by id.
568568
"mobile": null,
569569
"github": null,
570570
"facebook": null,
571-
"gender": "Male",
571+
"gender": "Man",
572572
"position": null,
573573
"deleted-at": null,
574574
"organisation": null,

0 commit comments

Comments
 (0)