Skip to content

Change default alcohol package selection #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mptrsn05 merged 1 commit into from
Sep 28, 2026
Merged

Change default alcohol package selection #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"eventAlcohol": "Alcohol",
"eventAlcoholMayAppear" : "Alcohol may be present",
"eventAlcoholFree" : "Alcoholfree",
"eventNoAlcohol" : "None",
"eventNone" : "None",
"eventNollning": "Introduction event",
"eventNollningMentor": "Introduction event (with your mentor group)",
"eventNollningMission": "Introduction event (with your mission group)",
Expand Down
4 changes: 2 additions & 2 deletions lib/l10n/app_localizations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,11 @@ abstract class AppLocalizations {
/// **'Alkoholfritt'**
String get eventAlcoholFree;

/// No description provided for @eventNoAlcohol.
/// No description provided for @eventNone.
///
/// In sv, this message translates to:
/// **'Inget'**
String get eventNoAlcohol;
String get eventNone;

/// No description provided for @eventNollning.
///
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_localizations_en.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get eventAlcoholFree => 'Alcoholfree';

@override
String get eventNoAlcohol => 'None';
String get eventNone => 'None';

@override
String get eventNollning => 'Introduction event';
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_localizations_sv.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class AppLocalizationsSv extends AppLocalizations {
String get eventAlcoholFree => 'Alkoholfritt';

@override
String get eventNoAlcohol => 'Inget';
String get eventNone => 'Inget';

@override
String get eventNollning => 'Nollningsevent';
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_sv.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"eventAlcohol": "Alkohol",
"eventAlcoholMayAppear" : "Alkohol kan förekomma",
"eventAlcoholFree" : "Alkoholfritt",
"eventNoAlcohol" : "Inget",
"eventNone" : "Inget",
"eventNollning": "Nollningsevent",
"eventNollningMentor": "Nollningsevent (med faddergruppen)",
"eventNollningMission": "Nollningsevent (med uppdragsgruppen)",
Expand Down
14 changes: 7 additions & 7 deletions lib/screens/event/event.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class _EventPageState extends State<EventPage> {
this.event = event;
this.user = user;
this.eventSignup = eventSignup;
this.drinkPackageAnswer = drinkPackageAlcohol;
this.drinkPackageAnswer = drinkPackageNone;
this.priorities = prioritiesResponse.data!.toList().cast<String>();
if (user.groups.isNotEmpty) {
this.defaultGroup = user.groups.first;
Expand Down Expand Up @@ -936,6 +936,10 @@ class _EventPageState extends State<EventPage> {
});
},
items: [
DropdownMenuItem<String?>(
value: drinkPackageNone,
child: Text(t.eventNone),
),
DropdownMenuItem<String?>(
value: drinkPackageAlcohol,
child: Text(t.eventAlcohol),
Expand All @@ -944,10 +948,6 @@ class _EventPageState extends State<EventPage> {
value: drinkPackageAlcoholFree,
child: Text(t.eventAlcoholFree),
),
DropdownMenuItem<String?>(
value: drinkPackageNone,
child: Text(t.eventNoAlcohol),
),
],
),
),
Expand Down Expand Up @@ -1119,14 +1119,14 @@ class _EventPageState extends State<EventPage> {
case "none":
drinkPackage = _drinkPackageWidget(
t.eventDrinkPackage,
" ${t.eventNoAlcohol}",
" ${t.eventNone}",
);
break;
default:
this.drinkPackageAnswer = drinkPackageNone;
drinkPackage = _drinkPackageWidget(
t.eventDrinkPackage,
" ${t.eventNoAlcohol}",
" ${t.eventNone}",
);
break;
}
Expand Down
Loading