Index: block.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/block.tpl.php,v retrieving revision 1.2 diff -u -r1.2 block.tpl.php --- block.tpl.php 3 Mar 2009 15:34:11 -0000 1.2 +++ block.tpl.php 5 Mar 2009 10:55:00 -0000 @@ -1,5 +1,9 @@ Index: comment-form.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/comment-form.tpl.php,v retrieving revision 1.4 diff -u -r1.4 comment-form.tpl.php --- comment-form.tpl.php 4 Mar 2009 22:32:06 -0000 1.4 +++ comment-form.tpl.php 5 Mar 2009 10:26:00 -0000 @@ -1,5 +1,9 @@
Index: comment-wrapper.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/comment-wrapper.tpl.php,v retrieving revision 1.4 diff -u -r1.4 comment-wrapper.tpl.php --- comment-wrapper.tpl.php 4 Mar 2009 22:32:06 -0000 1.4 +++ comment-wrapper.tpl.php 5 Mar 2009 10:29:00 -0000 @@ -36,7 +36,13 @@
type != 'forum'): ?>
- comment_count; if ($node->comment_count > 1) { print ' Comments'; } else { print ' Comment'; } ?> + + comment_count; + if ($node->comment_count > 1) { + print t('Comments'); } + else { print t('Comment'); } ?> +
Index: comment.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/comment.tpl.php,v retrieving revision 1.5 diff -u -r1.5 comment.tpl.php --- comment.tpl.php 4 Mar 2009 22:32:06 -0000 1.5 +++ comment.tpl.php 5 Mar 2009 10:25:00 -0000 @@ -26,7 +26,7 @@ * @see theme_comment() */ ?> -
+
Index: node.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/node.tpl.php,v retrieving revision 1.5 diff -u -r1.5 node.tpl.php --- node.tpl.php 4 Mar 2009 22:32:06 -0000 1.5 +++ node.tpl.php 5 Mar 2009 10:43:00 -0000 @@ -1,31 +1,81 @@ -
"> +
+ +">

- By ' .$name . '';} ?> - '. $date . '';} ?> +'. t('By') .' '. $name .''; + } +?> +'. $date .''; + } +?>

