diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 809e373a..97017fb1 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+- TMS-1059: Eventz changes:
+ - Add "Sign up"- & "Purchase tickets"-links
+ - Add translation to homepage link
+ - Fix regex pattern for short description
+
## [1.59.1] - 2024-10-28
- TMS-1075-fix: Early return added to ImageGalleryFormatter
diff --git a/lang/fi.mo b/lang/fi.mo
index 646b8d38..7ed90447 100644
Binary files a/lang/fi.mo and b/lang/fi.mo differ
diff --git a/lang/fi.po b/lang/fi.po
index 0b91ab07..6c141e54 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-09-13 15:09+0300\n"
-"PO-Revision-Date: 2024-09-13 15:09+0300\n"
+"POT-Creation-Date: 2024-11-13 20:00+0200\n"
+"PO-Revision-Date: 2024-11-13 20:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fi\n"
@@ -10,7 +10,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.5\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
"X-Poedit-WPHeader: style.css\n"
@@ -280,47 +280,59 @@ msgctxt "pagination"
msgid "Previous"
msgstr "Edellinen"
-#: lib/Eventz.php:114
+#: lib/Eventz.php:118
+msgid "Purchase tickets"
+msgstr "Osta liput"
+
+#: lib/Eventz.php:122 lib/Eventz.php:171
+msgid "Sign up"
+msgstr "Ilmoittaudu"
+
+#: lib/Eventz.php:132
+msgid "Homepage"
+msgstr "Kotisivut"
+
+#: lib/Eventz.php:146
msgid "Dates"
msgstr "Päivät"
-#: lib/Eventz.php:119
+#: lib/Eventz.php:151
msgid "Time"
msgstr "Aika"
-#: lib/Eventz.php:124
+#: lib/Eventz.php:156
msgid "Location"
msgstr "Sijainti"
-#: lib/Eventz.php:126
+#: lib/Eventz.php:158
msgid "Price"
msgstr "Hinta"
-#: lib/Eventz.php:128
+#: lib/Eventz.php:160
msgid "Organizer"
msgstr "Järjestäjä"
-#: lib/Eventz.php:129
+#: lib/Eventz.php:161
msgid "Area"
msgstr ""
-#: lib/Eventz.php:131
+#: lib/Eventz.php:163
msgid "Target"
msgstr ""
-#: lib/Eventz.php:133
+#: lib/Eventz.php:165
msgid "Tags"
msgstr ""
-#: lib/Eventz.php:137
+#: lib/Eventz.php:169
msgid "Links"
msgstr "Linkit"
-#: lib/Eventz.php:354
+#: lib/Eventz.php:389
msgid "Additional information"
msgstr "Lisätiedot"
-#: lib/Eventz.php:371
+#: lib/Eventz.php:406
msgid "Free"
msgstr "Maksuton"
@@ -1231,11 +1243,6 @@ msgstr ""
#~ msgid "Reply to comment"
#~ msgstr "Siirry sisältöön"
-#, fuzzy
-#~| msgid "Comments"
-#~ msgid "comment-page"
-#~ msgstr "Kommentit"
-
#, fuzzy
#~| msgid "Comments"
#~ msgid "Comment sent."
diff --git a/lang/sv_SE.mo b/lang/sv_SE.mo
index fd7919ca..793cadce 100644
Binary files a/lang/sv_SE.mo and b/lang/sv_SE.mo differ
diff --git a/lang/sv_SE.po b/lang/sv_SE.po
index 03df7b2f..d15c9525 100644
--- a/lang/sv_SE.po
+++ b/lang/sv_SE.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2022-01-10 15:07+0200\n"
-"PO-Revision-Date: 2022-01-10 15:07+0200\n"
+"POT-Creation-Date: 2024-11-13 20:00+0200\n"
+"PO-Revision-Date: 2024-11-13 20:01+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: sv\n"
@@ -10,7 +10,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.5\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
"X-Poedit-WPHeader: style.css\n"
@@ -24,6 +24,30 @@ msgstr ""
"X-Poedit-SearchPathExcluded-2: node_modules\n"
"X-Poedit-SearchPathExcluded-3: assets/dist\n"
+#: assets/dist/vendor.js:1
+msgid "entries"
+msgstr ""
+
+#: assets/dist/vendor.js:1
+msgid "values"
+msgstr ""
+
+#: assets/dist/vendor.js:1
+msgid "keys"
+msgstr ""
+
+#: assets/dist/vendor.js:1
+msgid "Wrong index!"
+msgstr ""
+
+#: assets/dist/vendor.js:1
+msgid "Wrong offset!"
+msgstr ""
+
+#: assets/dist/vendor.js:1
+msgid "Wrong length!"
+msgstr ""
+
#: comments.php:14
msgid "Comments"
msgstr ""
@@ -42,7 +66,7 @@ msgctxt "theme ACF"
msgid "Blogikirjoittaja"
msgstr ""
-#: lib/ACF/DynamicEventGroup.php:55
+#: lib/ACF/DynamicEventGroup.php:60
msgctxt "theme ACF"
msgid "Tiedot"
msgstr ""
@@ -51,14 +75,14 @@ msgstr ""
msgid "Open map"
msgstr ""
-#: lib/ACF/FrontPageGroup.php:38 lib/ACF/OnepagerGroup.php:70
-#: lib/ACF/PageGroup.php:39
+#: lib/ACF/FrontPageGroup.php:39 lib/ACF/OnepagerGroup.php:73
+#: lib/ACF/PageGroup.php:47
msgctxt "theme ACF"
msgid "Page Components"
msgstr ""
-#: lib/ACF/FrontPageGroup.php:90 lib/ACF/OnepagerGroup.php:123
-#: lib/ACF/PageGroup.php:140 lib/ACF/PostGroup.php:173
+#: lib/ACF/FrontPageGroup.php:91 lib/ACF/OnepagerGroup.php:126
+#: lib/ACF/PageGroup.php:260 lib/ACF/PostGroup.php:173
msgctxt "theme ACF"
msgid "Components"
msgstr ""
@@ -73,23 +97,159 @@ msgctxt "theme ACF"
msgid "Kalenterin asetukset"
msgstr ""
-#: lib/ACF/PostGroup.php:129
+#: lib/ACF/PageEventsSearchGroup.php:33
+msgctxt "theme ACF"
+msgid "Asetukset"
+msgstr ""
+
+#: lib/ACF/PageGroup.php:142
+msgctxt "theme ACF"
+msgid "Page settings"
+msgstr ""
+
+#: lib/ACF/PageGroup.php:235
+msgctxt "theme ACF"
+msgid "Remove hero-image overlay"
+msgstr ""
+
+#: lib/ACF/PageGroup.php:236
+msgctxt "theme ACF"
+msgid "Remove hero-image overlay and move the heading under the hero-element"
+msgstr ""
+
+#: lib/ACF/PostGroup.php:129 models/single.php:161
msgid "Related posts"
msgstr ""
-#: lib/ACF/SettingsGroup.php:51
+#: lib/ACF/SettingsGroup.php:52
msgctxt "theme ACF"
msgid "Site settings"
msgstr ""
-#: lib/Admin.php:89
+#: lib/Admin.php:94
msgid "Paragraph"
msgstr ""
-#: lib/Admin.php:90
+#: lib/Admin.php:95
msgid "Header"
msgstr ""
+#: lib/Assets.php:400
+msgid "Audio guide"
+msgstr ""
+
+#: lib/Assets.php:401
+msgid "Assistant"
+msgstr ""
+
+#: lib/Assets.php:402
+msgid "Lift"
+msgstr ""
+
+#: lib/Assets.php:403
+msgid "Induction loop"
+msgstr ""
+
+#: lib/Assets.php:404
+msgid "Information"
+msgstr ""
+
+#: lib/Assets.php:405
+msgid "Internet"
+msgstr ""
+
+#: lib/Assets.php:406
+msgid "Accessible entrance, Accessible toilet, Accessible parking"
+msgstr ""
+
+#: lib/Assets.php:407
+msgid "Café"
+msgstr ""
+
+#: lib/Assets.php:408
+msgid "Shop"
+msgstr ""
+
+#: lib/Assets.php:409
+msgid "Meeting room"
+msgstr ""
+
+#: lib/Assets.php:410
+msgid "Assistive device lending"
+msgstr ""
+
+#: lib/Assets.php:411
+msgid "Baby changing"
+msgstr ""
+
+#: lib/Assets.php:412
+msgid "Charging point"
+msgstr ""
+
+#: lib/Assets.php:413
+msgid "Ticket sales"
+msgstr ""
+
+#: lib/Assets.php:414
+msgid "Ramp"
+msgstr ""
+
+#: lib/Assets.php:415
+msgid "Services for the visually impaired"
+msgstr ""
+
+#: lib/Assets.php:416
+msgid "Service dogs allowed"
+msgstr ""
+
+#: lib/Assets.php:417
+msgid "Braille"
+msgstr ""
+
+#: lib/Assets.php:418
+msgid "Stairlift"
+msgstr ""
+
+#: lib/Assets.php:419
+msgid "Staircase"
+msgstr ""
+
+#: lib/Assets.php:420
+msgid "Platform lift"
+msgstr ""
+
+#: lib/Assets.php:421
+msgid "Rollator, walker"
+msgstr ""
+
+#: lib/Assets.php:422
+msgid "Electric mobility scooter storage"
+msgstr ""
+
+#: lib/Assets.php:423
+msgid "Lockers"
+msgstr ""
+
+#: lib/Assets.php:424
+msgid "Large print"
+msgstr ""
+
+#: lib/Assets.php:425
+msgid "Cloakroom"
+msgstr ""
+
+#: lib/Assets.php:426
+msgid "Sign-language services"
+msgstr ""
+
+#: lib/Assets.php:427 lib/Assets.php:428
+msgid "Accessible toilet: one-sided access"
+msgstr ""
+
+#: lib/Assets.php:429
+msgid "WC"
+msgstr ""
+
#: lib/Comments.php:72
msgid "Send Comment"
msgstr ""
@@ -111,51 +271,121 @@ msgctxt "pagination"
msgid "Go to Page"
msgstr ""
-#: lib/Formatters/GridFormatter.php:147
-msgid "Read more"
+#: lib/DustPressController.php:61
+msgctxt "pagination"
+msgid "Next"
+msgstr ""
+
+#: lib/DustPressController.php:62
+msgctxt "pagination"
+msgid "Previous"
msgstr ""
-#: lib/LinkedEvents.php:98
+#: lib/Eventz.php:118
+msgid "Purchase tickets"
+msgstr "Köp biljetter"
+
+#: lib/Eventz.php:122 lib/Eventz.php:171
+msgid "Sign up"
+msgstr "Anmäl dig"
+
+#: lib/Eventz.php:132
+msgid "Homepage"
+msgstr "Hemsida"
+
+#: lib/Eventz.php:146
msgid "Dates"
msgstr ""
-#: lib/LinkedEvents.php:100
+#: lib/Eventz.php:151
msgid "Time"
msgstr ""
-#: lib/LinkedEvents.php:102
+#: lib/Eventz.php:156
msgid "Location"
msgstr ""
-#: lib/LinkedEvents.php:104
+#: lib/Eventz.php:158
msgid "Price"
msgstr ""
-#: lib/LinkedEvents.php:106
+#: lib/Eventz.php:160
msgid "Organizer"
msgstr ""
-#: lib/LinkedEvents.php:213 lib/LinkedEvents.php:265
+#: lib/Eventz.php:161
+msgid "Area"
+msgstr ""
+
+#: lib/Eventz.php:163
+msgid "Target"
+msgstr ""
+
+#: lib/Eventz.php:165
+msgid "Tags"
+msgstr ""
+
+#: lib/Eventz.php:169
+msgid "Links"
+msgstr ""
+
+#: lib/Eventz.php:389
msgid "Additional information"
msgstr ""
-#: lib/LinkedEvents.php:258
+#: lib/Eventz.php:406
msgid "Free"
msgstr ""
-#: lib/LinkedEvents.php:288
-msgid "Additional info"
+#: lib/Formatters/AccordionFormatter.php:57
+msgctxt "theme-frontend"
+msgid "Expand"
+msgstr ""
+
+#: lib/Formatters/AccordionFormatter.php:58
+msgctxt "theme-frontend"
+msgid "Collapse"
+msgstr ""
+
+#: lib/Formatters/AccordionFormatter.php:59
+msgctxt "theme-frontend"
+msgid "Expand all sections"
+msgstr ""
+
+#: lib/Formatters/AccordionFormatter.php:60
+msgctxt "theme-frontend"
+msgid "Collapse all sections"
+msgstr ""
+
+#: lib/Formatters/CountdownFormatter.php:92 models/strings.php:230
+msgctxt "theme-frontend"
+msgid "Days"
+msgstr ""
+
+#: lib/Formatters/CountdownFormatter.php:93 models/strings.php:231
+msgctxt "theme-frontend"
+msgid "Hours"
msgstr ""
-#: lib/LinkedEvents.php:338
-msgid "Virtual event"
+#: lib/Formatters/CountdownFormatter.php:94 models/strings.php:232
+msgctxt "theme-frontend"
+msgid "Minutes"
+msgstr ""
+
+#: lib/Formatters/CountdownFormatter.php:95 models/strings.php:233
+msgctxt "theme-frontend"
+msgid "Seconds"
+msgstr ""
+
+#: lib/Formatters/GridFormatter.php:151
+msgid "Read more"
msgstr ""
-#: lib/NavigationController.php:34
+#: lib/NavigationController.php:39
msgid "Primary Navigation"
msgstr ""
-#: lib/NavigationController.php:35
+#: lib/NavigationController.php:40
msgid "Secondary Navigation"
msgstr ""
@@ -214,45 +444,45 @@ msgctxt "theme CPT"
msgid "Site settings"
msgstr ""
-#: lib/Roles.php:340
+#: lib/Roles.php:394
msgctxt "wp-geniem-roles"
msgid "Super Administrator"
msgstr ""
-#: lib/Roles.php:433
+#: lib/Roles.php:491
msgctxt "wp-geniem-roles"
msgid "Administrator"
msgstr ""
-#: lib/Roles.php:486
+#: lib/Roles.php:547
msgctxt "wp-geniem-roles"
msgid "Site Manager"
msgstr ""
-#: lib/Roles.php:530
+#: lib/Roles.php:600
msgctxt "wp-geniem-roles"
msgid "Author"
msgstr ""
-#: lib/Roles.php:598
+#: lib/Roles.php:668
msgctxt "wp-geniem-roles"
msgid "Contributor"
msgstr ""
-#: lib/Roles.php:618
+#: lib/Roles.php:688
msgctxt "wp-geniem-roles"
msgid "Subscriber"
msgstr ""
-#: lib/Security.php:112
+#: lib/Security.php:113
msgid "WARNING"
msgstr ""
-#: lib/Security.php:113
+#: lib/Security.php:114
msgid "Your password has been compromised."
msgstr ""
-#: lib/Security.php:114
+#: lib/Security.php:115
msgid "Please change your password as soon as possible."
msgstr ""
@@ -268,7 +498,7 @@ msgstr ""
msgid "Site settings"
msgstr ""
-#: lib/SiteController.php:170 models/strings.php:58
+#: lib/SiteController.php:170 models/strings.php:59
msgctxt "theme-frontend"
msgid "Page not found"
msgstr ""
@@ -328,82 +558,82 @@ msgctxt "Breadcrumbs"
msgid "Home"
msgstr ""
-#: lib/Traits/Sharing.php:97
+#: lib/Traits/Sharing.php:111
msgid "Share on Facebook"
msgstr ""
-#: lib/Traits/Sharing.php:103
+#: lib/Traits/Sharing.php:117
msgid "Share by email"
msgstr ""
-#: lib/Traits/Sharing.php:109
+#: lib/Traits/Sharing.php:123
msgid "Copy link to clipboard"
msgstr ""
-#: lib/Traits/Sharing.php:110
+#: lib/Traits/Sharing.php:124
msgid "Copied to clipboard"
msgstr ""
-#: lib/Traits/Sharing.php:116
+#: lib/Traits/Sharing.php:130
msgid "Share on Whatsapp"
msgstr ""
-#: lib/Traits/Sharing.php:122
+#: lib/Traits/Sharing.php:136
msgid "Share on Twitter"
msgstr ""
-#: lib/Traits/Sharing.php:128
+#: lib/Traits/Sharing.php:142
msgid "Share on LinkedIn"
msgstr ""
-#: lib/Traits/Sharing.php:134
+#: lib/Traits/Sharing.php:148
msgid "Share on Vkontakte"
msgstr ""
-#: lib/Traits/Sharing.php:140
+#: lib/Traits/Sharing.php:154
msgid "Share on Line"
msgstr ""
-#: models/archive-blog-article.php:167 models/archive.php:116
-#: models/home.php:269 models/search.php:70
+#: models/archive-blog-article.php:167 models/archive.php:122
+#: models/home.php:273 models/search.php:70
msgid "All"
msgstr ""
-#: models/error404.php:78
+#: models/error404.php:81
msgctxt "theme-frontend"
msgid "Go to search"
msgstr ""
-#: models/error404.php:95
+#: models/error404.php:98
msgctxt "theme-frontend"
msgid "Return to home"
msgstr ""
-#: models/page-events-calendar.php:39 models/page-events-search.php:118
+#: models/page-events-calendar.php:39 models/page-events-search.php:119
msgid "No results"
msgstr ""
-#: models/page-events-search.php:51
+#: models/page-events-search.php:52
msgid "Search term"
msgstr ""
-#: models/page-events-search.php:52
+#: models/page-events-search.php:53
msgid "Events from"
msgstr ""
-#: models/page-events-search.php:53 models/search.php:83
+#: models/page-events-search.php:54 models/search.php:83
msgid "Start date"
msgstr ""
-#: models/page-events-search.php:54 models/search.php:84
+#: models/page-events-search.php:55 models/search.php:84
msgid "End date"
msgstr ""
-#: models/page-events-search.php:117
+#: models/page-events-search.php:118
msgid "No search term given"
msgstr ""
-#: models/page-events-search.php:190 models/search.php:228
+#: models/page-events-search.php:212 models/search.php:228
#, php-format
msgctxt "search results summary"
msgid "%1$1s result found for \"%2$2s\""
@@ -447,459 +677,504 @@ msgstr ""
#: models/strings.php:44
msgctxt "theme-frontend"
-msgid "Open menu"
+msgid "Frequently searched pages"
msgstr ""
#: models/strings.php:45
msgctxt "theme-frontend"
-msgid "Close menu"
+msgid "Open menu"
msgstr ""
#: models/strings.php:46
msgctxt "theme-frontend"
-msgid "Language navigation"
+msgid "Close menu"
msgstr ""
#: models/strings.php:47
msgctxt "theme-frontend"
-msgid "Open search form"
+msgid "Language navigation"
msgstr ""
#: models/strings.php:48
msgctxt "theme-frontend"
-msgid "Open language navigation"
+msgid "Open search form"
msgstr ""
#: models/strings.php:49
msgctxt "theme-frontend"
+msgid "Open language navigation"
+msgstr ""
+
+#: models/strings.php:50
+msgctxt "theme-frontend"
msgid "Current language: "
msgstr ""
-#: models/strings.php:50 models/strings.php:51 models/strings.php:155
-#: models/strings.php:156
+#: models/strings.php:51 models/strings.php:52 models/strings.php:161
+#: models/strings.php:162
msgctxt "theme-frontend"
msgid "Search"
msgstr "Sök"
-#: models/strings.php:52 models/strings.php:53
+#: models/strings.php:53 models/strings.php:54
msgctxt "theme-frontend"
msgid "Search from site"
msgstr "Sök på webbplatsen"
-#: models/strings.php:54 models/strings.php:80 models/strings.php:138
-#: models/strings.php:151
+#: models/strings.php:55 models/strings.php:81 models/strings.php:143
+#: models/strings.php:157 models/strings.php:166 models/strings.php:237
msgctxt "theme-frontend"
msgid "Close"
msgstr ""
-#: models/strings.php:55 models/strings.php:64
+#: models/strings.php:56 models/strings.php:65
msgctxt "theme-frontend"
msgid "To home page"
msgstr ""
-#: models/strings.php:60
+#: models/strings.php:61
msgctxt "theme-frontend"
msgid "The content were looking for was not found"
msgstr ""
-#: models/strings.php:67
+#: models/strings.php:68
msgctxt "theme-frontend"
msgid "Skip video embed"
msgstr ""
-#: models/strings.php:68
+#: models/strings.php:69
msgctxt "theme-frontend"
msgid "Play video"
msgstr ""
-#: models/strings.php:69
+#: models/strings.php:70
msgctxt "theme-frontend"
msgid "Pause video"
msgstr ""
-#: models/strings.php:72
+#: models/strings.php:73
msgctxt "theme-frontend"
msgid "Skip social media embed"
msgstr "Hoppa över inbäddning av sociala medier"
-#: models/strings.php:75
+#: models/strings.php:76
msgctxt "theme-frontend"
msgid "Share Article"
msgstr ""
-#: models/strings.php:76
+#: models/strings.php:77
msgctxt "theme-frontend"
msgid "Share Event"
msgstr ""
-#: models/strings.php:77
+#: models/strings.php:78
msgctxt "theme-frontend"
msgid "Share to social media"
msgstr ""
-#: models/strings.php:81
+#: models/strings.php:82
msgctxt "theme-frontend"
msgid "Next"
msgstr ""
-#: models/strings.php:82 models/strings.php:150
+#: models/strings.php:83 models/strings.php:156 models/strings.php:165
msgctxt "theme-frontend"
msgid "Open"
msgstr ""
-#: models/strings.php:83
+#: models/strings.php:84
msgctxt "theme-frontend"
msgid "Previous"
msgstr ""
-#: models/strings.php:84
+#: models/strings.php:85
msgctxt "theme-frontend"
msgid "Go to slide"
msgstr ""
-#: models/strings.php:85
+#: models/strings.php:86
msgctxt "theme-frontend"
msgid "Centered"
msgstr ""
-#: models/strings.php:86
+#: models/strings.php:87
msgctxt "theme-frontend"
msgid "Slide"
msgstr ""
-#: models/strings.php:87
+#: models/strings.php:88
msgctxt "theme-frontend"
msgid "Image carousel"
msgstr ""
-#: models/strings.php:88
+#: models/strings.php:89
msgctxt "theme-frontend"
msgid "Modal image carousel"
msgstr ""
-#: models/strings.php:89
+#: models/strings.php:90
+msgctxt "theme-frontend"
+msgid "Browsing images"
+msgstr ""
+
+#: models/strings.php:91
msgctxt "theme-frontend"
msgid "Main image carousel"
msgstr ""
-#: models/strings.php:92
+#: models/strings.php:94
msgctxt "theme-frontend"
msgid "Move to tampere.fi"
msgstr ""
-#: models/strings.php:93
+#: models/strings.php:95
msgctxt "theme-frontend"
msgid "Back to top"
msgstr "Till början av sidan"
-#: models/strings.php:96
+#: models/strings.php:98
msgctxt "theme-frontend"
msgid "Opens in a new window"
msgstr ""
-#: models/strings.php:97
+#: models/strings.php:99
+msgctxt "theme-frontend"
+msgid "The link takes you to an external website"
+msgstr ""
+
+#: models/strings.php:100
msgctxt "theme-frontend"
msgid "All"
msgstr ""
-#: models/strings.php:98
+#: models/strings.php:101
msgctxt "theme-frontend"
msgid "Read more"
msgstr ""
-#: models/strings.php:101
+#: models/strings.php:104
msgctxt "theme-frontend"
msgid "Image:"
msgstr ""
-#: models/strings.php:102
+#: models/strings.php:105
msgctxt "theme-frontend"
msgid "Text:"
msgstr ""
-#: models/strings.php:105 models/strings.php:174
+#: models/strings.php:106
+msgctxt "theme-frontend"
+msgid "Articletype:"
+msgstr ""
+
+#: models/strings.php:109 models/strings.php:187
msgctxt "theme-frontend"
msgid "Month"
msgstr ""
-#: models/strings.php:106 models/strings.php:175
+#: models/strings.php:110 models/strings.php:188
msgctxt "theme-frontend"
msgid "Year"
msgstr ""
-#: models/strings.php:107
+#: models/strings.php:111
msgctxt "theme-frontend"
msgid "No results"
msgstr ""
-#: models/strings.php:108
+#: models/strings.php:112
msgctxt "theme-frontend"
msgid "Filter by Category"
msgstr ""
-#: models/strings.php:111 models/strings.php:188
+#: models/strings.php:113
+msgctxt "theme-frontend"
+msgid "The page reloads after the selection."
+msgstr ""
+
+#: models/strings.php:116 models/strings.php:201
msgctxt "theme-frontend"
msgid "January"
msgstr ""
-#: models/strings.php:112 models/strings.php:189
+#: models/strings.php:117 models/strings.php:202
msgctxt "theme-frontend"
msgid "February"
msgstr ""
-#: models/strings.php:113 models/strings.php:190
+#: models/strings.php:118 models/strings.php:203
msgctxt "theme-frontend"
msgid "March"
msgstr ""
-#: models/strings.php:114 models/strings.php:191
+#: models/strings.php:119 models/strings.php:204
msgctxt "theme-frontend"
msgid "April"
msgstr ""
-#: models/strings.php:115 models/strings.php:192 models/strings.php:206
+#: models/strings.php:120 models/strings.php:205 models/strings.php:219
msgctxt "theme-frontend"
msgid "May"
msgstr ""
-#: models/strings.php:116 models/strings.php:193
+#: models/strings.php:121 models/strings.php:206
msgctxt "theme-frontend"
msgid "June"
msgstr ""
-#: models/strings.php:117 models/strings.php:194
+#: models/strings.php:122 models/strings.php:207
msgctxt "theme-frontend"
msgid "July"
msgstr ""
-#: models/strings.php:118 models/strings.php:195
+#: models/strings.php:123 models/strings.php:208
msgctxt "theme-frontend"
msgid "August"
msgstr ""
-#: models/strings.php:119 models/strings.php:196
+#: models/strings.php:124 models/strings.php:209
msgctxt "theme-frontend"
msgid "September"
msgstr ""
-#: models/strings.php:120 models/strings.php:197
+#: models/strings.php:125 models/strings.php:210
msgctxt "theme-frontend"
msgid "October"
msgstr ""
-#: models/strings.php:121 models/strings.php:198
+#: models/strings.php:126 models/strings.php:211
msgctxt "theme-frontend"
msgid "November"
msgstr ""
-#: models/strings.php:122 models/strings.php:199
+#: models/strings.php:127 models/strings.php:212
msgctxt "theme-frontend"
msgid "December"
msgstr ""
-#: models/strings.php:125
+#: models/strings.php:130
msgctxt "theme-frontend"
msgid "Password:"
msgstr ""
-#: models/strings.php:126
+#: models/strings.php:131
msgctxt "theme-frontend"
msgid "Enter"
msgstr ""
-#: models/strings.php:128
+#: models/strings.php:133
msgctxt "theme-frontend"
msgid ""
"This content is password protected. To view it please enter your password "
"below:"
msgstr ""
-#: models/strings.php:134
+#: models/strings.php:139
msgctxt "theme-frontend"
msgid "Sibling pages"
msgstr ""
-#: models/strings.php:137
+#: models/strings.php:142
msgctxt "theme-frontend"
msgid "Comments"
msgstr ""
-#: models/strings.php:141
+#: models/strings.php:146
msgctxt "theme-frontend"
msgid "Show description"
msgstr ""
-#: models/strings.php:142
+#: models/strings.php:147
msgctxt "theme-frontend"
msgid "All articles"
msgstr ""
-#: models/strings.php:145
+#: models/strings.php:150
msgctxt "theme-frontend"
msgid "Event date"
msgstr ""
-#: models/strings.php:146
+#: models/strings.php:151
msgctxt "theme-frontend"
msgid "Event time"
msgstr ""
-#: models/strings.php:147
+#: models/strings.php:152
msgctxt "theme-frontend"
msgid "Event location"
msgstr ""
-#: models/strings.php:154
+#: models/strings.php:153
+msgctxt "theme-frontend"
+msgid "Event price"
+msgstr ""
+
+#: models/strings.php:160
msgctxt "theme-frontend"
msgid "Search contacts"
msgstr "Sök kontaktuppgifter"
-#: models/strings.php:159
+#: models/strings.php:167 models/strings.php:172
msgctxt "theme-frontend"
-msgid "Show artist"
+msgid "Related artwork"
msgstr ""
-#: models/strings.php:160
+#: models/strings.php:170
msgctxt "theme-frontend"
-msgid "Artwork by the same artist"
+msgid "Show artist"
msgstr ""
-#: models/strings.php:161
+#: models/strings.php:171
msgctxt "theme-frontend"
-msgid "Related artwork"
+msgid "Artwork by the same artist"
msgstr ""
-#: models/strings.php:164
+#: models/strings.php:175
msgctxt "theme-frontend"
msgid "Filter by type"
msgstr ""
-#: models/strings.php:165
+#: models/strings.php:176
msgctxt "theme-frontend"
msgid "Publish date"
msgstr ""
-#: models/strings.php:169 models/strings.php:177
+#: models/strings.php:177
+msgctxt "theme-frontend"
+msgid "Page location:"
+msgstr ""
+
+#: models/strings.php:178
+msgctxt "theme-frontend"
+msgid "Clear the form"
+msgstr ""
+
+#: models/strings.php:182 models/strings.php:190
msgctxt "theme-frontend"
msgid "Pick a date"
msgstr ""
-#: models/strings.php:170
+#: models/strings.php:183
msgctxt "theme-frontend"
msgid "dd.mm.yyyy"
msgstr ""
-#: models/strings.php:171
+#: models/strings.php:184
msgctxt "theme-frontend"
msgid "The chosen date is"
msgstr ""
-#: models/strings.php:172
+#: models/strings.php:185
msgctxt "theme-frontend"
msgid "Previous month"
msgstr ""
-#: models/strings.php:173
+#: models/strings.php:186
msgctxt "theme-frontend"
msgid "Next month"
msgstr ""
-#: models/strings.php:176
+#: models/strings.php:189
msgctxt "theme-frontend"
msgid "Close window"
msgstr ""
-#: models/strings.php:179
+#: models/strings.php:192
msgctxt "theme-frontend"
msgid "Sunday"
msgstr ""
-#: models/strings.php:180
+#: models/strings.php:193
msgctxt "theme-frontend"
msgid "Monday"
msgstr ""
-#: models/strings.php:181
+#: models/strings.php:194
msgctxt "theme-frontend"
msgid "Tuesday"
msgstr ""
-#: models/strings.php:182
+#: models/strings.php:195
msgctxt "theme-frontend"
msgid "Wednesday"
msgstr ""
-#: models/strings.php:183
+#: models/strings.php:196
msgctxt "theme-frontend"
msgid "Thursday"
msgstr ""
-#: models/strings.php:184
+#: models/strings.php:197
msgctxt "theme-frontend"
msgid "Friday"
msgstr ""
-#: models/strings.php:185
+#: models/strings.php:198
msgctxt "theme-frontend"
msgid "Saturday"
msgstr ""
-#: models/strings.php:202
+#: models/strings.php:215
msgctxt "theme-frontend"
msgid "Jan"
msgstr ""
-#: models/strings.php:203
+#: models/strings.php:216
msgctxt "theme-frontend"
msgid "Feb"
msgstr ""
-#: models/strings.php:204
+#: models/strings.php:217
msgctxt "theme-frontend"
msgid "Mar"
msgstr ""
-#: models/strings.php:205
+#: models/strings.php:218
msgctxt "theme-frontend"
msgid "Apr"
msgstr ""
-#: models/strings.php:207
+#: models/strings.php:220
msgctxt "theme-frontend"
msgid "Jun"
msgstr ""
-#: models/strings.php:208
+#: models/strings.php:221
msgctxt "theme-frontend"
msgid "Jul"
msgstr ""
-#: models/strings.php:209
+#: models/strings.php:222
msgctxt "theme-frontend"
msgid "Aug"
msgstr ""
-#: models/strings.php:210
+#: models/strings.php:223
msgctxt "theme-frontend"
msgid "Sept"
msgstr ""
-#: models/strings.php:211
+#: models/strings.php:224
msgctxt "theme-frontend"
msgid "Oct"
msgstr ""
-#: models/strings.php:212
+#: models/strings.php:225
msgctxt "theme-frontend"
msgid "Nov"
msgstr ""
-#: models/strings.php:213
+#: models/strings.php:226
msgctxt "theme-frontend"
msgid "Dec"
msgstr ""
-#: models/strings.php:227
+#: models/strings.php:236
+msgctxt "theme-frontend"
+msgid "Enlarged image"
+msgstr ""
+
+#: models/strings.php:250
msgid "Pagination"
msgstr ""
diff --git a/lang/tms-theme-base.pot b/lang/tms-theme-base.pot
index d9748848..6164829c 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-09-13 15:09+0300\n"
+"POT-Creation-Date: 2024-11-13 20:00+0200\n"
"PO-Revision-Date: 2022-01-12 10:08+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -10,7 +10,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.5\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
"X-Poedit-WPHeader: style.css\n"
@@ -280,47 +280,59 @@ msgctxt "pagination"
msgid "Previous"
msgstr ""
-#: lib/Eventz.php:114
+#: lib/Eventz.php:118
+msgid "Purchase tickets"
+msgstr ""
+
+#: lib/Eventz.php:122 lib/Eventz.php:171
+msgid "Sign up"
+msgstr ""
+
+#: lib/Eventz.php:132
+msgid "Homepage"
+msgstr ""
+
+#: lib/Eventz.php:146
msgid "Dates"
msgstr ""
-#: lib/Eventz.php:119
+#: lib/Eventz.php:151
msgid "Time"
msgstr ""
-#: lib/Eventz.php:124
+#: lib/Eventz.php:156
msgid "Location"
msgstr ""
-#: lib/Eventz.php:126
+#: lib/Eventz.php:158
msgid "Price"
msgstr ""
-#: lib/Eventz.php:128
+#: lib/Eventz.php:160
msgid "Organizer"
msgstr ""
-#: lib/Eventz.php:129
+#: lib/Eventz.php:161
msgid "Area"
msgstr ""
-#: lib/Eventz.php:131
+#: lib/Eventz.php:163
msgid "Target"
msgstr ""
-#: lib/Eventz.php:133
+#: lib/Eventz.php:165
msgid "Tags"
msgstr ""
-#: lib/Eventz.php:137
+#: lib/Eventz.php:169
msgid "Links"
msgstr ""
-#: lib/Eventz.php:354
+#: lib/Eventz.php:389
msgid "Additional information"
msgstr ""
-#: lib/Eventz.php:371
+#: lib/Eventz.php:406
msgid "Free"
msgstr ""
diff --git a/lib/Eventz.php b/lib/Eventz.php
index 59425c8f..5f0e871d 100644
--- a/lib/Eventz.php
+++ b/lib/Eventz.php
@@ -107,38 +107,73 @@ public static function normalize_event( $event ) : array {
$is_recurring = true;
}
+ // Format event links
+ $event_other_links = [];
+ $event_link_sign_up = '';
+ $event_link_purchase_ticket = '';
+ if ( $event->links ) {
+ foreach ( $event->links as $event_link ) {
+ // Assign links to their own variables
+ if ( $event_link->name === 'PurchaseTicket' ) {
+ $event_link->name = \__( 'Purchase tickets', 'tms-theme-base' );
+ $event_link_purchase_ticket = $event_link;
+ }
+ else if ( $event_link->name === 'SignUp' ) {
+ $event_link->name = \__( 'Sign up', 'tms-theme-base' );
+ $event_link_sign_up = $event_link;
+ }
+ else {
+ $event_other_links[] = $event_link;
+ }
+ }
+
+ $event_other_links = array_map( function ( $event_link ) {
+ if ( $event_link->name === 'HomePage' ) {
+ $event_link->name = \__( 'Homepage', 'tms-theme-base' );
+ }
+
+ return $event_link;
+ }, $event_other_links );
+
+ // Remove null values from the array
+ $event_other_links = array_filter( $event_other_links );
+ }
+
return [
- 'name' => $event->name ?? null,
- 'short_description' => static::get_short_description( $event ) ?? null,
- 'description' => nl2br( $event->description ) ?? null,
- 'date_title' => __( 'Dates', 'tms-theme-base' ),
- 'date' => static::get_event_date( $event ),
- 'dates' => static::get_event_dates( $event ),
- 'entries' => static::get_event_entries( $event ),
- 'recurring' => $is_recurring,
- 'time_title' => __( 'Time', 'tms-theme-base' ),
- 'time' => static::get_event_time( $event ),
+ 'name' => $event->name ?? null,
+ 'short_description' => static::get_short_description( $event ) ?? null,
+ 'description' => nl2br( $event->description ) ?? null,
+ 'date_title' => __( 'Dates', 'tms-theme-base' ),
+ 'date' => static::get_event_date( $event ),
+ 'dates' => static::get_event_dates( $event ),
+ 'entries' => static::get_event_entries( $event ),
+ 'recurring' => $is_recurring,
+ 'time_title' => __( 'Time', 'tms-theme-base' ),
+ 'time' => static::get_event_time( $event ),
// Include raw dates for possible sorting.
- 'start_date_raw' => static::get_as_datetime( $event->event->start ),
- 'end_date_raw' => static::get_as_datetime( $event->event->end ),
- 'location_title' => __( 'Location', 'tms-theme-base' ),
- 'location' => static::get_event_location( $event ),
- 'price_title' => __( 'Price', 'tms-theme-base' ),
- 'price' => static::get_event_price_info( $event, $lang_key ),
- 'provider_title' => __( 'Organizer', 'tms-theme-base' ),
- 'area_title' => __( 'Area', 'tms-theme-base' ),
- 'areas' => static::get_area_info( $event ),
- 'target_title' => __( 'Target', 'tms-theme-base' ),
- 'targets' => static::get_target_info( $event ),
- 'tags_title' => __( 'Tags', 'tms-theme-base' ),
- 'tags' => static::get_tag_info( $event ),
- 'keywords' => $topics ?? null,
- 'primary_keyword' => empty( $topics ) ? null : $topics[0],
- 'links_title' => __( 'Links', 'tms-theme-base' ),
- 'links' => $event->links,
- 'image' => $image ?? null,
- 'url' => static::get_event_url( $event->_id ),
- 'is_dynamic' => static::get_dynamic_event( $event->_id ),
+ 'start_date_raw' => static::get_as_datetime( $event->event->start ),
+ 'end_date_raw' => static::get_as_datetime( $event->event->end ),
+ 'location_title' => __( 'Location', 'tms-theme-base' ),
+ 'location' => static::get_event_location( $event ),
+ 'price_title' => __( 'Price', 'tms-theme-base' ),
+ 'price' => static::get_event_price_info( $event, $lang_key ),
+ 'provider_title' => __( 'Organizer', 'tms-theme-base' ),
+ 'area_title' => __( 'Area', 'tms-theme-base' ),
+ 'areas' => static::get_area_info( $event ),
+ 'target_title' => __( 'Target', 'tms-theme-base' ),
+ 'targets' => static::get_target_info( $event ),
+ 'tags_title' => __( 'Tags', 'tms-theme-base' ),
+ 'tags' => static::get_tag_info( $event ),
+ 'keywords' => $topics ?? null,
+ 'primary_keyword' => empty( $topics ) ? null : $topics[0],
+ 'links_title' => __( 'Links', 'tms-theme-base' ),
+ 'links' => $event_other_links,
+ 'sign_up_title' => __( 'Sign up', 'tms-theme-base' ),
+ 'link_sign_up' => $event_link_sign_up,
+ 'link_purchase_ticket' => $event_link_purchase_ticket,
+ 'image' => $image ?? null,
+ 'url' => static::get_event_url( $event->_id ),
+ 'is_dynamic' => static::get_dynamic_event( $event->_id ),
];
}
@@ -622,7 +657,8 @@ public static function get_short_description( $event ) {
}
// Define a regular expression pattern to match the first two sentences
- $pattern = '/^(.*?[.!?])\s+(.*?[.!?])/';
+ // This also takes and closing html-tags after the dot into consideration
+ $pattern = '/^(.*?[.!?](?:\s| |<\/[^>]+>)+)(.*?[.!?](?:\s| |<\/[^>]+>)+)/';
// Use preg_match() to find the first two sentences
if ( preg_match( $pattern, $event->description, $matches ) ) {
diff --git a/partials/views/single-dynamic-event/single-dynamic-event-hero-meta.dust b/partials/views/single-dynamic-event/single-dynamic-event-hero-meta.dust
index e7ca021a..91e6e0af 100644
--- a/partials/views/single-dynamic-event/single-dynamic-event-hero-meta.dust
+++ b/partials/views/single-dynamic-event/single-dynamic-event-hero-meta.dust
@@ -2,21 +2,35 @@
{?event.normalized.date}
{>"ui/icon" icon="date" class="icon--xlarge mr-4 mr-6-desktop {template_classes.hero_icon|s}" /}
- {event.normalized.date|s}
+
+ {event.normalized.date|html}
+
{>"ui/icon" icon="time" class="icon--xlarge mr-4 mr-6-desktop {template_classes.hero_icon|s}" /}
- {event.normalized.time|s}
+
+ {event.normalized.time|html}
+
{>"ui/icon" icon="location" class="icon--xlarge mr-4 mr-6-desktop {template_classes.hero_icon|s}" /}
- {event.normalized.location.name|s}
+
+ {event.normalized.location.name|html}
+
+ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.sign_up_title template_classes=template_classes.info_group_title icon="link" /}
+
+
+
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.links_title template_classes=template_classes.info_group_title icon="link" /}