diff --git a/docs/index.html b/docs/index.html index 4bae908df..06218df78 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,7 +3,7 @@ Paris 2024 - Calendars - + diff --git a/docs/ja/index.html b/docs/ja/index.html index f662c5162..f1b7a8bea 100644 --- a/docs/ja/index.html +++ b/docs/ja/index.html @@ -3,7 +3,7 @@ Paris 2024 - カレンダー - + diff --git a/docs/ja/medals.html b/docs/ja/medals.html index 526757f44..bc26d7680 100644 --- a/docs/ja/medals.html +++ b/docs/ja/medals.html @@ -3,7 +3,7 @@ Paris 2024 - メダル表 - + @@ -36,6 +36,7 @@ + @@ -43,6 +44,14 @@ + +
@@ -1295,6 +1304,7 @@
+<<<<<<< HEAD 🇮🇱 Israel 1 2 @@ -1355,6 +1365,10 @@
+======= +<<<<<<< HEAD +======= +>>>>>>> 9722b845f (add message to medals table page) 🇭🇺 Hungary 1 1 @@ -1383,6 +1397,37 @@
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇰🇪 Kenya + 1 + 1 + 1 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-05
Mary MORAA陸上競技 - 女子800m決勝
Beatrice CHEBET陸上競技 - 女子5000m決勝
Faith KIPYEGON陸上競技 - 女子5000m決勝
+
+
@@ -1521,6 +1566,69 @@
+<<<<<<< HEAD +======= + 🇦🇷 Argentina + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-07-31
Jose TORRES GIL自転車BMXフリースタイル - 男子パーク決勝
+
+
+
+ +
+ 🇨🇱 Chile + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Francisca CROVETTO CHADID射撃 - 女子スキート個人ファイナル
+
+
+
+ +
+ 🇩🇲 Dominica + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Thea LAFOND陸上競技 - 女子三段跳決勝
+
+
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) 🇳🇴 Norway 1 0 @@ -1538,6 +1646,26 @@
+
+ +
+ 🇷🇴 Romania + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
ルーマニアローイング - 女子エイト決勝A
+
+
@@ -1561,7 +1689,7 @@
- 🇩🇲 Dominica + 🇷🇸 Serbia 1 0 0 @@ -1569,11 +1697,11 @@
- + - - + +
2024-08-03
2024-08-04
Thea LAFOND陸上競技 - 女子三段跳決勝Novak DJOKOVICテニス - 男子シングルス決勝戦
@@ -1754,7 +1882,13 @@
+<<<<<<< HEAD 🇪🇹 Ethiopia +======= +<<<<<<< HEAD +======= + 🇦🇲 Armenia +>>>>>>> 9722b845f (add message to medals table page) 0 1 0 @@ -1762,6 +1896,7 @@
+<<<<<<< HEAD @@ -1787,6 +1922,13 @@ +======= + + + + + +>>>>>>> 9722b845f (add message to medals table page)
2024-08-05
Kunlavut VITIDSARN バドミントン - 男子シングルス決勝戦
2024-08-04
Artur DAVTYAN体操競技 - 男子種目別跳馬決勝
@@ -1794,6 +1936,10 @@
+<<<<<<< HEAD +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) 🇨🇴 Colombia 0 1 @@ -1814,7 +1960,7 @@
- 🇦🇲 Armenia + 🇪🇹 Ethiopia 0 1 0 @@ -1822,11 +1968,11 @@
- + - - + +
2024-08-04
2024-08-05
Artur DAVTYAN体操競技 - 男子種目別跳馬決勝Tsige DUGUMA陸上競技 - 女子800m決勝
@@ -1854,6 +2000,75 @@
+<<<<<<< HEAD +======= + 🇹🇭 Thailand + 0 + 1 + 0 + 1 +
+
+ + + + + + + +
2024-08-05
Kunlavut VITIDSARNバドミントン - 男子シングルス決勝戦
+
+
+
+ +
+ 🇹🇭 Thailand + 0 + 1 + 0 + 1 +
+
+ + + + + + + +
2024-08-05
Kunlavut VITIDSARNバドミントン - 男子シングルス決勝戦
+
+
+
+ +
+ 🇬🇷 Greece + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Emmanouil KARALIS陸上競技 - 男子棒高跳決勝
2024-08-04
Eleftherios PETROUNIAS体操競技 - 男子種目別つり輪決勝
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇩🇴 Dominican Republic 0 0 @@ -1876,6 +2091,121 @@
+
+ +
+<<<<<<< HEAD +======= +<<<<<<< HEAD + 🇲🇾 Malaysia + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Zii Jia LEEバドミントン - 男子シングルス3位決定戦
2024-08-04
CHIA/SOHバドミントン - 男子ダブルス3位決定戦
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) + 🇱🇹 Lithuania + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
リトアニア3x3 バスケットボール - 男子3位決定戦
2024-08-03
Viktorija SENKUTEローイング - 女子シングルスカル決勝A
+
+
+
+ +
+<<<<<<< HEAD + 🇲🇾 Malaysia +======= + 🇬🇩 Grenada +======= + 🇬🇷 Greece +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Zii Jia LEEバドミントン - 男子シングルス3位決定戦
2024-08-04
CHIA/SOHバドミントン - 男子ダブルス3位決定戦
+
+
+
+ +
+ 🇬🇷 Greece + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Emmanouil KARALIS陸上競技 - 男子棒高跳決勝
2024-08-04
Eleftherios PETROUNIAS体操競技 - 男子種目別つり輪決勝
+
+
@@ -1931,33 +2261,7 @@
- 🇬🇷 Greece - 0 - 0 - 2 - 2 -
-
- - - - - - - - - - - - - -
2024-08-05
Emmanouil KARALIS陸上競技 - 男子棒高跳決勝
2024-08-04
Eleftherios PETROUNIAS体操競技 - 男子種目別つり輪決勝
-
-
-
- -
- 🇹🇯 Tajikistan + 🇨🇻 Cabo Verde 0 0 1 @@ -1968,8 +2272,8 @@ 2024-08-04 ● - Davlat BOLTAEV - ボクシング - 男子92kg級 - 準決勝 + David de PINA + ボクシング - 男子51kg級 - 準決勝
@@ -2017,7 +2321,7 @@
- 🇨🇻 Cabo Verde + 🇬🇩 Grenada 0 0 1 @@ -2025,11 +2329,11 @@
- + - - + +
2024-08-04
2024-08-03
David de PINAボクシング - 男子51kg級 - 準決勝Lindon VICTOR陸上競技 - 男子十種競技1500m
@@ -2090,6 +2394,49 @@ ● Alan HATHERLY 自転車マウンテンバイク - 男子クロスカントリー +<<<<<<< HEAD +======= + + +
+
+
+ +
+ 🇨🇭 Switzerland + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-02
Zoe CLAESSENS自転車BMXレーシング - 女子決勝
+
+
+
+ +
+ 🇹🇯 Tajikistan + 0 + 0 + 1 + 1 +
+
+ + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page)
2024-08-04
Davlat BOLTAEVボクシング - 男子92kg級 - 準決勝
diff --git a/docs/ja/today.html b/docs/ja/today.html index c916f4ff7..71e012c15 100644 --- a/docs/ja/today.html +++ b/docs/ja/today.html @@ -3,7 +3,7 @@ Paris 2024 - 今日のイベント - + diff --git a/docs/ko/index.html b/docs/ko/index.html index 415d8796f..0be921666 100644 --- a/docs/ko/index.html +++ b/docs/ko/index.html @@ -3,7 +3,7 @@ Paris 2024 - 달력 - + diff --git a/docs/ko/medals.html b/docs/ko/medals.html index fd1ab9d27..dbc1e65f3 100644 --- a/docs/ko/medals.html +++ b/docs/ko/medals.html @@ -3,7 +3,7 @@ Paris 2024 - 메달 테이블 - + @@ -36,6 +36,7 @@
+ @@ -43,6 +44,14 @@
+ +
@@ -1322,36 +1331,6 @@
-
- -
- 🇰🇪 Kenya - 1 - 1 - 1 - 3 -
-
- - - - - - - - - - - - - - - - - -
2024-08-05
Mary MORAA육상 - 여자 800m 결승
Beatrice CHEBET육상 - 여자 5000m 결승
Faith KIPYEGON육상 - 여자 5000m 결승
-
-
@@ -1383,6 +1362,36 @@
+
+ +
+ 🇰🇪 Kenya + 1 + 1 + 1 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-05
Mary MORAA육상 - 여자 800m 결승
Beatrice CHEBET육상 - 여자 5000m 결승
Faith KIPYEGON육상 - 여자 5000m 결승
+
+
@@ -1541,7 +1550,9 @@
- 🇳🇴 Norway +<<<<<<< HEAD +======= + 🇩🇿 Algeria 1 0 0 @@ -1549,11 +1560,11 @@
- + - - + +
2024-08-03
2024-08-04
Markus ROOTH육상 - 남자 10종경기 1500mKaylia NEMOUR기계체조 - 여자 이단평행봉 결승
@@ -1561,7 +1572,7 @@
- 🇱🇨 Saint Lucia + 🇦🇷 Argentina 1 0 0 @@ -1569,11 +1580,31 @@
- + - - + + + +
2024-08-03
2024-07-31
Julien ALFRED육상 - 여자 100m 결승Jose TORRES GIL사이클 BMX 프리스타일 - 남자 파크 결승
+
+
+
+ +
+ 🇨🇱 Chile + 1 + 0 + 0 + 1 +
+
+ + + + + +
2024-08-04
Francisca CROVETTO CHADID사격 - 여자 스키트 결승
@@ -1601,6 +1632,110 @@
+<<<<<<< HEAD +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇳🇴 Norway + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Markus ROOTH육상 - 남자 10종경기 1500m
+
+
+
+ +
+ 🇷🇴 Romania + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
루마니아조정 - 여자 에이트 결승 A
+
+
+
+ +
+ 🇱🇨 Saint Lucia + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Julien ALFRED육상 - 여자 100m 결승
+
+
+
+ +
+ 🇷🇸 Serbia + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Novak DJOKOVIC테니스 - 남자 단식 금메달 결정전
+
+
+
+ +
+ 🇨🇱 Chile + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Francisca CROVETTO CHADID사격 - 여자 스키트 결승
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇩🇿 Algeria 1 0 @@ -1754,7 +1889,11 @@
+<<<<<<< HEAD 🇪🇹 Ethiopia +======= + 🇦🇲 Armenia +>>>>>>> 3b5ffcd28 (add message to medals table page) 0 1 0 @@ -1762,11 +1901,19 @@
+<<<<<<< HEAD +======= + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page)
2024-08-05
Tsige DUGUMA 육상 - 여자 800m 결승
2024-08-04
Artur DAVTYAN기계체조 - 남자 도마 결승
@@ -1794,7 +1941,7 @@
- 🇦🇲 Armenia + 🇪🇹 Ethiopia 0 1 0 @@ -1802,11 +1949,11 @@
- + - - + +
2024-08-04
2024-08-05
Artur DAVTYAN기계체조 - 남자 도마 결승Tsige DUGUMA육상 - 여자 800m 결승
@@ -1931,6 +2078,7 @@
+<<<<<<< HEAD 🇱🇹 Lithuania 0 0 @@ -1977,6 +2125,9 @@
+======= +<<<<<<< HEAD +>>>>>>> 9722b845f (add message to medals table page) 🇬🇩 Grenada 0 0 @@ -2018,6 +2169,9 @@
🇹🇯 Tajikistan +======= + 🇨🇻 Cabo Verde +>>>>>>> 3b5ffcd28 (add message to medals table page) 0 0 1 @@ -2028,8 +2182,8 @@ 2024-08-04 ● - Davlat BOLTAEV - 복싱 - 남자 92kg - 준결승 + David de PINA + 복싱 - 남자 51kg - 준결승
@@ -2077,7 +2231,7 @@
- 🇨🇻 Cabo Verde + 🇬🇩 Grenada 0 0 1 @@ -2085,11 +2239,11 @@
- + - - + +
2024-08-04
2024-08-03
David de PINA복싱 - 남자 51kg - 준결승Lindon VICTOR육상 - 남자 10종경기 1500m
@@ -2113,6 +2267,81 @@
+<<<<<<< HEAD +======= +
+
+ +
+ 🇿🇦 South Africa + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-07-29
Alan HATHERLY사이클 산악자전거 - 남자 크로스컨트리
+
+
+
+ +
+ 🇨🇭 Switzerland + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-02
Zoe CLAESSENS사이클 BMX 레이싱 - 여자 결승
+
+
+
+ +
+<<<<<<< HEAD + 🇿🇦 South Africa +======= + 🇹🇯 Tajikistan +>>>>>>> 3b5ffcd28 (add message to medals table page) + 0 + 0 + 1 + 1 +
+
+ +<<<<<<< HEAD + + + + + +======= + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page) + +
2024-07-29
Alan HATHERLY사이클 산악자전거 - 남자 크로스컨트리
2024-08-04
Davlat BOLTAEV복싱 - 남자 92kg - 준결승
+
+>>>>>>> 9722b845f (add message to medals table page)
diff --git a/docs/ko/today.html b/docs/ko/today.html index 79c746245..556f79a73 100644 --- a/docs/ko/today.html +++ b/docs/ko/today.html @@ -3,7 +3,7 @@ Paris 2024 - 오늘의 이벤트 - + diff --git a/docs/main.css b/docs/main.css index aeceee02c..7595c307d 100644 --- a/docs/main.css +++ b/docs/main.css @@ -606,6 +606,35 @@ html { --tw-contain-paint: ; --tw-contain-style: ; } +.alert { + display: grid; + width: 100%; + grid-auto-flow: row; + align-content: flex-start; + align-items: center; + justify-items: center; + gap: 1rem; + text-align: center; + border-radius: var(--rounded-box, 1rem); + border-width: 1px; + --tw-border-opacity: 1; + border-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity))); + padding: 1rem; + --tw-text-opacity: 1; + color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity))); + --alert-bg: var(--fallback-b2,oklch(var(--b2)/1)); + --alert-bg-mix: var(--fallback-b1,oklch(var(--b1)/1)); + background-color: var(--alert-bg); +} +@media (min-width: 640px) { + + .alert { + grid-auto-flow: column; + grid-template-columns: auto minmax(auto,1fr); + justify-items: start; + text-align: start; + } +} @media (hover:hover) { .menu li > *:not(ul, .menu-title, details, .btn):active, @@ -1742,6 +1771,10 @@ details.collapse summary::-webkit-details-marker { margin-top: 2.5rem; margin-bottom: 2.5rem; } +.my-4 { + margin-top: 1rem; + margin-bottom: 1rem; +} .mb-1 { margin-bottom: 0.25rem; } @@ -1763,6 +1796,9 @@ details.collapse summary::-webkit-details-marker { .h-5 { height: 1.25rem; } +.h-6 { + height: 1.5rem; +} .w-1\/4 { width: 25%; } @@ -1778,6 +1814,9 @@ details.collapse summary::-webkit-details-marker { .w-52 { width: 13rem; } +.w-6 { + width: 1.5rem; +} .w-full { width: 100%; } @@ -1790,6 +1829,9 @@ details.collapse summary::-webkit-details-marker { .flex-none { flex: none; } +.shrink-0 { + flex-shrink: 0; +} .rounded-box { border-radius: var(--rounded-box, 1rem); } @@ -1822,6 +1864,9 @@ details.collapse summary::-webkit-details-marker { --tw-bg-opacity: 1; background-color: rgb(244 114 182 / var(--tw-bg-opacity)); } +.stroke-info { + stroke: var(--fallback-in,oklch(var(--in)/1)); +} .p-2 { padding: 0.5rem; } diff --git a/docs/medals.html b/docs/medals.html index e5ef742fe..1eb029f7d 100644 --- a/docs/medals.html +++ b/docs/medals.html @@ -3,7 +3,7 @@ Paris 2024 - Medals table - + @@ -36,6 +36,7 @@
+ @@ -43,6 +44,14 @@
+ +
@@ -1325,6 +1334,40 @@
+<<<<<<< HEAD +======= +<<<<<<< HEAD + 🇮🇱 Israel + 1 + 2 + 0 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-03
Artem DOLGOPYATArtistic Gymnastics - Men's Floor Exercise Final
Tom REUVENYSailing - Men's Windsurfing - Final
Sharon KANTORSailing - Women's Windsurfing - Final
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇰🇪 Kenya 1 1 @@ -1355,6 +1398,8 @@
+======= +>>>>>>> 3b5ffcd28 (add message to medals table page) 🇭🇺 Hungary 1 1 @@ -1383,6 +1428,36 @@
+
+ +
+ 🇰🇪 Kenya + 1 + 1 + 1 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-05
Mary MORAAAthletics - Women's 800m Final
Beatrice CHEBETAthletics - Women's 5000m Final
Faith KIPYEGONAthletics - Women's 5000m Final
+
+
@@ -1476,6 +1551,7 @@
🇮🇪 Ireland +<<<<<<< HEAD 1 0 1 @@ -1582,18 +1658,26 @@
🇳🇴 Norway +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) 1 0 - 0 1 + 2
+ + + + + + - - + +
2024-08-04
Daniel WIFFENSwimming - Men's 1500m Freestyle Final
2024-08-03
Markus ROOTHAthletics - Men's Decathlon 1500mRhys MC CLENAGHANArtistic Gymnastics - Men's Pommel Horse Final
@@ -1601,7 +1685,9 @@
- 🇱🇨 Saint Lucia +<<<<<<< HEAD +======= + 🇩🇿 Algeria 1 0 0 @@ -1609,11 +1695,11 @@
- + - - + +
2024-08-03
2024-08-04
Julien ALFREDAthletics - Women's 100m FinalKaylia NEMOURArtistic Gymnastics - Women's Uneven Bars Final
@@ -1621,6 +1707,51 @@
+<<<<<<< HEAD +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇦🇷 Argentina + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-07-31
Jose TORRES GILCycling BMX Freestyle - Men's Park Final
+
+
+
+ +
+ 🇨🇱 Chile + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Francisca CROVETTO CHADIDShooting - Skeet Women's Final
+
+
+
+ +
+<<<<<<< HEAD +======= 🇩🇲 Dominica 1 0 @@ -1641,6 +1772,71 @@
+ 🇳🇴 Norway + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Markus ROOTHAthletics - Men's Decathlon 1500m
+
+
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇷🇴 Romania + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
RomaniaRowing - Women's Eight Final A
+
+
+
+ +
+<<<<<<< HEAD +======= + 🇱🇨 Saint Lucia + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Julien ALFREDAthletics - Women's 100m Final
+
+
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) 🇷🇸 Serbia 1 0 @@ -1661,6 +1857,32 @@
+<<<<<<< HEAD +======= +<<<<<<< HEAD + 🇩🇿 Algeria + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Kaylia NEMOURArtistic Gymnastics - Women's Uneven Bars Final
+
+
+
+ +
+======= +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) 🇪🇸 Spain 0 2 @@ -1754,6 +1976,29 @@
+<<<<<<< HEAD +======= + 🇦🇲 Armenia + 0 + 1 + 0 + 1 +
+
+ + + + + + + +
2024-08-04
Artur DAVTYANArtistic Gymnastics - Men's Vault Final
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇹🇭 Thailand 0 1 @@ -1794,7 +2039,7 @@
- 🇦🇲 Armenia + 🇪🇹 Ethiopia 0 1 0 @@ -1802,11 +2047,11 @@
- + - - + +
2024-08-04
2024-08-05
Artur DAVTYANArtistic Gymnastics - Men's Vault FinalTsige DUGUMAAthletics - Women's 800m Final
@@ -1834,7 +2079,85 @@
+<<<<<<< HEAD 🇪🇹 Ethiopia +======= +<<<<<<< HEAD +======= + 🇹🇭 Thailand + 0 + 1 + 0 + 1 +
+
+ + + + + + + +
2024-08-05
Kunlavut VITIDSARNBadminton - Men's Singles Gold Medal Match
+
+
+
+ +
+ 🇩🇴 Dominican Republic + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + +
2024-08-04
Cristian Javier PINALESBoxing - Men's 80kg - Semifinal
Yunior ALCANTARA REYESBoxing - Men's 51kg - Semifinal
+
+
+
+ +
+ 🇬🇷 Greece + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Emmanouil KARALISAthletics - Men's Pole Vault Final
2024-08-04
Eleftherios PETROUNIASArtistic Gymnastics - Men's Rings Final
+
+
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇱🇹 Lithuania +>>>>>>> 9722b845f (add message to medals table page) 0 1 0 @@ -1880,11 +2203,15 @@
+<<<<<<< HEAD 🇬🇷 Greece +======= + 🇨🇻 Cabo Verde +>>>>>>> 3b5ffcd28 (add message to medals table page) 0 0 - 2 - 2 + 1 + 1
@@ -1897,8 +2224,53 @@ +<<<<<<< HEAD +======= + + + +
2024-08-04
Eleftherios PETROUNIAS Artistic Gymnastics - Men's Rings FinalDavid de PINABoxing - Men's 51kg - Semifinal
+
+
+
+ +
+ 🇨🇺 Cuba + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-04
Arlen LOPEZ CARDONABoxing - Men's 80kg - Semifinal
+
+
+
+ +
+ 🇬🇪 Georgia + 0 + 0 + 1 + 1 +
+
+ + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page)
2024-08-04
Lasha GURULIBoxing - Men's 63.5kg - Semifinal
@@ -1957,6 +2329,49 @@
+<<<<<<< HEAD +======= + 🇰🇵 North Korea + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-04
PANG CholmiBoxing - Women's 54kg - Semifinal
+
+
+
+ +
+ 🇿🇦 South Africa + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-07-29
Alan HATHERLYCycling Mountain Bike - Men's Cross-country
+
+
+
+ +
+>>>>>>> 3b5ffcd28 (add message to medals table page) 🇨🇭 Switzerland 0 0 @@ -2033,86 +2448,6 @@
-
-
- -
- 🇨🇺 Cuba - 0 - 0 - 1 - 1 -
-
- - - - - - - -
2024-08-04
Arlen LOPEZ CARDONABoxing - Men's 80kg - Semifinal
-
-
-
- -
- 🇬🇪 Georgia - 0 - 0 - 1 - 1 -
-
- - - - - - - -
2024-08-04
Lasha GURULIBoxing - Men's 63.5kg - Semifinal
-
-
-
- -
- 🇨🇻 Cabo Verde - 0 - 0 - 1 - 1 -
-
- - - - - - - -
2024-08-04
David de PINABoxing - Men's 51kg - Semifinal
-
-
-
- -
- 🇰🇵 North Korea - 0 - 0 - 1 - 1 -
-
- - - - - - - -
2024-08-04
PANG CholmiBoxing - Women's 54kg - Semifinal
-
diff --git a/docs/ru/index.html b/docs/ru/index.html index 5733ef774..698696634 100644 --- a/docs/ru/index.html +++ b/docs/ru/index.html @@ -3,7 +3,7 @@ Paris 2024 - Календари - + diff --git a/docs/ru/medals.html b/docs/ru/medals.html index 67385846f..8b52a3a3d 100644 --- a/docs/ru/medals.html +++ b/docs/ru/medals.html @@ -3,7 +3,7 @@ Paris 2024 - Таблица медалей - + @@ -36,6 +36,7 @@
+ @@ -43,6 +44,14 @@
+ +
@@ -1322,36 +1331,6 @@
-
- -
- 🇰🇪 Kenya - 1 - 1 - 1 - 3 -
-
- - - - - - - - - - - - - - - - - -
2024-08-05
Mary MORAAЛегкая атлетика - 800м, финал (ж)
Beatrice CHEBETЛегкая атлетика - 5000м, финал (ж)
Faith KIPYEGONЛегкая атлетика - 5000м, финал (ж)
-
-
@@ -1383,6 +1362,36 @@
+
+ +
+ 🇰🇪 Kenya + 1 + 1 + 1 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-05
Mary MORAAЛегкая атлетика - 800м, финал (ж)
Beatrice CHEBETЛегкая атлетика - 5000м, финал (ж)
Faith KIPYEGONЛегкая атлетика - 5000м, финал (ж)
+
+
@@ -1449,6 +1458,36 @@
+<<<<<<< HEAD +======= + 🇮🇪 Ireland + 1 + 0 + 1 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-04
Daniel WIFFENПлавание - 1500м вольным стилем, финал (м)
2024-08-03
Rhys MC CLENAGHANСпортивная гимнастика - Конь, финал (м)
+
+
+
+ +
+<<<<<<< HEAD +>>>>>>> 9722b845f (add message to medals table page) 🇧🇪 Belgium 1 0 @@ -1501,7 +1540,13 @@
+<<<<<<< HEAD 🇦🇷 Argentina +======= +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇩🇿 Algeria +>>>>>>> 9722b845f (add message to medals table page) 1 0 0 @@ -1521,7 +1566,7 @@
- 🇳🇴 Norway + 🇦🇷 Argentina 1 0 0 @@ -1529,51 +1574,11 @@
- + - - - -
2024-08-03
2024-07-31
Markus ROOTHЛегкая атлетика - Десятиборье, 1500м (м)
-
-
-
- -
- 🇱🇨 Saint Lucia - 1 - 0 - 0 - 1 -
-
- - - - - - - -
2024-08-03
Julien ALFREDЛегкая атлетика - 100м, финал (ж)
-
-
-
- -
- 🇩🇲 Dominica - 1 - 0 - 0 - 1 -
-
- - - - - - + +
2024-08-03
Thea LAFONDЛегкая атлетика - Тройной прыжок, финал (ж)Jose TORRES GILВМХ-фристайл - Парк, финал (м)
@@ -1621,7 +1626,97 @@
+<<<<<<< HEAD 🇩🇿 Algeria +======= +<<<<<<< HEAD + 🇷🇸 Serbia +======= + 🇩🇲 Dominica +>>>>>>> 3b5ffcd28 (add message to medals table page) + 1 + 0 + 0 + 1 +
+
+ + + + +<<<<<<< HEAD +======= + + + +
2024-08-03
Thea LAFONDЛегкая атлетика - Тройной прыжок, финал (ж)
+
+
+
+ +
+ 🇳🇴 Norway + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Markus ROOTHЛегкая атлетика - Десятиборье, 1500м (м)
+
+
+
+ +
+ 🇷🇴 Romania + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
РумынияАкадемическая гребля - Восьмерки, финал A (ж)
+
+
+
+ +
+ 🇱🇨 Saint Lucia + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Julien ALFREDЛегкая атлетика - 100м, финал (ж)
+
+
+
+ +
+ 🇷🇸 Serbia +>>>>>>> 9722b845f (add message to medals table page) 1 0 0 @@ -1632,6 +1727,7 @@ 2024-08-04 ● +<<<<<<< HEAD Kaylia NEMOUR Спортивная гимнастика - Разновысокие брусья, финал (ж) @@ -1654,6 +1750,11 @@ ● Румыния Академическая гребля - Восьмерки, финал A (ж) +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + Novak DJOKOVIC + Теннис - Финал, одиночный разряд (м) +>>>>>>> 9722b845f (add message to medals table page)
@@ -1754,7 +1855,34 @@
+<<<<<<< HEAD 🇹🇭 Thailand +======= +<<<<<<< HEAD +======= + 🇦🇲 Armenia +>>>>>>> 9722b845f (add message to medals table page) + 0 + 1 + 0 + 1 +
+
+ +<<<<<<< HEAD + + + + + + +
2024-08-05
Kunlavut VITIDSARNБадминтон - Финал, одиночный (м)
+
+
+
+ +
+ 🇪🇹 Ethiopia 0 1 0 @@ -1765,8 +1893,39 @@ 2024-08-05 ● - Kunlavut VITIDSARN - Бадминтон - Финал, одиночный (м) + Tsige DUGUMA + Легкая атлетика - 800м, финал (ж) +======= + 2024-08-04 + + ● + Artur DAVTYAN + Спортивная гимнастика - Опорный прыжок, финал (м) +>>>>>>> 9722b845f (add message to medals table page) + + +
+
+
+ +
+<<<<<<< HEAD +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) + 🇨🇴 Colombia + 0 + 1 + 0 + 1 +
+
+ + + + + +
2024-08-05
Angel BARAJASСпортивная гимнастика - Перекладина, финал (м)
@@ -1791,46 +1950,6 @@
-
- -
- 🇨🇴 Colombia - 0 - 1 - 0 - 1 -
-
- - - - - - - -
2024-08-05
Angel BARAJASСпортивная гимнастика - Перекладина, финал (м)
-
-
-
- -
- 🇦🇲 Armenia - 0 - 1 - 0 - 1 -
-
- - - - - - - -
2024-08-04
Artur DAVTYANСпортивная гимнастика - Опорный прыжок, финал (м)
-
-
@@ -1854,7 +1973,15 @@
+<<<<<<< HEAD 🇩🇴 Dominican Republic +======= +<<<<<<< HEAD + 🇪🇹 Ethiopia +======= + 🇹🇭 Thailand +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page) 0 0 2 @@ -1864,6 +1991,7 @@ +<<<<<<< HEAD @@ -1872,6 +2000,16 @@ +======= + +<<<<<<< HEAD + + +======= + + +>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page)
2024-08-04
Cristian Javier PINALES Бокс - Полуфинал, до 80кг (м) Yunior ALCANTARA REYES Бокс - Полуфинал, до 51кг (м)Tsige DUGUMAЛегкая атлетика - 800м, финал (ж)Kunlavut VITIDSARNБадминтон - Финал, одиночный (м)
@@ -1957,7 +2095,99 @@
+<<<<<<< HEAD 🇹🇯 Tajikistan +======= + 🇲🇾 Malaysia +<<<<<<< HEAD + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-05
Zii Jia LEEБадминтон - Матч за 3-е место, одиночный (м)
2024-08-04
CHIA/SOHБадминтон - Матч за 3-е место, парный (м)
+
+
+
+ +
+ 🇩🇴 Dominican Republic + 0 + 0 + 2 + 2 +
+
+ + + + + + + + + + + + +
2024-08-04
Cristian Javier PINALESБокс - Полуфинал, до 80кг (м)
Yunior ALCANTARA REYESБокс - Полуфинал, до 51кг (м)
+
+
+
+ +
+ 🇿🇦 South Africa +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + 0 + 0 + 2 + 2 +
+
+ +<<<<<<< HEAD + + + + + +======= + + + + + + + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page) + +
2024-07-29
Alan HATHERLYМаунтинбайк - Кросс-кантри (м)
2024-08-05
Zii Jia LEEБадминтон - Матч за 3-е место, одиночный (м)
2024-08-04
CHIA/SOHБадминтон - Матч за 3-е место, парный (м)
+
+
+
+ +
+ 🇨🇻 Cabo Verde +>>>>>>> 9722b845f (add message to medals table page) 0 0 1 @@ -1968,8 +2198,8 @@ 2024-08-04 ● - Davlat BOLTAEV - Бокс - Полуфинал, до 92кг (м) + David de PINA + Бокс - Полуфинал, до 51кг (м)
@@ -2017,7 +2247,7 @@
- 🇨🇻 Cabo Verde + 🇬🇩 Grenada 0 0 1 @@ -2025,11 +2255,11 @@
- + - - + +
2024-08-04
2024-08-03
David de PINAБокс - Полуфинал, до 51кг (м)Lindon VICTORЛегкая атлетика - Десятиборье, 1500м (м)
@@ -2113,6 +2343,46 @@
+
+
+ +
+ 🇨🇭 Switzerland + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-02
Zoe CLAESSENSВМХ-гонки - Финал (ж)
+
+
+
+ +
+ 🇹🇯 Tajikistan + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-04
Davlat BOLTAEVБокс - Полуфинал, до 92кг (м)
+
diff --git a/docs/ru/today.html b/docs/ru/today.html index 08c54d70e..f3ef43a8d 100644 --- a/docs/ru/today.html +++ b/docs/ru/today.html @@ -3,7 +3,7 @@ Paris 2024 - События сегодня - + diff --git a/docs/today.html b/docs/today.html index 656d041e3..ff2a48720 100644 --- a/docs/today.html +++ b/docs/today.html @@ -3,7 +3,7 @@ Paris 2024 - Today's events - + diff --git a/docs/zh/index.html b/docs/zh/index.html index bb7124eec..95fc702f5 100644 --- a/docs/zh/index.html +++ b/docs/zh/index.html @@ -3,7 +3,7 @@ Paris 2024 - 日历 - + diff --git a/docs/zh/medals.html b/docs/zh/medals.html index facbfb298..8140121f9 100644 --- a/docs/zh/medals.html +++ b/docs/zh/medals.html @@ -3,7 +3,7 @@ Paris 2024 - 奖牌榜 - + @@ -36,6 +36,7 @@
+ @@ -43,6 +44,14 @@
+ +
@@ -1322,36 +1331,6 @@
-
- -
- 🇰🇪 Kenya - 1 - 1 - 1 - 3 -
-
- - - - - - - - - - - - - - - - - -
2024-08-05
Mary MORAA田径 - 女子800米决赛
Beatrice CHEBET田径 - 女子5000米决赛
Faith KIPYEGON田径 - 女子5000米决赛
-
-
@@ -1383,6 +1362,36 @@
+
+ +
+ 🇰🇪 Kenya + 1 + 1 + 1 + 3 +
+
+ + + + + + + + + + + + + + + + + +
2024-08-05
Mary MORAA田径 - 女子800米决赛
Beatrice CHEBET田径 - 女子5000米决赛
Faith KIPYEGON田径 - 女子5000米决赛
+
+
@@ -1449,6 +1458,36 @@
+<<<<<<< HEAD +======= + 🇮🇪 Ireland + 1 + 0 + 1 + 2 +
+
+ + + + + + + + + + + + + +
2024-08-04
Daniel WIFFEN游泳 - 男子1500米自由泳决赛
2024-08-03
Rhys MC CLENAGHAN竞技体操 - 男子鞍马决赛
+
+
+
+ +
+<<<<<<< HEAD +>>>>>>> 9722b845f (add message to medals table page) 🇧🇪 Belgium 1 0 @@ -1561,7 +1600,13 @@
+<<<<<<< HEAD 🇦🇷 Argentina +======= +======= +>>>>>>> 3b5ffcd28 (add message to medals table page) + 🇩🇿 Algeria +>>>>>>> 9722b845f (add message to medals table page) 1 0 0 @@ -1601,7 +1646,31 @@
+<<<<<<< HEAD 🇷🇸 Serbia +======= + 🇦🇷 Argentina + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-07-31
Jose TORRES GIL自由式小轮车 - 男子公园赛决赛
+
+
+
+ +
+ 🇨🇱 Chile +>>>>>>> 3b5ffcd28 (add message to medals table page) 1 0 0 @@ -1621,7 +1690,51 @@
+<<<<<<< HEAD 🇩🇿 Algeria +======= + 🇩🇲 Dominica + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Thea LAFOND田径 - 女子三级跳远决赛
+
+
+
+ +
+ 🇳🇴 Norway + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Markus ROOTH田径 - 男子十项全能1500米
+
+
+
+ +
+ 🇷🇴 Romania +>>>>>>> 9722b845f (add message to medals table page) 1 0 0 @@ -1641,7 +1754,31 @@
+<<<<<<< HEAD 🇨🇱 Chile +======= + 🇱🇨 Saint Lucia + 1 + 0 + 0 + 1 +
+
+ + + + + + + +
2024-08-03
Julien ALFRED田径 - 女子100米决赛
+
+
+
+ +
+ 🇷🇸 Serbia +>>>>>>> 3b5ffcd28 (add message to medals table page) 1 0 0 @@ -1652,8 +1789,13 @@ 2024-08-04 ● +<<<<<<< HEAD Francisca CROVETTO CHADID 射击 - 女子双向飞碟决赛 +======= + Novak DJOKOVIC + 网球 - 男子单打金牌赛 +>>>>>>> 3b5ffcd28 (add message to medals table page)
@@ -1754,6 +1896,41 @@
+<<<<<<< HEAD +======= +<<<<<<< HEAD + 🇹🇭 Thailand +======= + 🇦🇲 Armenia +>>>>>>> 3b5ffcd28 (add message to medals table page) + 0 + 1 + 0 + 1 +
+
+ +<<<<<<< HEAD + + + + + +======= + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page) + +
2024-08-05
Kunlavut VITIDSARN羽毛球 - 男子单打金牌赛
2024-08-04
Artur DAVTYAN竞技体操 - 男子跳马决赛
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇪🇹 Ethiopia 0 1 @@ -1814,7 +1991,7 @@
- 🇦🇲 Armenia + 🇪🇹 Ethiopia 0 1 0 @@ -1822,11 +1999,11 @@
- + - - + +
2024-08-04
2024-08-05
Artur DAVTYAN竞技体操 - 男子跳马决赛Tsige DUGUMA田径 - 女子800米决赛
@@ -1854,6 +2031,7 @@
+<<<<<<< HEAD 🇩🇴 Dominican Republic 0 0 @@ -1872,6 +2050,21 @@ ● Yunior ALCANTARA REYES 拳击 - 男子51公斤级 - 半决赛 +======= + 🇹🇭 Thailand + 0 + 1 + 0 + 1 +
+
+ + + + + + +>>>>>>> 9722b845f (add message to medals table page)
2024-08-05
Kunlavut VITIDSARN羽毛球 - 男子单打金牌赛
@@ -1879,7 +2072,11 @@
+<<<<<<< HEAD 🇲🇾 Malaysia +======= + 🇩🇴 Dominican Republic +>>>>>>> 9722b845f (add message to medals table page) 0 0 2 @@ -1887,17 +2084,16 @@
- - - - - - - - + + + + + + +
2024-08-05
Zii Jia LEE羽毛球 - 男子单打铜牌赛
2024-08-04
CHIA/SOH羽毛球 - 男子双打铜牌赛Cristian Javier PINALES拳击 - 男子80公斤级 - 半决赛
Yunior ALCANTARA REYES拳击 - 男子51公斤级 - 半决赛
@@ -1957,7 +2153,76 @@
+<<<<<<< HEAD +======= +<<<<<<< HEAD + 🇨🇭 Switzerland + 0 + 0 + 1 + 1 +
+
+ + + + + + +======= + 🇲🇾 Malaysia + 0 + 0 + 2 + 2 + +
+
2024-08-02
Zoe CLAESSENS小轮车竞速 - 女子决赛
+ + + + + + + + + + + +>>>>>>> 3b5ffcd28 (add message to medals table page) + +
2024-08-05
Zii Jia LEE羽毛球 - 男子单打铜牌赛
2024-08-04
CHIA/SOH羽毛球 - 男子双打铜牌赛
+
+
+
+ +
+<<<<<<< HEAD + 🇬🇩 Grenada + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-03
Lindon VICTOR田径 - 男子十项全能1500米
+
+
+
+ +
+>>>>>>> 9722b845f (add message to medals table page) 🇹🇯 Tajikistan +======= + 🇨🇻 Cabo Verde +>>>>>>> 3b5ffcd28 (add message to medals table page) 0 0 1 @@ -1968,8 +2233,13 @@ 2024-08-04 ● +<<<<<<< HEAD Davlat BOLTAEV 拳击 - 男子92公斤级 - 半决赛 +======= + David de PINA + 拳击 - 男子51公斤级 - 半决赛 +>>>>>>> 3b5ffcd28 (add message to medals table page)
@@ -2017,7 +2287,7 @@
- 🇨🇻 Cabo Verde + 🇬🇩 Grenada 0 0 1 @@ -2025,11 +2295,11 @@
- + - - + +
2024-08-04
2024-08-03
David de PINA拳击 - 男子51公斤级 - 半决赛Lindon VICTOR田径 - 男子十项全能1500米
@@ -2093,6 +2363,11 @@
+<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9722b845f (add message to medals table page)
@@ -2113,6 +2388,30 @@
+<<<<<<< HEAD +======= +
+
+ +
+ 🇹🇯 Tajikistan + 0 + 0 + 1 + 1 +
+
+ + + + + + + +
2024-08-04
Davlat BOLTAEV拳击 - 男子92公斤级 - 半决赛
+
+>>>>>>> 3b5ffcd28 (add message to medals table page) +>>>>>>> 9722b845f (add message to medals table page)
diff --git a/docs/zh/today.html b/docs/zh/today.html index c4bedc0c9..00b4900e5 100644 --- a/docs/zh/today.html +++ b/docs/zh/today.html @@ -3,7 +3,7 @@ Paris 2024 - 今天的活动 - + diff --git a/src/calendar.ts b/src/calendar.ts index 0497c4061..08f98070b 100644 --- a/src/calendar.ts +++ b/src/calendar.ts @@ -472,7 +472,7 @@ export class Calendar { if (a.bronze !== b.bronze) { return a.bronze < b.bronze ? 1 : -1; } - return a.name > b.name ? 1 : -1; + return getNOCName(a.noc) > getNOCName(b.noc) ? 1 : -1; }).forEach((noc) => { content.push(`
`); content.push(` `); diff --git a/src/index/template.html b/src/index/template.html index a169efbb4..0ccc70cc8 100644 --- a/src/index/template.html +++ b/src/index/template.html @@ -3,7 +3,7 @@ Paris 2024 - {{translate_calendars}} - + diff --git a/src/medals/template.html b/src/medals/template.html index 32cced398..0daf5ffcd 100644 --- a/src/medals/template.html +++ b/src/medals/template.html @@ -3,7 +3,7 @@ Paris 2024 - {{translate_medalsTable}} - + @@ -36,6 +36,7 @@
+ @@ -43,6 +44,14 @@
+ +
{{medals}}
diff --git a/src/today/template.html b/src/today/template.html index 9c0a02b16..b73e30c28 100644 --- a/src/today/template.html +++ b/src/today/template.html @@ -3,7 +3,7 @@ Paris 2024 - {{translate_todaysEvents}} - + diff --git a/src/translate.ts b/src/translate.ts index e1673835d..f4ea7474a 100644 --- a/src/translate.ts +++ b/src/translate.ts @@ -94,6 +94,13 @@ const todaysEvents = new Map([ ["zh", "今天的活动"], ]); +const medalsTableError = new Map([ + ["en", "Due to a recent update on the official website, the information on this page may no longer be accurate."], + ["ja", "公式ウェブサイトの最新情報により、このページの情報が正確でない可能性があります。"], + ["ko", "공식 웹 사이트의 최신 정보로 인해이 페이지의 정보가 더 이상 정확하지 않을 수 있습니다."], + ["ru", "Из-за недавнего обновления на официальном сайте информация на этой странице может быть недействительной."], + ["zh", "由于官方网站的最新更新,此页面上的信息可能不再准确。"], +]); export const translate = (text: string, language: string) => text .replace(/\{\{translate_allSports}}/gi, allSports.get(language)!) @@ -105,6 +112,7 @@ export const translate = (text: string, language: string) => text .replace(/\{\{translate_genderWomen}}/gi, genderWomen.get(language)!) .replace(/\{\{translate_medalEvents}}/gi, medalEvents.get(language)!) .replace(/\{\{translate_medalsTable}}/gi, medalsTable.get(language)!) + .replace(/\{\{translate_medalsTableError}}/gi, medalsTableError.get(language)!) .replace(/\{\{translate_noEventToday}}/gi, noEventToday.get(language)!) .replace(/\{\{translate_openingCeremony}}/gi, openingCeremony.get(language)!) .replace(/\{\{translate_todaysEvents}}/gi, todaysEvents.get(language)!)