From 8002b7ff52aca04a3b9f6213720b00f3a9b24dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= <eepi1994@hotmail.com>
Date: Mon, 16 Sep 2024 10:51:13 +0300
Subject: [PATCH] TMS-1067: Show price-info for event in listing if it's free

---
 CHANGELOG.MD                                  |   2 +
 lang/fi.mo                                    | Bin 13677 -> 13750 bytes
 lang/fi.po                                    | 179 +++++++-----------
 lang/tms-theme-base.pot                       | 170 +++++++----------
 lib/Eventz.php                                |   2 +-
 models/strings.php                            |   1 +
 partials/ui/event-highlight.dust              |  12 ++
 .../page-events-calendar-item-grid.dust       |  50 +++--
 .../page-events-calendar-item-list.dust       |  46 ++---
 9 files changed, 210 insertions(+), 252 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index ab20d062..25e832d6 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-1067: Show price-info for event in listing if it's free
+
 ## [1.58.2] - 2024-09-12
 
 - TMS-1061: Change hero video-field from URL to File, since the URL wasn't working
diff --git a/lang/fi.mo b/lang/fi.mo
index 45a2f382a551f40a4edc28fa0b1278ac007969c6..2c231dfdb2d549f074d1bbace629f33f4b49109b 100644
GIT binary patch
delta 4482
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

