From d75f92c430fa2cace37b39155ab80e0073a26287 Mon Sep 17 00:00:00 2001 From: Markus Pettersson Date: Thu, 24 Sep 2026 19:43:59 +0200 Subject: [PATCH] Change default alcohol package selection --- lib/l10n/app_en.arb | 2 +- lib/l10n/app_localizations.dart | 4 ++-- lib/l10n/app_localizations_en.dart | 2 +- lib/l10n/app_localizations_sv.dart | 2 +- lib/l10n/app_sv.arb | 2 +- lib/screens/event/event.dart | 14 +++++++------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 62c7576e..6205ace3 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -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)", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index d0c22d1d..dec6478b 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -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. /// diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 0c2126be..fcae1a60 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -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'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index 1716d76e..28e1a579 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -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'; diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index b29d0bba..ec27204d 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -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)", diff --git a/lib/screens/event/event.dart b/lib/screens/event/event.dart index d1784a33..1099edbe 100644 --- a/lib/screens/event/event.dart +++ b/lib/screens/event/event.dart @@ -125,7 +125,7 @@ class _EventPageState extends State { this.event = event; this.user = user; this.eventSignup = eventSignup; - this.drinkPackageAnswer = drinkPackageAlcohol; + this.drinkPackageAnswer = drinkPackageNone; this.priorities = prioritiesResponse.data!.toList().cast(); if (user.groups.isNotEmpty) { this.defaultGroup = user.groups.first; @@ -936,6 +936,10 @@ class _EventPageState extends State { }); }, items: [ + DropdownMenuItem( + value: drinkPackageNone, + child: Text(t.eventNone), + ), DropdownMenuItem( value: drinkPackageAlcohol, child: Text(t.eventAlcohol), @@ -944,10 +948,6 @@ class _EventPageState extends State { value: drinkPackageAlcoholFree, child: Text(t.eventAlcoholFree), ), - DropdownMenuItem( - value: drinkPackageNone, - child: Text(t.eventNoAlcohol), - ), ], ), ), @@ -1119,14 +1119,14 @@ class _EventPageState extends State { case "none": drinkPackage = _drinkPackageWidget( t.eventDrinkPackage, - " ${t.eventNoAlcohol}", + " ${t.eventNone}", ); break; default: this.drinkPackageAnswer = drinkPackageNone; drinkPackage = _drinkPackageWidget( t.eventDrinkPackage, - " ${t.eventNoAlcohol}", + " ${t.eventNone}", ); break; }