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

GDPR popravki prevodov

Browse Source
This commit is contained in:
pero1203 2021-02-25 10:29:24 +01:00
parent 8c093f57fc
commit 038f6677a0
3 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
admin/survey/classes/class.GDPR.php
View File

@ -754,7 +754,7 @@ class GDPR{
echo ' <br /><br /><br /><br />';
// Podrobnosti o zbiranju podatkov (popup v uvodu)
if($gdpr_settings['about'] == ''){
/*if($gdpr_settings['about'] == ''){
$about_array = self::getGDPRInfoArray($ank_id);
$about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
}
@ -762,7 +762,22 @@ class GDPR{
$about_text = $gdpr_settings['about'];
}
echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';
echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';*/
echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
if($language_slo){
$about_array = self::getGDPRInfoArray($ank_id, $language_id='1');
$about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
echo ' <br><br><span class="nastavitveSpan1">&nbsp;</span>';
}
if($language_eng){
$about_array = self::getGDPRInfoArray($ank_id, $language_id='2');
$about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
}
echo '<br /><br />';
@ -1811,14 +1826,28 @@ class GDPR{
// Vrnemo celoten gdpr text za respondenta (pravice...) v obliki array-a
public static function getGDPRInfoArray($ank_id){
public static function getGDPRInfoArray($ank_id, $language_id=''){
global $global_user_id;
global $lang;
$gdpr_settings = self::getUserSettings();
$gdpr_survey_settings = self::getSurveySettings($ank_id);
// Force language
$language_id_bck = '';
if($language_id != '' && $lang['id'] != $language_id){
// Shranimo star jezik da lahko preklopimo nazaj
$language_id_bck = $lang['id'];
$file = '../../lang/'.$language_id.'.php';
include($file);
$translation = ($language_id == '1') ? '_slo' : '_eng';
}
else{
$translation = ($lang['id'] == '1') ? '_slo' : '_eng';
}
$result = array();
@ -1959,6 +1988,13 @@ class GDPR{
}
// Preklopimo nazaj jezik
if($language_id_bck != '' && $language_id_bck != $lang['id']){
$file = '../../lang/'.$language_id_bck.'.php';
include($file);
}
return $result;
}
@ -2069,7 +2105,7 @@ class GDPR{
// OPOMBA
if($gdpr_survey_settings['note'.$translation] != ''){
$result[10]['heading'] = 'XI. '.$lang['note'];
$result[10]['text'][0] = $gdpr_survey_settings['note'.$translation];
$result[10]['text'][0] = '<strong>'.$gdpr_survey_settings['note'.$translation].'</strong>.';
}

13
admin/survey/classes/class.Vprasanje.php
View File

@ -4889,6 +4889,14 @@ class Vprasanje {
function set_GDPR () {
global $lang;
$lang_admin = SurveyInfo::getInstance()->getSurveyColumn('lang_admin');
$lang_resp = SurveyInfo::getInstance()->getSurveyColumn('lang_resp');
// nastavimo na jezik za respondentov vmesnik
$file = '../../lang/'.$lang_resp.'.php';
include($file);
$user_settings = GDPR::getSurveySettings($this->anketa);
// GDPR je radio (da / ne) tip vprasanja z predefiniranim textom
@ -4906,6 +4914,11 @@ class Vprasanje {
// Popravimo, da ima anketa vklopljen gdpr
sisplet_query("INSERT INTO srv_gdpr_anketa (ank_id) VALUES ('".$this->anketa."')");
// nastavimo nazaj na admin jezik
$file = '../../lang/'.$lang_admin.'.php';
include($file);
}
/**

2
admin/survey/export/latexclasses/class.LatexGDPR.php
View File

@ -105,7 +105,7 @@ class LatexGDPR{
$url = $matches[1][$key];
$url_text = $matches[2][$key];
$tex = str_replace($matches[0][$key], '\textcolor{crta}{ \underline{ \href{'.$url.'}'.'{'.$url_text.'} } }', $tex);
$tex = str_replace($matches[0][$key], '\textcolor{crta}{\underline{\href{'.$url.'}'.'{'.$url_text.'}}}', $tex);
}