From 3eae18f0023d5d6bb6a39f67b3100a109493079b Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 10:50:37 +0200
Subject: [PATCH 01/12] Resolve registration block caching issue

---
 .../registracija_1ka/registracija_1ka.module   | 18 ++++--------------
 .../src/Plugin/Block/RegistracijaBlock.php     | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
index 1dbcc50eb..9782adda7 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
@@ -9,19 +9,9 @@
  */
 function registracija_1ka_theme()
 {
-  if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-    include(__DIR__ . '/../../../../../../lang/1.php');
-  }else{
-    include(__DIR__ . '/../../../../../../lang/2.php');
-  }
-
-
 //    $lang['cms_register_user_text'] = str_replace('GOOGLE_URL', variable_get('1ka_google_prijava'), $lang['cms_register_user_text']);
 //    $lang['cms_register_user_text'] = str_replace('FACEBOOK_URL', variable_get('1ka_facebook_prijava'), $lang['cms_register_user_text']);
 
-    // Naložimo 1ka nastavitve
-    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
-
 
     /**
      * Dodatne opcijske nastavitve
@@ -39,11 +29,11 @@ function registracija_1ka_theme()
     return [
         'registracija_block' => [
             'variables' => [
-                'lang' => $lang ?? [],
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'lang' => [],
+                'jezik' => '',
                 //'obvestila' => $obvestila,
-                'recaptcha_sitekey' => $recaptcha_sitekey ?? '',
-                'login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : '')
+                'recaptcha_sitekey' => '',
+                'login__link' => '',
            ]
         ]
     ];
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
index 14706d8e0..4ee072921 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
@@ -19,8 +19,23 @@ class RegistracijaBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
+    $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    if($currentLanguage == 'sl') {
+      include(__DIR__ . '../../../../../../../../../lang/1.php');
+    } else{
+      include(__DIR__ . '../../../../../../../../../lang/2.php');
+    }
+
+    // Naložimo 1ka nastavitve
+    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
+
     return [
       '#theme' => 'registracija_block',
+      '#lang' => $lang ?? [],
+      '#jezik' => $currentLanguage,
+      '#recaptcha_sitekey' => $recaptcha_sitekey ?? '',
+      '#login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : ''),
     ];
   }
 
@@ -29,4 +44,3 @@ class RegistracijaBlock extends BlockBase {
   }
 
 }
-

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 02/12] 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 ?? [],
     ];
   }
 

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 03/12] 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

From 1f43885ddf5b849edd6aecbc040ecfb104d99a9c Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:04:25 +0200
Subject: [PATCH 04/12] Resolve PrijavaObnovitevGeslaBlock variable caching
 issue

---
 .../modules/custom/prijava_1ka/prijava_1ka.module    |  2 +-
 .../src/Plugin/Block/PrijavaObnovitevGeslaBlock.php  | 12 +++++++++---
 2 files changed, 10 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 ab8ca6a3e..6962f9d95 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -53,7 +53,7 @@ function prijava_1ka_theme()
 
         'prijava_obnovitev_gesla_block' => [
             'variables' => [
-
+                'lang' => [],
             ]
         ],
         'prijava_obnovitev_gesla_aktivacija_blok' => [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
index a35cbd4df..c3169b57f 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
@@ -20,10 +20,16 @@ class PrijavaObnovitevGeslaBlock 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_obnovitev_gesla_block',
-        ];
+      return [
+        '#theme' => 'prijava_obnovitev_gesla_block',
+        '#lang' => $lang ?? [],
+      ];
     }
 
     public function getCacheMaxAge() {

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 05/12] 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
+}

From 763ac2d93bcc898df1808f594236c6a02e293bb2 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:11:54 +0200
Subject: [PATCH 06/12] Resolve PrijavaArnesModalBlock variable caching issue

---
 .../modules/custom/prijava_1ka/prijava_1ka.module    |  3 +--
 .../src/Plugin/Block/PrijavaArnesModalBlock.php      | 12 +++++++++---
 2 files changed, 10 insertions(+), 5 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 aafdf91da..5dd8a79eb 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -67,7 +67,6 @@ function prijava_1ka_theme()
 
         'prijava_z_racuni_block' => [
           'variables' => [
-
             'url_google' => $url_google,
             //'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
             'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
@@ -77,7 +76,7 @@ function prijava_1ka_theme()
 
         'prijava_arnes_modal_block' => [
             'variables' => [
-
+              'lang' => [],
             ]
         ],
         'prijava_podatki_o_uporabniku_block' => [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
index 12f1d7ac3..7233d815c 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
@@ -21,10 +21,16 @@ class PrijavaArnesModalBlock 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_arnes_modal_block',
-        ];
+      return [
+        '#theme' => 'prijava_arnes_modal_block',
+        '#lang' => $lang ?? [],
+      ];
     }
 
 }
\ No newline at end of file

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 07/12] 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
+}

From 3da35ee4943d4e92e81f68cdfaa924ea3013185c Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:17:22 +0200
Subject: [PATCH 08/12] Resolve PrijavaIndividualnoSvetovanjeModalBlock
 variable caching issue

---
 .../modules/custom/prijava_1ka/prijava_1ka.module    |  2 +-
 .../PrijavaIndividualnoSvetovanjeModalBlock.php      | 12 +++++++++---
 2 files changed, 10 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 b9c48fa94..eb12730b5 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -90,7 +90,7 @@ function prijava_1ka_theme()
 
         'prijava_individualno_svetovanje_modal_block' => [
           'variables' => [
-
+            'lang' => [],
           ]
         ],
 
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
index edbb89405..8cc6907ef 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
@@ -20,10 +20,16 @@ class PrijavaIndividualnoSvetovanjeModalBlock 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_individualno_svetovanje_modal_block',
-        ];
+      return [
+        '#theme' => 'prijava_individualno_svetovanje_modal_block',
+        '#lang' => $lang ?? [],
+      ];
     }
 
 }

From 15fc49bbab92b999aefbefeb99ed03ff2cfcefd0 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:21:43 +0200
Subject: [PATCH 09/12] Resolve PrijavaZRacuniModalBlock variable caching issue

---
 .../custom/prijava_1ka/prijava_1ka.module     |  6 ++---
 .../Plugin/Block/PrijavaZRacuniModalBlock.php | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 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 eb12730b5..8873248bd 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -96,9 +96,9 @@ function prijava_1ka_theme()
 
       'prijava_z_racuni_modal_block' => [
         'variables' => [
-
-          'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false),
-          'url_google' => $url_google
+          'rememberMe' => FALSE,
+          'url_google' => $url_google,
+          'lang' => [],
         ]
       ]
     ];
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
index a5235e5d3..7866b727e 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
@@ -20,10 +20,29 @@ class PrijavaZRacuniModalBlock extends BlockBase {
      * {@inheritdoc}
      */
     public function build() {
+      //Url linki za preusmeritev
+      $redirect_url = 'https://www.1ka.si/frontend/api/google-oauth2.php';
+      $url_google = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com&redirect_uri='.$redirect_url;
 
-        return [
-            '#theme' => 'prijava_z_racuni_modal_block',
-        ];
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '../../../../../../../../../lang/1.php');
+
+        $url_google .= '&state=';
+      } else{
+        include(__DIR__ . '../../../../../../../../../lang/2.php');
+
+        $url_google .= '&state=regFromEnglish';
+      }
+
+      $url_google .= '&scope=email&access_type=online&prompt=consent';
+      $url_google .= '&openid.realm=https://www.1ka.si';
+
+      return [
+        '#theme' => 'prijava_z_racuni_modal_block',
+        '#rememberMe' => empty($_COOKIE['remember-me']),
+        '#url_google' => $url_google,
+        '#lang' => $lang ?? [],
+      ];
     }
 
 }

