diff -urp -N simplenews_template/CHANGELOG.txt simplenews_template_6/CHANGELOG.txt --- simplenews_template/CHANGELOG.txt 1970-01-01 01:00:00.000000000 +0100 +++ simplenews_template_6/CHANGELOG.txt 2008-10-23 15:33:50.000000000 +0200 @@ -0,0 +1,34 @@ +// $Id: CHANGELOG.txt,v 1.5 2008/10/19 21:24:11 tbarregren Exp $ + + +Simplenews Template x.x-x.x, xxxx-xx-xx +--------------------------------------- + + +Simplenews Template 5.x-1.x, xxxx-xx-xx +--------------------------------------- + + +Simplenews Template 5.x-1.2, 2008-10-19 +--------------------------------------- +#152819: Module .info files should not define 'version' in CVS. +Replaced the HTML version of README with a text dito. +#273089 by tizzo: Pass entire node to theme_simplenews_template_mail_content. +#322905 by sun: Added link to preview HTML newsletters in browser. +Minor improvements of the code itself, such as removing a lot of trailing + spaces. +#317976 by enboig: Added support for + Emogrifier . +#240562 by Sixcolored: Fixed a typo in the default template. +Minor improvements of the code itself. +Updated simplenews_template.pot. + + +Simplenews Template 5.x-1.1, 2007-04-09 +--------------------------------------- +#132288 by polar-bear: Fixed a stupid mistake in phptemplate_mimemail_message(). + + +Simplenews Template 5.x-1.0, 2007-03-22 +--------------------------------------- +Initial release of Simplenews Template. diff -urp -N simplenews_template/README.html simplenews_template_6/README.html --- simplenews_template/README.html 2007-03-22 21:27:54.000000000 +0100 +++ simplenews_template_6/README.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,266 +0,0 @@ - - - - - - - - README: Simplenews Template - - - -

- Simplenews Template -

-

- Simplenews Template is a Drupal module that extends the Simplenews module by providing a themable template with configurable header, footer and style. Header, footer and style are configurable for each newsletter independently. -

-

- Simplenews Template can with advantage be used in conjunction with RelatedContent. -

- -

- Requirements -

-

- To install Simplenews Template you need: -

- -

- Installation -

-

- Install Simplenews Template as follows: -

-
    -
  1. -

    - Download, install and configure the Mime Mail module, following the instructions for that module. -

    -
    2. -
  2. -

    - Download, install and configure the Simplenews module, following the instructions for that module. -

    -
    3. -
  3. -

    - Download the archive file with the latest stable version from Simplenews Template. -

    -
    4. -
  4. -

    - Unpack the downloaded archive into your Drupal's modules directory. -

    -
    5. -
  5. -

    - Verify that the modules directory contains a simplenews_template directory with simplenews_template.module and other files. -

    -
    6. -
  6. -

    - Go to admin/build/modules and enable the module. -

    -
    7. -
-

- Configuration -

-

- There is no configuration for the Simplenews Template module itself. -

-

- Usage -

-

- Header, footer and style is setup for each newsletter individually as follows: -

-
    -
  1. -

    - If not already existing, go to admin/content/newsletters/types and add at least one newsletter. -

    -
    2. -
  2. -

    - Go to admin/content/newsletters/settings, and select the newsletter to be configured. -

    -
    3. -
  3. -

    - Locate and open the collapsible section called Header. -

    -
    4. -
  4. -

    - Fill out the text area with the content to be shown at the beginning of each issue of the newsletter. Leave blank to not include a header. Do not forget to choose appropriate input format. -

    -
    5. -
  5. -

    - Locate and open the collapsible section called Footer. -

    -
    6. -
  6. -

    - Fill out the text area with the content to be shown at the end of each issue of the newsletter. Leave blank to not include a footer. Do not forget to choose appropriate input format. -

    -
    7. -
  7. -

    - Locate and open the collapsible section called Style. -

    -
    8. -
  8. -

    - Fill out the text field called Body background color with any valid HTML color value, e.g. #ff00ff and fuchsia. -

    -
    9. -
  9. -

    - Fill out the text area called CSS with style sheet rules valid within the HTML tags <style type="text/css">...</style>, e.g. div.message { color: red }. -

    -
    10. -
- -

- License -

-

- Simplenews Template. Copyright © Thomas Barregren. -

