Changeset 1803 for trunk

Timestamp:

Feb 11, 2007, 1:43:53 AM (18 years ago)

Author:

rub

Message:

Fix text/plain mail
Fix translations

Location:

trunk

Files:

• include/functions_mail.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)

trunk/include/functions_mail.inc.php

@@ -207 +207 @@
         ));
 
-    $mail_template->set_filename('mail_css_default_template', 'default-layout-mail-css.tpl');
-    $mail_template->assign_var_from_handle('MAIL_CSS_DEFAULT_TEMPLATE', 'mail_css_default_template');
-
-    $old_root = $mail_template->root;
-
-    $mail_template->root = PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/'.$user['theme'];
-    if (is_file($mail_template->root.'/layout-mail-css.tpl'))
-    {
-      $mail_template->set_filename('mail_css_theme', 'layout-mail-css.tpl');
-      $mail_template->assign_var_from_handle('MAIL_CSS_THEME', 'mail_css_theme');
-    }
-
-    $mail_template->root = PHPWG_ROOT_PATH.'template-common';
-    if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
-    {
-      $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
-      $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_COMMON', 'mail_css_local_template');
-    }
-
-    $mail_template->root = $old_root;
-    if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
-    {
-      $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
-      $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_TEMPLATE', 'mail_css_local_template');
+    if ($email_format == 'text/html')
+    {
+      if (is_file($mail_template->root.'/default-layout-mail-css.tpl'))
+      {
+        $mail_template->set_filename('mail_css_default_template', 'default-layout-mail-css.tpl');
+        $mail_template->assign_var_from_handle('MAIL_CSS_DEFAULT_TEMPLATE', 'mail_css_default_template');
+      }
+
+      $old_root = $mail_template->root;
+
+      $mail_template->root = PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/'.$user['theme'];
+      if (is_file($mail_template->root.'/layout-mail-css.tpl'))
+      {
+        $mail_template->set_filename('mail_css_theme', 'layout-mail-css.tpl');
+        $mail_template->assign_var_from_handle('MAIL_CSS_THEME', 'mail_css_theme');
+      }
+
+      $mail_template->root = PHPWG_ROOT_PATH.'template-common';
+      if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
+      {
+        $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
+        $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_COMMON', 'mail_css_local_template');
+      }
+
+      $mail_template->root = $old_root;
+      if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
+      {
+        $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
+        $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_TEMPLATE', 'mail_css_local_template');
+      }
     }
 

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -288 +288 @@
 $lang['nbm_content_new_elements_between_1'] = 'between ';
 $lang['nbm_content_new_elements_between_2'] = ' and ';
-$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail';
-$lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail';
+$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail.';
+$lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail.';
 $lang['nbm_content_subscribe_link'] = 'To subscribe';
 $lang['nbm_content_problem_contact'] = 'If you encounter problems or have any question, please send a message to ';
 $lang['nbm_content_pb_contact_object'] = '[NBM] Problems or questions';
-$lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail';
-$lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail';
+$lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail.';
+$lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail.';
 $lang['nbm_content_click_on'] = ', click on ';
 $lang['nbm_content_unsubscribe_link'] = 'To unsubscribe';