Translate lib/user (#2161)

nilsreichardt · web-flow · commit ea775f9cfbaf · 2026-02-06T23:25:52.000Z
Closes #2096
diff --git a/app/lib/account/account_page.dart b/app/lib/account/account_page.dart
@@ -23,6 +23,7 @@ import 'package:sharezone/settings/src/subpages/web_app.dart';
 import 'package:sharezone/widgets/avatar_card.dart';
 import 'package:sharezone_widgets/sharezone_widgets.dart';
 import 'package:sharezone_localizations/sharezone_localizations.dart';
+import 'package:user/user.dart';
 
 import 'account_page_bloc_factory.dart';
 
@@ -234,13 +235,13 @@ class _EmailText extends StatelessWidget {
 class _TypeOfUserText extends StatelessWidget {
   const _TypeOfUserText({required this.uid, required this.userType});
 
-  final String userType;
+  final TypeOfUser userType;
   final String uid;
 
   @override
   Widget build(BuildContext context) {
     return SelectableText(
-      userType,
+      userType.toLocalizedString(context),
       style: const TextStyle(fontSize: 14, color: Colors.grey),
     );
   }
diff --git a/app/lib/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_bloc.dart b/app/lib/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_bloc.dart
@@ -67,7 +67,7 @@ extension on MemberData {
       uid: '$id',
       name: name,
       hasRead: hasRead,
-      typeOfUser: typeOfUser.toReadableString(),
+      typeOfUser: typeOfUser,
     );
   }
 }
@@ -78,9 +78,7 @@ extension ImprovedSorting on List<UserView> {
   List<UserView> getViewsOfTypeOfUserSortedAlphabetically(
     TypeOfUser typeOfUser,
   ) {
-    return where(
-        (user) => user.typeOfUser == typeOfUser.toReadableString(),
-      ).toList()
+    return where((user) => user.typeOfUser == typeOfUser).toList()
       ..sort((a, b) => a.name.compareTo(b.name));
   }
 
diff --git a/app/lib/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_page.dart b/app/lib/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_page.dart
@@ -102,7 +102,7 @@ UserView _createMockView(int number, String name, {bool hasRead = false}) {
   return UserView(
     uid: "user$number",
     hasRead: hasRead,
-    typeOfUser: TypeOfUser.student.toReadableString(),
+    typeOfUser: TypeOfUser.student,
     name: name,
   );
 }
@@ -227,7 +227,7 @@ class _UserTile extends StatelessWidget {
       child: ListTile(
         key: ValueKey('${view.uid}${view.hasRead}'),
         title: Text(view.name),
-        subtitle: Text(view.typeOfUser),
+        subtitle: Text(view.typeOfUser.toLocalizedString(context)),
         leading: CircleAvatar(
           backgroundColor: Theme.of(context).primaryColor,
           child: Text(
diff --git a/app/lib/blackboard/details/blackboard_item_read_by_users_list/user_view.dart b/app/lib/blackboard/details/blackboard_item_read_by_users_list/user_view.dart
@@ -12,7 +12,7 @@ class UserView {
   final String uid;
   final String name;
   final String abbreviation;
-  final String typeOfUser;
+  final TypeOfUser typeOfUser;
   final bool hasRead;
 
   UserView({
diff --git a/app/lib/groups/src/widgets/member_list.dart b/app/lib/groups/src/widgets/member_list.dart
@@ -138,7 +138,7 @@ class MemberTile extends StatelessWidget {
     return ListTile(
       onLongPress: onLongPress,
       title: Text(memberData.name),
-      subtitle: Text(memberData.typeOfUser.toReadableString()),
+      subtitle: Text(memberData.typeOfUser.toLocalizedString(context)),
       leading: CircleAvatar(
         backgroundColor: Theme.of(context).primaryColor,
         child: Text(
diff --git a/app/lib/onboarding/sign_up/pages/choose_type_of_user.dart b/app/lib/onboarding/sign_up/pages/choose_type_of_user.dart
@@ -225,7 +225,7 @@ class _TypeOfUserTileNew extends StatelessWidget {
         return ListTile(
           leading: SvgPicture.asset(iconSvgPath, width: 45, height: 45),
           title: Text(
-            typeOfUser.toReadableString(),
+            typeOfUser.toLocalizedString(context),
             textAlign: TextAlign.center,
           ),
         );
@@ -236,7 +236,7 @@ class _TypeOfUserTileNew extends StatelessWidget {
           SvgPicture.asset(iconSvgPath, width: 60, height: 60),
           const SizedBox(height: 8),
           Text(
-            typeOfUser.toReadableString(),
+            typeOfUser.toLocalizedString(context),
             textAlign: TextAlign.center,
             style: const TextStyle(fontSize: 16),
           ),
diff --git a/app/lib/overview/views/user_view.dart b/app/lib/overview/views/user_view.dart
@@ -14,7 +14,7 @@ class UserView {
   final String name;
   final String abbreviation;
   final String? email;
-  final String userType;
+  final TypeOfUser userType;
   final StateEnum state;
   final bool isAnonymous;
   final Provider? provider;
@@ -40,7 +40,7 @@ class UserView {
       name = user.name,
       abbreviation = user.abbreviation,
       email = authUser?.email,
-      userType = user.typeOfUser.toReadableString(),
+      userType = user.typeOfUser,
       isAnonymous = authUser?.isAnonymous ?? false,
       state = user.state,
       provider = authUser?.provider;
@@ -50,7 +50,7 @@ class UserView {
       name = "",
       abbreviation = "",
       email = "",
-      userType = "",
+      userType = TypeOfUser.student,
       state = StateEnum.notSelected,
       isAnonymous = false,
       provider = null,
diff --git a/app/lib/settings/src/subpages/my_profile/change_type_of_user/change_type_of_user_page.dart b/app/lib/settings/src/subpages/my_profile/change_type_of_user/change_type_of_user_page.dart
@@ -204,7 +204,7 @@ class _ChangeTypeOfUser extends StatelessWidget {
           ])
             RadioListTile<TypeOfUser>(
               value: typeOfUser,
-              title: Text(typeOfUser.toReadableString()),
+              title: Text(typeOfUser.toLocalizedString(context)),
             ),
         ],
       ),
diff --git a/app/lib/settings/src/subpages/my_profile/my_profile_page.dart b/app/lib/settings/src/subpages/my_profile/my_profile_page.dart
@@ -36,6 +36,7 @@ import 'package:sharezone_common/api_errors.dart';
 import 'package:sharezone_localizations/sharezone_localizations.dart';
 import 'package:sharezone_widgets/sharezone_widgets.dart';
 import 'package:streaming_shared_preferences/streaming_shared_preferences.dart';
+import 'package:user/user.dart';
 
 import 'user_view.dart';
 
@@ -161,15 +162,15 @@ class _EmailTile extends StatelessWidget {
 }
 
 class _TypeOfUserTile extends StatelessWidget {
-  const _TypeOfUserTile({this.user});
+  const _TypeOfUserTile({required this.user});
 
-  final UserView? user;
+  final UserView user;
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
       title: Text(context.l10n.myProfileEmailAccountTypeTitle),
-      subtitle: Text(user!.typeOfUser),
+      subtitle: Text(user.typeOfUser.toLocalizedString(context)),
       leading: const Icon(Icons.accessibility),
       onTap: () => Navigator.pushNamed(context, ChangeTypeOfUserPage.tag),
     );
diff --git a/app/lib/settings/src/subpages/my_profile/user_view.dart b/app/lib/settings/src/subpages/my_profile/user_view.dart
@@ -17,7 +17,7 @@ class UserView {
   final String name;
   final String? email;
   final String? state;
-  final String typeOfUser;
+  final TypeOfUser typeOfUser;
   final bool isAnonymous;
   final Provider provider;
 
@@ -37,7 +37,7 @@ class UserView {
       name = user.name,
       email = authUser.email,
       state = stateEnumToString[user.state],
-      typeOfUser = user.typeOfUser.toReadableString(),
+      typeOfUser = user.typeOfUser,
       isAnonymous = authUser.isAnonymous,
       provider = authUser.provider;
 
@@ -47,7 +47,7 @@ class UserView {
       user: AppUser.create(id: ""),
       email: "",
       name: "",
-      typeOfUser: "",
+      typeOfUser: TypeOfUser.student,
       isAnonymous: true,
       provider: Provider.anonymous,
       state: "",
diff --git a/app/test/blackboard/blackboard_item_read_by_users_list/user_view_test.dart b/app/test/blackboard/blackboard_item_read_by_users_list/user_view_test.dart
@@ -72,6 +72,6 @@ UserView _createMockView(String name, TypeOfUser typeOfUser) {
     uid: "uid",
     hasRead: false,
     name: name,
-    typeOfUser: typeOfUser.toReadableString(),
+    typeOfUser: typeOfUser,
   );
 }
diff --git a/app/test_goldens/blackboard/details/blackboard_item_read_by_users_list_page_test.dart b/app/test_goldens/blackboard/details/blackboard_item_read_by_users_list_page_test.dart
@@ -19,9 +19,11 @@ import 'package:sharezone/blackboard/details/blackboard_item_read_by_users_list/
 import 'package:sharezone/blackboard/details/blackboard_item_read_by_users_list/blackboard_item_read_by_users_list_page.dart';
 import 'package:sharezone/blackboard/details/blackboard_item_read_by_users_list/user_view.dart';
 import 'package:sharezone/sharezone_plus/subscription_service/subscription_service.dart';
+import 'package:sharezone_localizations/sharezone_localizations.dart';
 import 'package:sharezone_widgets/sharezone_widgets.dart';
 import 'package:user/user.dart';
 
+import '../../flutter_test_config.dart';
 import 'blackboard_item_read_by_users_list_page_test.mocks.dart';
 
 @GenerateNiceMocks([
@@ -43,7 +45,7 @@ void main() {
           UserView(
             uid: "user$i",
             hasRead: random.nextBool(),
-            typeOfUser: TypeOfUser.student.toReadableString(),
+            typeOfUser: TypeOfUser.student,
             name: 'User $i',
           ),
       ];
@@ -68,7 +70,11 @@ void main() {
             ),
           ),
         ),
-        wrapper: materialAppWrapper(theme: theme),
+        wrapper: materialAppWrapper(
+          theme: theme,
+          localizations: SharezoneLocalizations.localizationsDelegates,
+          localeOverrides: defaultLocales,
+        ),
       );
     }
 
diff --git a/lib/sharezone_localizations/l10n/app_de.arb b/lib/sharezone_localizations/l10n/app_de.arb
@@ -1038,6 +1038,22 @@
     }
   },
   "timetableSettingsTitle": "Stundenplan",
+  "typeOfUserParent": "Elternteil",
+  "@typeOfUserParent": {
+    "description": "Label for the type of user parent."
+  },
+  "typeOfUserStudent": "Schüler*in",
+  "@typeOfUserStudent": {
+    "description": "Label for the type of user student."
+  },
+  "typeOfUserTeacher": "Lehrkraft",
+  "@typeOfUserTeacher": {
+    "description": "Label for the type of user teacher."
+  },
+  "typeOfUserUnknown": "Unbekannt",
+  "@typeOfUserUnknown": {
+    "description": "Label for the type of user unknown."
+  },
   "useAccountInstructionsAppBarTitle": "Anleitung",
   "@useAccountInstructionsAppBarTitle": {
     "description": "App bar title for the instructions on using multiple devices."
diff --git a/lib/sharezone_localizations/l10n/app_en.arb b/lib/sharezone_localizations/l10n/app_en.arb
@@ -507,6 +507,10 @@
   "timetableSettingsShowLessonsAbbreviation": "Show abbreviations in timetable",
   "timetableSettingsThisWeekIs": "This week is calendar week {calendar_week}. A-weeks are {is_a_week_even} calendar weeks and therefore it is currently a {even_or_odd_week}",
   "timetableSettingsTitle": "Timetable",
+  "typeOfUserParent": "Parent",
+  "typeOfUserStudent": "Student",
+  "typeOfUserTeacher": "Teacher",
+  "typeOfUserUnknown": "Unknown",
   "useAccountInstructionsAppBarTitle": "Instructions",
   "useAccountInstructionsHeadline": "How do I use Sharezone on multiple devices?",
   "useAccountInstructionsStep": "1. Go back to your profile\n2. Sign out using the sign-out icon at the top right.\n3. Confirm that your account will be deleted in the process.\n4. Tap the button \"Already have an account? Then...\" at the bottom.\n5. Sign in.",
diff --git a/lib/sharezone_localizations/lib/localizations/sharezone_localizations.gen.dart b/lib/sharezone_localizations/lib/localizations/sharezone_localizations.gen.dart
@@ -3013,6 +3013,30 @@ abstract class SharezoneLocalizations {
   /// **'Stundenplan'**
   String get timetableSettingsTitle;
 
+  /// Label for the type of user parent.
+  ///
+  /// In de, this message translates to:
+  /// **'Elternteil'**
+  String get typeOfUserParent;
+
+  /// Label for the type of user student.
+  ///
+  /// In de, this message translates to:
+  /// **'Schüler*in'**
+  String get typeOfUserStudent;
+
+  /// Label for the type of user teacher.
+  ///
+  /// In de, this message translates to:
+  /// **'Lehrkraft'**
+  String get typeOfUserTeacher;
+
+  /// Label for the type of user unknown.
+  ///
+  /// In de, this message translates to:
+  /// **'Unbekannt'**
+  String get typeOfUserUnknown;
+
   /// App bar title for the instructions on using multiple devices.
   ///
   /// In de, this message translates to:
diff --git a/lib/sharezone_localizations/lib/localizations/sharezone_localizations_de.gen.dart b/lib/sharezone_localizations/lib/localizations/sharezone_localizations_de.gen.dart
@@ -1705,6 +1705,18 @@ class SharezoneLocalizationsDe extends SharezoneLocalizations {
   @override
   String get timetableSettingsTitle => 'Stundenplan';
 
+  @override
+  String get typeOfUserParent => 'Elternteil';
+
+  @override
+  String get typeOfUserStudent => 'Schüler*in';
+
+  @override
+  String get typeOfUserTeacher => 'Lehrkraft';
+
+  @override
+  String get typeOfUserUnknown => 'Unbekannt';
+
   @override
   String get useAccountInstructionsAppBarTitle => 'Anleitung';
 
diff --git a/lib/sharezone_localizations/lib/localizations/sharezone_localizations_en.gen.dart b/lib/sharezone_localizations/lib/localizations/sharezone_localizations_en.gen.dart
@@ -1694,6 +1694,18 @@ class SharezoneLocalizationsEn extends SharezoneLocalizations {
   @override
   String get timetableSettingsTitle => 'Timetable';
 
+  @override
+  String get typeOfUserParent => 'Parent';
+
+  @override
+  String get typeOfUserStudent => 'Student';
+
+  @override
+  String get typeOfUserTeacher => 'Teacher';
+
+  @override
+  String get typeOfUserUnknown => 'Unknown';
+
   @override
   String get useAccountInstructionsAppBarTitle => 'Instructions';
 
diff --git a/lib/user/lib/src/models/type_of_user.dart b/lib/user/lib/src/models/type_of_user.dart
@@ -6,23 +6,22 @@
 //
 // SPDX-License-Identifier: EUPL-1.2
 
+import 'package:flutter/material.dart';
+import 'package:sharezone_localizations/sharezone_localizations.dart';
+
 enum TypeOfUser { student, teacher, parent, unknown }
 
 extension TypeOfUserExtension on TypeOfUser {
   bool get isTeacher => this == TypeOfUser.teacher;
   bool get isParent => this == TypeOfUser.parent;
   bool get isStudent => this == TypeOfUser.student;
 
-  String toReadableString() {
-    switch (this) {
-      case TypeOfUser.student:
-        return 'Schüler*in';
-      case TypeOfUser.teacher:
-        return 'Lehrkraft';
-      case TypeOfUser.parent:
-        return 'Elternteil';
-      case TypeOfUser.unknown:
-        return 'Unbekannt';
-    }
+  String toLocalizedString(BuildContext context) {
+    return switch (this) {
+      TypeOfUser.student => context.l10n.typeOfUserStudent,
+      TypeOfUser.teacher => context.l10n.typeOfUserTeacher,
+      TypeOfUser.parent => context.l10n.typeOfUserParent,
+      TypeOfUser.unknown => context.l10n.typeOfUserUnknown,
+    };
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ extension on MemberData {`
`67`	`67`	`uid: '$id',`
`68`	`68`	`name: name,`
`69`	`69`	`hasRead: hasRead,`
`70`		`- typeOfUser: typeOfUser.toReadableString(),`
	`70`	`+ typeOfUser: typeOfUser,`
`71`	`71`	`);`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -78,9 +78,7 @@ extension ImprovedSorting on List<UserView> {`
`78`	`78`	`List<UserView> getViewsOfTypeOfUserSortedAlphabetically(`
`79`	`79`	`TypeOfUser typeOfUser,`
`80`	`80`	`) {`
`81`		`- return where(`
`82`		`- (user) => user.typeOfUser == typeOfUser.toReadableString(),`
`83`		`- ).toList()`
	`81`	`+ return where((user) => user.typeOfUser == typeOfUser).toList()`
`84`	`82`	`..sort((a, b) => a.name.compareTo(b.name));`
`85`	`83`	`}`
`86`	`84`