From c3b6455a0d0950d44c033ad391559f5301293526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Wed, 13 Nov 2024 20:08:37 +0200 Subject: [PATCH 1/4] TMS-1059: Eventz link changes --- CHANGELOG.MD | 5 + lang/fi.mo | Bin 13750 -> 13863 bytes lang/fi.po | 45 +- lang/sv_SE.mo | Bin 1330 -> 1468 bytes lang/sv_SE.po | 579 +++++++++++++----- lang/tms-theme-base.pot | 38 +- lib/Eventz.php | 98 ++- .../single-dynamic-event-hero-meta.dust | 20 +- .../single-dynamic-event-info.dust | 11 + 9 files changed, 578 insertions(+), 218 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 3621a4aa..b7ab02e7 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 2c231dfdb2d549f074d1bbace629f33f4b49109b..25b60acb8f98d1dba7162bb5888cb66acb33e4b6 100644 GIT binary patch delta 4592 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 diff --git a/lang/fi.po b/lang/fi.po index 23824ca0..553e6012 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:01+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" @@ -1229,11 +1241,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 fd7919cadfd6808f60d79ffcc4229c616286488d..793cadcecab655cef84f96edae6ba325b0b63714 100644 GIT binary patch delta 429 zcmY+z1Vz8bxGLb4dsi+_Fp1!JCjoU_HR9!?vku?s^PQJwQo^I{O3# zp1Oq5se@0@J$i}0QxWuoKOg=x`=8l)h(9HI@ALMpkOZ|#g;a`qqfC+!kts}}Sx;jU zw{Q;kF@_~f<1sE`3)k=p*KvRue8Hut$R{$_ljwxVG8+jr2X5dD<}r>1GzXT@#>#K+ z;R5|7ZsHAc=6B3v%uktllS#_Va_?XGoScYEgL$E4dXr+SsoSon<*=m!?RKiCs-uH$ zBMjuIOXmh!g?_cJSt$SCFZb9>x#pxeyp%l)Wqd`N}e6Rm(Uwi?7K1JaG delta 312 zcmdnPy@{*-o)F7a1|Z-7Vi_Qg0b*_-o&&@nZ~}-0f%qg4^8xW~AeI8+S3oQZ#H@@A z401qP8c53nX)7SD2Bf2av?MbFLnDX=@@KO!Fz^8Btw0*2?+}m%qI!lKP=UKZS_CNZ z8AxjaX%1Ef2B2OrU;>grv%ml-40bF#kOnFR12z!pm#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 25d79b0a..db4ba6fa 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} +

{/event.normalized.date} {?event.normalized.time}
{>"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} +

{/event.normalized.time} {?event.normalized.location}
{>"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} +

{/event.normalized.location} + + {?event.normalized.link_purchase_ticket} +
+ + {event.normalized.link_purchase_ticket.name|html} + +
+ {/event.normalized.link_purchase_ticket} diff --git a/partials/views/single-dynamic-event/single-dynamic-event-info.dust b/partials/views/single-dynamic-event/single-dynamic-event-info.dust index 6704961c..753aa958 100644 --- a/partials/views/single-dynamic-event/single-dynamic-event-info.dust +++ b/partials/views/single-dynamic-event/single-dynamic-event-info.dust @@ -67,6 +67,17 @@ {/event.normalized.price} +{?event.normalized.link_sign_up} +
+ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.sign_up_title template_classes=template_classes.info_group_title icon="link" /} + +
+ {event.normalized.link_sign_up.name|attr} + {>"ui/link" link=event.normalized.link_sign_up.url /} +
+
+{/event.normalized.link_sign_up} + {?event.normalized.links}
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.links_title template_classes=template_classes.info_group_title icon="link" /} From 885a4ba29b17c038ceb2aae6d2f6a0ebf3b1dd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Thu, 14 Nov 2024 11:31:29 +0200 Subject: [PATCH 2/4] TMS-1059: Homepage-link translation --- lib/Eventz.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Eventz.php b/lib/Eventz.php index 5f0e871d..1c95d4db 100644 --- a/lib/Eventz.php +++ b/lib/Eventz.php @@ -128,7 +128,7 @@ public static function normalize_event( $event ) : array { } $event_other_links = array_map( function ( $event_link ) { - if ( $event_link->name === 'HomePage' ) { + if ( $event_link->name === 'HomePage' || $event_link->name === 'Homepage' ) { $event_link->name = \__( 'Homepage', 'tms-theme-base' ); } From ddcb94412df0cb35de09ca634e2b0259b2299b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Mon, 18 Nov 2024 09:16:34 +0200 Subject: [PATCH 3/4] TMS-1059: CR fix --- lib/Eventz.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Eventz.php b/lib/Eventz.php index 1c95d4db..28ae2aa1 100644 --- a/lib/Eventz.php +++ b/lib/Eventz.php @@ -115,11 +115,11 @@ public static function normalize_event( $event ) : array { 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->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->name = \__( 'Sign up', 'tms-theme-base' ); $event_link_sign_up = $event_link; } else { From cb95245dedb7800985e3f114ac3053a795d9865b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Tue, 19 Nov 2024 13:13:38 +0200 Subject: [PATCH 4/4] TMS-1059: Change escaping filter --- .../views/single-dynamic-event/single-dynamic-event-info.dust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partials/views/single-dynamic-event/single-dynamic-event-info.dust b/partials/views/single-dynamic-event/single-dynamic-event-info.dust index 753aa958..0662948e 100644 --- a/partials/views/single-dynamic-event/single-dynamic-event-info.dust +++ b/partials/views/single-dynamic-event/single-dynamic-event-info.dust @@ -72,7 +72,7 @@ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.sign_up_title template_classes=template_classes.info_group_title icon="link" /}
- {event.normalized.link_sign_up.name|attr} + {event.normalized.link_sign_up.name|html} {>"ui/link" link=event.normalized.link_sign_up.url /}