delta 4427
zcmYk-dwfrI9LMo57MsmxV=hy+xeT$^l$l`?##~b&<rWQ17EQV4G?L6^xy*e?npB7}
z(#53Anm>dtJkUR-qIq=D%_G+9z4Ot-dF=grp6~aZ^SzzRiYHZMdKV)C@*P__xsyz*
z>0DSf=T3yE*15oN=Ta~Tn`2LGfD^F>dKiTBu@NrCU@XKsxYx=hSc~!rtcz#x4lZ}!
zvlB|i6;wmlF%SbHoU4a*P#wl17r0~$z*LOI9;ov(P#tHX+M9*Cevy?6P}jYS%+c+s
zs`s2b$c`>7MKyHV%I8rR{D|tf!jAurn#sS|1_S6t1HT8gXvwJSdSPwsi_FOl!TLA>
z)z2IZqJOu59i5n`3S5s`x^1YA_ac3{gQ$kfQRkgRop%m(-jArIy^30aO4P(c=~W#^
z@uLAISh)*&&8Qg6jxLyn8tHsg!}(Tz1J&?;)Ig3|{aMt2uApwwFR1HkMfwAbG^0@y
zY=auW{iy4@M{@tGvy(=J9<Frc&rRkh4Cf=0a4T^LZb$lXH?T2A&}&0%hgA<J4x&8K
z>JK7+?xdA}Fe_0LY1okUZ^F*qw4#bMR0qRR^;xKUoNLGTA$_}2jKT}p6#qv4Tti-g
zyD$OO&H&Uv$D-PsgF0_5w!rs1tN0T2G*_Tz9L7}|P;=A;NvMVgq8fe%`Exl|zro7y
zqXu{yb!&e@wG+Z<)lM|3pN^>Zyy5J$W@kF;!Y!zg79)S|6hG>)0(C)k4(hxZRKrQA
zB~G{U7}Nx^t-R36>rn&RWqyIIoae5wqlW77^-)K0sB&ji!vj(GHUri1BGh@CQ8U?x
z>hLRMvhK1Oz-ZM@Q`F28t(=Z(cLdg>f0xY;tL_$JG;TrNn-b*DeQ(xaxH>NuwK6HF
zhKHcen~coGEk>QU9r<%5{OI_%sPk{2CK5?!P3hmYWk((N<wqmSM9nA%)lfb%DYpyN
zaXD&$m#iEd<6j?#Ixh|5a2#p?xyY$*2WsWYFc&YPr;$9(I_iLjTGCbgbi!gx#$RwD
zw&4cek9%-5UP8?%jr*gSk3vmg7HZ(jQ4@I^b!$Gxx%dsH;II~~|JCZwtzbIcsK{x>
ztB6NXU#_1~-|D|npUg_s3Iy`R>VwrB^<ip{y4O8W-;JSI3&)#TsP<m4<MU8o&=svc
zf213!&^_9Zfp{9#z<JaPeTVAcI_e8qhmV5Jk4DX~E2@LR7>FZLU%K(A^RqDk7ufM!
zJHFCmN8j!(sF@bp2|H0UE5>$MifZs0>Qh>cWzwfM1l4gAYUXjMTbX3_{ZQu(Lro~d
z%9BygiZ`1b4PY&*fla7^>_RoXAGHEUtp01Ozla*pWz>xSLOlzvt-n%@%(ke9F%`8^
z8K{ZPM6UN-E<0MHHFjW!dB`lsAda6$Jw%sKw?fOJ8P&sJY=U|wT48NWLM?fB<Pmde
z7=!7k^D;3|@Bd78)WJN|L%0Oh;0e^gzCo?bWz@rW9eZPByg!hUs0OE?&hxB354Dn8
zQSI!&8u$Tf#SUX#`gh0K(d%;7PWTOV;h(66Z(tn^xyPSb6lw`uqHbLh>Ub9n!M;{M
z40TIJq9*t}Rt?a~dFW|G>)6qV3Q!FfTKRxkf*Md6YDrI;U!vakbEtNHMYZz>>R#V8
zBNF_9#GwX~iW+dA1lC_89!iBe7-t7EQ8Sx?YIrWH;dxeGjA|&)%IoZS0jj-1)H70q
zVR#JH&R3}G&Y{}-E`jw|MFkalZT_+oLhkiXXn?wR(N<2hati7h>5ppoF;qJvP%AVZ
z^>9wIayDvUGcXJnpdRLY&nkAKMtm66&?(ftJ8$J{cKjx)f$&6s0I{g+;;}A1fSTE0
z)W9CM<D)Q?@>Dzi5^A8{B6c*=WvF|y+T4bEDEFc|C`Ww<E}~wqYZ#4{sCymV-XG9?
zsE)f~I`%+KXep|nHK?~}GxG1lbBEYzLB$0OuEx81pZ`A~l>anOP~Qo4VLpaqft7co
zZovW6vvL$Qurf@;GdLKVbl_`=(}+IV9m!(yG3loF|1dk_i2j4A!9heLK2A21RYcoX
zvXs0;j*?|W+c6(E2{nKM@&<W;yhGk5TSz?7wuf{lNh;94<Cgxv?XbNM&6YTdXojC!
zU5=TGTA^Yq-;KJ3+Q$314=~#HZ%6-zw-HbO1fC}4WGER;v^`0*eEW$Wtg&PRxqbVD
z!ep|JthWQPCU?{IATN@G<b9&;h>z=n&-?TD-~9np3@1}aZ?czYd&tMlFq6%Vm`7TX
zcS&`kO%GQMqSq~pY$AP#9_9l?Z<XGVuB1%szmT1oL>nJ0w~Gu>flW`gwoIajG=eN5
zZHcx7vX8VOJa29U*-4%ux3-7bX?&}IeaY*jKRKlP{}FkRd`^}SZMh`BYR|csaXxv^
z%D3P}srnWaVTM({X})H@VD>UsV`mad8W3+DKd+MML|Z2xw*~{q7}Ae4BQZo<DOo^T
zlQ{AeNhd4FED}kEkreU@(Q7+_XzSqP*7|Dx{x%gxl3HXrNhHn5V`MjZi#$RK$x8AZ
zxwWa4$H{h*ZIw+ijXX-8C3A?jo@92_o_<>SdjqYa#B7K4ZT~ZzSQH;#7FZM>Rav`s
ZQhZ`^Ok#(W#EwN#E&mBBYMf9|^FKZtnHT^7

diff --git a/lang/fi.po b/lang/fi.po
index ccf1979d..23824ca0 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2024-06-18 15:17+0300\n"
-"PO-Revision-Date: 2024-06-18 15:17+0300\n"
+"POT-Creation-Date: 2024-09-13 15:09+0300\n"
+"PO-Revision-Date: 2024-09-13 15:09+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fi\n"
@@ -75,13 +75,13 @@ msgid "Open map"
 msgstr "Avaa kartta"
 
 #: lib/ACF/FrontPageGroup.php:39 lib/ACF/OnepagerGroup.php:73
-#: lib/ACF/PageGroup.php:42
+#: lib/ACF/PageGroup.php:47
 msgctxt "theme ACF"
 msgid "Page Components"
 msgstr "Sivun komponentit"
 
 #: lib/ACF/FrontPageGroup.php:91 lib/ACF/OnepagerGroup.php:126
-#: lib/ACF/PageGroup.php:194 lib/ACF/PostGroup.php:173
+#: lib/ACF/PageGroup.php:260 lib/ACF/PostGroup.php:173
 msgctxt "theme ACF"
 msgid "Components"
 msgstr "Komponentit"
@@ -101,17 +101,17 @@ msgctxt "theme ACF"
 msgid "Asetukset"
 msgstr ""
 
-#: lib/ACF/PageGroup.php:43
+#: lib/ACF/PageGroup.php:142
 msgctxt "theme ACF"
 msgid "Page settings"
 msgstr "Sivun asetukset"
 
-#: lib/ACF/PageGroup.php:169
+#: lib/ACF/PageGroup.php:235
 msgctxt "theme ACF"
 msgid "Remove hero-image overlay"
 msgstr "Poista herokuvan tummennus"
 
-#: lib/ACF/PageGroup.php:170
+#: lib/ACF/PageGroup.php:236
 msgctxt "theme ACF"
 msgid "Remove hero-image overlay and move the heading under the hero-element"
 msgstr "Poista herokuvan tummennus ja siirrä otsikkoteksti hero-elementin alle"
@@ -344,22 +344,22 @@ msgctxt "theme-frontend"
 msgid "Collapse all sections"
 msgstr "Sulje kaikki sisällöt"
 
-#: lib/Formatters/CountdownFormatter.php:92 models/strings.php:229
+#: lib/Formatters/CountdownFormatter.php:92 models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Days"
 msgstr "Päivää"
 
-#: lib/Formatters/CountdownFormatter.php:93 models/strings.php:230
+#: lib/Formatters/CountdownFormatter.php:93 models/strings.php:231
 msgctxt "theme-frontend"
 msgid "Hours"
 msgstr "Tuntia"
 
-#: lib/Formatters/CountdownFormatter.php:94 models/strings.php:231
+#: lib/Formatters/CountdownFormatter.php:94 models/strings.php:232
 msgctxt "theme-frontend"
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: lib/Formatters/CountdownFormatter.php:95 models/strings.php:232
+#: lib/Formatters/CountdownFormatter.php:95 models/strings.php:233
 msgctxt "theme-frontend"
 msgid "Seconds"
 msgstr "Sekuntia"
@@ -706,8 +706,8 @@ msgctxt "theme-frontend"
 msgid "Current language: "
 msgstr "Valittu kieli: "
 
-#: models/strings.php:51 models/strings.php:52 models/strings.php:160
-#: models/strings.php:161
+#: models/strings.php:51 models/strings.php:52 models/strings.php:161
+#: models/strings.php:162
 msgctxt "theme-frontend"
 msgid "Search"
 msgstr "Hae"
@@ -718,7 +718,7 @@ msgid "Search from site"
 msgstr "Hae sivustolta"
 
 #: models/strings.php:55 models/strings.php:81 models/strings.php:143
-#: models/strings.php:156 models/strings.php:165 models/strings.php:236
+#: models/strings.php:157 models/strings.php:166 models/strings.php:237
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr "Sulje"
@@ -773,7 +773,7 @@ msgctxt "theme-frontend"
 msgid "Next"
 msgstr "Seuraava"
 
-#: models/strings.php:83 models/strings.php:155 models/strings.php:164
+#: models/strings.php:83 models/strings.php:156 models/strings.php:165
 msgctxt "theme-frontend"
 msgid "Open"
 msgstr "Avaa"
@@ -863,12 +863,12 @@ msgctxt "theme-frontend"
 msgid "Articletype:"
 msgstr "Artikkelityyppi:"
 
-#: models/strings.php:109 models/strings.php:186
+#: models/strings.php:109 models/strings.php:187
 msgctxt "theme-frontend"
 msgid "Month"
 msgstr "Kuukausi"
 
-#: models/strings.php:110 models/strings.php:187
+#: models/strings.php:110 models/strings.php:188
 msgctxt "theme-frontend"
 msgid "Year"
 msgstr "Vuosi"
@@ -888,62 +888,62 @@ msgctxt "theme-frontend"
 msgid "The page reloads after the selection."
 msgstr "Sivu latautuu uudelleen valinnan jälkeen."
 
-#: models/strings.php:116 models/strings.php:200
+#: models/strings.php:116 models/strings.php:201
 msgctxt "theme-frontend"
 msgid "January"
 msgstr "tammikuu"
 
-#: models/strings.php:117 models/strings.php:201
+#: models/strings.php:117 models/strings.php:202
 msgctxt "theme-frontend"
 msgid "February"
 msgstr "helmikuu"
 
-#: models/strings.php:118 models/strings.php:202
+#: models/strings.php:118 models/strings.php:203
 msgctxt "theme-frontend"
 msgid "March"
 msgstr "maaliskuu"
 
-#: models/strings.php:119 models/strings.php:203
+#: models/strings.php:119 models/strings.php:204
 msgctxt "theme-frontend"
 msgid "April"
 msgstr "huhtikuu"
 
-#: models/strings.php:120 models/strings.php:204 models/strings.php:218
+#: models/strings.php:120 models/strings.php:205 models/strings.php:219
 msgctxt "theme-frontend"
 msgid "May"
 msgstr "toukokuu"
 
-#: models/strings.php:121 models/strings.php:205
+#: models/strings.php:121 models/strings.php:206
 msgctxt "theme-frontend"
 msgid "June"
 msgstr "kesäkuu"
 
-#: models/strings.php:122 models/strings.php:206
+#: models/strings.php:122 models/strings.php:207
 msgctxt "theme-frontend"
 msgid "July"
 msgstr "heinäkuu"
 
-#: models/strings.php:123 models/strings.php:207
+#: models/strings.php:123 models/strings.php:208
 msgctxt "theme-frontend"
 msgid "August"
 msgstr "elokuu"
 
-#: models/strings.php:124 models/strings.php:208
+#: models/strings.php:124 models/strings.php:209
 msgctxt "theme-frontend"
 msgid "September"
 msgstr "syyskuu"
 
-#: models/strings.php:125 models/strings.php:209
+#: models/strings.php:125 models/strings.php:210
 msgctxt "theme-frontend"
 msgid "October"
 msgstr "lokakuu"
 
-#: models/strings.php:126 models/strings.php:210
+#: models/strings.php:126 models/strings.php:211
 msgctxt "theme-frontend"
 msgid "November"
 msgstr "marraskuu"
 
-#: models/strings.php:127 models/strings.php:211
+#: models/strings.php:127 models/strings.php:212
 msgctxt "theme-frontend"
 msgid "December"
 msgstr "joulukuu"
@@ -1002,218 +1002,180 @@ msgctxt "theme-frontend"
 msgid "Event location"
 msgstr "Paikka"
 
-#: models/strings.php:159
+#: models/strings.php:153
+msgctxt "theme-frontend"
+msgid "Event price"
+msgstr "Hinta"
+
+#: models/strings.php:160
 msgctxt "theme-frontend"
 msgid "Search contacts"
 msgstr "Etsi yhteystietoja"
 
-#: models/strings.php:166 models/strings.php:171
+#: models/strings.php:167 models/strings.php:172
 msgctxt "theme-frontend"
 msgid "Related artwork"
 msgstr "Liittyvät teokset"
 
-#: models/strings.php:169
+#: models/strings.php:170
 msgctxt "theme-frontend"
 msgid "Show artist"
 msgstr "Näytä taiteilija"
 
-#: models/strings.php:170
+#: models/strings.php:171
 msgctxt "theme-frontend"
 msgid "Artwork by the same artist"
 msgstr "Taiteilijan muut teokset"
 
-#: models/strings.php:174
+#: models/strings.php:175
 msgctxt "theme-frontend"
 msgid "Filter by type"
 msgstr "Rajaa tyypin mukaan"
 
-#: models/strings.php:175
+#: models/strings.php:176
 msgctxt "theme-frontend"
 msgid "Publish date"
 msgstr "Julkaisupäivä"
 
-#: models/strings.php:176
+#: models/strings.php:177
 msgctxt "theme-frontend"
 msgid "Page location:"
 msgstr "Sivun sijainti:"
 
-#: models/strings.php:177
+#: models/strings.php:178
 msgctxt "theme-frontend"
 msgid "Clear the form"
 msgstr "Tyhjennä lomake"
 
-#: models/strings.php:181 models/strings.php:189
+#: models/strings.php:182 models/strings.php:190
 msgctxt "theme-frontend"
 msgid "Pick a date"
 msgstr "Valitse päivämäärä"
 
-#: models/strings.php:182
+#: models/strings.php:183
 msgctxt "theme-frontend"
 msgid "dd.mm.yyyy"
 msgstr "pp.kk.vvvv"
 
-#: models/strings.php:183
+#: models/strings.php:184
 msgctxt "theme-frontend"
 msgid "The chosen date is"
 msgstr "Valittu päivämäärä on"
 
-#: models/strings.php:184
+#: models/strings.php:185
 msgctxt "theme-frontend"
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: models/strings.php:185
+#: models/strings.php:186
 msgctxt "theme-frontend"
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: models/strings.php:188
+#: models/strings.php:189
 msgctxt "theme-frontend"
 msgid "Close window"
 msgstr "Sulje ikkuna"
 
-#: models/strings.php:191
+#: models/strings.php:192
 msgctxt "theme-frontend"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: models/strings.php:192
+#: models/strings.php:193
 msgctxt "theme-frontend"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: models/strings.php:193
+#: models/strings.php:194
 msgctxt "theme-frontend"
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: models/strings.php:194
+#: models/strings.php:195
 msgctxt "theme-frontend"
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: models/strings.php:195
+#: models/strings.php:196
 msgctxt "theme-frontend"
 msgid "Thursday"
 msgstr "Torstai"
 
-#: models/strings.php:196
+#: models/strings.php:197
 msgctxt "theme-frontend"
 msgid "Friday"
 msgstr "Perjantai"
 
-#: models/strings.php:197
+#: models/strings.php:198
 msgctxt "theme-frontend"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: models/strings.php:214
+#: models/strings.php:215
 msgctxt "theme-frontend"
 msgid "Jan"
 msgstr "Tam"
 
-#: models/strings.php:215
+#: models/strings.php:216
 msgctxt "theme-frontend"
 msgid "Feb"
 msgstr "Hel"
 
-#: models/strings.php:216
+#: models/strings.php:217
 msgctxt "theme-frontend"
 msgid "Mar"
 msgstr "Maa"
 
-#: models/strings.php:217
+#: models/strings.php:218
 msgctxt "theme-frontend"
 msgid "Apr"
 msgstr "Huh"
 
-#: models/strings.php:219
+#: models/strings.php:220
 msgctxt "theme-frontend"
 msgid "Jun"
 msgstr "Kes"
 
-#: models/strings.php:220
+#: models/strings.php:221
 msgctxt "theme-frontend"
 msgid "Jul"
 msgstr "Hei"
 
-#: models/strings.php:221
+#: models/strings.php:222
 msgctxt "theme-frontend"
 msgid "Aug"
 msgstr "Elo"
 
-#: models/strings.php:222
+#: models/strings.php:223
 msgctxt "theme-frontend"
 msgid "Sept"
 msgstr "Syys"
 
-#: models/strings.php:223
+#: models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Oct"
 msgstr "Loka"
 
-#: models/strings.php:224
+#: models/strings.php:225
 msgctxt "theme-frontend"
 msgid "Nov"
 msgstr "Mar"
 
-#: models/strings.php:225
+#: models/strings.php:226
 msgctxt "theme-frontend"
 msgid "Dec"
 msgstr "Jou"
 
-#: models/strings.php:235
+#: models/strings.php:236
 msgctxt "theme-frontend"
 msgid "Enlarged image"
 msgstr "Suurennettu kuva"
 
-#: models/strings.php:249
+#: models/strings.php:250
 msgid "Pagination"
 msgstr "Sivutus"
 
-#: wp-content/mu-plugins/acf-codifier/src/Field/FlexibleContent.php:67
-#: wp-content/mu-plugins/acf-codifier/src/Field/Repeater.php:60
-msgid "Add Row"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisitePostObject.php:24
-msgid "Multisite Post Object"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteRelationship.php:24
-msgid "Multisite Relationship"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteTaxonomy.php:23
-msgid "Multisite taxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:23
-msgid "Multitaxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:516
-#, php-format
-msgctxt "No terms"
-msgid "No %s"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:18
-msgid "PHP"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:48
-#, fuzzy
-#| msgid "Induction loop"
-msgid "Instructions"
-msgstr "Induktio-silmukka"
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:50
-msgid ""
-"This field can only be used with ACF Codifier. Doesn't do anything if "
-"defined in the admin side."
-msgstr ""
-
 #. Theme Name of the plugin/theme
 msgid "TMS Theme Base"
 msgstr ""
@@ -1230,6 +1192,11 @@ msgstr ""
 msgid "https://geniem.fi"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Induction loop"
+#~ msgid "Instructions"
+#~ msgstr "Induktio-silmukka"
+
 #~ msgctxt "theme-frontend"
 #~ msgid "Dialog Window - Close (Press escape to close)"
 #~ msgstr "Dialogi-ikkuna - sulje (Sulje painamalla Esc -näppäintä)"
diff --git a/lang/tms-theme-base.pot b/lang/tms-theme-base.pot
index 4cb5b31a..25d79b0a 100644
--- a/lang/tms-theme-base.pot
+++ b/lang/tms-theme-base.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2024-06-18 15:17+0300\n"
+"POT-Creation-Date: 2024-09-13 15:09+0300\n"
 "PO-Revision-Date: 2022-01-12 10:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -75,13 +75,13 @@ msgid "Open map"
 msgstr ""
 
 #: lib/ACF/FrontPageGroup.php:39 lib/ACF/OnepagerGroup.php:73
-#: lib/ACF/PageGroup.php:42
+#: lib/ACF/PageGroup.php:47
 msgctxt "theme ACF"
 msgid "Page Components"
 msgstr ""
 
 #: lib/ACF/FrontPageGroup.php:91 lib/ACF/OnepagerGroup.php:126
-#: lib/ACF/PageGroup.php:194 lib/ACF/PostGroup.php:173
+#: lib/ACF/PageGroup.php:260 lib/ACF/PostGroup.php:173
 msgctxt "theme ACF"
 msgid "Components"
 msgstr ""
@@ -101,17 +101,17 @@ msgctxt "theme ACF"
 msgid "Asetukset"
 msgstr ""
 
-#: lib/ACF/PageGroup.php:43
+#: lib/ACF/PageGroup.php:142
 msgctxt "theme ACF"
 msgid "Page settings"
 msgstr ""
 
-#: lib/ACF/PageGroup.php:169
+#: lib/ACF/PageGroup.php:235
 msgctxt "theme ACF"
 msgid "Remove hero-image overlay"
 msgstr ""
 
-#: lib/ACF/PageGroup.php:170
+#: lib/ACF/PageGroup.php:236
 msgctxt "theme ACF"
 msgid "Remove hero-image overlay and move the heading under the hero-element"
 msgstr ""
@@ -344,22 +344,22 @@ msgctxt "theme-frontend"
 msgid "Collapse all sections"
 msgstr ""
 
-#: lib/Formatters/CountdownFormatter.php:92 models/strings.php:229
+#: lib/Formatters/CountdownFormatter.php:92 models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Days"
 msgstr ""
 
-#: lib/Formatters/CountdownFormatter.php:93 models/strings.php:230
+#: lib/Formatters/CountdownFormatter.php:93 models/strings.php:231
 msgctxt "theme-frontend"
 msgid "Hours"
 msgstr ""
 
-#: lib/Formatters/CountdownFormatter.php:94 models/strings.php:231
+#: lib/Formatters/CountdownFormatter.php:94 models/strings.php:232
 msgctxt "theme-frontend"
 msgid "Minutes"
 msgstr ""
 
-#: lib/Formatters/CountdownFormatter.php:95 models/strings.php:232
+#: lib/Formatters/CountdownFormatter.php:95 models/strings.php:233
 msgctxt "theme-frontend"
 msgid "Seconds"
 msgstr ""
@@ -697,8 +697,8 @@ msgctxt "theme-frontend"
 msgid "Current language: "
 msgstr ""
 
-#: models/strings.php:51 models/strings.php:52 models/strings.php:160
-#: models/strings.php:161
+#: models/strings.php:51 models/strings.php:52 models/strings.php:161
+#: models/strings.php:162
 msgctxt "theme-frontend"
 msgid "Search"
 msgstr ""
@@ -709,7 +709,7 @@ msgid "Search from site"
 msgstr ""
 
 #: models/strings.php:55 models/strings.php:81 models/strings.php:143
-#: models/strings.php:156 models/strings.php:165 models/strings.php:236
+#: models/strings.php:157 models/strings.php:166 models/strings.php:237
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr ""
@@ -764,7 +764,7 @@ msgctxt "theme-frontend"
 msgid "Next"
 msgstr ""
 
-#: models/strings.php:83 models/strings.php:155 models/strings.php:164
+#: models/strings.php:83 models/strings.php:156 models/strings.php:165
 msgctxt "theme-frontend"
 msgid "Open"
 msgstr ""
@@ -854,12 +854,12 @@ msgctxt "theme-frontend"
 msgid "Articletype:"
 msgstr ""
 
-#: models/strings.php:109 models/strings.php:186
+#: models/strings.php:109 models/strings.php:187
 msgctxt "theme-frontend"
 msgid "Month"
 msgstr ""
 
-#: models/strings.php:110 models/strings.php:187
+#: models/strings.php:110 models/strings.php:188
 msgctxt "theme-frontend"
 msgid "Year"
 msgstr ""
@@ -879,62 +879,62 @@ msgctxt "theme-frontend"
 msgid "The page reloads after the selection."
 msgstr ""
 
-#: models/strings.php:116 models/strings.php:200
+#: models/strings.php:116 models/strings.php:201
 msgctxt "theme-frontend"
 msgid "January"
 msgstr ""
 
-#: models/strings.php:117 models/strings.php:201
+#: models/strings.php:117 models/strings.php:202
 msgctxt "theme-frontend"
 msgid "February"
 msgstr ""
 
-#: models/strings.php:118 models/strings.php:202
+#: models/strings.php:118 models/strings.php:203
 msgctxt "theme-frontend"
 msgid "March"
 msgstr ""
 
-#: models/strings.php:119 models/strings.php:203
+#: models/strings.php:119 models/strings.php:204
 msgctxt "theme-frontend"
 msgid "April"
 msgstr ""
 
-#: models/strings.php:120 models/strings.php:204 models/strings.php:218
+#: models/strings.php:120 models/strings.php:205 models/strings.php:219
 msgctxt "theme-frontend"
 msgid "May"
 msgstr ""
 
-#: models/strings.php:121 models/strings.php:205
+#: models/strings.php:121 models/strings.php:206
 msgctxt "theme-frontend"
 msgid "June"
 msgstr ""
 
-#: models/strings.php:122 models/strings.php:206
+#: models/strings.php:122 models/strings.php:207
 msgctxt "theme-frontend"
 msgid "July"
 msgstr ""
 
-#: models/strings.php:123 models/strings.php:207
+#: models/strings.php:123 models/strings.php:208
 msgctxt "theme-frontend"
 msgid "August"
 msgstr ""
 
-#: models/strings.php:124 models/strings.php:208
+#: models/strings.php:124 models/strings.php:209
 msgctxt "theme-frontend"
 msgid "September"
 msgstr ""
 
-#: models/strings.php:125 models/strings.php:209
+#: models/strings.php:125 models/strings.php:210
 msgctxt "theme-frontend"
 msgid "October"
 msgstr ""
 
-#: models/strings.php:126 models/strings.php:210
+#: models/strings.php:126 models/strings.php:211
 msgctxt "theme-frontend"
 msgid "November"
 msgstr ""
 
-#: models/strings.php:127 models/strings.php:211
+#: models/strings.php:127 models/strings.php:212
 msgctxt "theme-frontend"
 msgid "December"
 msgstr ""
@@ -991,216 +991,180 @@ msgctxt "theme-frontend"
 msgid "Event location"
 msgstr ""
 
-#: models/strings.php:159
+#: models/strings.php:153
+msgctxt "theme-frontend"
+msgid "Event price"
+msgstr ""
+
+#: models/strings.php:160
 msgctxt "theme-frontend"
 msgid "Search contacts"
 msgstr ""
 
-#: models/strings.php:166 models/strings.php:171
+#: models/strings.php:167 models/strings.php:172
 msgctxt "theme-frontend"
 msgid "Related artwork"
 msgstr ""
 
-#: models/strings.php:169
+#: models/strings.php:170
 msgctxt "theme-frontend"
 msgid "Show artist"
 msgstr ""
 
-#: models/strings.php:170
+#: models/strings.php:171
 msgctxt "theme-frontend"
 msgid "Artwork by the same artist"
 msgstr ""
 
-#: models/strings.php:174
+#: models/strings.php:175
 msgctxt "theme-frontend"
 msgid "Filter by type"
 msgstr ""
 
-#: models/strings.php:175
+#: models/strings.php:176
 msgctxt "theme-frontend"
 msgid "Publish date"
 msgstr ""
 
-#: models/strings.php:176
+#: models/strings.php:177
 msgctxt "theme-frontend"
 msgid "Page location:"
 msgstr ""
 
-#: models/strings.php:177
+#: models/strings.php:178
 msgctxt "theme-frontend"
 msgid "Clear the form"
 msgstr ""
 
-#: models/strings.php:181 models/strings.php:189
+#: models/strings.php:182 models/strings.php:190
 msgctxt "theme-frontend"
 msgid "Pick a date"
 msgstr ""
 
-#: models/strings.php:182
+#: models/strings.php:183
 msgctxt "theme-frontend"
 msgid "dd.mm.yyyy"
 msgstr ""
 
-#: models/strings.php:183
+#: models/strings.php:184
 msgctxt "theme-frontend"
 msgid "The chosen date is"
 msgstr ""
 
-#: models/strings.php:184
+#: models/strings.php:185
 msgctxt "theme-frontend"
 msgid "Previous month"
 msgstr ""
 
-#: models/strings.php:185
+#: models/strings.php:186
 msgctxt "theme-frontend"
 msgid "Next month"
 msgstr ""
 
-#: models/strings.php:188
+#: models/strings.php:189
 msgctxt "theme-frontend"
 msgid "Close window"
 msgstr ""
 
-#: models/strings.php:191
+#: models/strings.php:192
 msgctxt "theme-frontend"
 msgid "Sunday"
 msgstr ""
 
-#: models/strings.php:192
+#: models/strings.php:193
 msgctxt "theme-frontend"
 msgid "Monday"
 msgstr ""
 
-#: models/strings.php:193
+#: models/strings.php:194
 msgctxt "theme-frontend"
 msgid "Tuesday"
 msgstr ""
 
-#: models/strings.php:194
+#: models/strings.php:195
 msgctxt "theme-frontend"
 msgid "Wednesday"
 msgstr ""
 
-#: models/strings.php:195
+#: models/strings.php:196
 msgctxt "theme-frontend"
 msgid "Thursday"
 msgstr ""
 
-#: models/strings.php:196
+#: models/strings.php:197
 msgctxt "theme-frontend"
 msgid "Friday"
 msgstr ""
 
-#: models/strings.php:197
+#: models/strings.php:198
 msgctxt "theme-frontend"
 msgid "Saturday"
 msgstr ""
 
-#: models/strings.php:214
+#: models/strings.php:215
 msgctxt "theme-frontend"
 msgid "Jan"
 msgstr ""
 
-#: models/strings.php:215
+#: models/strings.php:216
 msgctxt "theme-frontend"
 msgid "Feb"
 msgstr ""
 
-#: models/strings.php:216
+#: models/strings.php:217
 msgctxt "theme-frontend"
 msgid "Mar"
 msgstr ""
 
-#: models/strings.php:217
+#: models/strings.php:218
 msgctxt "theme-frontend"
 msgid "Apr"
 msgstr ""
 
-#: models/strings.php:219
+#: models/strings.php:220
 msgctxt "theme-frontend"
 msgid "Jun"
 msgstr ""
 
-#: models/strings.php:220
+#: models/strings.php:221
 msgctxt "theme-frontend"
 msgid "Jul"
 msgstr ""
 
-#: models/strings.php:221
+#: models/strings.php:222
 msgctxt "theme-frontend"
 msgid "Aug"
 msgstr ""
 
-#: models/strings.php:222
+#: models/strings.php:223
 msgctxt "theme-frontend"
 msgid "Sept"
 msgstr ""
 
-#: models/strings.php:223
+#: models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Oct"
 msgstr ""
 
-#: models/strings.php:224
+#: models/strings.php:225
 msgctxt "theme-frontend"
 msgid "Nov"
 msgstr ""
 
-#: models/strings.php:225
+#: models/strings.php:226
 msgctxt "theme-frontend"
 msgid "Dec"
 msgstr ""
 
-#: models/strings.php:235
+#: models/strings.php:236
 msgctxt "theme-frontend"
 msgid "Enlarged image"
 msgstr ""
 
-#: models/strings.php:249
+#: models/strings.php:250
 msgid "Pagination"
 msgstr ""
 
-#: wp-content/mu-plugins/acf-codifier/src/Field/FlexibleContent.php:67
-#: wp-content/mu-plugins/acf-codifier/src/Field/Repeater.php:60
-msgid "Add Row"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisitePostObject.php:24
-msgid "Multisite Post Object"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteRelationship.php:24
-msgid "Multisite Relationship"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteTaxonomy.php:23
-msgid "Multisite taxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:23
-msgid "Multitaxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:516
-#, php-format
-msgctxt "No terms"
-msgid "No %s"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:18
-msgid "PHP"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:48
-msgid "Instructions"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:50
-msgid ""
-"This field can only be used with ACF Codifier. Doesn't do anything if "
-"defined in the admin side."
-msgstr ""
-
 #. Theme Name of the plugin/theme
 msgid "TMS Theme Base"
 msgstr ""
diff --git a/lib/Eventz.php b/lib/Eventz.php
index 6dff15cf..59425c8f 100644
--- a/lib/Eventz.php
+++ b/lib/Eventz.php
@@ -348,7 +348,7 @@ public static function get_event_price_info( $event ) : ?array {
 
         return [
             [
-                'is_free'     => null,
+                'is_free'     => property_exists( $event->price, 'isFree' ) ? true : null,
                 'price'       => $price,
                 'info_url'    => [
                     'title' => __( 'Additional information', 'tms-theme-base' ),
diff --git a/models/strings.php b/models/strings.php
index cd7c10a2..4739f8b0 100644
--- a/models/strings.php
+++ b/models/strings.php
@@ -150,6 +150,7 @@ public function s() : array {
                 'date'     => _x( 'Event date', 'theme-frontend', 'tms-theme-base' ),
                 'time'     => _x( 'Event time', 'theme-frontend', 'tms-theme-base' ),
                 'location' => _x( 'Event location', 'theme-frontend', 'tms-theme-base' ),
+                'price'    => _x( 'Event price', 'theme-frontend', 'tms-theme-base' ),
             ],
             'sitemap'            => [
                 'open'  => _x( 'Open', 'theme-frontend', 'tms-theme-base' ),
diff --git a/partials/ui/event-highlight.dust b/partials/ui/event-highlight.dust
index 99445e32..68f1c97b 100644
--- a/partials/ui/event-highlight.dust
+++ b/partials/ui/event-highlight.dust
@@ -43,6 +43,18 @@
                 </div>
             {/location.name}
 
+            {#price}
+                {?is_free}
+                    <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
+                        <span class="is-flex" aria-label="{Strings.s.event.price|attr}">
+                            {>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
+                        </span>
+
+                        {price|html}
+                    </div>
+                {/is_free}
+            {/price}
+
             {?url}
                 <a href="{url|url}" class="button is-primary is-outlined is-small is-hidden-desktop mt-4">
                     {Strings.s.common.read_more|html}
diff --git a/partials/views/page-events-calendar/page-events-calendar-item-grid.dust b/partials/views/page-events-calendar/page-events-calendar-item-grid.dust
index 33b0e0b7..e34cfa64 100644
--- a/partials/views/page-events-calendar/page-events-calendar-item-grid.dust
+++ b/partials/views/page-events-calendar/page-events-calendar-item-grid.dust
@@ -1,58 +1,70 @@
-<div class="events__item has-height-100 {item_classes.grid.item|s}">
+<div class="events__item has-height-100 {item_classes.grid.item|attr}">
     {?image}
         <div class="image is-relative is-4by3" aria-hidden="true">
-            <a href="{url}" aria-hidden="true" tabindex="-1">
-                <img src="{image}" alt="" class="objectfit-image">
+            <a href="{url|url}" aria-hidden="true" tabindex="-1">
+                <img src="{image|url}" alt="" class="objectfit-image">
             </a>
 
             {?primary_keyword}
                 <span class="pill is-absolute has-bottom-2 has-left-2 is-bordered is-secondary">
-                    {primary_keyword|s}
+                    {primary_keyword|html}
                 </span>
             {/primary_keyword}
 
         </div>
     {/image}
 
-    <div class="events__item-inner pt-5 pr-6 pb-6 pl-6 {item_classes.grid.item_inner|s}">
+    <div class="events__item-inner pt-5 pr-6 pb-6 pl-6 {item_classes.grid.item_inner|attr}">
         <h3 class="h5 mt-0 mb-5">
-            <a href="{url}" class="has-text-black">
-                {name|s}
+            <a href="{url|url}" class="has-text-black">
+                {name|html}
             </a>
         </h3>
 
         <p class="has-text-small">
-            {short_description|s}
+            {short_description|kses}
         </p>
 
         <div class="is-flex is-align-items-center mt-2 mb-2">
-            <span class="is-flex" aria-label="{Strings.s.event.date|s}">
-                {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+            <span class="is-flex" aria-label="{Strings.s.event.date|attr}">
+                {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
             </span>
 
-            {date|s}
+            {date|html}
         </div>
 
         <div class="is-flex is-align-items-center mt-2 mb-2">
-            <span class="is-flex" aria-label="{Strings.s.event.time|s}">
-                {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+            <span class="is-flex" aria-label="{Strings.s.event.time|attr}">
+                {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
             </span>
 
-            {time|s}
+            {time|html}
         </div>
 
         {?location.name}
             <div class="is-flex is-align-items-center mt-2 mb-2">
-                <span class="is-flex" aria-label="{Strings.s.event.location|s}">
-                    {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+                <span class="is-flex" aria-label="{Strings.s.event.location|attr}">
+                    {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
                 </span>
 
-                {location.name|s}
+                {location.name|html}
             </div>
         {/location.name}
 
-        <a href="{url}" class="button is-primary is-outlined is-small mt-4">
-            {Strings.s.common.read_more|s}
+        {#price}
+            {?is_free}
+                <div class="is-flex is-align-items-center mt-2 mb-2">
+                    <span class="is-flex" aria-label="{Strings.s.event.price|attr}">
+                        {>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
+                    </span>
+
+                    {price|html}
+                </div>
+            {/is_free}
+        {/price}
+
+        <a href="{url|url}" class="button is-primary is-outlined is-small mt-4">
+            {Strings.s.common.read_more|html}
         </a>
     </div>
 </div>
diff --git a/partials/views/page-events-calendar/page-events-calendar-item-list.dust b/partials/views/page-events-calendar/page-events-calendar-item-list.dust
index dea5a9e2..777612c1 100644
--- a/partials/views/page-events-calendar/page-events-calendar-item-list.dust
+++ b/partials/views/page-events-calendar/page-events-calendar-item-list.dust
@@ -1,19 +1,19 @@
-<div class="events__item columns is-gapless mt-4 mb-4 {item_classes.list.item|s}">
+<div class="events__item columns is-gapless mt-4 mb-4 {item_classes.list.item|attr}">
     {?image}
         <div class="column is-4 is-relative">
-            <a href="{url}" class="is-hidden-mobile is-overlay has-background-cover" aria-hidden="true"
+            <a href="{url|url}" class="is-hidden-mobile is-overlay has-background-cover" aria-hidden="true"
                tabindex="-1" {@inlinebg url=image /}></a>
 
             <div class="image is-16by9 is-hidden-tablet" aria-hidden="true">
-                <a href="{url}" aria-hidden="true" tabindex="-1">
-                    <img src="{image}" alt="" class="objectfit-image">
+                <a href="{url|url}" aria-hidden="true" tabindex="-1">
+                    <img src="{image|url}" alt="" class="objectfit-image">
                 </a>
             </div>
 
             {?primary_keyword}
                 <span
                     class="is-absolute has-top-1 has-left-1 pill is-bordered has-background-primary-invert has-text-primary">
-                    {primary_keyword|s}
+                    {primary_keyword|html}
                 </span>
             {/primary_keyword}
         </div>
@@ -22,45 +22,45 @@
     <div class="column">
         <div class="events__item-inner pt-5 pr-6 pb-6 pl-6">
             <h3 class="h5 mt-0 mb-5">
-                <a href="{url}" class="has-text-black">
-                    {name|s}
+                <a href="{url|url}" class="has-text-black">
+                    {name|html}
                 </a>
             </h3>
 
             <div class="is-flex is-flex-wrap-wrap">
-                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|s}">
-                    <span class="is-flex" aria-label="{Strings.s.event.date|s}">
-                        {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|attr}">
+                    <span class="is-flex" aria-label="{Strings.s.event.date|attr}">
+                        {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                     </span>
 
-                    {date|s}
+                    {date|html}
                 </div>
 
-                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|s}">
-                    <span class="is-flex" aria-label="{Strings.s.event.time|s}">
-                        {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|attr}">
+                    <span class="is-flex" aria-label="{Strings.s.event.time|attr}">
+                        {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                     </span>
 
-                    {time|s}
+                    {time|html}
                 </div>
 
                 {?location.name}
-                    <div class="is-flex is-align-items-center mt-2 mb-2 {item_classes.list.meta_label|s}">
-                        <span class="is-flex" aria-label="{Strings.s.event.location|s}">
-                            {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                    <div class="is-flex is-align-items-center mt-2 mb-2 {item_classes.list.meta_label|attr}">
+                        <span class="is-flex" aria-label="{Strings.s.event.location|attr}">
+                            {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                         </span>
 
-                        {location.name|s}
+                        {location.name|html}
                     </div>
                 {/location.name}
             </div>
 
-            <p class="has-text-small {item_classes.list.description|s}">
-                {short_description|s}
+            <p class="has-text-small {item_classes.list.description|attr}">
+                {short_description|kses}
             </p>
 
-            <a href="{url}" class="button is-primary is-outlined is-small mt-4">
-                {Strings.s.common.read_more|s}
+            <a href="{url|url}" class="button is-primary is-outlined is-small mt-4">
+                {Strings.s.common.read_more|html}
             </a>
         </div>
     </div>