From b8d4d85e0ee6bd997f5e590d45801bf0aaa8ec3c Mon Sep 17 00:00:00 2001 From: Rene Arumetsa Date: Sun, 19 Oct 2025 21:23:48 +0300 Subject: [PATCH] Feature: Fix the timetable.. --- src/data/timetable.ts | 68 ++++++++++++++++--------------------------- translations/en.json | 15 ++++++++-- translations/et.json | 13 +++++++-- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/data/timetable.ts b/src/data/timetable.ts index 8255a1e..8b0628f 100644 --- a/src/data/timetable.ts +++ b/src/data/timetable.ts @@ -12,41 +12,22 @@ export const scheduleData: Record = { locationKey: "schedule.locations.registrationSetup", time: "17:00", }, + { titleKey: "schedule.events.miniTournaments", locationKey: "schedule.locations.studentHouse", time: "18:00", }, - { - titleKey: "schedule.events.tournamentRegistration", - locationKey: "schedule.locations.auditorium", - time: "18:00", - }, - { - titleKey: "schedule.events.streetFighter6", - locationKey: "schedule.locations.studentHouse", - time: "18:00", - }, { titleKey: "schedule.events.smashBrosUltimate", locationKey: "schedule.locations.studentHouse", time: "18:30", }, { - titleKey: "schedule.events.cs2Tournament", + titleKey: "schedule.events.cs2LolTournaments", locationKey: "schedule.locations.auditorium", time: "20:00", }, - { - titleKey: "schedule.events.lolTournament", - locationKey: "schedule.locations.auditorium", - time: "20:00", - }, - { - titleKey: "schedule.events.sf6SsbuFinale", - locationKey: "schedule.locations.studentHouse", - time: "22:00", - }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditoriumAndStudentHouse", @@ -55,9 +36,9 @@ export const scheduleData: Record = { ], oct25: [ { - titleKey: "schedule.events.doorsOpen", - locationKey: "schedule.locations.auditoriumAndStudentHouse", - time: "10:00", + titleKey: "schedule.events.doorsOpenSimple", + locationKey: "schedule.locations.auditorium", + time: "09:30", }, { titleKey: "schedule.events.cs2Continue", @@ -70,35 +51,35 @@ export const scheduleData: Record = { time: "12:00", }, { - titleKey: "schedule.events.2xkoTournament", - locationKey: "schedule.locations.studentHouse", + titleKey: "schedule.events.expoOpens", + locationKey: "schedule.locations.entranceHall", time: "12:00", }, { - titleKey: "schedule.events.tekken8Tournament", + titleKey: "schedule.events.2xkoTournament", locationKey: "schedule.locations.studentHouse", - time: "12:30", + time: "13:30", }, { - titleKey: "schedule.events.2xkoTekken8Finale", - locationKey: "schedule.locations.studentHouse", - time: "18:00", + titleKey: "schedule.events.lolFinale", + locationKey: "schedule.locations.auditorium", + time: "19:30", }, { - titleKey: "schedule.events.lolFinale", + titleKey: "schedule.events.cs2lbsemifinals", locationKey: "schedule.locations.auditorium", - time: "18:30", + time: "19:30", + }, + { + titleKey: "schedule.events.cs2lbfinals", + locationKey: "schedule.locations.auditorium", + time: "21:30", }, { titleKey: "schedule.events.granTurismoFinale", locationKey: "schedule.locations.studentHouse", time: "20:00", }, - { - titleKey: "schedule.events.lolTournamentSemifinals", - locationKey: "schedule.locations.auditorium", - time: "*01:00", - }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditoriumAndStudentHouse", @@ -107,24 +88,25 @@ export const scheduleData: Record = { ], oct26: [ { - titleKey: "schedule.events.cs2Finale", + titleKey: "schedule.events.cs2semifinals", locationKey: "schedule.locations.auditorium", - time: "10:00", + time: "11:00", }, { - titleKey: "schedule.events.cs2FinalMatch", + titleKey: "schedule.events.Cs2finals", locationKey: "schedule.locations.auditorium", time: "15:30", }, { - titleKey: "schedule.events.cs2TournamentFinale", + + titleKey: "schedule.events.AwardsCeremony", locationKey: "schedule.locations.auditorium", time: "18:00", }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditorium", - time: "18:30", + time: "19:00", }, ], }; diff --git a/translations/en.json b/translations/en.json index d313d4f..4aefb80 100644 --- a/translations/en.json +++ b/translations/en.json @@ -139,13 +139,16 @@ "oct25": "October 25th", "oct26": "October 26th", "events": { - "doorsOpen": "Doors open", - "miniTournaments": "Mini tournaments", + "doorsOpen": "Doors open, expo area available", + "doorsOpenSimple": "Doors open", + "expoOpens": "Expo area opens", + "miniTournaments": "Mini tournaments begin", "tournamentRegistration": "Tournament registration", "streetFighter6": "Street Fighter 6 tournament", "smashBrosUltimate": "Smash Bros. Ultimate tournament", "cs2Tournament": "CS2 tournament", "lolTournament": "LoL tournament", + "cs2LolTournaments": "CS2 & LoL tournaments", "sf6SsbuFinale": "SF6 & SSBU finale", "doorsClose": "Doors close", "cs2Continue": "CS2 tournament continues", @@ -153,7 +156,13 @@ "2xkoTournament": "2XKO tournament", "tekken8Tournament": "Tekken 8 tournament", "2xkoTekken8Finale": "2XKO & Tekken 8 finale", - "lolFinale": "LoL finale", + "lolFinale": "LoL finale and 3rd place match", + "cs2lbsemifinals": "CS2 lower bracket semifinals", + "cs2lbfinals": "CS2 lower bracket finals", + "cs2setup": "CS2 setup for finals", + "cs2semifinals": "CS2 upper bracket semifinals", + "Cs2finals": "CS2 finals", + "AwardsCeremony": "Awards ceremony", "granTurismoFinale": "Gran Turismo finale", "lolTournamentSemifinals": "LoL tournament semifinals", "cs2Finale": "CS2 finale", diff --git a/translations/et.json b/translations/et.json index 36b66f0..2f4dee9 100644 --- a/translations/et.json +++ b/translations/et.json @@ -140,13 +140,16 @@ "oct25": "25. oktoober", "oct26": "26. oktoober", "events": { - "doorsOpen": "Uksed avatakse", + "doorsOpen": "Uksed avatakse, messiala avatud", + "doorsOpenSimple": "Uksed avatakse", + "expoOpens": "Messiala avatakse", "miniTournaments": "Miniturniirid", "tournamentRegistration": "Turniiride registreerimine", "streetFighter6": "Street Fighter 6 turniir", "smashBrosUltimate": "Smash Bros. Ultimate turniir", "cs2Tournament": "CS2 turniir", "lolTournament": "LoL turniir", + "cs2LolTournaments": "CS2 ja LoL turniirid", "sf6SsbuFinale": "SF6 ja SSBU finaal", "doorsClose": "Uksed suletakse", "cs2Continue": "CS2 turniir jätkub", @@ -154,7 +157,13 @@ "2xkoTournament": "2XKO turniir", "tekken8Tournament": "Tekken 8 turniir", "2xkoTekken8Finale": "2XKO ja Tekken 8 finaal", - "lolFinale": "LoL finaal", + "lolFinale": "LoL finaal ja 3. koha mäng", + "cs2lbsemifinals": "CS2 alamliiga poolfinaalid", + "cs2lbfinals": "CS2 alamliiga finaalid", + "cs2setup": "CS2 finaalide ettevalmistus", + "cs2semifinals": "CS2 ülemliiga poolfinaalid", + "Cs2finals": "CS2 finaalid", + "AwardsCeremony": "Autasustamine", "granTurismoFinale": "Gran Turismo finaal", "lolTournamentSemifinals": "LoL turniiri poolfinaalid", "cs2Finale": "CS2 finaal",