-

- Simplenews Template is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -

-

- Simplenews Template is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -

-

- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -

- - diff -urp -N simplenews_template/README.txt simplenews_template_6/README.txt --- simplenews_template/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ simplenews_template_6/README.txt 2008-10-23 23:08:34.000000000 +0200 @@ -0,0 +1,151 @@ +// $Id: README.txt,v 1.3 2008/10/19 18:21:42 tbarregren Exp $ + +Additions for D6 update +=================== + +First attempt at a D6 port. +Emogrifier not currently working. +Per newsletter CSS not working. You can add a mail.css file to your theme folder which will be picked up if you add the following code to the template.php file in your theme folder. + +/** + * Override mimemail message theme so that mail.css is + * called from this theme folder rather than the module folder. + */ +function phptemplate_simplenews_template_mimemail_message($body) { + return theme_mimemail_message($body); +} + +Instructions below may need to be updated for D6 version. + + + +Simplenews Template +=================== + +Simplenews Template is a Drupal module that extends the Simplenews module by +providing a themable template with configurable header, footer and style. +Header, footer and style are configurable for each newsletter independently. + +Simplenews Template can with advantage be used in conjunction with +RelatedContent . + +Developed by + + * Thomas Barregren + +Sponsored by + + * Spoon Media + * Webbredaktören + + +Requirements +------------ + +To install Simplenews Template you need: + + * Drupal 5.x + * Simplenews + * Mime Mail + * PHPTemplate based theme + + +Installation +------------ + +Install Simplenews Template as follows: + + 1. Download, install and configure the Mime Mail module. + See http://drupal.org/project/mimemail. + + 2. Download, install and configure the Simplenews module. + See http://drupal.org/project/simplenews. + + 3. Download the latest stable version of Simplenews Template. + See http://drupal.org/project/simplenews_template. + + 4. Unpack the downloaded file into sites/all/modules or the modules directory + of your site. + + 5. Go to Administer » Site building » Modules and enable the module. + + 6. OPTIONAL: To enable automatic insertion of the Simplenews Template style + definitions into HTML-tags of e-mails, download the Emogrifier from + http://www.pelagodesign.com/sidecar/emogrifier/ and extract the file + emogrifier.php file into the Simplenews Template folder. More information + below. + + +Configuration +------------- + +There is no configuration for the Simplenews Template module itself. + + +Usage +----- + +Header, footer and style is setup for each newsletter individually as follows: + + 1. If not already existing, go to admin/content/newsletters/types and add at + least one newsletter. + + 2. Go to admin/content/newsletters/settings, and select the newsletter to be + configured. + + 3. Fill out the text area with the content to be shown at the beginning of + each issue of the newsletter. Leave blank to not include a header. Do not + forget to choose appropriate input format. + + 4. Locate and open the collapsible section called Footer. Fill out the text + area with the content to be shown at the end of each issue of the + newsletter. Leave blank to not include a footer. Do not forget to choose + appropriate input format. + + 5. Locate and open the collapsible section called Style. Fill out the text + field called Body background color with any valid HTML color value, + e.g. #ff00ff and fuchsia. + + 6. Fill out the text area called CSS with style sheet rules valid within the + HTML tags , + e.g. div.message { color: red }. + + +Emogrifier +---------- + +Some e-mail clients, notably Microsoft Outlook 2007 and Google Gmail, discharge +CSS defintions within -
-
-$content -
-
- - + +
+
+$node->body +
+
+ + EOT; } @@ -104,66 +142,98 @@ function theme_simplenews_template_mimem /** * Overriding theme_simplenews_newsletter(). + * Not currently being called as Simplenews for D6 doesn't call this theme function. + * To enable the emogrify function again, would probably have to call it from + * theme_simplenews_template_mimemail_message function above. */ -function phptemplate_simplenews_newsletter($node, $tid) { - +function phptemplate_simplenews_newsletter($body, $title, $tid) { + // Theme the subject - $term = taxonomy_get_term($tid); - $node->subject = theme('simplenews_template_mail_subject', $term->name, $node->title); - + //$term = taxonomy_get_term($tid); + //$node->subject = theme('simplenews_template_mail_subject', $term->name, $node->title); + // Theme the e-mail $css = _simplenews_template_get_css($tid); $bgcolor = _simplenews_template_get_bgcolor($tid); - $node->body = theme('simplenews_template_mail_content', $node->body, $term->name, $node->title, $css, $bgcolor); - + $node = theme('simplenews_template_mail_content', $node, $css, $bgcolor); + + // If the Emogrifier exists, + // insert the CSS definitions into the HTML tags. + $node->body = _simplenews_template_emogrify($node->body, $css); + return $node; } /** + * Overriding theme_simplenews_newsletter_body(). + * Added for D6 compatability. + * A simple override to stop the title being added before the header. + */ +function phptemplate_simplenews_newsletter_body($body, $title) { + return $body; +} + +/** * Overriding theme_mimemail_message(). */ function phptemplate_mimemail_message($content) { - + // If content already is a complete html page, just return it. if (_simplenews_template_starts_with($content, ' exists, + * the CSS definitions in $css are inserted into tags within $html based on the + * CSS selectors. + */ +function _simplenews_template_emogrify($html, $css) { + $path = drupal_get_path('module', 'simplenews_template'); + $path = "./$path/emogrifier.php"; + if (is_file($path)) { + include_once $path; + $emogrifier = new Emogrifier(); + $emogrifier->setHTML($html); + $emogrifier->setCSS($css); + $html = $emogrifier->emogrify(); + } + return $html; +} + +/** + * Returns true iff $text starts with any of the arguments following $text, * whitespaces and comments excluded. */ -function _simplenews_template_starts_with($text) { - +function _simplenews_template_starts_with($text) { + // White space characters. static $ws = " \t\n\r\0\x0B"; - + // Skip whitespaces and comments. $pos = 0; - while(true) { + while (true) { $pos += strspn($text, $ws, $pos); - $is_comment = strcmp(substr($text, $pos, 4), '', $pos) + 3; } - - // Return true if any of the strings to look for are found. + + // Return true if any of the strings to look for are found. $args = func_get_args(); array_shift($args); - foreach($args as $start) { - if (strcasecmp(substr($text, $pos, strlen($start)), $start) == 0) { - return true; - } + foreach ($args as $start) { + $start = drupal_strtolower($start); + if (drupal_substr($text, $pos, drupal_strlen($start)) === $start) return true; } - + // Return false since none of the strings to look for was found. return false; - + } @@ -172,96 +242,64 @@ function _simplenews_template_starts_wit ******************************************************************************/ /** - * Implementation of hook_form_alter(). + * Implementation of hook_perm(). */ -function simplenews_template_form_alter($form_id, &$form) { - if ($form_id == 'simplenews_admin_settings') { - $tid = $form['#validate']['simplenews_admin_settings_validate'][0]; - if ($tid) { - _simplenews_template_form_alter_newsletter_settings($form, $tid); - } - } +function simplenews_template_perm() { + return array('access newsletter preview'); } /** - * Implementation of hook_nodeapi(). + * Implementation of hook_menu(). */ -function simplenews_template_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { - if ($node->type == 'simplenews') { - $function = "_simplenews_template_node_$op"; - if (function_exists($function)) { - return $function($node, $a3, $a4); - } - } -} +function simplenews_template_menu() { + $items = array(); -/** - * Implementation of hook_help(). - */ -function simplenews_template_help($section='admin/help#simplenews_template') { - switch ($section) { - case 'admin/help#simplenews_template': - return _simplenews_template_help(); - } + $items['simplenews_template/preview/%'] = array( + 'title' => 'Simplenews Template preview', + 'page callback' => 'simplenews_template_preview', + 'page arguments' => array(2), + 'access arguments' => array('access newsletter preview'), + 'type' => MENU_CALLBACK, + ); + + return $items; } - -/****************************************************************************** - * ALTER SIMPLENEWS ADMIN SETTINGS FORM (NEWSLETTER SETTINGS) - ******************************************************************************/ - /** - * Add Simplenews Template settings to the node type forms. + * Implementation of hook_form_alter(). */ -function _simplenews_template_form_alter_newsletter_settings(&$form, $tid) { - $form['simplenews_template']['#weight'] = -10; - _simplenews_template_form_alter_header($form, $tid); - _simplenews_template_form_alter_footer($form, $tid); - _simplenews_template_form_alter_style($form, $tid); +function simplenews_template_form_simplenews_admin_types_form_alter(&$form, &$form_state) { + $tid = $form['tid']['#value']; -} - -function _simplenews_template_form_alter_header(&$form, $tid) { + $form['simplenews_template']['#weight'] = 10; - // Header filedset + // Header fieldset $form['simplenews_template']['simplenews_template_header'] = array( '#type' => 'fieldset', '#title' => t('Header'), - '#description' => t( - 'Enter a header common for all issues of this newsletter. For more information, see the !help.', - array('!help' => l(t('help page'), 'admin/help/simplenews_template#header')) - ), + '#description' => t('The header common for all issues of this newsletter.'), '#collapsible' => true, '#collapsed' => true, ); - // Header $form['simplenews_template']['simplenews_template_header']["simplenews_template_header_$tid"] = array( '#type' => 'textarea', '#title' => t('Header'), + '#weight' => -10, '#description' => t('Enter the content of the newsletter\'s header.'), - '#default_value' => _simplenews_template_get_header($tid), + '#default_value' => variable_get("simplenews_template_header_$tid", ''), ); - // Header input format - $form['simplenews_template']['simplenews_template_header']['simplenews_template_header_format_$tid'] = filter_form(_simplenews_template_get_header_format($tid), 1, array("simplenews_template_header_format_$tid")); - -} + $form['simplenews_template']['simplenews_template_header']["simplenews_template_header_format_$tid"] = filter_form(_simplenews_template_get_header_format($tid), 1, array("simplenews_template_header_format_$tid")); -function _simplenews_template_form_alter_footer(&$form, $tid) { - // Footer filedset $form['simplenews_template']['simplenews_template_footer'] = array( '#type' => 'fieldset', '#title' => t('Footer'), - '#description' => t( - 'Enter a footer common for all issues of this newsletter. For more information, see the !help.', - array('!help' => l(t('help page'), 'admin/help/simplenews_template#footer')) - ), + '#description' => t('The footer common for all issues of this newsletter.'), '#collapsible' => true, '#collapsed' => true, - ); - + ); // Footer $form['simplenews_template']['simplenews_template_footer']["simplenews_template_footer_$tid"] = array( '#type' => 'textarea', @@ -269,76 +307,118 @@ function _simplenews_template_form_alter '#description' => t('Enter the content of the newsletter\'s footer.'), '#default_value' => _simplenews_template_get_footer($tid), ); - // Footer input format - $form['simplenews_template']['simplenews_template_footer']['simplenews_template_footer_format_$tid'] = filter_form(_simplenews_template_get_footer_format($tid), 1, array("simplenews_template_footer_format_$tid")); - -} + $form['simplenews_template']['simplenews_template_footer']["simplenews_template_footer_format_$tid"] = filter_form(_simplenews_template_get_footer_format($tid), 1, array("simplenews_template_footer_format_$tid")); -function _simplenews_template_form_alter_style(&$form, $tid) { - // Style fieldset $form['simplenews_template']['simplenews_template_style'] = array( '#type' => 'fieldset', '#title' => t('Style'), - '#description' => t( - 'For more information, see the !help.', - array('!help' => l(t('help page'), 'admin/help/simplenews_template#style')) - ), + '#description' => t('To add CSS styles to the email, add a file called mail.css to your theme folder. Also see the readme file for a code snippet to add to the template.php file in your theme folder'), '#collapsible' => true, '#collapsed' => true, ); - // Background color - $form['simplenews_template']['simplenews_template_style']["simplenews_template_bgcolor_$tid"] = array( - '#type' => 'textfield', - '#title' => t('Body background color'), - '#description' => t('Enter the body background color to be used in all issues of this newsletter.'), - '#default_value' => _simplenews_template_get_bgcolor($tid), - ); + $form['#submit'][] = 'simplenews_template_save_newsletter_settings'; +} - // CSS - $form['simplenews_template']['simplenews_template_style']["simplenews_template_css_$tid"] = array( - '#type' => 'textarea', - '#title' => t('CSS'), - '#description' => t('Enter the CSS code to be included in all issues of this newsletter.'), - '#default_value' => _simplenews_template_get_css($tid), - ); +/** + * Submit function for the settings form. + */ +function simplenews_template_save_newsletter_settings($form_state) { + $tid = $form_state['tid']['#value']; + // header + variable_set("simplenews_template_header_$tid", $form_state['#post']['simplenews_template_header_'.$tid]); + variable_set("simplenews_template_header_format_$tid", $form_state['#post']["simplenews_template_header_format_$tid"]); + // footer + variable_set("simplenews_template_footer_$tid", $form_state['#post']["simplenews_template_footer_$tid"]); + variable_set("simplenews_template_footer_format_$tid", $form_state['#post']["simplenews_template_footer_format_$tid"]); +} +/** + * Implementation of hook_nodeapi(). + */ +function simplenews_template_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { + if ($node->type == 'simplenews') { + $function = "_simplenews_template_node_$op"; + if (function_exists($function)) { + return $function($node, $a3, $a4); + } + } +} + +/** + * Implementation of hook_link_alter(&$links, $node). + */ +function simplenews_template_link_alter(&$node, &$links) { + if ($node->type == 'simplenews' && $node->s_format == 'html' && user_access('access newsletter preview')) { + $links['simplenews_preview'] = array( + 'title' => t('Preview'), + 'href' => "simplenews_template/preview/$node->nid", + 'attributes' => array( + 'target' => '_blank', + ), + ); + } } /****************************************************************************** + * MENU CALLBACKS + ******************************************************************************/ + +/** + * Output a Simplenews template'd newsletter node like in a mail. + * + * @param $nid + * The simplenews node id to render. + * @param $vid + * (optional) A revision id to use; most recent is used if omitted. + * + * @return + * A full HTML page containing the same markup as in outgoing mails. + */ +function simplenews_template_preview($nid = 0, $vid = NULL) { + $node = node_load($nid, $vid); + if (!$node || $node->type != 'simplenews') { + return drupal_not_found(); + } + $node = simplenews_node_prepare($nid, $vid, $node->tid); + $node = theme('simplenews_newsletter_footer', $node, ''); + echo $node->body; +} + +/****************************************************************************** * IMPLEMENTING THE NODE API ******************************************************************************/ /** * A newsletter issue is being viewed. - */ + */ function _simplenews_template_node_view(&$node, $teaser, $page) { - + // Don't include header and footer if this is a teaser. if ($teaser) return; - + // Get taxonomy id - $tid = $node->tid; - + $tid = $node->simplenews['tid']; + // Retrive and filter the header content. $header = _simplenews_template_get_header($tid); $header = check_markup($header, _simplenews_template_get_header_format($tid), false); - + // Retrive the body. It is already filtered since it is part of a node. $body .= $node->content['body']['#value']; - + // Retrive and filter the footer content. $footer = _simplenews_template_get_footer($tid); $footer = check_markup($footer, _simplenews_template_get_footer_format($tid), false); - + // Theme the content $content = theme('simplenews_template_content', $term->name, $node->title, $header, $body, $footer); - + // Update the node's content - $node->content['body']['#value'] = $content; + $node->content['body']['#value'] = $content; } @@ -350,320 +430,41 @@ function _simplenews_template_node_view( /** * Returns the header. */ -function _simplenews_template_get_header($tid) -{ +function _simplenews_template_get_header($tid) { return variable_get("simplenews_template_header_$tid", ''); } /** * Returns header format. */ -function _simplenews_template_get_header_format($tid) -{ +function _simplenews_template_get_header_format($tid) { return variable_get("simplenews_template_header_format_$tid", FILTER_FORMAT_DEFAULT); } /** * Returns the footer. */ -function _simplenews_template_get_footer($tid) -{ +function _simplenews_template_get_footer($tid) { return variable_get("simplenews_template_footer_$tid", ''); } /** * Returns footer format. */ -function _simplenews_template_get_footer_format($tid) -{ +function _simplenews_template_get_footer_format($tid) { return variable_get("simplenews_template_footer_format_$tid", FILTER_FORMAT_DEFAULT); } /** * Returns the background color. */ -function _simplenews_template_get_bgcolor($tid) -{ +function _simplenews_template_get_bgcolor($tid) { return variable_get("simplenews_template_bgcolor_$tid", '#ffffff'); } /** * Returns the CSS. */ -function _simplenews_template_get_css($tid) -{ +function _simplenews_template_get_css($tid) { return variable_get("simplenews_template_css_$tid", ''); } - - -/****************************************************************************** - * HELP - *****************************************************************************/ - -/** - * Returns full help text. - */ -function _simplenews_template_help() { - $help = << --> - -

- Simplenews Template is a Drupal module that extends the Simplenews module by providing a themable template with configurable header, footer and style. Header, footer and style are configurable for each newsletter independently. -

-

- Simplenews Template can with advantage be used in conjunction with RelatedContent. -

- -

- Requirements -

-

- To install Simplenews Template you need: -

- -

- Installation -

-

- Install Simplenews Template as follows: -

-
    -
  1. -

    - Download, install and configure the Mime Mail module, following the instructions for that module. -

    -
    2. -
  2. -

    - Download, install and configure the Simplenews module, following the instructions for that module. -

    -
    3. -
  3. -

    - Download the archive file with the latest stable version from Simplenews Template. -

    -
    4. -
  4. -

    - Unpack the downloaded archive into your Drupal's modules directory. -

    -
    5. -
  5. -

    - Verify that the modules directory contains a simplenews_template directory with simplenews_template.module and other files. -

    -
    6. -
  6. -

    - Go to admin/build/modules and enable the module. -

    -
    7. -
-

- Configuration -

-

- There is no configuration for the Simplenews Template module itself. -

-

- Usage -

-

- Header, footer and style is setup for each newsletter individually as follows: -

-
    -
  1. -

    - If not already existing, go to admin/content/newsletters/types and add at least one newsletter. -

    -
    2. -
  2. -

    - Go to admin/content/newsletters/settings, and select the newsletter to be configured. -

    -
    3. -
  3. -

    - Locate and open the collapsible section called Header. -

    -
    4. -
  4. -

    - Fill out the text area with the content to be shown at the beginning of each issue of the newsletter. Leave blank to not include a header. Do not forget to choose appropriate input format. -

    -
    5. -
  5. -

    - Locate and open the collapsible section called Footer. -

    -
    6. -
  6. -

    - Fill out the text area with the content to be shown at the end of each issue of the newsletter. Leave blank to not include a footer. Do not forget to choose appropriate input format. -

    -
    7. -
  7. -

    - Locate and open the collapsible section called Style. -

    -
    8. -
  8. -

    - Fill out the text field called Body background color with any valid HTML color value, e.g. #ff00ff and fuchsia. -

    -
    9. -
  9. -

    - Fill out the text area called CSS with style sheet rules valid within the HTML tags <style type="text/css">...</style>, e.g. div.message { color: red }. -

    -
    10. -
- -

- License -

-

- Simplenews Template !version. Copyright © !year Thomas Barregren. -

-

- Simplenews Template is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -

-

- Simplenews Template is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -

-

- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -

-EOT; - - $version = str_replace(array('$Re'.'vision:', ' $'), array('', ''), '$Revision: 1.2 $'); - $year = substr('$Date: 2007/04/09 21:52:23 $', 7, 4); - return t($help, array('!version' => $version, '!year' => $year)); - -} \ No newline at end of file diff -urp -N simplenews_template/translations/fr.po simplenews_template_6/translations/fr.po --- simplenews_template/translations/fr.po 1970-01-01 01:00:00.000000000 +0100 +++ simplenews_template_6/translations/fr.po 2008-10-23 15:33:50.000000000 +0200 @@ -0,0 +1,100 @@ +# $Id: fr.po,v 1.1 2008/10/18 02:22:49 sun Exp $ +# +# French translation of Drupal (general) +# Copyright YEAR NAME +# Generated from files: +# simplenews_template.module,v 1.2 2007/04/09 21:52:23 tbarregren +# simplenews_template.install,v 1.1 2007/03/22 20:27:54 tbarregren +# simplenews_template.info,v 1.1 2007/03/22 20:27:54 tbarregren +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2008-10-06 20:36+0200\n" +"PO-Revision-Date: 2008-10-06 20:36+0200\n" +"Last-Translator: NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#: simplenews_template.module:229;241 +msgid "Header" +msgstr "Titre" + +#: simplenews_template.module:230 +msgid "Enter a header common for all issues of this newsletter. For more information, see the !help." +msgstr "" +"Entrez une entête commune pour toutes les newsletters. Pour plus " +"d'information, voir l'!help." + +#: simplenews_template.module:232;259;286 +msgid "help page" +msgstr "page d'aide" + +#: simplenews_template.module:242 +msgid "Enter the content of the newsletter's header." +msgstr "Entrez le contenu de l'entête de la newsletter." + +#: simplenews_template.module:256;268 +msgid "Footer" +msgstr "Pied de page" + +#: simplenews_template.module:257 +msgid "Enter a footer common for all issues of this newsletter. For more information, see the !help." +msgstr "" +"Entrez un pied de page commun pour toutes les newsletter. Pour plus " +"d'information, voir l'!help." + +#: simplenews_template.module:269 +msgid "Enter the content of the newsletter's footer." +msgstr "Entrez le contenu du pied de page de la newsletter." + +#: simplenews_template.module:283 +msgid "Style" +msgstr "Style" + +#: simplenews_template.module:284 +msgid "For more information, see the !help." +msgstr "Pour plus d'information, voir l'!help." + +#: simplenews_template.module:295 +msgid "Body background color" +msgstr "Couleur de fond du " + +#: simplenews_template.module:296 +msgid "Enter the body background color to be used in all issues of this newsletter." +msgstr "" +"Entrez la couleur de fond qui doit être utilisée pour les éditions " +"de cette newsletter." + +#: simplenews_template.module:303 +msgid "CSS" +msgstr "CSS" + +#: simplenews_template.module:304 +msgid "Enter the CSS code to be included in all issues of this newsletter." +msgstr "" +"Entrez le code CSS qui doit être inclus dans toutes les éditions de " +"cette newsletter." + +#: simplenews_template.install:25 +msgid "!module was succefully installed." +msgstr "!module a été installé avec succès." + +#: simplenews_template.install:37 +msgid "Failed to delete variables for Simplenews Template." +msgstr "Echec lors de la suppresion des variables de Simplenews Template." + +#: simplenews_template.info:0 +msgid "Simplenews Template" +msgstr "Simplenews Template" + +#: simplenews_template.info:0 +msgid "Extends Simplenews by providing a themable template with configurable header, footer and style." +msgstr "" +"Étend Simplenews en fournissant un template \"thémable\" avec " +"entête, pied de page et styles configurables." + diff -urp -N simplenews_template/translations/no.po simplenews_template_6/translations/no.po --- simplenews_template/translations/no.po 1970-01-01 01:00:00.000000000 +0100 +++ simplenews_template_6/translations/no.po 2008-10-23 15:33:50.000000000 +0200 @@ -0,0 +1,96 @@ +# $Id: no.po,v 1.1 2008/10/18 02:22:18 sun Exp $ +# +# Norwegian translation of Drupal (general) +# Copyright YEAR NAME +# Generated from files: +# simplenews_template.module,v 1.2 2007/04/09 21:52:23 tbarregren +# simplenews_template.install,v 1.1 2007/03/22 20:27:54 tbarregren +# simplenews_template.info,v 1.1 2007/03/22 20:27:54 tbarregren +# +msgid "" +msgstr "" +"Project-Id-Version: Simplenews Template 5.x-1.1\n" +"POT-Creation-Date: 2007-10-19 12:42+0200\n" +"PO-Revision-Date: 2007-10-19 12:57+0100\n" +"Last-Translator: Sten Johnsen \n" +"Language-Team: THINEA Webteknologi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Poedit-Language: Norwegian Bokmal\n" +"X-Poedit-Country: NORWAY\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: simplenews_template.module:229;241 +msgid "Header" +msgstr "Tittel" + +#: simplenews_template.module:230 +msgid "Enter a header common for all issues of this newsletter. For more information, see the !help." +msgstr "Legg inn en header felles for alle utsendelsene av dette nyhetsbrevet. For mer informasjon, se !help." + +#: simplenews_template.module:232;259;286 +msgid "help page" +msgstr "hjelpeside" + +#: simplenews_template.module:242 +msgid "Enter the content of the newsletter's header." +msgstr "Skriv inn innholdet i nyhetsbrevet header." + +#: simplenews_template.module:256;268 +msgid "Footer" +msgstr "Bunntekst" + +#: simplenews_template.module:257 +msgid "Enter a footer common for all issues of this newsletter. For more information, see the !help." +msgstr "Legg inn en bunntekst felles for alle utgaver av dette nyhetsbrevet. For mer informasjon se !help." + +#: simplenews_template.module:269 +msgid "Enter the content of the newsletter's footer." +msgstr "Legg inn innholdet i nyhetsbrevets bunntekst." + +#: simplenews_template.module:283 +msgid "Style" +msgstr "Stil" + +#: simplenews_template.module:284 +msgid "For more information, see the !help." +msgstr "For mer informasjon, se !help." + +#: simplenews_template.module:295 +msgid "Body background color" +msgstr "Hovedtekst bakgrunn farge" + +#: simplenews_template.module:296 +msgid "Enter the body background color to be used in all issues of this newsletter." +msgstr "Legg in hovedtekstens bakgrunnsfarge. Blir benyttet i alle utgaver av dette nyhetsbrevet." + +#: simplenews_template.module:303 +msgid "CSS" +msgstr "CSS" + +#: simplenews_template.module:304 +msgid "Enter the CSS code to be included in all issues of this newsletter." +msgstr "Legg inn CSS koden som skal legges ved alle utgaver av dette nyhetsbrevet." + +#: simplenews_template.module:0 +msgid "simplenews_template" +msgstr "simplenews_template" + +#: simplenews_template.install:25 +msgid "!module was succefully installed." +msgstr "!module ble installert." + +#: simplenews_template.install:37 +msgid "Failed to delete variables for Simplenews Template." +msgstr "Kunne ikke slette variabler for Simplenews Template." + +#: simplenews_template.info:0 +msgid "Simplenews Template" +msgstr "Simplenews Template" + +#: simplenews_template.info:0 +msgid "Extends Simplenews by providing a themable template with configurable header, footer and style." +msgstr "Utvider Simplenews ved å legge til en mal med konfigurerbar topptekst og bunntekst og stil." + diff -urp -N simplenews_template/translations/simplenews_template.pot simplenews_template_6/translations/simplenews_template.pot --- simplenews_template/translations/simplenews_template.pot 1970-01-01 01:00:00.000000000 +0100 +++ simplenews_template_6/translations/simplenews_template.pot 2008-10-23 15:33:50.000000000 +0200 @@ -0,0 +1,97 @@ +# $Id: simplenews_template.pot,v 1.2 2008/10/19 20:47:56 tbarregren Exp $ +# +# LANGUAGE translation of Drupal (general) +# Copyright YEAR NAME +# Generated from files: +# simplenews_template.module,v 1.9 2008/10/19 20:45:10 tbarregren +# simplenews_template.info,v 1.3 2008/10/19 09:15:48 tbarregren +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2008-10-19 22:46+0200\n" +"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" +"Last-Translator: NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: simplenews_template.module:203 +msgid "Simplenews Template preview" +msgstr "" + +#: simplenews_template.module:242 +msgid "Preview" +msgstr "" + +#: simplenews_template.module:298;307 +msgid "Header" +msgstr "" + +#: simplenews_template.module:299 +msgid "The header common for all issues of this newsletter." +msgstr "" + +#: simplenews_template.module:308 +msgid "Enter the content of the newsletter's header." +msgstr "" + +#: simplenews_template.module:322;331 +msgid "Footer" +msgstr "" + +#: simplenews_template.module:323 +msgid "The footer common for all issues of this newsletter." +msgstr "" + +#: simplenews_template.module:332 +msgid "Enter the content of the newsletter's footer." +msgstr "" + +#: simplenews_template.module:346 +msgid "Style" +msgstr "" + +#: simplenews_template.module:347 +msgid "The style to be applied to all issues of this newsletter" +msgstr "" + +#: simplenews_template.module:355 +msgid "Body background color" +msgstr "" + +#: simplenews_template.module:356 +msgid "Enter the backgound color of the body." +msgstr "" + +#: simplenews_template.module:363 +msgid "CSS" +msgstr "" + +#: simplenews_template.module:364 +msgid "Enter the CSS rules of the body." +msgstr "" + +#: simplenews_template.module:192 +msgid "access newsletter preview" +msgstr "" + +#: simplenews_template.module:0 +msgid "simplenews_template" +msgstr "" + +#: simplenews_template.info:0 +msgid "Simplenews Template" +msgstr "" + +#: simplenews_template.info:0 +msgid "Extends Simplenews by providing a themable template with configurable header, footer and style." +msgstr "" + +#: simplenews_template.info:0 +msgid "Mail" +msgstr "" +