From 86f22214a225ccf7df52a3ea719c7e50990b6c09 Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:22:40 +0200
Subject: [PATCH 10/12] Remove unnecessary preprocess functions

---
 .../custom/prijava_1ka/prijava_1ka.module     | 42 -------------------
 1 file changed, 42 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 8873248bd..b0d4e0881 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -103,45 +103,3 @@ function prijava_1ka_theme()
       ]
     ];
 }
-
-/*
-* Never cache
-*/
-function prijava_1ka_preprocess(&$variables)
-{
-//  if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [
-//      'prijava_intro_block',
-//      'prijava_block',
-//      'prijava_obnovitev_gesla_block',
-//      'prijava_obnovitev_gesla_aktivacija_blok',
-//      'prijava_podatki_o_uporabniku_block'
-//    ])
-//  ){
-
-    if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-      include (__DIR__ . '/../../../../../../lang/1.php');
-    }else{
-      include (__DIR__ . '/../../../../../../lang/2.php');
-    }
-    $variables['lang'] = $lang;
-    $variables['#cache']['max-age'] = 0;
-//  }
-
-  return $variables;
-}
-
-function prijava_1ka_preprocess_block(&$variables)
-{
-  if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [
-      'prijava_intro_block',
-      'prijava_block',
-      'prijava_obnovitev_gesla_block',
-      'prijava_obnovitev_gesla_aktivacija_blok',
-      'prijava_podatki_o_uporabniku_block'
-    ])
-  ){;
-    $variables['#cache']['max-age'] = 0;
-  }
-
-  return $variables;
-}

