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

---
 .../custom/prijava_1ka/prijava_1ka.module     |  8 +++----
 .../Block/PrijavaPodatkiOUporabnikuBlock.php  | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 10 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 5dd8a79eb..b9c48fa94 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -81,10 +81,10 @@ function prijava_1ka_theme()
         ],
         'prijava_podatki_o_uporabniku_block' => [
             'variables' => [
-
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
-                'ime' => (isset($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : null),
-                'from1ka' => (isset($_GET['from1ka']) ? $_GET['from1ka'] : false) ,
+                'prijavljen' => FALSE,
+                'ime' => NULL,
+                'from1ka' => FALSE,
+                'lang' => [],
             ]
         ],
 
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php
index 3bb10df06..817bcd29f 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\prijava_1ka\Plugin\Block;
 
+use Drupal\Core\Block\BlockBase;
+
 /**
  * Prikaže podatke že o prijavljenem uporabniku.
  * Prikažemo, podatke o prijavljenem uporabniku
@@ -12,17 +14,25 @@ namespace Drupal\prijava_1ka\Plugin\Block;
  *   category = @Translation("1KA"),
  * )
  */
-class PrijavaPodatkiOUporabnikuBlock
-{
+class PrijavaPodatkiOUporabnikuBlock extends BlockBase {
 
     /**
      * {@inheritdoc}
      */
     public function build() {
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '../../../../../../../../../lang/2.php');
+      }
 
-        return [
-            '#theme' => 'prijava_podatki_o_uporabniku_block',
-        ];
+      return [
+        '#theme' => 'prijava_podatki_o_uporabniku_block',
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#ime' => (isset($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : NULL),
+        '#from1ka' => ($_GET['from1ka'] ?? FALSE),
+        '#lang' => $lang ?? [],
+      ];
     }
 
-}
\ No newline at end of file
+}