diff options
-rw-r--r-- | include/functions_mail.inc.php | 6 | ||||
-rw-r--r-- | language/en_UK.iso-8859-1/admin.lang.php | 1 | ||||
-rw-r--r-- | language/fr_FR.iso-8859-1/admin.lang.php | 1 | ||||
-rw-r--r-- | template/yoga/mail/text/html/admin/cat_group_info.tpl | 2 | ||||
-rw-r--r-- | template/yoga/mail/text/plain/admin/cat_group_info.tpl | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index 92d5ead6a..5f10d2f0a 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -369,7 +369,8 @@ WHERE $list = array();
while ($row = mysql_fetch_array($result))
{
- list($row['template'], $row['theme']) = explode('/', $row['template']);
+ $row['template_theme'] = $row['template'];
+ list($row['template'], $row['theme']) = explode('/', $row['template_theme']);
$list[] = $row;
}
}
@@ -387,7 +388,8 @@ FROM WHERE '.$conf['user_fields']['email'].' IS NOT NULL AND group_id = '.$group_id.' - AND language = \''.$elem['language'].'\' + AND language = \''.$elem['language'].'\'
+ AND template = \''.$elem['template_theme'].'\'
;'; $result = pwg_query($query); diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index 94883cf27..89c3148fa 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -583,6 +583,7 @@ $lang['An information email was sent to group "%s"'] = 'An information email was $lang['Send an information email to group members'] = 'Send an information email to group members'; $lang['Group'] = 'Group'; $lang['[%s] Come to visit the category %s'] = '[%s] Come to visit the category %s'; +$lang['Hello,'] = 'Hello,'; $lang['See you soon.'] = 'See you soon.'; $lang['Come to discover the category:'] = 'Come to discover the category:'; $lang['mail_content'] = 'Mail content'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index e529c23d6..ec7b037ea 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -582,6 +582,7 @@ $lang['An information email was sent to group "%s"'] = 'Un mail d\'informations $lang['Send an information email to group members'] = 'Envoyer un mail d\'informations aux membres d\'un groupe'; $lang['Group'] = 'Groupe'; $lang['[%s] Come to visit the category %s'] = '[%s] Venez visiter la catégorie %s'; +$lang['Hello,'] = 'Bonjour,'; $lang['See you soon.'] = 'A bientôt.'; $lang['Come to discover the category:'] = 'Venez découvrir la catégorie:'; $lang['mail_content'] = 'Contenu du mail'; diff --git a/template/yoga/mail/text/html/admin/cat_group_info.tpl b/template/yoga/mail/text/html/admin/cat_group_info.tpl index fc05c6831..3451f6645 100644 --- a/template/yoga/mail/text/html/admin/cat_group_info.tpl +++ b/template/yoga/mail/text/html/admin/cat_group_info.tpl @@ -1,7 +1,7 @@ <div id="cat_group_info"> <h2>{lang:Informations}</h2> <p>{IMG_URL}</p> -<p>{lang:hello}</p> +<p>{lang:Hello,}</p> <p>{lang:Come to discover the category:} <a href="{LINK}">{CAT_NAME}</a></p> <p>{CPL_CONTENT}</p> <p>{lang:See you soon.}</p> diff --git a/template/yoga/mail/text/plain/admin/cat_group_info.tpl b/template/yoga/mail/text/plain/admin/cat_group_info.tpl index 87d510fae..b38521465 100644 --- a/template/yoga/mail/text/plain/admin/cat_group_info.tpl +++ b/template/yoga/mail/text/plain/admin/cat_group_info.tpl @@ -1,4 +1,4 @@ -{lang:hello} +{lang:Hello,} {lang:Come to discover the category:} {CAT_NAME} {LINK} |