may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve registration block caching issue

Browse Source
This commit is contained in:
Tilen Gombac 2022-10-28 10:50:37 +02:00
parent e5dff04b1c
commit 3eae18f002
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
View File

@ -9,19 +9,9 @@
*/ */
function registracija_1ka_theme() 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('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']); // $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 * Dodatne opcijske nastavitve
@ -39,11 +29,11 @@ function registracija_1ka_theme()
return [ return [
'registracija_block' => [ 'registracija_block' => [
'variables' => [ 'variables' => [
'lang' => $lang ?? [], 'lang' => [],
'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), 'jezik' => '',
//'obvestila' => $obvestila, //'obvestila' => $obvestila,
'recaptcha_sitekey' => $recaptcha_sitekey ?? '', 'recaptcha_sitekey' => '',
'login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : '') 'login__link' => '',
] ]
] ]
]; ];

16
frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
View File

@ -19,8 +19,23 @@ class RegistracijaBlock extends BlockBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function build() { 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 [ return [
'#theme' => 'registracija_block', '#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 {
} }
} }