From f237c94bf6291c577334bcc8538c8ef02581bf43 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 12:54:30 +0200
Subject: [PATCH] Resolve PrijavaBlock variable caching issue

---
 .../web/modules/custom/prijava_1ka/prijava_1ka.module |  8 ++++----
 .../prijava_1ka/src/Plugin/Block/PrijavaBlock.php     | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 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 86c561d4a..76b1205f0 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -26,15 +26,15 @@ function prijava_1ka_theme()
     return [
         'prijava_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' => [],
             ]
         ],
         'prijava_intro_block' => [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
index dcb31768e..fb604f181 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
@@ -64,8 +64,19 @@ class PrijavaBlock extends BlockBase implements ContainerFactoryPluginInterface
   public function build() {
     //return $this->formBuilder->getForm('Drupal\prijava_1ka\Form\PrijavaBlockForm');
 
+    $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    if($currentLanguage == 'sl') {
+      include(__DIR__ . '../../../../../../../../../lang/1.php');
+    } else{
+      include(__DIR__ . '../../../../../../../../../lang/2.php');
+    }
+
     return [
       '#theme' => 'prijava_block',
+      '#prijavljen' => isset($_COOKIE['unam']),
+      '#jezik' => $currentLanguage,
+      '#lang' => $lang ?? [],
     ];
   }