From 5ec14f83786baa291be30e5fb4af2f2c796dc878 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:02:03 +0200
Subject: [PATCH] Resolve PrijavaIntroBlock variable caching issue

---
 .../custom/prijava_1ka/prijava_1ka.module       |  9 ++++-----
 .../src/Plugin/Block/PrijavaIntroBlock.php      | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
index 76b1205f0..ab8ca6a3e 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -39,16 +39,15 @@ function prijava_1ka_theme()
         ],
         'prijava_intro_block' => [
             'variables' => [
-
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
+                'prijavljen' => FALSE,
                 //'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']),
                 //'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']),
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'jezik' => '',
                 'google2fa_error' => '',
                 'email' => '',
                 'password' => '',
-                'error' => ''
-                //'lang' => // TU moramo pridobiti spremenljivke iz 1ka.si
+                'error' => '',
+                'lang' => [],
             ]
         ],
 
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php
index 2ee8097cb..92db6f860 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php
@@ -20,9 +20,20 @@ class PrijavaIntroBlock extends BlockBase {
      * {@inheritdoc}
      */
     public function build() {
-        return [
-            '#theme' => 'prijava_intro_block',
-        ];
+      $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+      if($currentLanguage == 'sl') {
+        include(__DIR__ . '../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '../../../../../../../../../lang/2.php');
+      }
+
+      return [
+        '#theme' => 'prijava_intro_block',
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#jezik' => $currentLanguage,
+        '#lang' => $lang ?? [],
+      ];
     }
 
 }
\ No newline at end of file