From 461118ae328082473951aa6c778121be9fb11121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20David?= Date: Thu, 21 Nov 2024 19:28:49 +0100 Subject: [PATCH 1/6] Aktualizovat app/Modules/Fof/DefaultModule/templates/Default/default.latte --- app/Modules/Fof/DefaultModule/templates/Default/default.latte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Modules/Fof/DefaultModule/templates/Default/default.latte b/app/Modules/Fof/DefaultModule/templates/Default/default.latte index 5cccec74..a3f33d82 100644 --- a/app/Modules/Fof/DefaultModule/templates/Default/default.latte +++ b/app/Modules/Fof/DefaultModule/templates/Default/default.latte @@ -31,8 +31,8 @@ {/switch} {elseif $newestEvent->getRegistrationPeriod()->isOnGoing()} {switch $language->value} - {case 'cs'}

Registace pro rok 2024 je otevřena!
Loni se nás sešlo téměř 1200 z více než 20 zemí světa; pojďte si s námi užít tento svátek fyziky i letos!

- {default}

Registration for the year 2024 is open!
Last year, almost 1200 of us gathered from more than 20 countries around the world. Come and enjoy this physics feast with us again this year!

+ {case 'cs'}

Registace pro rok 2025 je otevřena!
Loni se nás sešlo téměř 1200 z více než 20 zemí světa; pojďte si s námi užít tento svátek fyziky i letos!

+ {default}

Registration for the year 2025 is open!
Last year, almost 1200 of us gathered from more than 20 countries around the world. Come and enjoy this physics feast with us again this year!

{/switch} {elseif $newestEvent->getRegistrationPeriod()->isBefore()} {switch $language->value} From 710cd6b5d6382a8b6cb3ae773c9601c1398dfb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20David?= Date: Thu, 21 Nov 2024 19:33:42 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Odradkov=C3=A1n=C3=AD=20webu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultModule/templates/Schedule/detail.latte | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte b/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte index 9e0f761c..3a70dcde 100644 --- a/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte +++ b/app/Modules/Fof/DefaultModule/templates/Schedule/detail.latte @@ -92,24 +92,12 @@

Městská hra

Městská hra probíhá průběžně celý týden.

- {default}
February 12, 2025 - February 16, 2025

City rally

The city rally runs continuously throughout the week.

- {/switch} {var $key = null} {* {dump $groups} *} From 7d14fa8ee26301563d91df0f7e550e6cb12701c9 Mon Sep 17 00:00:00 2001 From: vercah Date: Thu, 21 Nov 2024 23:23:57 +0100 Subject: [PATCH 3/6] fix link --- .../Fof/DefaultModule/templates/Accommodation/default.latte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte b/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte index 86147fed..f6146c38 100644 --- a/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte +++ b/app/Modules/Fof/DefaultModule/templates/Accommodation/default.latte @@ -262,10 +262,10 @@ {switch $language->value} {case 'cs'}

Jak zaplatit za ubytování a raut?

-

Při placení postupujte podle pokynů uvedených na této stránce.

+

Při placení postupujte podle pokynů uvedených na této stránce.

{default}

How to pay for accommodation and buffet?

-

When making a payment, please follow the instructions provided on this page.

+

When making a payment, please follow the instructions provided on this page.

{/switch} From da2a9f34e9bcb235a852d88e246016d83f61ea13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Kr=C5=A1ka?= Date: Fri, 22 Nov 2024 00:47:57 +0100 Subject: [PATCH 4/6] fol show map --- app/Modules/Fol/DefaultModule/templates/Default/default.latte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Modules/Fol/DefaultModule/templates/Default/default.latte b/app/Modules/Fol/DefaultModule/templates/Default/default.latte index c6a1d2b5..ea9ff3e1 100644 --- a/app/Modules/Fol/DefaultModule/templates/Default/default.latte +++ b/app/Modules/Fol/DefaultModule/templates/Default/default.latte @@ -75,11 +75,11 @@
- {* {if $newestEvent->getRegistrationPeriod()->is(Fykosak\Utils\DateTime\Phase::before)} + {if $newestEvent->getRegistrationPeriod()->is(Fykosak\Utils\DateTime\Phase::before)} {control upperHomeBeforeRegistration} {elseif true} {control upperHomeMap} - {/if} *} + {/if}
From eedf196e12c7765c86a0aa44cd2de12817a6e9e3 Mon Sep 17 00:00:00 2001 From: rkuklik Date: Fri, 22 Nov 2024 14:59:39 +0100 Subject: [PATCH 5/6] fix(fol): add notice about results --- app/Components/ResultsPanel/panel.latte | 27 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/app/Components/ResultsPanel/panel.latte b/app/Components/ResultsPanel/panel.latte index efa53a55..b2bb3300 100644 --- a/app/Components/ResultsPanel/panel.latte +++ b/app/Components/ResultsPanel/panel.latte @@ -17,14 +17,27 @@ {*
We apologize for duration with sending certificates for participation. Due to teams, which cheated, the ranking will change slightly. Because of this, all is a little bit late.
*} {/switch} + {if $event->eventId == 189} +

+ + {switch $lang->value} + {case 'cs'} + Výsledky ještě nejsou finální. + {default} + Results are not final yet. + {/switch} + +

+ {/if}
+ id="results-panel" + data-url="{link apiResults:results!}" + data-lang="{$lang->value}" + class="results-panel" + data-teams="{control apiResults:teamsData}" + data-results="{control apiResults:resultsData}" + > + From cf7a03096e521103c5564b00c6688dd5714f6228 Mon Sep 17 00:00:00 2001 From: rkuklik Date: Fri, 22 Nov 2024 15:00:41 +0100 Subject: [PATCH 6/6] fix(fol): save before commit :/ --- .../Fol/DefaultModule/templates/Default/default.latte | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/Modules/Fol/DefaultModule/templates/Default/default.latte b/app/Modules/Fol/DefaultModule/templates/Default/default.latte index ea9ff3e1..2c7a23fe 100644 --- a/app/Modules/Fol/DefaultModule/templates/Default/default.latte +++ b/app/Modules/Fol/DefaultModule/templates/Default/default.latte @@ -100,9 +100,6 @@ Pro zachování férovosti soutěže proto rušíme veškeré bodové penalizace za chybné odpovědi odevzdané před 18:11 CET.

-

- Výsledky ještě nejsou finální. -

Děkujeme za pochopení a vaši účast v soutěži!

@@ -121,9 +118,6 @@ To address this issue fairly, we will cancel any penalties for incorrect answers to this problem until 18:11 CET.

-

- Results are not final yet. -

Thank you for your understanding and for competing!