From 608232d0bbb4a5dbc8a91f2735dd2d5eede5f5a5 Mon Sep 17 00:00:00 2001
From: pero1203
Date: Thu, 4 Mar 2021 13:40:29 +0100
Subject: [PATCH 1/2] Popravki redesigna emaila
---
admin/survey/classes/objects/obj.MailAdapter.php | 14 ++++++++------
lang/1.php | 2 +-
lang/2.php | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php
index 29b7fd48a..6124af2cb 100644
--- a/admin/survey/classes/objects/obj.MailAdapter.php
+++ b/admin/survey/classes/objects/obj.MailAdapter.php
@@ -774,7 +774,8 @@ class MailAdapter{
-
+
+
@@ -814,8 +815,8 @@ class MailAdapter{
|
+ |
diff --git a/lang/1.php b/lang/1.php
index 9116d6035..d4f97c5c3 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7930,7 +7930,7 @@ $lang = array (
/* EMAIL TEMPLATE */
- 'email_template_footer' => 'Potrebujete pomoč pri ustvarjanju ankete ali analiziranju podatkov? Poglejte naš priročnik ali zaprosite za pomoč enega od naših strokovnjakov.',
+ 'email_template_footer' => 'Potrebujete pomoč pri ustvarjanju ankete ali analiziranju podatkov? Za uporabnike 1KA nudimo individualno svetovanje na področjih uporabe 1KA, statistike in metodologije.',
'email_template_footer2_recipient' => 'Sporočilo smo vam poslali na',
'email_template_footer2_unsubscribe' => 'Za odjavo kliknite tukaj.',
'email_template_footer2_unsubscribe' => 'Za spremembo nastavitev kliknite tukaj.',
diff --git a/lang/2.php b/lang/2.php
index 48aed91c5..52ca558ef 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7825,7 +7825,7 @@ GDPR introduction preview",
/* EMAIL TEMPLATE */
- 'email_template_footer' => 'Do you need help with creating a survey or analizing data? Take a look at our in-detail help section or hire one of our specialists to help you.',
+ 'email_template_footer' => 'Need help creating a survey or analyzing data? For 1KA users we offer individual advice in the areas of use of 1KA, statistics and methodology.',
'email_template_footer2_recipient' => 'This message was sent to',
'email_template_footer2_unsubscribe' => 'To unsubscribe click here.',
'email_template_footer2_unsubscribe' => 'To change your settings click here.',
From 758ad8f2c137fa6df35d1bcba54ee0fc3e8e3c01 Mon Sep 17 00:00:00 2001
From: pero1203
Date: Thu, 4 Mar 2021 14:29:35 +0100
Subject: [PATCH 2/2] Popravki novega designa emailov - footer
---
admin/survey/classes/objects/obj.MailAdapter.php | 10 ++++------
lang/1.php | 2 +-
lang/2.php | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php
index 6124af2cb..7e7c694c8 100644
--- a/admin/survey/classes/objects/obj.MailAdapter.php
+++ b/admin/survey/classes/objects/obj.MailAdapter.php
@@ -848,13 +848,11 @@ class MailAdapter{
|
-
+ '.$lang['email_template_footer2_unsubscribe'].'
+
diff --git a/lang/1.php b/lang/1.php
index d4f97c5c3..447febc2a 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7933,7 +7933,7 @@ $lang = array (
'email_template_footer' => 'Potrebujete pomoč pri ustvarjanju ankete ali analiziranju podatkov? Za uporabnike 1KA nudimo individualno svetovanje na področjih uporabe 1KA, statistike in metodologije.',
'email_template_footer2_recipient' => 'Sporočilo smo vam poslali na',
'email_template_footer2_unsubscribe' => 'Za odjavo kliknite tukaj.',
- 'email_template_footer2_unsubscribe' => 'Za spremembo nastavitev kliknite tukaj.',
+ 'email_template_footer2_unsubscribe' => 'Za spremembo nastavitev kliknite tukaj.',
diff --git a/lang/2.php b/lang/2.php
index 52ca558ef..22622a149 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7828,7 +7828,7 @@ GDPR introduction preview",
'email_template_footer' => 'Need help creating a survey or analyzing data? For 1KA users we offer individual advice in the areas of use of 1KA, statistics and methodology.',
'email_template_footer2_recipient' => 'This message was sent to',
'email_template_footer2_unsubscribe' => 'To unsubscribe click here.',
- 'email_template_footer2_unsubscribe' => 'To change your settings click here.',
+ 'email_template_footer2_unsubscribe' => 'To change your settings click here.',