Merge branch 'TMS-1021' into stage

devgeniem · Mar 20, 2024 · dc67deb · dc67deb
2 parents cc44048 + 2ad051b
commit dc67deb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -9,12 +9,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - TMS-968: Add recurring events to event-component
 - TMS-1013: Add entries fetching to Eventz event-integration
-- TMS-1009: Fix error when fetching Eventz response with languages other than fi & en
-- TMS-1015: Header accessibility fixes
-- TMS-996: Change bold image-caption text to normal
 - TMS-914:
     - Add new anchor-links block & functionalities
     - Add anchor id-elements to blocks & components
+- TMS-1021: Fix image alignment in image-carousel modal
+
+## [1.54.6] - 2024-03-18
+
+- TMS-996: Change bold image-caption text to normal
+- TMS-1009: Fix error when fetching Eventz response with languages other than fi & en
+- TMS-1015: Header accessibility fixes
 - TMS-1017: Add image alt-text to imported news
 - TMS-1018: Remove external-link icons from imported news image links
 

diff --git a/assets/styles/ui-components/_modal.scss b/assets/styles/ui-components/_modal.scss
@@ -106,28 +106,26 @@
                 }
             }
 
-            .slick-slide{
-                padding:0.588rem;
+            .slick-slide {
+                align-self: center;
+                padding: 0.588rem;
             }
 
             .slick-current {
                 &:focus {
-                    outline:0;
+                    outline: 0;
                     .image-carousel__item {
                         outline: .125rem solid $white;
                         outline-offset: .25rem;
                     }
                 }
             }
-
         }
 
         .image-carousel__item {
             img {
-                @include until($desktop) {
-                    max-height: 80vh;
-                    object-fit: contain;
-                }
+                max-height: 80vh;
+                object-fit: contain;
             }
         }
     }

diff --git a/lib/ACF/DynamicEventGroup.php b/lib/ACF/DynamicEventGroup.php
@@ -284,11 +284,18 @@ protected function get_choices_by_name( string $name, array $field ) : array {
             return $field;
         }
 
-        $cache_key = 'events-' . $name;
-        $response  = wp_cache_get( $cache_key );
-        $lang_key  = Localization::get_current_language();
+        $cache_key             = 'events-' . $name;
+        $response              = wp_cache_get( $cache_key );
+        $lang_key              = Localization::get_current_language();
+        $request_allowed_langs = [
+            'fi',
+            'en',
+        ];
 
-        if ( ! $response && ( $lang_key === 'fi' || $lang_key === 'en' ) ) {
+        if (
+            ! $response &&
+            in_array( $lang_key, $request_allowed_langs, true )
+        ) {
             try {
                 $client   = new EventzClient( PIRKANMAA_EVENTZ_API_URL, PIRKANMAA_EVENTZ_API_KEY );
                 $response = $client->{'get_' . $name }( $lang_key );

diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Base
  * Description: Tampere Multisite Base Theme
  * Domain Path: /lang
- * Version:     1.54.5
+ * Version:     1.54.6
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-base