Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@

"messagesMessages": "Messages",

"nolleguide": "THE STUDENT GUIDE",
"nolleguide": "The Student Guide",

"nolleguideWeAtFsek": "The F-guild",
"nolleguideEtiquette": "All you need to know",
Expand Down Expand Up @@ -323,7 +323,7 @@
"readMotionAnswer": "Read motion answer",
"readProposition": "Read motion from the board",

"emergencyContacts": "Emergency contact numbers",
"emergencyContacts": "Emergency Contact Numbers",
"emergencyNumOne": "112",
"emergencyTitleOne": " - Emergency",
"emergencyContentOne": "In case of emergency, always call 112. This number allows you to reach the police, ambulance, fire brigade etc.",
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ abstract class AppLocalizations {
/// No description provided for @nolleguide.
///
/// In sv, this message translates to:
/// **'NOLLEGUIDEN'**
/// **'Nolleguiden'**
String get nolleguide;

/// No description provided for @nolleguideWeAtFsek.
Expand Down
4 changes: 2 additions & 2 deletions lib/l10n/app_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get messagesMessages => 'Messages';

@override
String get nolleguide => 'THE STUDENT GUIDE';
String get nolleguide => 'The Student Guide';

@override
String get nolleguideWeAtFsek => 'The F-guild';
Expand Down Expand Up @@ -933,7 +933,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get readProposition => 'Read motion from the board';

@override
String get emergencyContacts => 'Emergency contact numbers';
String get emergencyContacts => 'Emergency Contact Numbers';

@override
String get emergencyNumOne => '112';
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_localizations_sv.dart
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ class AppLocalizationsSv extends AppLocalizations {
String get messagesMessages => 'Meddelanden';

@override
String get nolleguide => 'NOLLEGUIDEN';
String get nolleguide => 'Nolleguiden';

@override
String get nolleguideWeAtFsek => 'F-sektionen';
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_sv.arb
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@

"messagesMessages": "Meddelanden",

"nolleguide": "NOLLEGUIDEN",
"nolleguide": "Nolleguiden",

"nolleguideWeAtFsek": "F-sektionen",
"nolleguideEtiquette": "Allt du behöver veta",
Expand Down
6 changes: 3 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:fsek_mobile/app.dart';
import 'package:bloc/bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:fsek_mobile/screens/home/nollningHome25.dart';
import 'package:fsek_mobile/screens/moose_game/moose_game.dart';
import 'package:fsek_mobile/screens/news/news.dart';
import 'package:fsek_mobile/screens/calendar/calendar.dart';
Expand Down Expand Up @@ -42,8 +41,9 @@ void main() async {
final List<Destination> navbarDestinations = <Destination>[
Destination(0, Icons.feed_outlined, NewsPage()),
Destination(1, Icons.calendar_today, Calendar()),
// Destination(2, Icons.home, HomePage()),
Destination(2, Icons.home, NollningHomePage()),
// During introduction, modify NollningHomePage() and comment the normal HomePage()
// Destination(2, Icons.home, NollningHomePage()),
Destination(2, Icons.home, HomePage()),
Destination(3, CustomIcons.moose, MooseGamePage()),
Destination(4, Icons.list, OtherContent()),
];
Expand Down
Loading