From 62b51ddd8c9a448de2539349668007f1abc8e54d Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 13:55:53 +0200
Subject: [PATCH 11/12] Fix include language routes

---
 .../prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php   | 4 ++--
 .../custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php      | 4 ++--
 .../Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php  | 4 ++--
 .../custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php | 4 ++--
 .../src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php | 4 ++--
 .../src/Plugin/Block/PrijavaObnovitevGeslaBlock.php           | 4 ++--
 .../src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php       | 4 ++--
 .../prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php | 4 ++--
 .../registracija_1ka/src/Plugin/Block/RegistracijaBlock.php   | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
index 7233d815c..333c802d3 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
@@ -22,9 +22,9 @@ class PrijavaArnesModalBlock extends BlockBase {
      */
     public function build() {
       if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
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 fb604f181..b706a19cb 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
@@ -67,9 +67,9 @@ class PrijavaBlock extends BlockBase implements ContainerFactoryPluginInterface
     $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
     if($currentLanguage == 'sl') {
-      include(__DIR__ . '../../../../../../../../../lang/1.php');
+      include(__DIR__ . '/../../../../../../../../../lang/1.php');
     } else{
-      include(__DIR__ . '../../../../../../../../../lang/2.php');
+      include(__DIR__ . '/../../../../../../../../../lang/2.php');
     }
 
     return [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
index 8cc6907ef..9f2f08c3a 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
@@ -21,9 +21,9 @@ class PrijavaIndividualnoSvetovanjeModalBlock extends BlockBase {
      */
     public function build() {
       if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
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 92db6f860..1852231cc 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
@@ -23,9 +23,9 @@ class PrijavaIntroBlock extends BlockBase {
       $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
       if($currentLanguage == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
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 784ae9da0..511056ddb 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
@@ -23,9 +23,9 @@ class PrijavaObnovitevGeslaAktivacijaBlock extends BlockBase {
       $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
       if($currentLanguage == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
index c3169b57f..9dd059e16 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
@@ -21,9 +21,9 @@ class PrijavaObnovitevGeslaBlock extends BlockBase {
      */
     public function build() {
       if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
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 817bcd29f..3c92a99b5 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
@@ -21,9 +21,9 @@ class PrijavaPodatkiOUporabnikuBlock extends BlockBase {
      */
     public function build() {
       if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
       }
 
       return [
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
index 7866b727e..e3a119e1a 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
@@ -25,11 +25,11 @@ class PrijavaZRacuniModalBlock extends BlockBase {
       $url_google = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com&redirect_uri='.$redirect_url;
 
       if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-        include(__DIR__ . '../../../../../../../../../lang/1.php');
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
 
         $url_google .= '&state=';
       } else{
-        include(__DIR__ . '../../../../../../../../../lang/2.php');
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
 
         $url_google .= '&state=regFromEnglish';
       }
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
index 4ee072921..bc3f15b0b 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
@@ -22,9 +22,9 @@ class RegistracijaBlock extends BlockBase {
     $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
     if($currentLanguage == 'sl') {
-      include(__DIR__ . '../../../../../../../../../lang/1.php');
+      include(__DIR__ . '/../../../../../../../../../lang/1.php');
     } else{
-      include(__DIR__ . '../../../../../../../../../lang/2.php');
+      include(__DIR__ . '/../../../../../../../../../lang/2.php');
     }
 
     // Naložimo 1ka nastavitve

From 8a4daa4e9151354523d2e2e7508ba7730dc92a3b Mon Sep 17 00:00:00 2001
From: Tilen Gombac <tilen.gombac@agiledrop.com>
Date: Fri, 28 Oct 2022 14:44:55 +0200
Subject: [PATCH 12/12] Pass current language id to inline template

---
 .../src/Controller/ReturnCallController.php            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php
index 9c827bf7f..73b372b11 100644
--- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php
+++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php
@@ -22,6 +22,11 @@ class ReturnCallController extends ControllerBase
             'description' => [
                 '#type' => 'inline_template',
                 '#template' => $template,
+                '#context' => [
+                  'language' => [
+                    'id' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                  ],
+                ],
             ],
         ];
 
@@ -39,6 +44,11 @@ class ReturnCallController extends ControllerBase
             'description' => [
                 '#type' => 'inline_template',
                 '#template' => $template,
+                '#context' => [
+                  'language' => [
+                    'id' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                  ],
+                ],
             ],
         ];