balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

fixed i18n error spam on home screen (welcome msg)

Browse Source
This commit is contained in:
Kima 2023-10-08 11:51:09 +02:00
parent a7f1681902
commit 387e2e46db
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filcnaplo_mobile_ui/lib/pages/home/home_page.dart
View File

@ -102,6 +102,8 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
firstName = "János"; firstName = "János";
} }
bool customWelcome = settings.welcomeMessage.replaceAll(' ', '') != '';
if (now.isBefore(DateTime(now.year, DateTime.august, 31)) && if (now.isBefore(DateTime(now.year, DateTime.august, 31)) &&
now.isAfter(DateTime(now.year, DateTime.june, 14))) { now.isAfter(DateTime(now.year, DateTime.june, 14))) {
greeting = "goodrest"; greeting = "goodrest";
@ -138,7 +140,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
greeting = "merryxmas"; greeting = "merryxmas";
} else if (now.month == DateTime.january && now.day == 1) { } else if (now.month == DateTime.january && now.day == 1) {
greeting = "happynewyear"; greeting = "happynewyear";
} else if (settings.welcomeMessage.replaceAll(' ', '') != '') { } else if (customWelcome) {
greeting = settings.welcomeMessage; greeting = settings.welcomeMessage;
greeting = localizeFill( greeting = localizeFill(
settings.welcomeMessage, settings.welcomeMessage,
@ -153,6 +155,8 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
} else { } else {
greeting = "goodevening"; greeting = "goodevening";
} }
greeting = customWelcome ? greeting : greeting.i18n.fill([firstName]);
} }
@override @override
@ -191,7 +195,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
title: Padding( title: Padding(
padding: const EdgeInsets.only(left: 24.0), padding: const EdgeInsets.only(left: 24.0),
child: Text( child: Text(
greeting.i18n.fill([firstName]), greeting,
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,