From 42ab95fcf30b47338ebd50eab9fcb2a75bea605f Mon Sep 17 00:00:00 2001 From: Oluwatobiloba Promise Temitope Date: Sat, 12 Sep 2026 11:25:01 +0300 Subject: [PATCH 1/2] add missing data, sync and reorder --- src/data/timetable.ts | 179 +++++++++++++++++++++++++++++------------- translations/en.json | 12 +++ translations/et.json | 12 +++ 3 files changed, 147 insertions(+), 56 deletions(-) diff --git a/src/data/timetable.ts b/src/data/timetable.ts index f1b26f2..85d343c 100644 --- a/src/data/timetable.ts +++ b/src/data/timetable.ts @@ -135,59 +135,67 @@ export const scheduleData: Record = { }, { titleKey: "schedule.events.gamersSetup", + locationKey: [ + "schedule.locations.studentHouse", + "schedule.locations.lobbyAndLanArea" + ], + time: "09:00-10:00", + }, + { + titleKey: "schedule.events.cs2GamersSetup", locationKey: "schedule.locations.auditorium", time: "09:00-10:30", }, { - titleKey: "schedule.events.gamersSetup", - locationKey: "schedule.locations.studentHouse", - time: "09:00-11:30", + titleKey: "schedule.events.gamedevExpo", + locationKey: "schedule.locations.lobbyAndLanArea", + time: "09:00-19:00", }, { - titleKey: "schedule.events.cs2WbR1", - locationKey: "schedule.locations.auditorium", - time: "10:30-13:00", + titleKey: "schedule.events.miniTournaments", + locationKey: "schedule.locations.studentHouse", + time: "10:00-17:00", + }, + { + titleKey: "schedule.events.lanAreaTournaments", + locationKey: "schedule.locations.lobbyAndLanArea", + time: "10:00-22:00", }, { titleKey: "schedule.events.cs2ScWbR1", locationKey: "schedule.locations.auditorium", time: "10:30-11:30", }, + { + titleKey: "schedule.events.cs2WbR1", + locationKey: "schedule.locations.auditorium", + time: "10:30-13:00", + }, + { + titleKey: "schedule.events.lolGamersSetup", + locationKey: "schedule.locations.auditorium", + time: "11:30-12:30", + }, { titleKey: "schedule.events.cs2ScLbR1", locationKey: "schedule.locations.auditorium", time: "11:30-12:30", }, + { + titleKey: "schedule.events.cs2ScWbR2", + locationKey: "schedule.locations.auditorium", + time: "12:30-13:30", + }, { titleKey: "schedule.events.lolSemiFinals", locationKey: "schedule.locations.auditorium", time: "12:30-17:30", }, - { - titleKey: "schedule.events.expoOpens", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "12:00", - }, - { - titleKey: "schedule.events.gamedevExpo", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "12:00-19:00", - }, - { - titleKey: "schedule.events.miniTournaments", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "13:00-19:00", - }, { titleKey: "schedule.events.cs2LbR1", locationKey: "schedule.locations.auditorium", time: "13:00-14:00", }, - { - titleKey: "schedule.events.cs2ScWbR2", - locationKey: "schedule.locations.auditorium", - time: "12:30-13:30", - }, { titleKey: "schedule.events.cs2ScLbR2", locationKey: "schedule.locations.auditorium", @@ -218,19 +226,54 @@ export const scheduleData: Record = { locationKey: "schedule.locations.auditorium", time: "16:30-17:30", }, + { + titleKey: "schedule.events.rlFinal", + locationKey: "schedule.locations.lobbyAndLanArea", + time: "17:00-18:00", + }, + { + titleKey: "schedule.events.cs16Final", + locationKey: "schedule.locations.studentHouse", + time: "17:00-18:00", + }, + { + titleKey: "schedule.events.osuFinal", + locationKey: "schedule.locations.studentHouse", + time: "17:00-18:00", + }, + { + titleKey: "schedule.events.eaFc26Final", + locationKey: "schedule.locations.studentHouse", + time: "17:00-18:00", + }, + { + titleKey: "schedule.events.lolBreak", + locationKey: "schedule.locations.auditorium", + time: "17:30-19:00", + }, { titleKey: "schedule.events.break", locationKey: "schedule.locations.auditorium", time: "17:30-19:30", }, { - titleKey: "schedule.events.break", + titleKey: "schedule.events.tekken8Final", + locationKey: "schedule.locations.studentHouse", + time: "18:00-18:30", + }, + { + titleKey: "schedule.events.evalHfdAndFinal", locationKey: "schedule.locations.studentHouse", time: "18:00-19:00", }, + { + titleKey: "schedule.events.tokonFinal", + locationKey: "schedule.locations.studentHouse", + time: "18:30-19:00", + }, { titleKey: "schedule.events.avatarLegendsFinal", - locationKey: "schedule.locations.lobbyAndLanArea", + locationKey: "schedule.locations.studentHouse", time: "19:00-19:30", }, { @@ -238,41 +281,36 @@ export const scheduleData: Record = { locationKey: "schedule.locations.lobbyAndLanArea", time: "19:00-20:00", }, + { + titleKey: "schedule.events.gt7HfdAndFinal", + locationKey: "schedule.locations.studentHouse", + time: "19:00-20:00", + }, { titleKey: "schedule.events.lolFinalsAndThirdPlace", locationKey: "schedule.locations.auditorium", time: "19:00-00:00", }, { - titleKey: "schedule.events.cs2WbR3", - locationKey: "schedule.locations.auditorium", - time: "19:30-22:00", + titleKey: "schedule.events.twoXkoFinal", + locationKey: "schedule.locations.studentHouse", + time: "19:30-20:00", }, { - titleKey: "schedule.events.cs2ScSemiFinal", + titleKey: "schedule.events.cs2ScLbR4", locationKey: "schedule.locations.auditorium", time: "19:30-20:30", }, { - titleKey: "schedule.events.tekken8Final", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "19:30-20:00", - }, - { - titleKey: "schedule.events.streetFighter6Final", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "20:00-20:30", + titleKey: "schedule.events.cs2WbR4", + locationKey: "schedule.locations.auditorium", + time: "19:30-22:00", }, { titleKey: "schedule.events.gamedevExpo", locationKey: "schedule.locations.lobbyAndLanArea", time: "20:00-00:00", }, - { - titleKey: "schedule.events.twoXkoFinal", - locationKey: "schedule.locations.lobbyAndLanArea", - time: "20:30-21:00", - }, { titleKey: "schedule.events.cs2ScLbR5", locationKey: "schedule.locations.auditorium", @@ -280,18 +318,28 @@ export const scheduleData: Record = { }, { titleKey: "schedule.events.ssbuFinal", - locationKey: "schedule.locations.lobbyAndLanArea", + locationKey: "schedule.locations.studentHouse", time: "21:00-21:30", }, { - titleKey: "schedule.events.cs2ScTournamentFinal", - locationKey: "schedule.locations.auditorium", - time: "21:30-23:30", + titleKey: "schedule.events.invincibleVsFinal", + locationKey: "schedule.locations.studentHouse", + time: "21:30-22:00", }, { - titleKey: "schedule.events.invincibleVsFinal", + titleKey: "schedule.events.cs2ScLbR6", + locationKey: "schedule.locations.auditorium", + time: "21:30-22:30", + }, + { + titleKey: "schedule.events.miniTournamentsAwardCeremony", + locationKey: "schedule.locations.studentHouse", + time: "22:00-22:30", + }, + { + titleKey: "schedule.events.lanAreaAwardCeremony", locationKey: "schedule.locations.lobbyAndLanArea", - time: "21:30-22:00", + time: "22:00-22:30", }, { titleKey: "schedule.events.cs2LbR3", @@ -299,9 +347,19 @@ export const scheduleData: Record = { time: "22:00-23:00", }, { - titleKey: "schedule.events.miniTournamentsAwardCeremony", + titleKey: "schedule.events.exploring", + locationKey: "schedule.locations.studentHouse", + time: "22:30-00:00", + }, + { + titleKey: "schedule.events.exploring", locationKey: "schedule.locations.lobbyAndLanArea", - time: "22:00-22:30", + time: "22:30-00:00", + }, + { + titleKey: "schedule.events.cs2ScTournamentFinal", + locationKey: "schedule.locations.auditorium", + time: "22:30-00:30", }, { titleKey: "schedule.events.cs2LbR4", @@ -309,14 +367,23 @@ export const scheduleData: Record = { time: "23:00-00:00", }, { - titleKey: "schedule.events.awardCeremony", - locationKey: "schedule.locations.lobbyAndLanArea", + titleKey: "schedule.events.lolAwardCeremony", + locationKey: "schedule.locations.auditorium", time: "00:00-00:30", }, + { + titleKey: "schedule.events.doorsClose", + locationKey: [ + "schedule.locations.studentHouse", + "schedule.locations.lobbyAndLanArea", + ], + + time: "00:30-02:00", + }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditorium", - time: "~01:30", + time: "02:00", }, ], sep13: [ diff --git a/translations/en.json b/translations/en.json index 843ae31..bbed428 100644 --- a/translations/en.json +++ b/translations/en.json @@ -781,12 +781,15 @@ "Cs2finals": "CS2 finals", "AwardsCeremony": "Awards ceremony", "awardCeremony": "Award ceremony", + "lolAwardCeremony": "LoL Award Ceremony", "granTurismoFinale": "Gran Turismo finale", "lolTournamentSemifinals": "LoL tournament semifinals", "cs2Finale": "CS2 finale", "cs2FinalMatch": "CS2 final match", "cs2TournamentFinale": "CS2 tournament finale", "gamersSetup": "Gamers Setup", + "cs2GamersSetup": "CS2 Gamers Setup", + "lolGamersSetup": "LoL Gamers Setup", "staffSetup": "Staff Setup", "exploring": "Exploring", "gameDevShowcasing": "GameDev Showcasing", @@ -808,13 +811,21 @@ "gamedevAwardCeremony": "Gamedev Award Ceremony", "break": "CS2 Break", "avatarLegendsFinal": "Avatar Legends final", + "rlFinal": "RL Final", + "cs16Final": "CS 1.6", + "osuFinal": "OSU Final", + "eaFc26Final": "EA FC 26 Final", + "evalHfdAndFinal": "EVAL HFd and Final", "tekken8Final": "Tekken 8 final", + "tokonFinal": "Tokon Final", + "gt7HfdAndFinal": "GT7 HFd and Final", "streetFighter6Final": "Street Fighter 6 final", "twoXkoFinal": "2XKO final", "ssbuFinal": "SSBU final", "invincibleVsFinal": "Invincible VS final", "finalsAndThirdPlace": "Finals + 3rd place", "miniTournamentsAwardCeremony": "Mini Tournaments Award Ceremony", + "lanAreaAwardCeremony": "LAN Area Award Ceremony (Student House)", "justFunTime": "Just fun time?", "estimatedEndOfDay2": "Estimated End of Day 2", "estimatedEndOfFinals": "Estimated End of Finals", @@ -840,6 +851,7 @@ "cs2ScLbR4": "CS2 Second Chance LB Round 4", "cs2ScSemiFinal": "CS2 Second Chance Semi Final", "cs2ScLbR5": "CS2 Second Chance LB Round 5", + "cs2ScLbR6": "CS2 Second Chance LB Round 6", "cs2ScTournamentFinal": "CS2 Second Chance Tournament Final", "lolBreak": "LoL Break", "lolSemiFinals": "LoL Semi Finals", diff --git a/translations/et.json b/translations/et.json index 337e771..6f8c3b0 100644 --- a/translations/et.json +++ b/translations/et.json @@ -782,12 +782,15 @@ "Cs2finals": "CS2 finaalid", "AwardsCeremony": "Autasustamine", "awardCeremony": "Autasustamine", + "lolAwardCeremony": "LoL-i autasustamine", "granTurismoFinale": "Gran Turismo finaal", "lolTournamentSemifinals": "LoL turniiri poolfinaalid", "cs2Finale": "CS2 finaal", "cs2FinalMatch": "CS2 finaalimäng", "cs2TournamentFinale": "CS2 turniiri finaal", "gamersSetup": "Mängijate seadistamine", + "cs2GamersSetup": "CS2 Mängijate seadistamine", + "lolGamersSetup": "LoL Mängijate seadistamine", "staffSetup": "Personal seadistamine", "exploring": "Avastamine", "gameDevShowcasing": "Mänguarenduse tutvustamine", @@ -809,13 +812,21 @@ "gamedevAwardCeremony": "Mänguarenduse autasustamine", "break": "CS2 paus", "avatarLegendsFinal": "Avatar Legends finaal", + "rlFinal": "RL finaal", + "cs16Final": "CS 1.6", + "osuFinal": "OSU finaal", + "eaFc26Final": "EA FC 26 finaal", + "evalHfdAndFinal": "EVAL HFd ja finaal", "tekken8Final": "Tekken 8 finaal", + "tokonFinal": "Tokon finaal", + "gt7HfdAndFinal": "GT7 HFd ja finaal", "streetFighter6Final": "Street Fighter 6 finaal", "twoXkoFinal": "2XKO finaal", "ssbuFinal": "SSBU finaal", "invincibleVsFinal": "Invincible VS finaal", "finalsAndThirdPlace": "Finaalid + 3. koht", "miniTournamentsAwardCeremony": "Miniturniiride autasustamine", + "lanAreaAwardCeremony": "LAN-ala autasustamine (Tudengimajas)", "justFunTime": "Lihtsalt lõbus aeg?", "estimatedEndOfDay2": "Päeva 2 eeldatav lõpp", "estimatedEndOfFinals": "Finaalide eeldatav lõpp", @@ -841,6 +852,7 @@ "cs2ScLbR4": "CS2 teise šansi kaotajate veergu 4. ring", "cs2ScSemiFinal": "CS2 teise šansi poolfinaal", "cs2ScLbR5": "CS2 teise šansi kaotajate veergu 5. ring", + "cs2ScLbR6": "CS2 teise šansi kaotajate veergu 6. ring", "cs2ScTournamentFinal": "CS2 teise šansi turniiri finaal", "lolBreak": "LoL vaheajad", "lolSemiFinals": "LoL poolfinaalid", From 3406ea1ef22a3634b489fd8523d27d1ed6135759 Mon Sep 17 00:00:00 2001 From: Oluwatobiloba Promise Temitope Date: Sat, 12 Sep 2026 11:28:57 +0300 Subject: [PATCH 2/2] remove duplicate --- src/data/timetable.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/data/timetable.ts b/src/data/timetable.ts index 85d343c..d83e390 100644 --- a/src/data/timetable.ts +++ b/src/data/timetable.ts @@ -348,12 +348,7 @@ export const scheduleData: Record = { }, { titleKey: "schedule.events.exploring", - locationKey: "schedule.locations.studentHouse", - time: "22:30-00:00", - }, - { - titleKey: "schedule.events.exploring", - locationKey: "schedule.locations.lobbyAndLanArea", + locationKey: ["schedule.locations.studentHouse", "schedule.locations.lobbyAndLanArea"], time: "22:30-00:00", }, {