-
"> +
1): ?>
- - 1) { print ' Comments'; } else { print ' Comment'; } ?> - + + 1) { + print t('Comments'); + } + else { + print t('Comment'); + } +?> +
- +
@@ -48,7 +98,7 @@
- Continue Reading +
Index: page.tpl.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/page.tpl.php,v retrieving revision 1.6 diff -u -r1.6 page.tpl.php --- page.tpl.php 4 Mar 2009 22:32:06 -0000 1.6 +++ page.tpl.php 5 Mar 2009 10:55:00 -0000 @@ -1,5 +1,11 @@ Index: template.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/template.php,v retrieving revision 1.4 diff -u -r1.4 template.php --- template.php 4 Mar 2009 22:32:06 -0000 1.4 +++ template.php 5 Mar 2009 10:54:00 -0000 @@ -1,6 +1,10 @@ '; @@ -162,26 +166,24 @@ */ function phptemplate_comment_count($comment_count, $node_url) { - - switch (theme_get_setting('display_teaser_comment')) { - case 'hide': - $output = ''; - break; - case 'addnew': - $output = '
'; - $output .= ''; - $output .= 'Add new comment'; - $output .= ''; - $output .= '
'; - break; - - default: - $output = '
'; - $output .= ''; - $output .= $comment_count . ' comments'; - $output .= ''; - $output .= '
'; - } + switch (theme_get_setting('display_teaser_comment')) { + case 'hide': + $output = ''; + break; + case 'addnew': + $output = '
'; + $output .= ''; + $output .= t('Add new comment'); + $output .= ''; + $output .= '
'; + break; + default: + $output = '
'; + $output .= ''; + $output .= $comment_count .' '. t('comments'); + $output .= ''; + $output .= '
'; + } return $output; } @@ -190,14 +192,13 @@ */ function phptemplate_display_author($name) { - - if (theme_get_setting('display_author') == 0) { - $output = ''; - } - else { - $output = 'By ' .$name . ''; - } - return $output; + if (theme_get_setting('display_author') == 0) { + $output = ''; + } + else { + $output = ''. t('By') .' '. $name .''; + } + return $output; } @@ -206,10 +207,10 @@ */ function phptemplate_mainwidth_class($dock) { - - $mainwidth = 'width940'; - if ( $dock ) {$mainwidth = 'width580';} - print $mainwidth; + $mainwidth = 'width940'; + if ( $dock ) { + $mainwidth = 'width580';} + print $mainwidth; } @@ -228,7 +229,7 @@ /** * Theme FORM. */ -function magazeen_theme(){ +function magazeen_theme() { return array( 'comment_form' => array( 'arguments' => array('form' => NULL), @@ -237,17 +238,17 @@ ); } - function magazeen_preprocess_comment_form(&$vars) { - $vars['submit'] = drupal_render($vars['form']['submit']); - $vars['preview'] = drupal_render($vars['form']['preview']); - $vars['subject'] = drupal_render($vars['form']['subject']); - $vars['comment'] = drupal_render($vars['form']['comment_filter']['comment']); - $vars['form']['name']['#title'] = t('Name (required)'); - $vars['name'] = drupal_render($vars['form']['name']); - $vars['form']['mail']['#title'] = t('Mail (will not be published) (required)'); - $vars['mail'] = drupal_render($vars['form']['mail']); - $vars['form']['homepage']['#title'] = t('Website'); - $vars['homepage'] = drupal_render($vars['form']['homepage']); - $vars['comment_preview'] = drupal_render($vars['form']['comment_preview']); - } +function magazeen_preprocess_comment_form(&$vars) { + $vars['submit'] = drupal_render($vars['form']['submit']); + $vars['preview'] = drupal_render($vars['form']['preview']); + $vars['subject'] = drupal_render($vars['form']['subject']); + $vars['comment'] = drupal_render($vars['form']['comment_filter']['comment']); + $vars['form']['name']['#title'] = t('Name (required)'); + $vars['name'] = drupal_render($vars['form']['name']); + $vars['form']['mail']['#title'] = t('Mail (will not be published) (required)'); + $vars['mail'] = drupal_render($vars['form']['mail']); + $vars['form']['homepage']['#title'] = t('Website'); + $vars['homepage'] = drupal_render($vars['form']['homepage']); + $vars['comment_preview'] = drupal_render($vars['form']['comment_preview']); +} //dsm($vars['form']); \ No newline at end of file Index: theme-settings.php =================================================================== RCS file: /cvs/drupal/contributions/themes/magazeen/theme-settings.php,v retrieving revision 1.4 diff -u -r1.4 theme-settings.php --- theme-settings.php 4 Mar 2009 22:32:06 -0000 1.4 +++ theme-settings.php 5 Mar 2009 10:24:00 -0000 @@ -1,5 +1,9 @@ TRUE, '#collapsed' => FALSE, ); - // Comment Title - $form['tnt_container']['general_settings']['comment']['comment_title'] = array( - '#type' => 'textfield', - '#title' => t('Comment Title'), - '#description' => t('Customize the title for the comments box'), - '#size' => 60, - '#default_value' => $settings['comment_title'], - ); - - // Display Teaser Comment - $form['tnt_container']['general_settings']['comment']['display_teaser_comment'] = array( - '#type' => 'select', - '#title' => t('Option to display comment count in teaser if less than 1'), - '#default_value' => $settings["display_teaser_comment"], - '#options' => array( - 'normal' => t('Display comment count'), - 'hide' => t('Don\'t display comment count'), - 'addnew' => t('Display "Add new comment"'), - ), - ); + // Comment Title + $form['tnt_container']['general_settings']['comment']['comment_title'] = array( + '#type' => 'textfield', + '#title' => t('Comment Title'), + '#description' => t('Customize the title for the comments box'), + '#size' => 60, + '#default_value' => $settings['comment_title'], + ); + + // Display Teaser Comment + $form['tnt_container']['general_settings']['comment']['display_teaser_comment'] = array( + '#type' => 'select', + '#title' => t('Option to display comment count in teaser if less than 1'), + '#default_value' => $settings["display_teaser_comment"], + '#options' => array( + 'normal' => t('Display comment count'), + 'hide' => t('Don\'t display comment count'), + 'addnew' => t('Display "Add new comment"'), + ), + ); // SEO settings $form['tnt_container']['seo'] = array( @@ -207,7 +211,8 @@ '#rows' => 6, '#default_value' => $settings['meta_description'], ); - } else { + } + else { $form['tnt_container']['seo']['meta']['#description'] = 'NOTICE: You currently have the "nodewords" module installed and enabled, so the meta tag theme settings have been disabled to prevent conflicts. If you later wish to re-enable the meta tag theme settings, you must first disable the "nodewords" module.'; $form['tnt_container']['seo']['meta']['meta_keywords']['#disabled'] = 'disabled'; $form['tnt_container']['seo']['meta']['meta_description']['#disabled'] = 'disabled';