From 16a12e2b530a0ab93646165b7025942800bc5f04 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:08:53 +0200
Subject: [PATCH] Resolve PrijavaObnovitevGeslaAktivacijaBlock variable caching
 issue

---
 .../custom/prijava_1ka/prijava_1ka.module     |  8 ++++----
 .../PrijavaObnovitevGeslaAktivacijaBlock.php  | 19 +++++++++++++++----
 2 files changed, 19 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 6962f9d95..aafdf91da 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -58,10 +58,10 @@ function prijava_1ka_theme()
         ],
         'prijava_obnovitev_gesla_aktivacija_blok' => [
             'variables' => [
-
-                //'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
-                'rememberMe' => (isset($_COOKIE['remember-me']) ? false : true)
+                'jezik' => '',
+                'prijavljen' => FALSE,
+                'rememberMe' => TRUE,
+                'lang' => [],
             ]
         ],
 
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php
index e2e3c336d..784ae9da0 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php
@@ -20,10 +20,21 @@ class PrijavaObnovitevGeslaAktivacijaBlock extends BlockBase {
      * {@inheritdoc}
      */
     public function build() {
+      $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
-        return [
-            '#theme' => 'prijava_obnovitev_gesla_aktivacija_block',
-        ];
+      if($currentLanguage == 'sl') {
+        include(__DIR__ . '../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '../../../../../../../../../lang/2.php');
+      }
+
+      return [
+        '#theme' => 'prijava_obnovitev_gesla_aktivacija_block',
+        '#jezik' => $currentLanguage,
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#rememberMe' => !isset($_COOKIE['remember-me']),
+        '#lang' => $lang ?? [],
+      ];
     }
 
-}
\ No newline at end of file
+}