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

Merge branch 'dev' of github.com:refilc/naplo into dev

Browse Source
This commit is contained in:
Kima 2024-02-25 22:55:41 +01:00
commit c214705368
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refilc_desktop_ui/lib/pages/absences/absences_page.dart
View File

@ -395,7 +395,7 @@ class _AbsencesPageState extends State<AbsencesPage>
child: filterWidgets[index - (activeData <= 1 ? 1 : 0)],
);
} else {
return Empty(subtitle: "empty".i18n);
return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n);
}
},
),

9
refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart
View File

@ -7,7 +7,8 @@ extension ScreensLocalization on String {
"Absences": "Absences",
"Delays": "Delays",
"Misses": "Misses",
"empty": "You have no absences.",
"emptyDelays": "You have no absences.",
"emptyMisses": "You have no absences.",
"stat_1": "Excused Absences",
"stat_2": "Unexcused Absences",
"stat_3": "Excused Delay",
@ -22,7 +23,8 @@ extension ScreensLocalization on String {
"Absences": "Hiányzások",
"Delays": "Késések",
"Misses": "Hiányok",
"empty": "Nincsenek hiányaid.",
"emptyDelays": "Nincsenek hiányzásaid.",
"emptyMisses": "Nincsenek hiányaid.",
"stat_1": "Igazolt hiányzások",
"stat_2": "Igazolatlan hiányzások",
"stat_3": "Igazolt Késés",
@ -37,7 +39,8 @@ extension ScreensLocalization on String {
"Absences": "Fehlen",
"Delays": "Verspätung",
"Misses": "Fehlt",
"empty": "Sie haben keine Fehlen.",
"emptyDelays": "Sie haben keine Fehlen.",
"emptyMisses": "Sie haben keine Fehlen.",
"stat_1": "Entschuldigte Fehlen",
"stat_2": "Unentschuldigte Fehlen",
"stat_3": "Entschuldigte Verspätung",

2
refilc_desktop_ui/lib/pages/home/home_page.dart
View File

@ -56,7 +56,7 @@ class _HomePageState extends State<HomePage>
greeting = "happynewyear";
} else if (now.hour >= 18) {
greeting = "goodevening";
} else if (now.hour >= 10) {
} else if (now.hour >= 12) {
greeting = "goodafternoon";
} else if (now.hour >= 4) {
greeting = "goodmorning";

2
refilc_mobile_ui/lib/pages/absences/absences_page.dart
View File

@ -423,7 +423,7 @@ class AbsencesPageState extends State<AbsencesPage>
child: filterWidgets[index - (activeData <= 1 ? 1 : 0)],
);
} else {
return Empty(subtitle: "empty".i18n);
return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n);
}
},
),

9
refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart
View File

@ -7,7 +7,8 @@ extension ScreensLocalization on String {
"Absences": "Absences",
"Delays": "Delays",
"Misses": "Misses",
"empty": "You have no absences.",
"emptyDelays": "You have no absences.",
"emptyMisses": "You have no absences.",
"stat_1": "Excused Absences",
"stat_2": "Unexcused Absences",
"stat_3": "Excused Delay",
@ -23,7 +24,8 @@ extension ScreensLocalization on String {
"Absences": "Hiányzások",
"Delays": "Késések",
"Misses": "Hiányok",
"empty": "Nincsenek hiányaid.",
"emptyDelays": "Nincsenek hiányzásaid.",
"emptyMisses": "Nincsenek hiányaid.",
"stat_1": "Igazolt hiányzások",
"stat_2": "Igazolatlan hiányzások",
"stat_3": "Igazolt Késés",
@ -39,7 +41,8 @@ extension ScreensLocalization on String {
"Absences": "Fehlen",
"Delays": "Verspätung",
"Misses": "Fehlt",
"empty": "Sie haben keine Fehlen.",
"emptyDelays": "Sie haben keine Fehlen.",
"emptyMisses": "Sie haben keine Fehlen.",
"stat_1": "Entschuldigte Fehlen",
"stat_2": "Unentschuldigte Fehlen",
"stat_3": "Entschuldigte Verspätung",

2
refilc_mobile_ui/lib/pages/home/home_page.dart
View File

@ -153,7 +153,7 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
customWelcome = true;
} else if (now.hour >= 18) {
greeting = "goodevening";
} else if (now.hour >= 10) {
} else if (now.hour >= 12) {
greeting = "goodafternoon";
} else if (now.hour >= 4) {
greeting = "goodmorning";