From 763ac2d93bcc898df1808f594236c6a02e293bb2 Mon Sep 17 00:00:00 2001 From: Tilen Gombac Date: Fri, 28 Oct 2022 13:11:54 +0200 Subject: [PATCH] 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